添加元素图层合并模式由正片叠底改为默认

This commit is contained in:
X1627315083
2026-01-19 16:08:08 +08:00
parent 9613d2b5b2
commit 7ff2c2095a
3 changed files with 10 additions and 3 deletions

View File

@@ -190,7 +190,9 @@ export default defineComponent({
watch(()=>detailData.selectDetail,async (newValue,oldValue)=>{ watch(()=>detailData.selectDetail,async (newValue,oldValue)=>{
detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id) detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id)
if(newValue?.path)await getSketchSize() if(newValue?.path)await getSketchSize()
detailData.canvasKey += 1 if(newValue?.id && oldValue?.id && (newValue.id != oldValue.id)){
detailData.canvasKey += 1
}
// privewDetail(oldValue) // privewDetail(oldValue)
},{immediate: true}) },{immediate: true})
provide('getCanvasIfEdit',detailData.getCanvasIfEdit) provide('getCanvasIfEdit',detailData.getCanvasIfEdit)

View File

@@ -285,7 +285,7 @@ export default defineComponent({
}) })
} }
const editSketchCanvasInit = (value:any)=>{ const editSketchCanvasInit = async (value:any)=>{
detailData.canvasInstance = value detailData.canvasInstance = value
detailData.getCanvasIfEdit.fun = getCanvasLength detailData.getCanvasIfEdit.fun = getCanvasLength
detailData.isShowMark = false detailData.isShowMark = false
@@ -343,7 +343,7 @@ export default defineComponent({
const canvasLoadJsonSuccess = async ()=>{ const canvasLoadJsonSuccess = async ()=>{
let otherData = await props.updateOtherLayers() let otherData = await props.updateOtherLayers()
await updateOtherLayers(otherData) await updateOtherLayers(otherData)
await setUndivideLayer() setUndivideLayer()
} }
const setUndivideLayer = async ()=>{ const setUndivideLayer = async ()=>{
await new Promise<void>(async (resolve, reject) => { await new Promise<void>(async (resolve, reject) => {
@@ -355,6 +355,7 @@ export default defineComponent({
isContainNormalLayer:false, isContainNormalLayer:false,
width:props.sketchSize.width, width:props.sketchSize.width,
height:props.sketchSize.height}).then((rv)=>{ height:props.sketchSize.height}).then((rv)=>{
console.log('====================',rv)
detailData.selectDetail.undividedLayerColor = rv detailData.selectDetail.undividedLayerColor = rv
}) })
// } // }
@@ -394,6 +395,7 @@ export default defineComponent({
// privewDetail() // privewDetail()
}) })
onMounted(()=>{ onMounted(()=>{
console.log('==========================',detailData.canvasLoad)
nextTick(async ()=>{ nextTick(async ()=>{
// detailData.currentView = 'canvasEditor' // detailData.currentView = 'canvasEditor'
const sessionCanvasList = sessionStorage.getItem('canvasList'); const sessionCanvasList = sessionStorage.getItem('canvasList');

View File

@@ -373,6 +373,9 @@ export default defineComponent({
gapX: 0, gapX: 0,
gapY: 0, gapY: 0,
} }
if(props.type == 'element'){
item.object.blendMode = 'source-over'
}
} }
if(item.ifSingle){ if(item.ifSingle){
editPrintElementData.printStyleList[props.type].single.push(item) editPrintElementData.printStyleList[props.type].single.push(item)