导出图片添加印花平铺判断

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

@@ -13,7 +13,6 @@ import {
   createLayer,
   LayerType,
   SpecialLayerId,
-  SpecialType,
   BlendMode,
 } from "../utils/layerHelper";
 import { ObjectMoveCommand } from "../commands/ObjectCommands";
@@ -45,7 +44,7 @@ import {
 } from "../utils/layerUtils";
 import { imageModeHandler } from "../utils/imageHelper";
 import { getObjectAlphaToCanvas } from "../utils/objectHelper";
-import { AddLayerCommand, RemoveLayerCommand } from "../commands/LayerCommands";
+import { AddLayerCommand, RemoveLayerCommand, ToggleChildLayerVisibilityCommand } from "../commands/LayerCommands";
 import { fa, id } from "element-plus/es/locales.mjs";
 import i18n from "@/lang/index.ts";
 const {t} = i18n.global;
@@ -717,6 +716,8 @@ export class CanvasManager {
       originX: backgroundLayerObject.originX || "left",
       originY: backgroundLayerObject.originY || "top",
       absolutePositioned: true,
+	  rx: 15,
+	  ry: 15,
     });
   }
   getBackgroundLayer() {
@@ -827,7 +828,7 @@ export class CanvasManager {
   updateMaskPosition(backgroundLayerObject) {
     if (!backgroundLayerObject || !this.maskLayer || !this.canvas.clipPath)
       return;
-
+    console.log("backgroundLayerObject");
     const left = backgroundLayerObject.left;
     const top = backgroundLayerObject.top;
 
@@ -922,6 +923,8 @@ export class CanvasManager {
    * @param {Boolean} options.isContainBg 是否包含背景图层
    * @param {Boolean} options.isContainFixed 是否包含固定图层
    * @param {Boolean} options.isContainFixedOther 是否包含其他固定图层
+   * @param {Boolean} options.isPrintTrimsNoRepeat 是否包含印花图层的不平铺
+   * @param {Boolean} options.isPrintTrimsRepeat 是否包含印花图层的平铺
    * @param {String} options.layerId 导出具体图层ID
    * @param {Array} options.layerIdArray 导出多个图层ID数组
    * @param {String} options.expPicType 导出图片类型 (png/jpg/svg)
@@ -942,6 +945,8 @@ export class CanvasManager {
       // this.canvas.renderAll(); // 重新渲染画布
       // 自动设置红绿图模式相关参数
       const enhancedOptions = {
+		isPrintTrimsNoRepeat: true,
+		isPrintTrimsRepeat: true,
         ...options,
         // 如果没有明确指定，则根据当前模式自动设置
         restoreOpacityInRedGreen:
@@ -972,7 +977,46 @@ export class CanvasManager {
           console.log("红绿图模式导出图层:", normalLayerIds);
         }
       }
-      return await this.exportManager.exportImage(enhancedOptions);
+
+	  // 处理特殊图层的显示状态
+	  const ptlids = [];
+	  if(!enhancedOptions.isPrintTrimsNoRepeat || !enhancedOptions.isPrintTrimsRepeat){
+		let layers = this.layers?.value?.find((layer) => layer.isPrintTrimsGroup)?.children || [];
+		for(let layer of layers){
+			if(!layer.visible) continue;
+			let repeat = layer.fabricObjects?.[0]?.fill?.repeat || "no-repeat";
+			if(typeof repeat !== "string") repeat = "no-repeat";
+			if(repeat === "no-repeat"){
+				if(enhancedOptions.isPrintTrimsNoRepeat) continue;
+			}else{
+				if(enhancedOptions.isPrintTrimsRepeat) continue;
+			}
+			ptlids.push(layer.id);
+			const command = new ToggleChildLayerVisibilityCommand({
+				canvas: this.canvas,
+				layers: this.layers,
+				layerId: layer.id,
+				layerManager: this.layerManager,
+			});
+			await command.execute(false);
+		}
+		await this.changeCanvas();
+	  }
+      const res = await this.exportManager.exportImage(enhancedOptions);
+	  // 恢复特殊图层的显示状态
+	  if(ptlids.length > 0){
+		for(let id of ptlids){
+			const command = new ToggleChildLayerVisibilityCommand({
+				canvas: this.canvas,
+				layers: this.layers,
+				layerId: id,
+				layerManager: this.layerManager,
+			});
+			await command.execute(true);
+		}
+		await this.changeCanvas();
+	  }
+	  return res;
     } catch (error) {
       console.warn("CanvasManager导出图片失败:", error);
       throw error;
@@ -1533,7 +1577,7 @@ export class CanvasManager {
             selectable: true,
             hasControls: true,
             hasBorders: true,
-			specialType: SpecialType.PRINT_TRIMS_O,
+			isPrintTrims: true,
 			globalCompositeOperation: BlendMode.MULTIPLY,
 		  });
 		  resolve(fabricImage);
@@ -1547,7 +1591,7 @@ export class CanvasManager {
 	    visible: true,
 	    locked: false,
 	    opacity: 1.0,
-		specialType: SpecialType.PRINT_TRIMS_L,
+		isPrintTrims: true,
 		blendMode: BlendMode.MULTIPLY,
 	    fabricObjects: [image.toObject(["id", "layerId", "layerName"])],
 		metadata: {sourceData: item},
@@ -1601,7 +1645,7 @@ export class CanvasManager {
 			width: image.width,
 			height: image.height,
 		},
-		specialType: SpecialType.REPEAT_O,
+		isPrintTrims: true,
       });
       this.canvas.add(rect);
 	  let layer = createLayer({
@@ -1611,7 +1655,7 @@ export class CanvasManager {
 	    visible: true,
 	    locked: true,
 	    opacity: 1,
-		specialType: SpecialType.REPEAT_L,
+		isPrintTrims: true,
 		blendMode: BlendMode.MULTIPLY,
 	    fabricObjects: [rect.toObject(["id", "layerId", "layerName"])],
 		metadata: {sourceData: item},
@@ -1630,7 +1674,7 @@ export class CanvasManager {
 	//   })
 	//   children.push(layer);
 	// }
-	// if(children.length === 0) return;
+	if(children.length === 0) return;
 	const groupRect = new fabric.Rect({});
 	await this.setObjecCliptInfo(groupRect);
 	// 插入组图层
@@ -1646,11 +1690,8 @@ export class CanvasManager {
 		children: children,
 		clippingMask: groupRect.toObject(),
 		isPrintTrimsGroup: true,
-		specialType: SpecialType.PRINT_TRIMS_G,
 	});
 	this.layers.value.splice(groupIndex, 0, groupLayer);
-	console.log("==========layers", [...this.layers.value]);
-
   }
 
   /**

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

@@ -502,7 +502,6 @@ export class ToolManager {
     if (!this.canvas) return;
     this.canvas.isDrawingMode = false;
     this.canvas.selection = true;
-		
   }
 
   /**
@@ -511,7 +510,7 @@ export class ToolManager {
    */
   checkToolCanOperateSelectedObject() {
 	const layer = this.layerManager?.getActiveLayer();
-	const isSpecialLayer = !!layer?.specialType;
+	const isSpecialLayer = !!layer?.isPrintTrims || !!layer?.isPrintTrimsGroup;
 	if (isSpecialLayer) {
 		this._disableBrushIndicator();
 		this.canvas.defaultCursor = "not-allowed";