fix
This commit is contained in:
@@ -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
|
||||||
@@ -610,6 +611,7 @@ export default defineComponent({
|
|||||||
// }
|
// }
|
||||||
detailDom.canvasBox.editFront(str)
|
detailDom.canvasBox.editFront(str)
|
||||||
if(str == 'canvasEditor'){
|
if(str == 'canvasEditor'){
|
||||||
|
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 +643,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 +763,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 || []
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user