diff --git a/components.d.ts b/components.d.ts index 1796a907..e62b27e1 100644 --- a/components.d.ts +++ b/components.d.ts @@ -9,8 +9,10 @@ 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'] @@ -18,15 +20,22 @@ 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'] + ATimeRangePicker: typeof import('ant-design-vue/es')['TimeRangePicker'] 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 8bcfa5e7..16efb71b 100644 Binary files a/dist.7z and b/dist.7z differ diff --git a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue index 8f573217..f944678a 100644 --- a/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue +++ b/src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue @@ -398,7 +398,7 @@ const handleToolClick = (tool) => { .tools-list{ display: flex; flex-direction: column; - gap: 0.7rem; + gap: 0.5rem; flex: 1; overflow-y: auto; overflow-x: hidden; diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index 897ff9fe..98e37b17 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -298,9 +298,10 @@ export default defineComponent({ } const setClothes = async (list:any)=>{ let clothesList:any = [] + await nextTick() for(let i = 0;i v.status === "done" diff --git a/src/component/Detail/model/index.vue b/src/component/Detail/model/index.vue index 782f9580..815dce6a 100644 --- a/src/component/Detail/model/index.vue +++ b/src/component/Detail/model/index.vue @@ -65,8 +65,8 @@ export default defineComponent({ libraryList:null as any, position:null as any, }) - const getSubmitData = (value:any)=>{ - return getDetailListDom.position.getSubmitData(value) + const getSubmitData = (value:any,boolean)=>{ + return getDetailListDom.position.getSubmitData(value,boolean) } const showDesignImgDetail = (str:any)=>{ new Promise((resolve, reject) => { diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue index 68c239ce..ab2cbf6d 100644 --- a/src/component/Detail/model/modelPosition.vue +++ b/src/component/Detail/model/modelPosition.vue @@ -319,9 +319,9 @@ export default defineComponent({ }); return arr } - const getSubmitData = (value:any)=>{ + const getSubmitData = (value:any,isNoComputed)=>{ let parentNode = document.getElementsByClassName('molepositon')[0].getElementsByClassName("designOpenrtion_imgMask")[0].getBoundingClientRect() - if(!detailData.frontBack?.body?.layersObject?.[0]?.imageSize){ + if(!detailData.frontBack?.body?.layersObject?.[0]?.imageSize || isNoComputed){ return{ scale:value.layersObject[0].scale, offset:value.layersObject[0].offset, @@ -329,7 +329,6 @@ export default defineComponent({ } } let ratio = detailData.frontBack.body.layersObject[0].imageSize[0]/parentNode.width - // let arr:any = sort(detailData.frontBack.front) let arr:any = sort(JSON.parse(JSON.stringify(detailData.frontBack.front))) let num = 10 diff --git a/src/component/home/design/collection/more.vue b/src/component/home/design/collection/more.vue index 1c77c9ce..153b64e9 100644 --- a/src/component/home/design/collection/more.vue +++ b/src/component/home/design/collection/more.vue @@ -121,7 +121,7 @@ export default defineComponent({ props.list[props.index].imgUrl = rv.url props.list[props.index].resData = { id:rv.id, - designType:props.item.resData.designType, + designType:props.item.resData.designType || props.item.designType, } }else{ rv.imgUrl = rv.url @@ -130,7 +130,7 @@ export default defineComponent({ rv.resData = { id:rv.id, url:rv.url, - designType:props.item.resData.designType, + designType:props.item.resData.designType || props.item.designType, } props.list.unshift(rv) } diff --git a/src/component/home/design/editDesignType/index.vue b/src/component/home/design/editDesignType/index.vue index 51d34141..4664486f 100644 --- a/src/component/home/design/editDesignType/index.vue +++ b/src/component/home/design/editDesignType/index.vue @@ -37,10 +37,10 @@
--> -
+
{{$t('ProductImg.Similarity')}}
-
+
-
+
{{$t('ProductImg.RelightDirection')}}
-
+
-
+
{{$t('ProductImg.Highlight')}}
-
+
-
+
{{ $t('poseTransfer.hint') }}
@@ -263,7 +263,7 @@ setup(props:any,{emit}) { title:'', label:t('speedList.toproductFlus'), relightLabel:t('speedList.relightEdit'), - value:'flux', + value:'advanced', },{ title:'', label:t('speedList.toproductBasic'), @@ -277,7 +277,7 @@ setup(props:any,{emit}) { title:'', label:t('speedList.toproductFlus'), relightLabel:t('speedList.relightEdit'), - value:'flux', + value:'advanced', }, }) const openSpeed = ()=>{ @@ -338,7 +338,6 @@ setup(props:any,{emit}) { projectId:productimg.selectObject.id, productImage:getMinioUrl(productimg.scaleImageList[productimg.scaleImageIndex].sourceUrl), modelName:speed.speedData.value, - parentId:productimg.selectGenerate.parentId || productimg.selectGenerate.userLikeSortId, userLikeSortId:productimg.openType == 'add'?(productimg.selectGenerate.userLikeSortId || null):null, isDefaultLike:true,//表示是否生成就like @@ -352,7 +351,7 @@ setup(props:any,{emit}) { direction:productimg.productimgRelightDirection, prompt:productimg.productimgSearchName, toProductImageVOList:[obj], - modelName:speed.speedData.value, + modelName:'flux', brightenValue:productimg.productimgBrightenValue, projectId:productimg.selectObject.id, imageStrength:(100 - imageStrength)/100, @@ -367,6 +366,7 @@ setup(props:any,{emit}) { // },10000) let url = Https.httpUrls.relight if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'ToProductImage'){ + data.modelName = speed.speedData.value url = Https.httpUrls.toProduct }else if(productimg.scaleImageList[productimg.scaleImageIndex]?.resultType == 'PoseTransfer'){ url = Https.httpUrls.poseTransform @@ -426,7 +426,8 @@ setup(props:any,{emit}) { ...rv[0], prompt:productimg.productimgSearchName, parentId:productimg.selectGenerate?.parentId || productimg.selectGenerate.userLikeGroupId, - modelName:speed.speedData.value, + // modelName:speed.speedData.value, + modelName:data.modelName, poseId:productimg.selectPose, userLikeSortId:productimg.selectGenerate.userLikeSortId || productimg.selectGenerate?.parentId, sourceUrl:productimg.selectGenerate?.sourceUrl || productimg.selectGenerate?.productImage, diff --git a/src/component/home/tools/poseTransfer/index.vue b/src/component/home/tools/poseTransfer/index.vue index 9012b9f9..a42012d8 100644 --- a/src/component/home/tools/poseTransfer/index.vue +++ b/src/component/home/tools/poseTransfer/index.vue @@ -450,7 +450,6 @@ 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 f281ad1a..7cc481b7 100644 --- a/src/component/home/tools/toProduct/index.vue +++ b/src/component/home/tools/toProduct/index.vue @@ -46,7 +46,6 @@ :headers="{ Authorization: token }" :before-upload="beforeUpload" :multiple="!!upload.projectId" - v-model:file-list="fileList[productimgMenu.value]" accept=".jpg,.png,.jpeg,.bmp" @change="(file) => fileUploadChange(file)" > @@ -61,10 +60,10 @@
-
+
{{$t('ProductImg.Similarity')}}
-
+
--> -
+
{{$t('ProductImg.RelightDirection')}}
-
+
-
+
{{$t('ProductImg.Highlight')}}
-
+
-
+
{{ $t('poseTransfer.hint') }}
@@ -296,7 +295,7 @@ export default defineComponent({ title:'', label:t('speedList.toproductFlus'), relightLabel:t('speedList.relightEdit'), - value:'flux', + value:'advanced', },{ title:'', label:t('speedList.toproductBasic'), @@ -307,9 +306,9 @@ export default defineComponent({ speedState:false, speedData:{ title:'', - label:'FLUX', - relightLabel:'Edit', - value:'flux', + label:t('speedList.toproductFlus'), + relightLabel:t('speedList.relightEdit'), + value:'advanced', }, }) @@ -426,6 +425,7 @@ export default defineComponent({ } let fileUploadChange = (data: any)=> { + console.log(data) let file = data.file; let bor = true if (file.status === "done") { @@ -472,7 +472,8 @@ export default defineComponent({ CollectionType:props.productimgMenu.value, } } - return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE; + console.log(!!((isJpgOrPng && isLt2M && productImgData.selectObject.id) || Upload.LIST_IGNORE)) + return !!((isJpgOrPng && isLt2M && productImgData.selectObject.id) || Upload.LIST_IGNORE); } let setGenerate = (item:any)=>{ item.isChecked = !item.isChecked @@ -583,7 +584,7 @@ export default defineComponent({ toProductImageVOList:selectArr, // userLikeGroupId:upload.value.userlikeGroupId, projectId:productImgData.selectObject.id, - modelName:speed.speedData.value, + modelName:obj.elementType == 'Relight'?'flux':speed.speedData.value, direction:RelightDirection.value, brightenValue:productImgData.brightenValue, imageStrength:(100 - imageStrength)/100, @@ -659,7 +660,7 @@ export default defineComponent({ let index = productImgData.generateList[props.productimgMenu.value].findIndex((obj:any) => obj.taskId === element.taskId); productImgData.generateList[props.productimgMenu.value][index] = { ...element, - modelName:speed.speedData.value, + modelName:props.productimgMenu.value == 'Relight'?'flux':speed.speedData.value, } // productImgData.generateList[props.productimgMenu.value].unshift(element) data = data.filter((item:any) => item !== element.taskId); diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts index dd8a39ab..d5bfe898 100644 --- a/src/store/Detail/designDetail.ts +++ b/src/store/Detail/designDetail.ts @@ -214,9 +214,6 @@ const DesignDetail : Module = { for (let j = 0; j < data.clothes.length; j++) { const item = data.clothes[j]; if(!item.id)continue - if(item.id == state.selectDetail.id || state.selectDetail.newDetail?.sketch?.id == item.id){ - - } let id_:any if(state.currentDetailType != 'models'){ if(data.clothes.length > 2){ @@ -240,7 +237,7 @@ const DesignDetail : Module = { img.src = state.frontBack.body.path; img.onload = () => { let scale:any = el.parentNode.offsetWidth / img.width; - if(state.selectDetail.newDetail?.sketch?.id && !state.selectDetail.id){ + if(state.selectDetail?.newDetail?.sketch?.id && !state.selectDetail.id){ state.frontBack.front.push({id:state.selectDetail.newDetail?.sketch?.id}) state.frontBack.back.push({id:state.selectDetail.newDetail?.sketch?.id}) }