From 57878af36bb0b2df90da0a5291e692db1aa7963a Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 16 Oct 2025 16:30:09 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=BB=E5=B8=83?=
 =?UTF-8?q?=E8=BF=87=E5=BA=A6=E5=8A=A8=E7=94=BB=E5=AF=BC=E8=87=B4=E7=BA=A2?=
 =?UTF-8?q?=E7=BB=BF=E5=9B=BE=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CanvasEditor/managers/animation/AnimationManager.js     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/component/Canvas/CanvasEditor/managers/animation/AnimationManager.js b/src/component/Canvas/CanvasEditor/managers/animation/AnimationManager.js
index c9250732..fae2d949 100644
--- a/src/component/Canvas/CanvasEditor/managers/animation/AnimationManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/animation/AnimationManager.js
@@ -69,7 +69,7 @@ export class AnimationManager {
 
     // 如果变化太小，直接应用缩放
     if (Math.abs(targetZoom - currentZoom) < 0.01) {
-      this._applyZoom(point, targetZoom);
+    //   this._applyZoom(point, targetZoom);
       return;
     }
 
@@ -121,7 +121,7 @@ export class AnimationManager {
           this._zoomAnimation = null;
 
           // 确保最终状态准确
-          this._applyZoom(point, targetZoom, true);
+        //   this._applyZoom(point, targetZoom, true);
         },
       };
 
@@ -817,7 +817,7 @@ export class AnimationManager {
         this._wasZooming = false;
 
         // 确保最终状态准确
-        this._applyZoom(point, targetZoom, true);
+        // this._applyZoom(point, targetZoom, true);
       },
     });
   }

From a297bb9791b8322a78746fa3720aa74b85ea40b6 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 16 Oct 2025 18:18:50 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=91=98=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E8=B0=83=E7=94=A8=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Administrator/affiliate/affiliateAudit/affiliateAudit.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue b/src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue
index c1d9d698..107d4934 100644
--- a/src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue
+++ b/src/component/Administrator/affiliate/affiliateAudit/affiliateAudit.vue
@@ -75,7 +75,7 @@
 			</a-table>
 		</div>
 		<itemAffiliateDetail ref="itemAffiliateDetail"></itemAffiliateDetail>
-		<editAudit ref="editAudit"></editAudit>
+		<editAudit ref="editAudit" @searchHistoryList="searchHistoryList"></editAudit>
     </div>
 </template>
 <script lang="ts">

From 0c0f4522fcc51e107cfbe66a5e8064240a0bf4ba Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 17 Oct 2025 17:39:19 +0800
Subject: [PATCH 3/6] =?UTF-8?q?=E7=94=BB=E5=B8=83=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=92=A4=E5=9B=9E=E3=80=81=E9=A2=91=E7=B9=81=E6=92=A4=E5=9B=9E?=
 =?UTF-8?q?=E5=8F=8D=E6=92=A4=E5=9B=9E=E3=80=81=E5=9B=BE=E7=89=87=E8=A3=81?=
 =?UTF-8?q?=E5=89=AAid=E4=B8=A2=E5=A4=B1=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CanvasEditor/commands/LayerCommands.js    |  9 ++++-
 src/component/Canvas/CanvasEditor/index.vue   | 39 ++++++++++---------
 .../CanvasEditor/managers/LayerManager.js     |  3 +-
 3 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/component/Canvas/CanvasEditor/commands/LayerCommands.js b/src/component/Canvas/CanvasEditor/commands/LayerCommands.js
index 1dffba96..fe2b13af 100644
--- a/src/component/Canvas/CanvasEditor/commands/LayerCommands.js
+++ b/src/component/Canvas/CanvasEditor/commands/LayerCommands.js
@@ -70,7 +70,7 @@ export class AddLayerCommand extends Command {
 
   undo() {
     // 从图层列表删除该图层
-    this.layers.value = this.beforeLayers;
+	this.layers.value = [...this.beforeLayers];
 
     // 恢复原活动图层
     this.activeLayerId.value = this.oldActiveLayerId;
@@ -563,7 +563,12 @@ export class RemoveLayerCommand extends Command {
         allObjects.push(object);
       }
     }
-
+	layer.fabricObjects?.forEach((fabric) => {
+		const { object } = findObjectById(this.canvas, fabric.id);
+		if (object && !allObjects.includes(object)) {
+		  allObjects.push(object);
+		}
+	  });
     // 递归收集子图层的对象
     if (layer.children && Array.isArray(layer.children)) {
       layer.children.forEach((childLayer) => {
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 6ab169bb..7551a319 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -693,25 +693,26 @@ function removeLayer(layerId) {
     return;
 	}
 
-  if (canvasManager && canvasManager.canvas) {
-    const layerToRemove = layers.value.find((l) => l.id === layerId);
-    if (layerToRemove) {
-      const elementIds = layerToRemove?.fabricObjects?.map((e) => e.id);
-      elementIds.forEach((elementId) => {
-        const objectToRemove = canvasManager.canvas
-          .getObjects()
-          .find((obj) => obj.id === elementId);
-        if (objectToRemove) {
-          canvasManager.canvas.remove(objectToRemove);
-        }
-      });
-      if (activeLayerId.value === layerId) {
-        activeElementId.value = null;
-      }
-      canvasManager.canvas.renderAll();
-    }
-  }
-  layerManager.removeLayer(layerId);
+	layerManager.removeLayer(layerId);
+//   此处删除画布上内容导致撤回操作无效（多余）
+//   if (canvasManager && canvasManager.canvas) {
+//     const layerToRemove = layers.value.find((l) => l.id === layerId);
+//     if (layerToRemove) {
+//       const elementIds = layerToRemove?.fabricObjects?.map((e) => e.id);
+//       elementIds.forEach((elementId) => {
+//         const objectToRemove = canvasManager.canvas
+//           .getObjects()
+//           .find((obj) => obj.id === elementId);
+//         if (objectToRemove) {
+//           canvasManager.canvas.remove(objectToRemove);
+//         }
+//       });
+//       if (activeLayerId.value === layerId) {
+//         activeElementId.value = null;
+//       }
+//       canvasManager.canvas.renderAll();
+//     }
+//   }
 }
 
 function triggerImageUpload() {
diff --git a/src/component/Canvas/CanvasEditor/managers/LayerManager.js b/src/component/Canvas/CanvasEditor/managers/LayerManager.js
index 2497c55d..50320aa1 100644
--- a/src/component/Canvas/CanvasEditor/managers/LayerManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/LayerManager.js
@@ -1819,7 +1819,8 @@ export class LayerManager {
     }
 
     // 检查是否是唯一的普通图层
-    const normalLayers = this.layers.value.filter((l) => !l.isBackground);
+    const normalLayers = this.layers.value.filter((l) => !l.isBackground && !l.isFixed);
+	console.log("普通图层:", normalLayers)
     if (normalLayers.length === 1) {
       console.warn("不能剪切唯一的普通图层");
       return null;

From d467fc92e7cc3823c56ea67c2c3b9dec36308325 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 22 Oct 2025 16:06:04 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=20=E6=9B=B4?=
 =?UTF-8?q?=E6=8D=A2=E6=A8=A1=E7=89=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index ffd06964..d7f5f685 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -391,7 +391,7 @@ export default defineComponent({
 					rv:rv,
 					fun:setRevocation
 				}
-				detailData.designDetail.oldModel = detailData.designDetail.newModel
+				detailData.designDetail.oldModel = JSON.parse(JSON.stringify(detailData.designDetail.newModel))
 				delete detailData.designDetail.newModel
 				store.commit('DesignDetail/setPraeview',value)
 				detailData.loadingShow = false

From 8ba26667c9189f98932052c7fc69b039c87d365e Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Thu, 23 Oct 2025 11:23:57 +0800
Subject: [PATCH 5/6] fix

---
 src/component/Detail/DesignDetail.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index d7f5f685..e9767b5e 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -391,7 +391,7 @@ export default defineComponent({
 					rv:rv,
 					fun:setRevocation
 				}
-				detailData.designDetail.oldModel = JSON.parse(JSON.stringify(detailData.designDetail.newModel))
+				if(detailData?.designDetail?.newModel)detailData.designDetail.oldModel = JSON.parse(JSON.stringify(detailData.designDetail.newModel))
 				delete detailData.designDetail.newModel
 				store.commit('DesignDetail/setPraeview',value)
 				detailData.loadingShow = false

From 430332481e4966ee1bd39b32cfe7ef41128ad1c1 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 5 Nov 2025 16:25:14 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=AB=98=E7=BA=A7?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7=E4=B8=AD=E7=94=9F=E6=88=90=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js  | 2 +-
 src/component/home/design/collection/PrintboardUpload.vue      | 1 -
 src/component/home/tools/toProduct/index.vue                   | 3 ++-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js b/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js
index cb91dcae..d3e5a482 100644
--- a/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/liquify/LiquifyCPUManager.js
@@ -5,7 +5,7 @@
 export class LiquifyCPUManager {
 	constructor(options = {}) {
 		this.config = {
-			gridSize: 8, // 稍微增大网格提高性能
+			gridSize: 100, // 稍微增大网格提高性能
 			maxStrength: 200, // 适度降低最大强度
 			smoothingIterations: 1, // 增加平滑处理
 			relaxFactor: 0.05, // 适度松弛
diff --git a/src/component/home/design/collection/PrintboardUpload.vue b/src/component/home/design/collection/PrintboardUpload.vue
index 56ab8e8d..c818e55d 100644
--- a/src/component/home/design/collection/PrintboardUpload.vue
+++ b/src/component/home/design/collection/PrintboardUpload.vue
@@ -1,6 +1,5 @@
 <template>
     <div class="printboard_upload_modal" :class="[driver__.driver?'showEvents':'']">
-		
         <div class="printboard_left_upload modal_left">
             <div class="left_upload_header">
                 <div class="upload_header_item">
diff --git a/src/component/home/tools/toProduct/index.vue b/src/component/home/tools/toProduct/index.vue
index 4291d6b8..dbd286e9 100644
--- a/src/component/home/tools/toProduct/index.vue
+++ b/src/component/home/tools/toProduct/index.vue
@@ -587,8 +587,9 @@ export default defineComponent({
 				toProductImageVOList:selectArr,
 				// userLikeGroupId:upload.value.userlikeGroupId,
 				projectId:productImgData.selectObject.id,
-				modelName:obj.elementType == 'Relight'?'flux':speed.speedData.value,
+				modelName:props.productimgMenu.value == 'Relight'?'flux':speed.speedData.value,
 				direction:RelightDirection.value,
+				ageGroup:store.state.Workspace.probjects.ageGroup,
 				brightenValue:productImgData.brightenValue,
 				imageStrength:(100 - imageStrength)/100,