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

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

Browse Source
This commit is contained in:
李志鹏
2026-01-16 13:02:28 +08:00
parent ba5b1657a5 30109fdb79
commit 2b7db933d9
3 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -619,13 +619,13 @@ export default defineComponent({
} }
} }
if(detailData.currentDetailType == 'print'){ if(detailData.currentDetailType == 'print'){
otherData.printObject = detailData.selectDetail.newDetail?.print?.length>0?{prints:detailData.selectDetail.newDetail?.print}:detailData.selectDetail.printObject || null otherData.printObject = {prints:detailData.selectDetail.newDetail?.print}
} }
if(detailData.currentDetailType == 'element'){ if(detailData.currentDetailType == 'element'){
otherData.trims = detailData.selectDetail.newDetail?.element?.length>0?detailData.selectDetail.newDetail?.element:detailData.selectDetail.trims || null otherData.trims = detailData.selectDetail.newDetail?.element
} }
} }
console.log(otherData,'=======',detailData.selectDetail) console.log(JSON.parse(JSON.stringify(otherData)),'=======',JSON.parse(JSON.stringify(detailData.selectDetail)))
return otherData return otherData
} }
const uploadElement = async ()=>{//取出画布数据更新到detail const uploadElement = async ()=>{//取出画布数据更新到detail

19
src/component/Detail/canvas/index.vue
View File

@@ -181,13 +181,13 @@ export default defineComponent({
if(oldSelectDetail?.partialDesign)oldSelectDetail.partialDesign.partialDesignBase64 = rv if(oldSelectDetail?.partialDesign)oldSelectDetail.partialDesign.partialDesignBase64 = rv
}) })
//包含平铺图层 single+overall模式的图 //包含平铺图层 single+overall模式的图
await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:true,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{ // await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:true,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{
oldSelectDetail.undividedLayerWithSinglePrint = rv // oldSelectDetail.undividedLayerWithSinglePrint = rv
}) // })
//不包含平铺图层overall模式的图 //不包含平铺图层overall模式的图
await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:false,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{ // await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:false,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{
oldSelectDetail.undividedLayer = rv // oldSelectDetail.undividedLayer = rv
}) // })
res('') res('')
}) })
} }
@@ -336,11 +336,16 @@ export default defineComponent({
const canvasLoadJsonSuccess = async ()=>{ const canvasLoadJsonSuccess = async ()=>{
let otherData = await props.updateOtherLayers() let otherData = await props.updateOtherLayers()
updateOtherLayers(otherData) updateOtherLayers(otherData)
if(detailData.selectDetail.undividedLayerColor){ if(!detailData.selectDetail.undividedLayerColor){
await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsRepeat:false,isPrintTrimsNoRepeat:false,isContainNormalLayer:false}).then((rv)=>{ await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsRepeat:false,isPrintTrimsNoRepeat:false,isContainNormalLayer:false}).then((rv)=>{
detailData.selectDetail.undividedLayerColor = rv detailData.selectDetail.undividedLayerColor = rv
}) })
} }
if(!detailData.selectDetail.undividedLayer){
await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:false,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{
detailData.selectDetail.undividedLayer = rv
})
}
} }
const submitBase64Data = ()=>{ const submitBase64Data = ()=>{

3
src/component/Detail/detailRight/editPrintElement.vue
View File

@@ -385,12 +385,15 @@ export default defineComponent({
item.token = Date.now().toString() + (editPrintElementData.printStyleList[props.type].overall.length + '') item.token = Date.now().toString() + (editPrintElementData.printStyleList[props.type].overall.length + '')
// editPrintElementData.printStyleList[props.type].overall = [] // editPrintElementData.printStyleList[props.type].overall = []
editPrintElementData.printStyleList[props.type].overall.push(item) editPrintElementData.printStyleList[props.type].overall.push(item)
setTimeout(()=>{
editPrintElementDom.pingpuRef.updataList([ editPrintElementDom.pingpuRef.updataList([
{ {
action: ACTIONS.ADD, action: ACTIONS.ADD,
data: item, data: item,
}, },
]); ]);
})
} }
} }
const setPosition = ()=>{ const setPosition = ()=>{