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-23 15:41:45 +08:00
parent 55ede508cb fbb66fd192
commit 4afe1b637e
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -131,6 +131,7 @@ import { useStore } from "vuex";
import { openGuide,driverObj__ } from "@/tool/guide"; import { openGuide,driverObj__ } from "@/tool/guide";
import { KeyValueDB } from "@/tool/indexedDB"; import { KeyValueDB } from "@/tool/indexedDB";
import { useI18n } from 'vue-i18n' import { useI18n } from 'vue-i18n'
import { convertToEC4StyleForCustomSerise } from 'echarts/types/src/util/styleCompat.js'
export default defineComponent({ export default defineComponent({
components:{ components:{
detailLeft,model,detailRight,canvasBox detailLeft,model,detailRight,canvasBox
@@ -336,11 +337,12 @@ export default defineComponent({
}) })
if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail() if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
if(detailDom.canvasBox && (detailData.currentDetailType != 'sketch' || detailData.isEditPattern.value == 'canvasEditor')){ if(detailDom.canvasBox && (detailData.currentDetailType != 'sketch' || detailData.isEditPattern.value == 'canvasEditor')){
if(detailData.isEditPattern.value !== 'editSketch'){ // if(detailData.isEditPattern.value !== 'editSketch'){
let otherData = await updateOtherLayers(detailData.isEditPattern.value == 'canvasEditor'?'all':'single') // let otherDataupDateFrontBackSketch = await updateOtherLayers(detailData.isEditPattern.value == 'canvasEditor'?'all':'single')
await detailDom.canvasBox.updateOtherLayers(otherData) // await detailDom.canvasBox.updateOtherLayers(otherData)
} // }
await detailDom.canvasBox.privewDetail() await detailDom.canvasBox.privewDetail()
await uploadSelectDetail()
await uploadElement() await uploadElement()
} }
for(let i = 0;i<list.length;i++){ for(let i = 0;i<list.length;i++){
@@ -610,6 +612,7 @@ export default defineComponent({
// } // }
detailDom.canvasBox.editFront(str) detailDom.canvasBox.editFront(str)
if(str == 'canvasEditor'){ if(str == '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)
} }
@@ -641,7 +644,6 @@ export default defineComponent({
} }
const updateOtherLayers = async (str:any='all',type:any='noFirst')=>{//更新到画布图层 const updateOtherLayers = async (str:any='all',type:any='noFirst')=>{//更新到画布图层
let otherData:any = {} let otherData:any = {}
console.log('detailData.selectDetail.newDetail',detailData.selectDetail)
if(str == 'all'){ if(str == 'all'){
await uploadSelectDetail() await uploadSelectDetail()
otherData = { otherData = {
@@ -762,15 +764,15 @@ export default defineComponent({
detailData.selectDetail.color = color detailData.selectDetail.color = color
}else{ }else{
if(detailData.currentDetailType == 'color'){ if(detailData.currentDetailType == 'color'){
delete detailData.selectDetail.newDetail.color if(detailData.selectDetail.newDetail?.color)delete detailData.selectDetail.newDetail.color
detailData.selectDetail.color = color detailData.selectDetail.color = color
} }
if(detailData.currentDetailType == 'print'){ if(detailData.currentDetailType == 'print'){
delete detailData.selectDetail.newDetail.print if(detailData.selectDetail.newDetail?.print)delete detailData.selectDetail.newDetail.print
detailData.selectDetail.printObject.prints = allInfo.prints || [] detailData.selectDetail.printObject.prints = allInfo.prints || []
} }
if(detailData.currentDetailType == 'element'){ if(detailData.currentDetailType == 'element'){
delete detailData.selectDetail.newDetail.element if(detailData.selectDetail.newDetail?.element)delete detailData.selectDetail.newDetail.element
detailData.selectDetail.trims.prints = allInfo.trims || [] detailData.selectDetail.trims.prints = allInfo.trims || []
} }
} }