修复页面刷新sketch会增加和颜色板块关闭后再次打开颜色异常问题

2025-10-10 13:03:21 +08:00
parent f8ebfa8809
commit d35f24d817
12 changed files with 37 additions and 1281 deletions
--- a/src/component/HomePage/Generate
+++ b/src/component/HomePage/Generate
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -507,7 +507,6 @@ export default defineComponent({
    watch(
      () => scene.value,
      (newVal, oldVal) => {
-        console.log('scene-------------newVal', newVal)
        if (newVal.value == 'extract') {
          speed.speedData = {
            ...speed.extractList[0]
@@ -869,7 +868,7 @@ export default defineComponent({
        }
        data = {
          generateType: 'text',
-          designType: 'collection',
+          designType: this.sketchboardList[0]?.designType?this.sketchboardList[0].designType:'collection',
          collectionElementId: collectionElementId,
          level1Type: this.upload.level1Type,
          level2Type: level2Type,
@@ -1289,6 +1288,7 @@ export default defineComponent({
        status: 'done',
        ...data,
        errCode: 0,
+		designType:'Library',
        imgUrl: data.url,
        xhr: {
          response: JSON.stringify({
--- a/src/component/HomePage/NewCollectionReview.vue
+++ b/src/component/HomePage/NewCollectionReview.vue
@@ -136,7 +136,7 @@ export default defineComponent({
 	data(){
 		return{
 			imgOpen:true,
-
+			setSketchTime:null as any,
 		}
 	},
 	watch: {
@@ -153,12 +153,18 @@ export default defineComponent({
 						newArr.push(newVal?.[index]?.id?newVal?.[index]?.id:newVal?.[index]?.sketchBoardIdd)
 					});
 					if(JSON.stringify(newArr)!=JSON.stringify(oldArr)){
-						this.setSketch()
+						clearTimeout(this.setSketchTime)
+						this.setSketchTime = setTimeout(()=>{
+							this.setSketch()
+						},500)
 						this.imgOpen = true
 					}
 				}else{
 					nextTick(()=>{
-						this.setSketch()
+						clearTimeout(this.setSketchTime)
+						this.setSketchTime = setTimeout(()=>{
+							this.setSketch()
+						},500)
 						this.imgOpen = true
 					})
 				}
@@ -201,6 +207,7 @@ export default defineComponent({
 			let sketchH = [0,0,0]
 			nextTick().then(async ()=>{
 				if(this.sketchList && this.sketchList!=null){
+					console.log(JSON.parse(JSON.stringify(this.sketch)),JSON.parse(JSON.stringify(this.sketchList)))
 					for (let i = 0; i < this.sketchList?.length; i++) {
 						let sketch1:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
 						let sketch2:any = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
@@ -232,6 +239,7 @@ export default defineComponent({
 							}
 						})
 					}
+					console.log(JSON.parse(JSON.stringify(this.sketch)))
 					this.imgOpen = true
 					this.store.commit('setshowSketchList', this.sketch)
 				}
--- a/src/component/HomePage/generalMenu.vue
+++ b/src/component/HomePage/generalMenu.vue
@@ -213,7 +213,6 @@ import { message, Upload, Modal } from "ant-design-vue";
 		onMounted(() => {
 			instance.appContext.config.globalProperties.$dropdownEvents.onClose(removePrintModel)
 			window.addEventListener('scroll', handleScroll, true)
-			console.log(instance,)
 		})

 		onUnmounted(() => {
--- a/src/component/home/design/collection/ColorboardUpload.vue
+++ b/src/component/home/design/collection/ColorboardUpload.vue
@@ -450,7 +450,7 @@ export default defineComponent({

        //清除当前的颜色
        clearCurrentColor(index){
-            this.selectColor = {}
+            // this.selectColor = {}
            // this.fileList = []
 			this.reviewColor={}
 			this.colorList[index] = {}
@@ -673,6 +673,7 @@ export default defineComponent({

        openSetData(){
            let colorList = this.store.state.UploadFilesModule.allBoardData.colorBoards
+			this.colorList = [{},{},{},{},{},{},{},{}]
 			let hex
            colorList.forEach((ele, index) => {
 				this.colorList[index] = ele
@@ -681,10 +682,11 @@ export default defineComponent({
 				this.colorList[index].gradient = ele.gradient
 				this.colorList[index].name = ele.name
            });
-			if(this.colorList[0]?.gradient && this.colorList[0]?.gradient?.selectIndex>-1 && this.colorList[0]?.gradient?.gradientShow){
-				this.selectColor = {rgba:this.colorList[0].gradient.gradientList[0].rgba,hex:hex} //顔色选择器默认颜色
+			this.selectIndex = colorList.length - 1
+			if(this.colorList[colorList.length - 1]?.gradient && this.colorList[colorList.length - 1]?.gradient?.selectIndex>-1 && this.colorList[colorList.length - 1]?.gradient?.gradientShow){
+				this.selectColor = {rgba:this.colorList[colorList.length - 1].gradient.gradientList[colorList.length - 1].rgba,hex:hex} //顔色选择器默认颜色
 			}else{
-				this.selectColor = {rgba:this.colorList[0].rgba,hex:hex} //顔色选择器默认颜色
+				this.selectColor = {rgba:this.colorList[colorList.length - 1].rgba,hex:hex} //顔色选择器默认颜色
 			}
            this.store.commit('setColorboardList',colorList)
        },
--- a/src/component/home/design/index.vue
+++ b/src/component/home/design/index.vue
@@ -2185,6 +2185,7 @@ export default defineComponent({
 	// padding-right:5rem;
 	overflow: initial !important;
 	position: relative;
+	padding: .5rem 0;
 	.page_content {
 		position: relative;
 		
--- a/src/component/home/design/mannequin/index.vue
+++ b/src/component/home/design/mannequin/index.vue
@@ -152,6 +152,11 @@ export default defineComponent({
 				}
 			})
 			if(index != -1){
+				let num = data.selectObject.model.filter((item:any)=>item.level3Type == data.selectObject.sex).length
+				if(num <= 1 && data.selectObject.model[index].level3Type == data.selectObject.sex){
+					message.info(t('LibraryPage.jsContent14'))//最多选择四个
+					return
+				}
 				if(list.length > 1){
 					list.splice(index,1)
 				}else{
@@ -163,6 +168,7 @@ export default defineComponent({
 						id:item.id,
 						url:item.presignedUrl || item.url,
 						type:item.type?item.type:data.systemUser?'System':'Library',
+						level3Type:data.selectObject.sex,
 					}
 					list.push(model)
 				}else{
@@ -170,7 +176,13 @@ export default defineComponent({
 				}
 			}
 		}
+
 		const deleteSelectModel = (index:number)=>{
+			let num = data.selectObject.model.filter((item:any)=>item.level3Type == data.selectObject.sex).length
+			if(num <= 1 && data.selectObject.model[index].level3Type == data.selectObject.sex){
+				message.info(t('LibraryPage.jsContent14'))//最多选择四个
+				return
+			}
 			let list = store.state.Workspace.probjects.model
 			if(list.length > 1){
 				list.splice(index,1)
--- a/src/component/home/index.vue
+++ b/src/component/home/index.vue
@@ -241,7 +241,8 @@ export default defineComponent({
 								url:item.url,
 								id:item.mannequinRelationId,
 								type:item.mannequinRelationType,
-								collectionElementId:item.collectionId
+								collectionElementId:item.collectionId,
+								level3Type:item.level3Type
 							})
 						})
 						store.commit('setProbject',{model:arr})
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -336,6 +336,7 @@ export default {
    jsContent11: "你确定删除当前品牌DNA吗？",
    jsContent12: "请先取消选中后就再次点击删除",
    jsContent13: "您必须选择至少一个模特，且最多不超过四个",
+    jsContent14: "您必须选择一个当前项目性别相同的模特",
  },
  HistoryPage: {
    History: "历史",
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -336,6 +336,7 @@ export default {
    jsContent11: "Are you sure about deleting the current brand DNA?",
    jsContent12: "Please deselect first, then try deleting again.",
    jsContent13: "You must select at least one mannequin and no more than four.",
+    jsContent14: "You must select a model whose gender is the same as that of the current project.",
  },
  HistoryPage: {
    History: "History",
--- a/src/store/homeStore/homeStore.ts
+++ b/src/store/homeStore/homeStore.ts
@@ -256,6 +256,7 @@ const HomeStoreModule : Module<DesignDetail,RootState> = {
 				deReconstruction:null,
 				canvas:null
 			}
+			state.showSketchList = []
        },
        setTemplateData(state,data){
            state.templateId=data.id
--- a/src/store/workspace/workspace.ts
+++ b/src/store/workspace/workspace.ts
@@ -70,12 +70,10 @@ const Workspace : Module<DesignDetail,RootState> = {
            state.projectList = list
        },
 		setProbject(state,data){
-			console.log(123123,data)
 			for (const key in data) {
 				if(data[key] == undefined)continue
 				state.probjects[key] = data[key]
 			}
-			console.log(state.probjects)
 		},
 		createProbject(state){
 			state.probjects = {