From 0c0f4522fcc51e107cfbe66a5e8064240a0bf4ba Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 17 Oct 2025 17:39:19 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=94=BB=E5=B8=83=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=92=A4=E5=9B=9E=E3=80=81=E9=A2=91=E7=B9=81=E6=92=A4=E5=9B=9E?= =?UTF-8?q?=E5=8F=8D=E6=92=A4=E5=9B=9E=E3=80=81=E5=9B=BE=E7=89=87=E8=A3=81?= =?UTF-8?q?=E5=89=AAid=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CanvasEditor/commands/LayerCommands.js | 9 ++++- src/component/Canvas/CanvasEditor/index.vue | 39 ++++++++++--------- .../CanvasEditor/managers/LayerManager.js | 3 +- 3 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/component/Canvas/CanvasEditor/commands/LayerCommands.js b/src/component/Canvas/CanvasEditor/commands/LayerCommands.js index 1dffba96..fe2b13af 100644 --- a/src/component/Canvas/CanvasEditor/commands/LayerCommands.js +++ b/src/component/Canvas/CanvasEditor/commands/LayerCommands.js @@ -70,7 +70,7 @@ export class AddLayerCommand extends Command { undo() { // 从图层列表删除该图层 - this.layers.value = this.beforeLayers; + this.layers.value = [...this.beforeLayers]; // 恢复原活动图层 this.activeLayerId.value = this.oldActiveLayerId; @@ -563,7 +563,12 @@ export class RemoveLayerCommand extends Command { allObjects.push(object); } } - + layer.fabricObjects?.forEach((fabric) => { + const { object } = findObjectById(this.canvas, fabric.id); + if (object && !allObjects.includes(object)) { + allObjects.push(object); + } + }); // 递归收集子图层的对象 if (layer.children && Array.isArray(layer.children)) { layer.children.forEach((childLayer) => { diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue index 6ab169bb..7551a319 100644 --- a/src/component/Canvas/CanvasEditor/index.vue +++ b/src/component/Canvas/CanvasEditor/index.vue @@ -693,25 +693,26 @@ function removeLayer(layerId) { return; } - if (canvasManager && canvasManager.canvas) { - const layerToRemove = layers.value.find((l) => l.id === layerId); - if (layerToRemove) { - const elementIds = layerToRemove?.fabricObjects?.map((e) => e.id); - elementIds.forEach((elementId) => { - const objectToRemove = canvasManager.canvas - .getObjects() - .find((obj) => obj.id === elementId); - if (objectToRemove) { - canvasManager.canvas.remove(objectToRemove); - } - }); - if (activeLayerId.value === layerId) { - activeElementId.value = null; - } - canvasManager.canvas.renderAll(); - } - } - layerManager.removeLayer(layerId); + layerManager.removeLayer(layerId); +// 此处删除画布上内容导致撤回操作无效（多余） +// if (canvasManager && canvasManager.canvas) { +// const layerToRemove = layers.value.find((l) => l.id === layerId); +// if (layerToRemove) { +// const elementIds = layerToRemove?.fabricObjects?.map((e) => e.id); +// elementIds.forEach((elementId) => { +// const objectToRemove = canvasManager.canvas +// .getObjects() +// .find((obj) => obj.id === elementId); +// if (objectToRemove) { +// canvasManager.canvas.remove(objectToRemove); +// } +// }); +// if (activeLayerId.value === layerId) { +// activeElementId.value = null; +// } +// canvasManager.canvas.renderAll(); +// } +// } } function triggerImageUpload() { diff --git a/src/component/Canvas/CanvasEditor/managers/LayerManager.js b/src/component/Canvas/CanvasEditor/managers/LayerManager.js index 2497c55d..50320aa1 100644 --- a/src/component/Canvas/CanvasEditor/managers/LayerManager.js +++ b/src/component/Canvas/CanvasEditor/managers/LayerManager.js @@ -1819,7 +1819,8 @@ export class LayerManager { } // 检查是否是唯一的普通图层 - const normalLayers = this.layers.value.filter((l) => !l.isBackground); + const normalLayers = this.layers.value.filter((l) => !l.isBackground && !l.isFixed); + console.log("普通图层:", normalLayers) if (normalLayers.length === 1) { console.warn("不能剪切唯一的普通图层"); return null; From d467fc92e7cc3823c56ea67c2c3b9dec36308325 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 22 Oct 2025 16:06:04 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=20=E6=9B=B4?= =?UTF-8?q?=E6=8D=A2=E6=A8=A1=E7=89=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/Detail/DesignDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index ffd06964..d7f5f685 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -391,7 +391,7 @@ export default defineComponent({ rv:rv, fun:setRevocation } - detailData.designDetail.oldModel = detailData.designDetail.newModel + detailData.designDetail.oldModel = JSON.parse(JSON.stringify(detailData.designDetail.newModel)) delete detailData.designDetail.newModel store.commit('DesignDetail/setPraeview',value) detailData.loadingShow = false From 8ba26667c9189f98932052c7fc69b039c87d365e Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 23 Oct 2025 11:23:57 +0800 Subject: [PATCH 3/8] fix --- src/component/Detail/DesignDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index d7f5f685..e9767b5e 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -391,7 +391,7 @@ export default defineComponent({ rv:rv, fun:setRevocation } - detailData.designDetail.oldModel = JSON.parse(JSON.stringify(detailData.designDetail.newModel)) + if(detailData?.designDetail?.newModel)detailData.designDetail.oldModel = JSON.parse(JSON.stringify(detailData.designDetail.newModel)) delete detailData.designDetail.newModel store.commit('DesignDetail/setPraeview',value) detailData.loadingShow = false From 430332481e4966ee1bd39b32cfe7ef41128ad1c1 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Wed, 5 Nov 2025 16:25:14 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AB=98=E7=BA=A7?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E4=B8=AD=E7=94=9F=E6=88=90=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js | 2 +- src/component/home/design/collection/PrintboardUpload.vue | 1 - src/component/home/tools/toProduct/index.vue | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js b/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js index cb91dcae..d3e5a482 100644 --- a/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js +++ b/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js @@ -5,7 +5,7 @@ export class LiquifyCPUManager { constructor(options = {}) { this.config = { - gridSize: 8, // 稍微增大网格提高性能 + gridSize: 100, // 稍微增大网格提高性能 maxStrength: 200, // 适度降低最大强度 smoothingIterations: 1, // 增加平滑处理 relaxFactor: 0.05, // 适度松弛 diff --git a/src/component/home/design/collection/PrintboardUpload.vue b/src/component/home/design/collection/PrintboardUpload.vue index 56ab8e8d..c818e55d 100644 --- a/src/component/home/design/collection/PrintboardUpload.vue +++ b/src/component/home/design/collection/PrintboardUpload.vue @@ -1,6 +1,5 @@ From 7678f4c12d8a41f3b0d08b066b1f6502a20a9567 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 6 Nov 2025 13:42:49 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E8=B0=83=E6=95=B4history=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/cn.ts | 4 ++-- src/lang/en.ts | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lang/cn.ts b/src/lang/cn.ts index d9b66e3e..8cada0ce 100644 --- a/src/lang/cn.ts +++ b/src/lang/cn.ts @@ -345,8 +345,8 @@ export default { StartDate: "开始日期", EndDate: "结束日期", inputContent1: "输入名字进行搜索", - Detail: "细节", - Edit: "编辑", + Detail: "结果", + Edit: "设置", Rename: "重命名", Retrieve: "选择", Delete: "删除", diff --git a/src/lang/en.ts b/src/lang/en.ts index 43515604..c2c2e632 100644 --- a/src/lang/en.ts +++ b/src/lang/en.ts @@ -346,7 +346,7 @@ export default { EndDate: "End Date", inputContent1: "Search by collection name", Detail: "Result", - Edit: "Edit", + Edit: "Setting", Rename: "Rename", Retrieve: "Retrieve", Delete: "Delete", From 2899f4d6fea08c45057f36f505b539896d3cac72 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 6 Nov 2025 14:44:16 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B6=B2=E5=8C=96?= =?UTF-8?q?=E9=97=AA=E5=B1=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js b/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js index d3e5a482..cb91dcae 100644 --- a/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js +++ b/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js @@ -5,7 +5,7 @@ export class LiquifyCPUManager { constructor(options = {}) { this.config = { - gridSize: 100, // 稍微增大网格提高性能 + gridSize: 8, // 稍微增大网格提高性能 maxStrength: 200, // 适度降低最大强度 smoothingIterations: 1, // 增加平滑处理 relaxFactor: 0.05, // 适度松弛 From 787a9d5f2905ba2837b68979dd6783288d7ea1d5 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Thu, 6 Nov 2025 16:12:22 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=BF=9B=E5=85=A5library=E6=88=96=E8=80=85=E4=BB=BB=E6=84=8F?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=86=8D=E6=AC=A1=E5=9B=9E=E6=9D=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E4=BC=9A=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/component/home/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/component/home/index.vue b/src/component/home/index.vue index 98e9304e..183a4e63 100644 --- a/src/component/home/index.vue +++ b/src/component/home/index.vue @@ -97,7 +97,8 @@ export default defineComponent({ } // 如果是同一个项目且openType为history，跳过重新初始化 - if(isSameProject){ + console.log(isSameProject,data.openType) + if(isSameProject || (!query.history && !query.id)){ data.dataLoad = false console.log(dataDom.design) // dataDom.design?.init()