diff --git a/public/image/loading.gif b/public/image/loading.gif new file mode 100644 index 00000000..bdfc9d4e Binary files /dev/null and b/public/image/loading.gif differ diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 9ecd4d34..bc412e3d 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -677,7 +677,7 @@ export default defineComponent({ if (key == "printboardFiles") { imgWidth = canvasWH.value.width / 8; } - if (key == "sketchboardFiles"||key == 'moodboardFiles') { + if (key == "sketchboardFiles"||key == 'moodboardFiles'||key == 'FinalizeImage') { imgWidth = (canvasWH.value.width - (sketchGrouping - 1) * 20) / @@ -781,6 +781,7 @@ export default defineComponent({ let num = 0; for (let key in allBoardData.value) { if (key !== "colorBoards" && key !== "moodTemplateId") { + if(!(allBoardData.value[key] instanceof Array)) continue for (let item of allBoardData.value[key]) { if ( key == "disposeMoodboard" && diff --git a/src/component/HomePage/scaleImage.vue b/src/component/HomePage/scaleImage.vue index 77dad3b3..341184b5 100644 --- a/src/component/HomePage/scaleImage.vue +++ b/src/component/HomePage/scaleImage.vue @@ -104,6 +104,7 @@ +
@@ -133,12 +134,11 @@ import { defineComponent, h, ref ,toRefs,createVNode,reactive, nextTick} from "vue"; import { Https } from "@/tool/https"; import { Modal } from "ant-design-vue"; -// import domTurnImg from '@/tool/domTurnImg' -import { useStore } from "vuex"; import { ExclamationCircleOutlined } from '@ant-design/icons-vue'; import { downloadIamge } from "@/tool/util"; import { getCookie,setCookie } from "@/tool/cookie"; import { useI18n } from "vue-i18n"; +import { useStore } from "vuex"; import generalMiniCanvas from "@/component/modules/generalMiniCanvas.vue"; export default defineComponent({ components:{generalMiniCanvas}, @@ -222,6 +222,7 @@ export default defineComponent({ Https.axiosPost(url, data).then( (rv) => { isShowMark.value = false + scaleImageList.value[scaleImageIndex.value].imgUrl = '/image/loading.gif' let arr:any = [] rv.forEach((item:any)=>{ arr.push(item.taskId) @@ -401,13 +402,14 @@ export default defineComponent({ document.removeEventListener('keydown',this.setKeydown) }, lastStep(){ - + if(this.productimgIsProductimg) return if(this.scaleImageIndex <= 0){ }else{ this.scaleImageIndex -= 1 } }, nextStep(){ + if(this.productimgIsProductimg) return if(this.scaleImageIndex >= this.scaleImageList.length-1){ }else{ this.scaleImageIndex += 1 @@ -469,6 +471,7 @@ export default defineComponent({ img{ width: auto; height: 100%; + max-width: 40rem; } &.active{ display: flex; diff --git a/src/component/modules/liquefaction.vue b/src/component/modules/liquefaction.vue index 6d7d4919..65864270 100644 --- a/src/component/modules/liquefaction.vue +++ b/src/component/modules/liquefaction.vue @@ -62,8 +62,8 @@ export default defineComponent({ // let presentState = ref('paypal'); let liqufeaction = ref(false); let liqufeactionData = reactive({ - routes: 90,//移动框大小 - density: 80,//移动大小 + routes: 30,//移动框大小 + density: 30,//移动大小 }) let arrows = ref({ show:false, diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 363066f4..1ca7b727 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -344,7 +344,7 @@ export default { SelectSuccessivelyOnTitle:'连续选色模式开启.', SelectSuccessivelyOffTitle:'连续选色模式关闭.', SelectSeparately:'单选', - ExtractColor:'提取颜色', + ExtractColor:'提取', Single:'单色', Gradual:'渐变', Alignment:'线性', diff --git a/src/lang/en.ts b/src/lang/en.ts index 08665808..27ad73ce 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -48,7 +48,7 @@ export default { CanvasSize:'Canvas Size', Height:'Height', Width:'Width', - CanvasNav:'Canvas Nav', + CanvasNav:'Elements', CanvasTool:'Canvas Tool', Color:'Color', Size:'Size', @@ -522,7 +522,7 @@ export default { }, works:{ all:'All', - FavoriteWorks:'Like The Works', + FavoriteWorks:'Like Works', MyWorks:'My Works', }, Publish:{ diff --git a/tsconfig.json b/tsconfig.json index 8330a406..5d3382fa 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -40,6 +40,7 @@ "tests/**/*.tsx", "src/**/*.js", "src/**/*.svg", + "src/**/*.gif", ], "exclude": [ "node_modules"