Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

components.d.ts

@@ -9,10 +9,8 @@ export {}
 declare module 'vue' {
   export interface GlobalComponents {
     ABadge: typeof import('ant-design-vue/es')['Badge']
-    ABreadcrumb: typeof import('ant-design-vue/es')['Breadcrumb']
     ACheckbox: typeof import('ant-design-vue/es')['Checkbox']
     AConfigProvider: typeof import('ant-design-vue/es')['ConfigProvider']
-    ADatePicker: typeof import('ant-design-vue/es')['DatePicker']
     ADrawer: typeof import('ant-design-vue/es')['Drawer']
     ADropdown: typeof import('ant-design-vue/es')['Dropdown']
     AImage: typeof import('ant-design-vue/es')['Image']
@@ -20,21 +18,15 @@ declare module 'vue' {
     AMenu: typeof import('ant-design-vue/es')['Menu']
     AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
     AModal: typeof import('ant-design-vue/es')['Modal']
-    APagination: typeof import('ant-design-vue/es')['Pagination']
     APopover: typeof import('ant-design-vue/es')['Popover']
     ARangePicker: typeof import('ant-design-vue/es')['RangePicker']
     ASelect: typeof import('ant-design-vue/es')['Select']
     ASelectOption: typeof import('ant-design-vue/es')['SelectOption']
     ASlider: typeof import('ant-design-vue/es')['Slider']
-    ASpace: typeof import('ant-design-vue/es')['Space']
     ASpin: typeof import('ant-design-vue/es')['Spin']
-    ASubMenu: typeof import('ant-design-vue/es')['SubMenu']
     ASwitch: typeof import('ant-design-vue/es')['Switch']
     ATable: typeof import('ant-design-vue/es')['Table']
-    ATabPane: typeof import('ant-design-vue/es')['TabPane']
-    ATabs: typeof import('ant-design-vue/es')['Tabs']
     AUpload: typeof import('ant-design-vue/es')['Upload']
-    ElCascader: typeof import('element-plus/es')['ElCascader']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
   }

src/assets/icons/Folder.svg

@@ -0,0 +1,22 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="288.000000pt" height="288.000000pt" viewBox="0 0 288.000000 288.000000"
+ preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,288.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M379 2446 c-101 -36 -179 -116 -209 -214 -19 -62 -20 -93 -20 -792 0
+-701 1 -730 20 -793 26 -83 88 -155 168 -194 l57 -28 1045 0 1045 0 47 22
+c101 46 170 138 188 250 6 32 10 329 10 668 0 659 -3 692 -54 774 -35 54 -101
+108 -163 131 -52 19 -78 20 -626 20 l-572 0 -46 53 c-25 29 -70 66 -100 82
+l-54 30 -350 2 c-269 2 -358 0 -386 -11z m710 -175 c20 -11 42 -25 48 -33 6
+-7 48 -92 92 -188 85 -183 118 -229 196 -274 73 -43 119 -46 635 -46 l490 0 0
+-517 c0 -496 -1 -519 -20 -547 -10 -17 -36 -40 -57 -53 l-38 -23 -993 0 c-968
+0 -994 0 -1031 20 -22 11 -48 35 -60 53 -21 34 -21 40 -21 777 0 737 0 743 21
+777 12 18 37 42 57 53 34 18 60 19 340 20 280 0 306 -1 341 -19z m1381 -174
+c53 -28 80 -75 80 -139 l0 -48 -506 0 c-498 0 -507 0 -541 21 -31 19 -74 88
+-103 165 l-10 24 519 0 518 0 43 -23z"/>
+</g>
+</svg>

src/assets/style/style.css

@@ -62,6 +62,9 @@ li {
   height: 100%;
   margin: 0 auto;
 }
+.ant-dropdown-menu {
+  border-radius: 1rem;
+}
 .button_second {
   width: 14rem;
   text-align: center;

src/assets/style/style.less

@@ -63,6 +63,9 @@ input:focus{
     height: 100%;
     margin: 0 auto;
 }
+.ant-dropdown-menu{
+	border-radius: 1rem;
+}
 .button_second{
     width: 14rem;
     text-align: center;

src/component/Detail/model/modelPosition.vue

@@ -121,7 +121,7 @@ export default defineComponent({
 					});
 					setTimeout(() => {
 						emit('modelOnLoad')
-					});
+					},500);
 				};
 				img.src = detailData.frontBack?.body?.path;
 			})

src/component/home/design/collection/PrintboardUpload.vue

@@ -27,20 +27,6 @@
 							<span @click.stop="open(3)">{{ $t('PrintboardUpload.Generate') }}</span>
 							
 						</div>
-						<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
-							<generalMenu :dataList="printCatecoryList" @setprintModel="setSceneList" :item="scene" width="14rem" style="padding: 0;"></generalMenu>
-							<!-- <div @click.stop="openPrintModel"><span>{{ scene.name }}<i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></span>	</div>
-							<ul v-show="openMenu">
-								<li 
-									v-for="item,index in printCatecoryList" 
-									class="printModel_item" 
-									@click.stop="setSceneList(item)"
-									:title="item.value == 'Pattern'?$t('PrintboardUpload.PatternTitle'):
-									item.value == 'Logo'?$t('PrintboardUpload.LogoTitle'):
-									item.value == 'Slogan'?$t('PrintboardUpload.SloganTitle'):''"
-								>{{ item.name }}</li>
-							</ul> -->
-						</div>
                     </div>
                 </div>
             </div>
@@ -108,7 +94,7 @@
 				@confirmSelect="confirmSelect"
 				:disignTypeList="printCatecoryList"
 				></Material>
-			<Generate v-show="openClick == 3" ref="Generate" :scene="scene" :sketchCatecoryList="printCatecoryList" msg="Printboard"></Generate>
+			<Generate v-show="openClick == 3" ref="Generate" :sketchCatecoryList="printCatecoryList" msg="Printboard"></Generate>
         </div>
 		<div class="modal_right">
 			<div class="modal_layout">
@@ -218,7 +204,6 @@ export default defineComponent({
 			name:'Pattern',
 			value:'Pattern'
 		})
-		let openMenu = ref(false)
 		let printCatecoryList:any = computed(()=>{
 			return store.state.UserHabit.printType
 		})
@@ -237,7 +222,6 @@ export default defineComponent({
 			useGenerate,
 			workspace,
 			scene,
-			openMenu,
 			printCatecoryList,
 			printboardList,
         }
@@ -618,23 +602,6 @@ export default defineComponent({
 			scaleImage.isLike = false
 			scaleImage.init(this.printboardList,index)
 		},
-		setSceneList(data:any){
-			if(this.scene.value === data.value) return
-			this.scene = data
-			let generate:any = this.$refs.Generate
-			generate.sketchboardList = []
-			generate.searchPictureName = ''
-			this.openMenu = false
-		},
-		openPrintModel(){
-			if(this.openMenu)return
-			document.addEventListener('click',this.removePrintModel)
-			this.openMenu = true
-		},
-		removePrintModel(){
-			this.openMenu = false
-			document.removeEventListener('click',this.removePrintModel)
-		}
      }
 
 })

src/component/home/design/collection/SketchboardUpload.vue

@@ -23,20 +23,6 @@
                 >
                     <span>{{ $t('SketchboardUpload.Generate') }}</span>
                 </div>
-				<div v-show="openClick == 3" class="generalMenu_printModel printMenu">
-					<div @click.stop="openPrintModel"> <span>{{ scene.name }}<i class="icon iconfont icon-xiala" :class="{forbidden:openMenu}"></i></span>
-						</div>
-					<ul v-show="openMenu">
-						<li 
-							v-for="item,index in sketchStyleList" 
-							class="printModel_item" 
-							@click.stop="setSceneList(item)"
-							:title="item.value == 'Pattern'?$t('PrintboardUpload.PatternTitle'):
-							item.value == 'Logo'?$t('PrintboardUpload.LogoTitle'):
-							item.value == 'Slogan'?$t('PrintboardUpload.SloganTitle'):''"
-						>{{ item.name }}</li>
-					</ul>
-				</div>
             </div>
             <div v-show="openClick == 1" class="sketchboard_body">
                 <div class="upload_img_body scroll_style">
@@ -129,7 +115,6 @@
                 v-show="openClick == 3"
                 ref="Generate"
                 msg="Sketchboard"
-				:scene="scene"
 				:gender="workspace.sex"
 				:sketchCatecoryList="sketchCatecoryList"
             ></Generate>
@@ -236,14 +221,6 @@ export default defineComponent({
 			designType:'',
 		})
 		
-		let openMenu = ref(false)
-		let sketchStyleList:any = computed(()=>{
-			return store.state.UserHabit.SketchGenerateType
-		})
-		let scene = ref({
-			name: t('SketchboardUpload.GenerateSketch'),
-			value:'generate'
-		})
         return {
             fileList,
             openClick,
@@ -256,9 +233,6 @@ export default defineComponent({
 			driver__,
 			isTest,
 			useGenerate,
-			scene,
-			openMenu,
-			sketchStyleList,
         };
     },
     data() {
@@ -572,23 +546,6 @@ export default defineComponent({
             }
             this.store.commit("setSketchboardFile", this.fileList);
         },
-		setSceneList(data:any){
-			if(this.scene.value === data.value) return
-			this.scene = data
-			let generate:any = this.$refs.Generate
-			generate.sketchboardList = []
-			generate.searchPictureName = ''
-			this.openMenu = false
-		},
-		openPrintModel(){
-			if(this.openMenu)return
-			document.addEventListener('click',this.removePrintModel)
-			this.openMenu = true
-		},
-		removePrintModel(){
-			this.openMenu = false
-			document.removeEventListener('click',this.removePrintModel)
-		}
     },
 });
 </script>

src/component/home/tools/poseTransfer/index.vue

@@ -450,7 +450,7 @@ export default defineComponent({
 						str:'add',
 						list:[file]
 					}
-
+					console.log(1111)
 					store.commit('setUploadElement',storeData)
 				}else{
 					bor = false

src/component/home/tools/toProduct/index.vue

@@ -45,8 +45,8 @@
 										}"
 										:headers="{ Authorization: token }"
 										:before-upload="beforeUpload"
+										:multiple="!!upload.projectId"
 										v-model:file-list="fileList[productimgMenu.value]"
-										:multiple="true"
 										accept=".jpg,.png,.jpeg,.bmp"
 										@change="(file) => fileUploadChange(file)"
 									>
@@ -323,6 +323,9 @@ export default defineComponent({
 		watch(()=>store.state.HomeStoreModule.uploadElement.length,(newVal,oldVal)=>{
 			if(props.isDesignPage)return
 			productImgData.fileList[props.productimgMenu.value] = store.state.HomeStoreModule.uploadElement
+			if(productImgData.fileList[props.productimgMenu.value][0]){
+				productImgData.fileList[props.productimgMenu.value][0].isChecked = true
+			}
 		})
 		const productImgDom = reactive({
 			generalDragLeft:null as any,
@@ -435,11 +438,14 @@ export default defineComponent({
 					// if(props.productimgMenu.value == 'Relight'){
 					// 	file.type = "ToProductImage"
 					// }
-					productImgData.fileList[props.productimgMenu.value].filter((v: any) => v.status === "done");
+					let storeData = {
+						str:'add',
+						list:[file]
+					}
+					store.commit('setUploadElement',storeData)
 				}else{
 					bor = false
 				}
-				// this.showFileList = productImgData.fileList
             } else if (file.status === "error") {
 				bor = false
             }
@@ -468,9 +474,6 @@ export default defineComponent({
 			}
             return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
         }
-		let deleteFile = (index:any)=>{
-			productImgData.fileList[props.productimgMenu.value].splice(index,1)
-		}
 		let setGenerate = (item:any)=>{
 			item.isChecked = !item.isChecked
 		}
@@ -893,7 +896,6 @@ export default defineComponent({
 			setproduct,
 			fileUploadChange,
 			beforeUpload,
-			deleteFile,
 			setGenerate,
 			setUploadDelete,
 			likeFile,

src/lang/cn.ts

@@ -441,6 +441,7 @@ export default {
     Maximum: "最多可上传16张图片，每张图片最大5MB",
     Thumbnail: "选择的印花",
     inputContent1: "生成图片的标题",
+    GeneratePrint: "图案",
     maximumLength: "输入的内容超过允许输入的最大长度",
     PatternTitle: "生成可在服装上完全平铺的重复设计图案。",
     LogoTitle: "为文字内容创建艺术字体设计，适用于各种标语或短语。",
@@ -452,6 +453,7 @@ export default {
     jsContent5: "输入的内容超过允许输入的最大长度",
     jsContent6: "请输入内容~",
     jsContent7: "请确保所有必填项都填妥",
+    Pattern: "图案",
   },
   ColorboardUpload: {
     Thumbnail: "选择的颜色缩略图",

src/lang/en.ts

@@ -441,6 +441,7 @@ export default {
     Maximum: "Maximum 16 images can be uploaded, Maximum 5MB per image",
     Thumbnail: "Selected printboard",
     inputContent1: "Input prompt",
+    GeneratePrint: "Pattern",
     maximumLength: "The entered content exceeds the maximum length.",
     PatternTitle: "Generates repeatable designs that can be fully tiled across garments.",
     LogoTitle: "Creates standalone graphic designs that can be placed individually or tiled.",
@@ -452,6 +453,7 @@ export default {
     jsContent5: "The entered content exceeds the maximum length.",
     jsContent6: "Please enter content",
     jsContent7: "Please ensure all required fields are filled out",
+    Pattern: 'Pattern',
   },
   ColorboardUpload: {
     Thumbnail: "Thumbnail preview of selected colors",

src/views/HomeView/library.vue

@@ -996,7 +996,9 @@ export default defineComponent({
 					this.isSloganHint = ''
 				}
 				if(newVal.value == 'extract'){
-					this.speedData = this.extractList[0]
+					this.speedData = {
+						...this.extractList[0]
+					}
 				}else if(newVal.value == 'Logo' || newVal.value == 'Slogan'){
 					this.speedData = {
 						value:'',
@@ -1008,7 +1010,9 @@ export default defineComponent({
 					// }else{
 					// 	this.speedData = this.speedList[0]
 					// }
-					this.speedData = this.speedList[0]
+					this.speedData = {
+						...this.speedList[0]
+					}
 				}
 				this.speedState = false
 			}