diff --git a/src/component/Canvas/CanvasEditor/commands/LayerCommands.js b/src/component/Canvas/CanvasEditor/commands/LayerCommands.js index 3ea26e31..66880184 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; @@ -564,12 +564,11 @@ export class RemoveLayerCommand extends Command { } } layer.fabricObjects?.forEach((fabric) => { - const { object } = findObjectById(this.canvas, fabric.id); - if (object && !allObjects.includes(object)) { - allObjects.push(object); - } - }); - + 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 63d40b12..084b8908 100644 --- a/src/component/Canvas/CanvasEditor/index.vue +++ b/src/component/Canvas/CanvasEditor/index.vue @@ -706,7 +706,7 @@ function removeLayer(layerId) { return; } - layerManager.removeLayer(layerId); + layerManager.removeLayer(layerId); // 此处删除画布上内容导致撤回操作无效(多余) // if (canvasManager && canvasManager.canvas) { // const layerToRemove = layers.value.find((l) => l.id === layerId); diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue index c3379746..f6ab8d38 100644 --- a/src/component/Detail/DesignDetail.vue +++ b/src/component/Detail/DesignDetail.vue @@ -403,7 +403,7 @@ export default defineComponent({ rv:rv, fun:setRevocation } - detailData.designDetail.oldModel = 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 diff --git a/src/component/home/design/collection/PrintboardUpload.vue b/src/component/home/design/collection/PrintboardUpload.vue index 90ac862d..531b3782 100644 --- a/src/component/home/design/collection/PrintboardUpload.vue +++ b/src/component/home/design/collection/PrintboardUpload.vue @@ -1,6 +1,5 @@