From 26abb2aa88dd63eb4878a90e3b766a8263761c0d Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Sat, 24 Jan 2026 11:55:51 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A2=9C=E8=89=B2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/detailLeft/colorBox/index.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/component/Detail/detailLeft/colorBox/index.vue b/src/component/Detail/detailLeft/colorBox/index.vue index f1fa97ef..6300ddee 100644 --- a/src/component/Detail/detailLeft/colorBox/index.vue +++ b/src/component/Detail/detailLeft/colorBox/index.vue @@ -100,7 +100,6 @@ export default defineComponent({ tcxToColor:'', }) watch(()=>colorData.selectColor,async (newVal,oldVal)=>{ - console.log('=======',123) if((newVal.rgba && newVal.rgba?.r != null) || newVal.gradient != null){ console.log('=======',123) let data :any = {} @@ -130,11 +129,12 @@ export default defineComponent({ }) watch(()=>colorData.selectDetail.id,(newVal,oldVal)=>{ if(!newVal)return - if(!colorData.colorList?.list?.[newVal]){ - colorData.colorList.list[newVal] = [] - }else{ - return - } + colorData.colorList.list[newVal] = [] + // if(!colorData.colorList?.list?.[newVal]){ + // colorData.colorList.list[newVal] = [] + // }else{ + // // return + // } let isNoSelect = false let pushIndex = 0 for (let index = 0; index < 9; index++) { @@ -151,6 +151,7 @@ export default defineComponent({ (JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && colorData.selectDetail.color.gradient) ){ isNoSelect = true + console.log('=======',123) colorData.selectColor = item colorData.colorList.index = index }else if(color?.rgba?.r){ @@ -174,6 +175,7 @@ export default defineComponent({ } colorData.colorList.list[newVal].push(item) } + console.log('=======',isNoSelect) if(!isNoSelect){ let color = colorData.selectDetail.newDetail?.color?.rgba?.r != null?colorData.selectDetail.newDetail?.color:colorData.selectDetail.color let item:any = {} From 6ad81a1896644762dc80469beaf659ab31d95120 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Sat, 24 Jan 2026 13:25:40 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=E8=A7=92=E5=BA=A6?= =?UTF-8?q?=E5=92=8C=E9=95=9C=E5=83=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/Detail/designDetail.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/store/Detail/designDetail.ts b/src/store/Detail/designDetail.ts index f8e36f91..8547783a 100644 --- a/src/store/Detail/designDetail.ts +++ b/src/store/Detail/designDetail.ts @@ -81,7 +81,7 @@ const DesignDetail : Module = { left:v.layersObject[i].position?.[1], width:v.layersObject[i].imageSize?.[0], height:v.layersObject[i].imageSize?.[1], - transform:`rotate(${v.layersObject[i]?.rotate || 0}deg) scaleX(${v.layersObject[i].transpose?.[0] || 1}) scaleY(${v.layersObject[i].transpose?.[1] || 1})`, + transform:`scaleX(${v.layersObject[i].transpose?.[0] || 1}) scaleY(${v.layersObject[i].transpose?.[1] || 1}) rotate(${v.layersObject?.[i]?.rotate || 0}deg)`, } v.layersObject[i].centers={ left:0, @@ -277,7 +277,7 @@ const DesignDetail : Module = { width:item.layersObject[i].imageSize?.[0] * scale + 'px', height:item.layersObject[i].imageSize?.[1] * scale + 'px', zIndex:v?.style?.zIndex?v.style.zIndex:v.priority?v.priority:state.frontBack.front.length, - transform:`rotate(${item.layersObject?.[i]?.rotate || 0}deg) scaleX(${item.layersObject[i].transpose?.[0] || 1}) scaleY(${item.layersObject[i].transpose?.[1] || 1})`, + transform:`scaleX(${item.layersObject[i].transpose?.[0] || 1}) scaleY(${item.layersObject[i].transpose?.[1] || 1}) rotate(${item.layersObject?.[i]?.rotate || 0}deg)`, } item.layersObject[i].centers={ left:0, From ba49b02ebee1962ca12c504ddbba152d535efee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com> Date: Mon, 26 Jan 2026 09:40:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=B0=E8=8A=B1=E7=BB=84=E4=B8=8D?= =?UTF-8?q?=E8=AE=A9=E5=A4=9A=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CanvasEditor/components/LayersPanel/LayersPanel.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue index 0ed765d5..9c718004 100644 --- a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue +++ b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue @@ -584,15 +584,16 @@ function handleLayerClick(layer, event) { // 如果不是多选模式，才可激活图层 // 1.如果是组，则设置组下的第一个子图层为活动图层 // 2.否则直接设置活动图层 - if (isGroupLayerType(layer) && layer.children && layer.children.length > 0) { + if (isGroupLayerType(layer) && layer.children && layer.children.length > 0 && !layer.isPrintTrimsGroup) { // 如果是组图层，设置第一个子图层为活动图层 layerManager?.setAllActiveGroupLayerCanvasObject?.(layer); setActiveLayer(layer.children[0].id, { parentId: layer.id }); } else { + let id = layer.isPrintTrimsGroup ? layer.children?.[0]?.id || layer.id : layer.id; // 选中画布中的图层对象 - layerManager?.selectLayerObjects(layer.id); + layerManager?.selectLayerObjects(id); // 否则直接设置当前图层为活动图层 - setActiveLayer(layer.id); + setActiveLayer(id); layerManager?.updateLayersObjectsInteractivity(); } }