diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index a9d5bf58..f5f3b223 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -131,6 +131,7 @@ import { useStore } from "vuex"; import { openGuide,driverObj__ } from "@/tool/guide"; import { KeyValueDB } from "@/tool/indexedDB"; import { useI18n } from 'vue-i18n' +import { convertToEC4StyleForCustomSerise } from 'echarts/types/src/util/styleCompat.js' export default defineComponent({ components:{ detailLeft,model,detailRight,canvasBox @@ -336,11 +337,12 @@ export default defineComponent({ }) if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail() if(detailDom.canvasBox && (detailData.currentDetailType != 'sketch' || detailData.isEditPattern.value == 'canvasEditor')){ - if(detailData.isEditPattern.value !== 'editSketch'){ - let otherData = await updateOtherLayers(detailData.isEditPattern.value == 'canvasEditor'?'all':'single') - await detailDom.canvasBox.updateOtherLayers(otherData) - } + // if(detailData.isEditPattern.value !== 'editSketch'){ + // let otherDataupDateFrontBackSketch = await updateOtherLayers(detailData.isEditPattern.value == 'canvasEditor'?'all':'single') + // await detailDom.canvasBox.updateOtherLayers(otherData) + // } await detailDom.canvasBox.privewDetail() + await uploadSelectDetail() await uploadElement() } for(let i = 0;i{//更新到画布图层 let otherData:any = {} - console.log('detailData.selectDetail.newDetail',detailData.selectDetail) if(str == 'all'){ await uploadSelectDetail() otherData = { @@ -762,15 +764,15 @@ export default defineComponent({ detailData.selectDetail.color = color }else{ if(detailData.currentDetailType == 'color'){ - delete detailData.selectDetail.newDetail.color + if(detailData.selectDetail.newDetail?.color)delete detailData.selectDetail.newDetail.color detailData.selectDetail.color = color } 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 || [] } 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 || [] } }