From 46693db23ba09326329961717ca3a75e4b943bb1 Mon Sep 17 00:00:00 2001
From: bighuixiang <472705331@qq.com>
Date: Wed, 3 Sep 2025 22:03:51 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8F=B3=E9=94=AE=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Canvas/CanvasEditor/managers/LayerManager.js | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/component/Canvas/CanvasEditor/managers/LayerManager.js b/src/component/Canvas/CanvasEditor/managers/LayerManager.js
index 57587c59..2497c55d 100644
--- a/src/component/Canvas/CanvasEditor/managers/LayerManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/LayerManager.js
@@ -938,7 +938,7 @@ export class LayerManager {
    */
   removeLayer(layerId) {
     // 查找要删除的图层
-    const { layer } = findLayerRecursively(this.layers.value, layerId);
+    const { layer, parent } = findLayerRecursively(this.layers.value, layerId);
     // 如果是背景层或固定层，不允许删除
     if (layer && (layer.isBackground || layer.isFixed)) {
       console.warn(layer.isBackground ? "背景层不可删除" : "固定层不可删除");
@@ -946,10 +946,16 @@ export class LayerManager {
       return false;
     }
 
-    // 如果图层有子图层，提示确认
-    if (layer && layer.children && layer.children.length > 0) {
-      console.warn("该图层包含子图层，删除将同时删除所有子图层");
-      message.warning("该图层包含子图层，删除将同时删除所有子图层");
+    // // 如果图层有子图层，提示确认
+    // if (layer && layer.children && layer.children.length > 0) {
+    //   console.warn("该图层包含子图层，删除将同时删除所有子图层");
+    //   message.warning("该图层包含子图层，删除将同时删除所有子图层");
+    // }
+
+    // 删除的是子图层
+    if (parent && layer) {
+      this.removeChildLayer(layer.id, parent.id);
+      return true;
     }
 
     // 直接创建和执行命令