diff --git a/components.d.ts b/components.d.ts index fb059677..1796a907 100644 --- a/components.d.ts +++ b/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'] } diff --git a/dist.7z b/dist.7z index 6913ba9d..8bcfa5e7 100644 Binary files a/dist.7z and b/dist.7z differ diff --git a/src/assets/icons/Folder.svg b/src/assets/icons/Folder.svg new file mode 100644 index 00000000..abfd060d --- /dev/null +++ b/src/assets/icons/Folder.svg @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/src/assets/images/icon/library.png b/src/assets/images/icon/library.png new file mode 100644 index 00000000..60b8e7bf Binary files /dev/null and b/src/assets/images/icon/library.png differ diff --git a/src/assets/images/icon/upload_black.png b/src/assets/images/icon/upload_black.png new file mode 100644 index 00000000..635249c7 Binary files /dev/null and b/src/assets/images/icon/upload_black.png differ diff --git a/src/assets/images/icon/upload_gray.png b/src/assets/images/icon/upload_gray.png new file mode 100644 index 00000000..4e109e29 Binary files /dev/null and b/src/assets/images/icon/upload_gray.png differ diff --git a/src/assets/style/style.css b/src/assets/style/style.css index 64efbb76..96ae3887 100644 --- a/src/assets/style/style.css +++ b/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; diff --git a/src/assets/style/style.less b/src/assets/style/style.less index e9c26827..8e0a7922 100644 --- a/src/assets/style/style.less +++ b/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; diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue index a154e658..68c239ce 100644 --- a/src/component/Detail/model/modelPosition.vue +++ b/src/component/Detail/model/modelPosition.vue @@ -121,7 +121,7 @@ export default defineComponent({ }); setTimeout(() => { emit('modelOnLoad') - }); + },500); }; img.src = detailData.frontBack?.body?.path; }) diff --git a/src/component/HomePage/Generate copy.vue b/src/component/HomePage/Generate copy.vue new file mode 100644 index 00000000..8b420cf9 --- /dev/null +++ b/src/component/HomePage/Generate copy.vue @@ -0,0 +1,1268 @@ + + + diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue index ea52b080..f931518a 100644 --- a/src/component/HomePage/Generate.vue +++ b/src/component/HomePage/Generate.vue @@ -1,1246 +1,1486 @@ diff --git a/src/component/home/design/collection/PrintboardUpload.vue b/src/component/home/design/collection/PrintboardUpload.vue index d1d37d96..56ab8e8d 100644 --- a/src/component/home/design/collection/PrintboardUpload.vue +++ b/src/component/home/design/collection/PrintboardUpload.vue @@ -27,20 +27,6 @@ {{ $t('PrintboardUpload.Generate') }} -
- - -
@@ -108,7 +94,7 @@ @confirmSelect="confirmSelect" :disignTypeList="printCatecoryList" > - +
@@ -129,7 +115,6 @@ v-show="openClick == 3" ref="Generate" msg="Sketchboard" - :scene="scene" :gender="workspace.sex" :sketchCatecoryList="sketchCatecoryList" > @@ -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) - } }, }); diff --git a/src/component/home/tools/poseTransfer/index.vue b/src/component/home/tools/poseTransfer/index.vue index 51985644..9012b9f9 100644 --- a/src/component/home/tools/poseTransfer/index.vue +++ b/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 diff --git a/src/component/home/tools/toProduct/index.vue b/src/component/home/tools/toProduct/index.vue index cd6228a4..f281ad1a 100644 --- a/src/component/home/tools/toProduct/index.vue +++ b/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, diff --git a/src/lang/cn.ts b/src/lang/cn.ts index 1b459be2..2748fe81 100644 --- a/src/lang/cn.ts +++ b/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: "选择的颜色缩略图", diff --git a/src/lang/en.ts b/src/lang/en.ts index 621e7464..110ca588 100644 --- a/src/lang/en.ts +++ b/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", diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue index 7b7b2700..a4b66aba 100644 --- a/src/views/HomeView/library.vue +++ b/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 }