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

src/component/Canvas/CanvasEditor/index.vue

@@ -902,7 +902,7 @@ const changeCanvas = async (command) => {
     ...command, // 传递完整的命令数据
   };
   emit("changeCanvas", commandData);
-  if (command.canUndo || command.canRedo) {
+  if ((command.canUndo || command.canRedo) && props.enabledRedGreenMode) {
     setTimeout(async () => {
       const imageData = await canvasManager.exportImage({
         restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度

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

@@ -555,23 +555,17 @@ export class ExportManager {
       );
     }
 
-    // 获取固定图层对象的边界矩形（包含位置、尺寸、缩放等信息）
-    const fixedBounds = fixedLayerObject?.getBoundingRect?.();
-
     // 使用固定图层的实际显示尺寸作为导出画布尺寸
-    const canvasWidth = Math.round(fixedBounds.width);
-    const canvasHeight = Math.round(fixedBounds.height);
+    const canvasWidth = Math.round(fixedLayerObject.width * fixedLayerObject.scaleX);
+    const canvasHeight = Math.round(fixedLayerObject.height * fixedLayerObject.scaleY);
 
     console.log(`红绿图模式导出，画布尺寸: ${canvasWidth}x${canvasHeight}`);
-    console.log("固定图层边界:", fixedBounds);
 
     // 创建固定尺寸的临时画布
     const scaleFactor = 2; // 高清导出
     const tempCanvas = document.createElement("canvas");
     tempCanvas.width = canvasWidth * scaleFactor;
     tempCanvas.height = canvasHeight * scaleFactor;
-    tempCanvas.style.width = canvasWidth + "px";
-    tempCanvas.style.height = canvasHeight + "px";
 
     const tempFabricCanvas = new fabric.StaticCanvas(tempCanvas, {
       width: canvasWidth,
@@ -584,8 +578,7 @@ export class ExportManager {
 
     try {
       // 获取裁剪路径对象（如果存在）
-      const clipPathObject = await this._getClipPathObject(fixedBounds);
-
+      const clipPathObject = await this._getClipPathObject(fixedLayerObject);
       // 克隆并添加所有对象到临时画布，需要调整位置相对于固定图层
       for (let i = 0; i < objectsToExport.length; i++) {
         const obj = objectsToExport[i];
@@ -594,19 +587,20 @@ export class ExportManager {
           restoreOpacityInRedGreen && true
         );
         if (cloned) {
-          // 调整对象位置：将原画布坐标转换为以固定图层为原点的相对坐标
           cloned.set({
-            left: cloned.left - fixedBounds.left,
-            top: cloned.top - fixedBounds.top,
+            left: 0,
+            top: 0,
+			originX: "left",
+			originY: "top",
           });
 
           // 更新对象坐标
           cloned.setCoords();
 
           // 设置裁剪路径到对象
-          if (clipPathObject) {
-            cloned.clipPath = clipPathObject;
-          }
+        //   if (clipPathObject) {
+        //     cloned.clipPath = clipPathObject;
+        //   }
 
           tempFabricCanvas.add(cloned);
         }

src/component/Detail/canvas/index.vue

@@ -230,7 +230,7 @@ export default defineComponent({
 			let size = {
 				...detailData.canvasConfig,
 			}
-
+			store.commit('DesignDetail/updataDetailItem',{maskUrl:value})
 			segmentImage(value,full,size).then(async (rv)=>{
 				let front = detailData.frontBack.front[detailData.imgDomIndex]
 				let back = detailData.frontBack.back[detailData.imgDomIndex]
@@ -243,7 +243,7 @@ export default defineComponent({
 				let base64 = await resizeImageWithNativeCanvas(front.oldMaskUrl,value)
 				front.maskUrl = base64
 				back.imageUrl = rv.targetBackUrl
-				store.commit('DesignDetail/updataDetailItem',{maskUrl:value})
+				// store.commit('DesignDetail/updataDetailItem',{maskUrl:value})
 			})
 
 		}

src/component/HomePage/Cropper.vue

@@ -30,7 +30,7 @@
                         :outputSize="option.size"
                         :outputType="option.outputType"
                         :auto-crop="option.autoCrop"
-						:fixedBox="isRound"
+						:fixedBox="!isRound"
 						:movable="true"
                         :fixed="isRound"
                         :auto-crop-width="option.autoCropWidth"
@@ -333,7 +333,6 @@ export default defineComponent({
             .cut_picture_review_block{
                 width: 100%;
                 height: calc(100% - 6.8rem*1.2);
-				min-height: calc(100% - 6.8rem*1.2);
 				margin: 0 auto;
 				.next_step_button{
 					margin-top: 2rem;

src/component/home/design/collection/PrintboardUpload.vue

@@ -145,7 +145,7 @@
 		</div>
 		<!-- 取消请求 -->
 		<scaleImage ref="scaleImage"></scaleImage>
-        <Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isRound="false" :isUpload="isUpload"></Cropper>
+        <Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper>
     </div>
 </template>
 <script lang="ts">

src/component/home/design/index.vue

@@ -682,6 +682,7 @@ export default defineComponent({
 			store.commit("cancelDeleteDesignCollectionList",index);
 		}
 		const designMousedown = (e:any,design:any,str:string)=>{
+			collItemSize.isMove = false
 			if(str != 'disLike'){
 				if(design.resultType != 'Design' || designData.isUnfold)return
 				if(str != 'like' && showDesignMark.value) return
@@ -695,7 +696,6 @@ export default defineComponent({
 			startY = e.clientY,
 			left = item.el.offsetLeft,
 			top = item.el.offsetTop;
-			collItemSize.isMove = false
 			let moveFun = (e:any) => {
 				collItemSize.isMove = true
 				let X = e.clientX - startX + left;