合并画布

src/component/Canvas/CanvasEditor/utils/layerHelper.js

@@ -164,7 +164,9 @@ export function createLayerFromFabricObject(
  */
 export function createLayer(options = {}) {
   const id =
-    options.id || `layer_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
+    options.id ||
+    generateId("layer_") ||
+    `layer_${Date.now()}_${Math.floor(Math.random() * 1000)}`;
   return {
     id: id,
     // 图层基本属性
@@ -471,30 +473,36 @@ export function cloneLayer(layer) {
  * @returns {Object|null} 包含layer和parent的对象，如果未找到返回null
  */
 export function findLayerRecursively(layers, layerId, parent = null) {
-  if (!layers || !Array.isArray(layers) || !layerId) {
+  try {
+    if (!layers || !Array.isArray(layers) || !layerId) {
+      return null;
+    }
+
+    // 在当前图层列表中查找
+    for (const layer of layers) {
+      if (layer && layer.id === layerId) {
+        return { layer, parent };
+      }
+
+      // 如果是组图层，递归查找子图层
+      if (
+        layer &&
+        (layer.type === "group" ||
+          layer.type === LayerType.GROUP ||
+          (layer.children && Array.isArray(layer.children)))
+      ) {
+        const result = findInChildLayers(layer.children, layerId, layer);
+        if (result) {
+          return result;
+        }
+      }
+    }
+  } catch (error) {
+    console.error(`查找图层 ${layerId} 时出错:`, error);
     return null;
   }
 
-  // 在当前图层列表中查找
-  for (const layer of layers) {
-    if (layer && layer.id === layerId) {
-      return { layer, parent };
-    }
-
-    // 如果是组图层，递归查找子图层
-    if (
-      layer &&
-      (layer.type === "group" ||
-        layer.type === LayerType.GROUP ||
-        (layer.children && Array.isArray(layer.children)))
-    ) {
-      const result = findInChildLayers(layer.children, layerId, layer);
-      if (result) {
-        return result;
-      }
-    }
-  }
-
+  console.warn(`图层 ${layerId} 未找到`);
   return null;
 }