aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
X1627315083@163.com
2026-05-14 18:06:01 +08:00
parent 9a40e69081
commit a1281c8e3f
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/component/Detail/DesignDetail.vue
View File

@@ -331,7 +331,6 @@ export default defineComponent({
store.commit('DesignDetail/setCurrentDetailType',str) store.commit('DesignDetail/setCurrentDetailType',str)
} }
const setClothes = async (list:any,str:string)=>{ const setClothes = async (list:any,str:string)=>{
console.log(JSON.parse(JSON.stringify(list)))
let clothesList:any = [] let clothesList:any = []
if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{ if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{
detailData.selectDetail.sketchString = rv detailData.selectDetail.sketchString = rv
@@ -369,7 +368,6 @@ export default defineComponent({
// }else if(isCurrent){ // }else if(isCurrent){
// } // }
console.log(JSON.parse(JSON.stringify(detailData.selectDetail.color)),'=====')
color = list[i].color?.rgba?.r != null?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'' color = list[i].color?.rgba?.r != null?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:''
gradient = list[i].gradient gradient = list[i].gradient
if((detailData.currentDetailType == 'sketch' && newData?.sketch) || detailData.isEditPattern.value == 'editSketch'){ if((detailData.currentDetailType == 'sketch' && newData?.sketch) || detailData.isEditPattern.value == 'editSketch'){
@@ -565,11 +563,14 @@ export default defineComponent({
} }
}else{ }else{
//走画布合成图片并且直接分割 //走画布合成图片并且直接分割
if(detailData.isEditPattern.value !== 'canvasEditor'){ if(detailData.isEditPattern.value !== 'canvasEditor' && detailData.isEditPattern.value !== 'redGreenExample'){
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail() if(detailData.isEditPattern.value !== 'canvasEditor'){
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
}
let otherData = await updateOtherLayers('single') let otherData = await updateOtherLayers('single')
await detailDom.canvasBox.updateOtherLayers(otherData) await detailDom.canvasBox.updateOtherLayers(otherData)
} }
await detailDom.canvasBox.privewDetail() await detailDom.canvasBox.privewDetail()
await upDateFrontBackSketch() await upDateFrontBackSketch()
await uploadSelectDetail() await uploadSelectDetail()
@@ -625,7 +626,7 @@ export default defineComponent({
if(detailData.isEditPattern.value && detailData.isEditPattern.value == str){ if(detailData.isEditPattern.value && detailData.isEditPattern.value == str){
// await detailDom.canvasBox.saveCanvas() // await detailDom.canvasBox.saveCanvas()
await (detailDom.canvasBox as any).privewDetail() await (detailDom.canvasBox as any).privewDetail()
if(detailData.isEditPattern.value == 'canvasEditor')await uploadSelectDetail() if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample')await uploadSelectDetail()
detailData.isEditPattern.value = '' detailData.isEditPattern.value = ''
}else{ }else{
// if(detailData.isEditPattern.value && (str == 'canvasEditor' || str == 'redGreenExample')){ // if(detailData.isEditPattern.value && (str == 'canvasEditor' || str == 'redGreenExample')){
@@ -780,8 +781,7 @@ export default defineComponent({
color.gradient = canvasColor.gradient color.gradient = canvasColor.gradient
} }
} }
if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample'){
if(detailData.isEditPattern.value == 'canvasEditor'){
delete detailData.selectDetail.newDetail delete detailData.selectDetail.newDetail
detailData.selectDetail.trims.prints = allInfo.trims || [] detailData.selectDetail.trims.prints = allInfo.trims || []
detailData.selectDetail.printObject.prints = allInfo.prints || [] detailData.selectDetail.printObject.prints = allInfo.prints || []
@@ -804,7 +804,6 @@ export default defineComponent({
if(detailData.currentDetailType == 'color'){ if(detailData.currentDetailType == 'color'){
detailData.detailLeftColorKey++ detailData.detailLeftColorKey++
} }
} }
const canvasReload = async ()=>{ const canvasReload = async ()=>{
if(detailData.isEditPattern.value){ if(detailData.isEditPattern.value){

6
src/component/Detail/model/index.vue
View File

@@ -124,7 +124,11 @@ export default defineComponent({
const handleResize = ()=>{ const handleResize = ()=>{
clearTimeout(time) clearTimeout(time)
time = setTimeout(()=>{ time = setTimeout(()=>{
store.commit('DesignDetail/setDesignDetail',getDetailListData.designDetail) let data = {
...getDetailListData.designDetail,
fromType:'resize',
}
store.commit('DesignDetail/setDesignDetail',data)
getDetailListDom.position?.updataPosition?.() getDetailListDom.position?.updataPosition?.()
getDetailListDom.modelNav?.setItemPosition?.() getDetailListDom.modelNav?.setItemPosition?.()
getDetailListDom.position?.updateRect?.() getDetailListDom.position?.updateRect?.()

6
src/store/Detail/designDetail.ts
View File

@@ -87,8 +87,10 @@ const DesignDetail : Module<DesignDetail,RootState> = {
left:0, left:0,
top:0, top:0,
} }
v.maskMinioUrl = v.layersObject?.[0]?.maskMinioUrl if(data?.fromType !== 'resize'){
v.maskUrl = v.layersObject?.[0]?.maskUrl v.maskMinioUrl = v.layersObject?.[0]?.maskMinioUrl
v.maskUrl = v.layersObject?.[0]?.maskUrl
}
v.layersObject[i].designOpenrtionBtn = false v.layersObject[i].designOpenrtionBtn = false
if(v.layersObject[i].imageCategory.indexOf("back") == -1){ if(v.layersObject[i].imageCategory.indexOf("back") == -1){
front[index] = v.layersObject[i] front[index] = v.layersObject[i]