Merge branch 'StableVersion' of http://18.167.251.121:10003/aidlab/aida_front into StableVersion

src/component/Canvas/CanvasEditor/managers/CanvasManager.js

@@ -1098,7 +1098,7 @@ FixJsonIdLoss(json){
               // console.log("图层关联验证结果:", isValidate);
               // 排序
               // 使用LayerSort工具重新排列画布对象（如果可用）
-              await this?.layerManager?.layerSort?.rearrangeObjects();
+              await this?.layerManager?.layerSort?.rearrangeObjectsAsync();
 
               this.layerManager.activeLayerId.value = this.layers.value[0]
                 .children?.length
@@ -1140,6 +1140,27 @@ FixJsonIdLoss(json){
       throw new Error("解析JSON失败，请检查输入格式: " + error.message);
     }
   }
+  /** 修复JSON数据中的ID丢失问题 */
+  FixJsonIdLoss(json){
+	const layers = json?.layers || [];
+	const objects = json?.canvas?.objects || [];
+	layers.forEach((layer) => {
+		if(!layer.fabricObjects?.[0]?.id && !layer.fabricObject?.id){
+			const obj = objects?.find((o) => o.layerId === layer.id);
+			if(obj) {
+				layer.fabricObjects = [{
+					id: obj.id,
+					type: obj.type,
+				}]
+			}
+		}
+	})
+	// 排序
+	objects.sort((a, b) => {
+		if (a.isBackground) return -1;
+		if (b.isBackground) return 1;
+	})
+  }
 
   /**
    * 缩放红绿图模式内容以适应当前画布大小

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

@@ -71,14 +71,17 @@ export class LayerSort {
       // if (!layer.visible) {
       //   continue;
       // }
-
+	  let id = layer.fabricObject?.id || layer.fabricObjects?.[0]?.id || null;
       // 处理不同类型的图层
-      if (layer.isBackground && layer.fabricObject) {
+      if (layer.isBackground && id) {
         // 背景图层对象放在最底层
-        zIndexMap.set(layer.fabricObject.id, currentZIndex++);
+        zIndexMap.set(id, currentZIndex++);
-      } else if (layer.isFixed && layer.fabricObject) {
+      } else if (layer.isFixed && id) {
         // 固定图层对象
-        zIndexMap.set(layer.fabricObject.id, currentZIndex++);
+        zIndexMap.set(id, currentZIndex++);
+      } else if (layer.isFixedOther && id) {
+        // 其他固定图层对象
+        zIndexMap.set(id, currentZIndex++);
       } else if (!layer.isBackground && !layer.isFixed) {
         // 普通图层
         currentZIndex = this.processLayerObjects(