diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue index 437de717..a44e31ad 100644 --- a/src/component/Detail/canvas/index.vue +++ b/src/component/Detail/canvas/index.vue @@ -16,6 +16,7 @@ :clothing-image-opts="{ imageMode:'contains', }" + :hideCanvas="hideCanvas" ref="editCanvas"> @@ -37,6 +38,7 @@ :clothing-image-opts="{ imageMode:'contains', }" + :hideCanvas="hideCanvas" ref="editCanvasBackFront"> @@ -63,6 +65,7 @@ import { useStore } from "vuex"; import { useI18n } from 'vue-i18n' import editCanvas from "@/component/Canvas/CanvasEditor/index.vue"; import { formatTime,segmentImage,getMinioUrl } from "@/tool/util"; +import { useRouter, useRoute } from 'vue-router' export default defineComponent({ components:{ @@ -77,7 +80,7 @@ export default defineComponent({ setup(props,{emit}) { const store = useStore(); const {t} = useI18n(); - + const route = useRoute() const detailDom = reactive({ editFrontBack:null as any, model:null, @@ -104,6 +107,7 @@ export default defineComponent({ getCanvasIfEdit:inject('getCanvasIfEdit')as any, canvasInstance:null as any, canvasJSON:'', + hideCanvas: computed(()=>store.state.Workspace.projectPath !== route.fullPath), }) watch(()=>detailData.selectDetail,(newValue,oldValue)=>{ detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id) diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index 2c3c5d1d..ac59a11a 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -724,8 +724,9 @@ export default defineComponent({ } }, methods: { - generageAdd(data: any) { - if (!data?.imgUrl) return + generageAdd(value: any) { + if (!value?.imgUrl) return + const data = JSON.parse(JSON.stringify(value)) data.type_ = this.type_ data.type_.type1 = data.designType ? data.designType : this.type_.type1 data.resData = JSON.parse(JSON.stringify(data)) @@ -1204,13 +1205,14 @@ export default defineComponent({ Https.axiosPost(Https.httpUrls.generateLike, data) .then(rv => { item.like = true + item.libraryId = rv.libraryId }) .catch(res => {}) this.fileList[index].state = '' this.generageAdd(item) } else { this.fileList[index].state = 'delete' - this.generageAdd(item) + // this.generageAdd(item) let data = { generateDetailId: item.id, timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone @@ -1218,6 +1220,7 @@ export default defineComponent({ Https.axiosGet(Https.httpUrls.generateDislike, { params: data }) .then(rv => { item.like = false + item.libraryId = null }) .catch(res => {}) } diff --git a/src/component/HomePage/sketchCategory.vue b/src/component/HomePage/sketchCategory.vue index 6ccde777..966d3660 100644 --- a/src/component/HomePage/sketchCategory.vue +++ b/src/component/HomePage/sketchCategory.vue @@ -119,10 +119,22 @@ export default defineComponent({ file.level2Type = cate.value; file.categoryValue = cate.value; file.category = cate.name; - if(props.isSetSketchCategory){ + + console.log("libraryId:" + file.libraryId) + if(file.libraryId){ + let data = { + libraryId:[file.libraryId], + level2Type:props.item.categoryValue, + } + Https.axiosPost(Https.httpUrls.setSketchLibrary,data).then( + (rv: any) => { + emit('upTypeSucced') + } + ).catch((res)=>{ + }); + }else if(props.isSetSketchCategory){ setSketchLibrary(props.item) } - // this.store.commit("sketchGenerateFiles", this.fileList); } let setSketchLibrary = (item:any)=>{ diff --git a/src/component/modules/generalMiniCanvas.vue b/src/component/modules/generalMiniCanvas.vue index 255ce6ad..15c579d3 100644 --- a/src/component/modules/generalMiniCanvas.vue +++ b/src/component/modules/generalMiniCanvas.vue @@ -5,6 +5,7 @@ @canvasInit="canvasInit" @changeCanvas="changeCanvas" is-general + :hideCanvas="hideCanvas" :isBackgroundChangeable="false" ref="editCanvas"> @@ -26,6 +27,7 @@ import { Https } from "@/tool/https"; import { useStore } from "vuex"; import { useI18n } from "vue-i18n"; import editCanvas from "@/component/Canvas/CanvasEditor/index.vue"; +import { useRouter, useRoute } from 'vue-router' export default defineComponent({ @@ -53,12 +55,14 @@ export default defineComponent({ const isShowMark = ref(false) const component = reactive({ }) + const route = useRoute() const data = reactive({ canvasLoad:false, canvasJSON:computed(()=>store.state.HomeStoreModule.canvasData.canvas), canvasConfig:{ }, + hideCanvas: computed(()=>store.state.Workspace.projectPath !== route.fullPath), }) watch(()=>data.canvasJSON,(newVal)=>{ dataDom.editCanvas.loadJSON(newVal) diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index ea8e13bf..2e4eefcd 100644 --- a/src/views/HomeView/library.vue +++ b/src/views/HomeView/library.vue @@ -1067,6 +1067,7 @@ export default defineComponent({ Https.axiosPost(Https.httpUrls.generateLike, data).then( (rv) => { item.like = true + item.libraryId = rv.libraryId } ).catch(res=>{ }); @@ -1078,6 +1079,7 @@ export default defineComponent({ Https.axiosGet(Https.httpUrls.generateDislike, {params:data}).then( (rv) => { item.like = false + item.libraryId = null } ).catch(res=>{ });