From 920d01a97255aedc9c22509a9bc4148b9206f21b Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 23 Jan 2026 21:42:43 +0800
Subject: [PATCH 01/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=B4=E6=8A=A4?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/index.ts   | 2 +-
 src/views/Upgrade.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index b264f4f2..f08f513e 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -532,7 +532,7 @@ function isTimeRangePassed(timeRange) {
 router.beforeEach((to: any, from, next) => {
 	store.commit("set_view_loading", true);
   //系统维护时间
-	const time = '2026-01-23T21:00:00 - 2026-01-23T22:00:00';
+	const time = '2026-01-23T21:00:00 - 2026-01-23T23:00:00';
 	if (isTimeRangePassed(time) == 'in_progress') {
 	  // 	系统维护
 		const toName = to.name === 'upgrade';
diff --git a/src/views/Upgrade.vue b/src/views/Upgrade.vue
index 14527a10..ee1aa460 100644
--- a/src/views/Upgrade.vue
+++ b/src/views/Upgrade.vue
@@ -12,7 +12,7 @@
 			<!-- <div class="upgrade-content-textab">Due to the system server upgrade, we will start the upgrade from 9:30 am Hong Kong time on the weekend of October 20th until October 21st. During this time,<br> the AiDA system will be temporarily inaccessible. We apologize for any inconvenience this may cause and thank you for your understanding.</div> -->
 			<!-- 有截至时间 -->
 			<div class="upgrade-content-textab">
-				Due to system server upgrades, maintenance will be carried out from 21:00 to 22:00 on January 19, 2026 (today).
+				Due to system server upgrades, maintenance will be carried out from 21:00 to 23:00 on January 19, 2026 (today).
 				<br>
 				The AiDA system will be temporarily unavailable during this period. We sincerely apologize for any inconvenience caused and thank you for your understanding.</div>
 			<br>
@@ -20,7 +20,7 @@
 			<br>
 			<!-- <div class="upgrade-content-textab">由于系统服务器维护，AiDA系统暂时无法访问。对于由此造成的任何不便，我们深表歉意，并感谢您的理解</div> -->
 			<div class="upgrade-content-textab">
-				由于系统服务器升级，我们将于1月23日21:00 至1月23日22:00进行升级。
+				由于系统服务器升级，我们将于1月23日21:00 至1月23日23:00进行升级。
 				<br>
 				在此期间，AiDA系统将暂时无法访问。给您带来的不便，我们深表歉意，并感谢您的理解</div>
 		</div>

From 07b7a6f1d71aecbeba363131f118b35aa54b5ad3 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 23 Jan 2026 22:31:51 +0800
Subject: [PATCH 02/12] FIX

---
 src/router/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/index.ts b/src/router/index.ts
index f08f513e..b264f4f2 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -532,7 +532,7 @@ function isTimeRangePassed(timeRange) {
 router.beforeEach((to: any, from, next) => {
 	store.commit("set_view_loading", true);
   //系统维护时间
-	const time = '2026-01-23T21:00:00 - 2026-01-23T23:00:00';
+	const time = '2026-01-23T21:00:00 - 2026-01-23T22:00:00';
 	if (isTimeRangePassed(time) == 'in_progress') {
 	  // 	系统维护
 		const toName = to.name === 'upgrade';

From b158341d6e787676f28c421d886b3c51678dac90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com>
Date: Mon, 26 Jan 2026 16:47:03 +0800
Subject: [PATCH 03/12] =?UTF-8?q?=E5=8D=B0=E8=8A=B1=E7=BB=84=E7=A6=81?=
 =?UTF-8?q?=E6=AD=A2=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CanvasEditor/components/LayersPanel/LayersPanel.vue    | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue
index b6971bb3..1ed62871 100644
--- a/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue
+++ b/src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue
@@ -584,15 +584,16 @@ function handleLayerClick(layer, event) {
       // 如果不是多选模式，才可激活图层
       // 1.如果是组，则设置组下的第一个子图层为活动图层
       // 2.否则直接设置活动图层
-      if (isGroupLayerType(layer) && layer.children && layer.children.length > 0) {
+      if (isGroupLayerType(layer) && layer.children && layer.children.length > 0 && !layer.isPrintTrimsGroup) {
         // 如果是组图层，设置第一个子图层为活动图层
         layerManager?.setAllActiveGroupLayerCanvasObject?.(layer);
         setActiveLayer(layer.children[0].id, { parentId: layer.id });
       } else {
+		let id = layer.isPrintTrimsGroup ? layer.children?.[0]?.id || layer.id : layer.id;
         // 选中画布中的图层对象
-        layerManager?.selectLayerObjects(layer.id);
+        layerManager?.selectLayerObjects(id);
         // 否则直接设置当前图层为活动图层
-        setActiveLayer(layer.id);
+        setActiveLayer(id);
         layerManager?.updateLayersObjectsInteractivity();
       }
     }

From fb1d09d98efd80ee9bc54d328692d348ed487e45 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 27 Jan 2026 10:12:13 +0800
Subject: [PATCH 04/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E8=BE=93=E5=85=A5=E9=AA=8C=E8=AF=81=E7=A0=81=E6=9C=80=E5=B0=8F?=
 =?UTF-8?q?=E9=AB=98=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/HomePage/bindEmail.vue            | 1 +
 src/component/LoginPage/login/enterprise.vue    | 2 +-
 src/component/LoginPage/login/personal.vue      | 1 +
 src/component/LoginPage/login/school.vue        | 2 +-
 src/component/mainPage/signUp/registerModel.vue | 2 ++
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/component/HomePage/bindEmail.vue b/src/component/HomePage/bindEmail.vue
index d4b18e4d..dfe73a96 100644
--- a/src/component/HomePage/bindEmail.vue
+++ b/src/component/HomePage/bindEmail.vue
@@ -595,6 +595,7 @@ export default defineComponent({
             .login_form_content {
                 margin-top: 4rem;
 				position: relative;
+				min-height: 34rem;
                 &[state="2"]{
 					height: 30rem;
 					>*{
diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue
index c2265558..dadf84ce 100644
--- a/src/component/LoginPage/login/enterprise.vue
+++ b/src/component/LoginPage/login/enterprise.vue
@@ -790,7 +790,7 @@ export default defineComponent({
       .login_form_content {
         margin-top: 4rem;
         position: relative;
-
+		min-height: 34rem;
         &[state="2"] {
           > * {
             opacity: 0;
diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue
index a597ba09..2712e61d 100644
--- a/src/component/LoginPage/login/personal.vue
+++ b/src/component/LoginPage/login/personal.vue
@@ -799,6 +799,7 @@ export default defineComponent({
 
       .login_form_content {
         position: relative;
+		min-height: 34rem;
         &[state="2"] {
           > * {
             opacity: 0;
diff --git a/src/component/LoginPage/login/school.vue b/src/component/LoginPage/login/school.vue
index 6c49f25c..93e8c38f 100644
--- a/src/component/LoginPage/login/school.vue
+++ b/src/component/LoginPage/login/school.vue
@@ -826,7 +826,7 @@ export default defineComponent({
       .login_form_content {
         margin-top: 4rem;
         position: relative;
-
+		min-height: 34rem;
         &[state="2"] {
           > * {
             opacity: 0;
diff --git a/src/component/mainPage/signUp/registerModel.vue b/src/component/mainPage/signUp/registerModel.vue
index 9b3d52ed..fd499749 100644
--- a/src/component/mainPage/signUp/registerModel.vue
+++ b/src/component/mainPage/signUp/registerModel.vue
@@ -916,9 +916,11 @@ export default defineComponent({
       .login_form_content {
         margin-top: 4rem;
         position: relative;
+		min-height: 34rem;
 		@media (max-width: 768px) {
 			margin-top: 2.4rem;
 			height: 20rem;
+			min-height: auto;
 		}
         &[state="2"] {
           > * {

From 03a9e2f52c91f7d89112ceb240001d8326364213 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 27 Jan 2026 10:15:20 +0800
Subject: [PATCH 05/12] fix

---
 src/component/mainPage/signUp/registerModel.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/component/mainPage/signUp/registerModel.vue b/src/component/mainPage/signUp/registerModel.vue
index fd499749..557afb9e 100644
--- a/src/component/mainPage/signUp/registerModel.vue
+++ b/src/component/mainPage/signUp/registerModel.vue
@@ -919,8 +919,10 @@ export default defineComponent({
 		min-height: 34rem;
 		@media (max-width: 768px) {
 			margin-top: 2.4rem;
-			height: 20rem;
 			min-height: auto;
+			&[state="2"] {
+				height: 20rem;
+			}
 		}
         &[state="2"] {
           > * {

From 4dfa9433fd56af9d7decbf99fbd61e6ce3e64ab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BF=97=E9=B9=8F?= <2916022834@qq.com>
Date: Tue, 27 Jan 2026 11:01:33 +0800
Subject: [PATCH 06/12] =?UTF-8?q?=E7=94=BB=E5=B8=83=20=E9=83=A8=E4=BB=B6?=
 =?UTF-8?q?=E9=80=89=E5=8F=96=E3=80=81=E5=8D=B0=E8=8A=B1=E7=A6=81=E7=94=A8?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FillGroupLayerBackgroundCommand.js        |   5 +-
 .../commands/LassoCutoutCommand.js            |  12 +-
 .../CanvasEditor/commands/PartCommands.js     |  56 ++++
 .../components/PartSelectorPanel.vue          |  76 +----
 .../components/SelectMenuPanel/index.vue      |  13 +-
 src/component/Canvas/CanvasEditor/index.vue   |   8 +-
 .../CanvasEditor/managers/CanvasManager.js    |   6 +-
 .../CanvasEditor/managers/PartManager.js      | 316 ++++++++++++------
 .../CanvasEditor/managers/ToolManager.js      |   4 +-
 .../Canvas/CanvasEditor/utils/helper.js       |   1 +
 src/component/Canvas/canvasExample.vue        |  11 +-
 src/component/Canvas/test.vue                 |   2 +-
 12 files changed, 328 insertions(+), 182 deletions(-)
 create mode 100644 src/component/Canvas/CanvasEditor/commands/PartCommands.js

diff --git a/src/component/Canvas/CanvasEditor/commands/FillGroupLayerBackgroundCommand.js b/src/component/Canvas/CanvasEditor/commands/FillGroupLayerBackgroundCommand.js
index edd061ac..26f90e2c 100644
--- a/src/component/Canvas/CanvasEditor/commands/FillGroupLayerBackgroundCommand.js
+++ b/src/component/Canvas/CanvasEditor/commands/FillGroupLayerBackgroundCommand.js
@@ -106,7 +106,6 @@ export class FillGroupLayerBackgroundCommand extends Command {
         });
       }
     }
-
     // 判断fabricObjects是否是组对象
     const firstObj = layer.fabricObjects?.[0] || null;
     // 如果没有找到第一个对象，则直接添加到当前画布
@@ -173,8 +172,8 @@ export class FillGroupLayerBackgroundCommand extends Command {
     }
     const canvasObj = findObjectById(this.canvas, firstObj?.id)?.object;
     if (
-      (canvasObj && canvasObj.type === "group") ||
-      canvasObj._objects?.length > 0
+      canvasObj && (canvasObj.type === "group" ||
+      canvasObj._objects?.length > 0)
     ) {
       this.newFill.set({
         left: 0,
diff --git a/src/component/Canvas/CanvasEditor/commands/LassoCutoutCommand.js b/src/component/Canvas/CanvasEditor/commands/LassoCutoutCommand.js
index a3ad1eaf..b69f2cdc 100644
--- a/src/component/Canvas/CanvasEditor/commands/LassoCutoutCommand.js
+++ b/src/component/Canvas/CanvasEditor/commands/LassoCutoutCommand.js
@@ -147,11 +147,11 @@ export class LassoCutoutCommand extends CompositeCommand {
       }
 
       // 确定源图层
-      const sourceLayer = this.layerManager.getActiveLayer();
-      if (!sourceLayer) {
-        console.error("无法执行套索抠图：源图层无效");
-        return false;
-      }
+    //   const sourceLayer = this.layerManager.getActiveLayer();
+    //   if (!sourceLayer) {
+    //     console.error("无法执行套索抠图：源图层无效");
+    //     return false;
+    //   }
 
       // 获取源图层的所有对象（包括子图层）
       // const sourceObjects = this._getLayerObjects(sourceLayer);
@@ -225,7 +225,7 @@ export class LassoCutoutCommand extends CompositeCommand {
 
 			const layers = this.layerManager.layers.value;
 			var topLayerIndex = 0;
-			layers.forEach((layer, index) => {
+			if(this.originalLayer)layers.forEach((layer, index) => {
 				if (layer.id === this.originalLayer.id) {
 					topLayerIndex = index;
 				}else if (layer.children.length > 0) {
diff --git a/src/component/Canvas/CanvasEditor/commands/PartCommands.js b/src/component/Canvas/CanvasEditor/commands/PartCommands.js
new file mode 100644
index 00000000..c8e1178c
--- /dev/null
+++ b/src/component/Canvas/CanvasEditor/commands/PartCommands.js
@@ -0,0 +1,56 @@
+import { Command } from "./Command.js";
+
+/**
+ * 部件绘制命令
+ */
+export class PartDrawCommand extends Command {
+	constructor(options) {
+		super({
+			name: "部件绘制命令",
+			saveState: false,
+		});
+
+		this.canvas = options.canvas;
+		this.partManager = options.partManager;
+		this.partCanvas = options.partCanvas;
+		this.oldPartCanvas = this.partManager.partCanvas;
+	}
+	execute() {
+		this.partManager.drawPartCanvas(this.partCanvas);
+		return true;
+	}
+	undo() {
+		this.partManager.drawPartCanvas(this.oldPartCanvas);
+		return true;
+	}
+}
+/**
+ * 部件点选绘制命令
+ */
+export class PartPointDrawCommand extends Command {
+	constructor(options) {
+		super({
+			name: "部件点选绘制命令",
+			saveState: false,
+		});
+
+		this.canvas = options.canvas;
+		this.partManager = options.partManager;
+		this.partCanvas = options.partCanvas;
+		this.pointList = options.pointList;
+		this.oldPartCanvas = this.partManager.partCanvas;
+		this.oldPointList = [...this.partManager.pointList];
+	}
+	async execute() {
+		const list = [...this.pointList];
+		const canvas = this.partCanvas;
+		const res = await this.partManager.pointDrawPartCanvas(list, canvas);
+		return res;
+	}
+	async undo() {
+		const list = [...this.oldPointList];
+		const canvas = this.oldPartCanvas;
+		const res = await this.partManager.pointDrawPartCanvas(list, canvas);
+		return res;
+	}
+}
diff --git a/src/component/Canvas/CanvasEditor/components/PartSelectorPanel.vue b/src/component/Canvas/CanvasEditor/components/PartSelectorPanel.vue
index 658d647f..1bf5d790 100644
--- a/src/component/Canvas/CanvasEditor/components/PartSelectorPanel.vue
+++ b/src/component/Canvas/CanvasEditor/components/PartSelectorPanel.vue
@@ -20,13 +20,13 @@
 							<img
 								src="/src/assets/images/canvas/shubiao-l.png"
 							/>
-							<span>Left Click: Add</span>
+							<span>{{ t("Canvas.LeftClickAdd") }}</span>
 						</div>
 						<div>
 							<img
 								src="/src/assets/images/canvas/shubiao-r.png"
 							/>
-							<span>Right Click: Remove</span>
+							<span>{{ t("Canvas.RightClickRemove") }}</span>
 						</div>
 					</div>
 				</div>
@@ -57,15 +57,15 @@
 							$t("Canvas.creation")
 						}}</span>
 					</div>
-					<div class="action-btn" @click="onCopyCreate">
+					<!-- <div class="action-btn" @click="onCopyCreate">
 						<svg-icon name="CCut" size="26" />
 						<span class="btn-text">{{
 							$t("Canvas.CreateAndCopy")
 						}}</span>
-					</div>
+					</div> -->
 					<div class="action-btn" @click="onReset">
 						<svg-icon name="CCut" size="26" />
-						<span class="btn-text">清空当前点位</span>
+						<span class="btn-text">{{ $t("Canvas.TheClearlySelectedContent") }}</span>
 					</div>
 				</div>
 			</div>
@@ -76,23 +76,9 @@
 <script setup>
 	import { ref, onMounted, watch } from "vue";
 	import { useI18n } from "vue-i18n";
-	import {
-		CreateSelectionCommand,
-		InvertSelectionCommand,
-		FeatherSelectionCommand,
-		FillSelectionCommand,
-	} from "../commands/SelectionCommands";
-	import { ToolCommand } from "../commands/ToolCommands";
-	import {
-		LassoCutoutCommand,
-		ClearSelectionCommand,
-		// CutSelectionToNewLayerCommand,
-	} from "../commands/LassoCutoutCommand";
-
 	import { OperationType } from "../utils/layerHelper";
-	import { ClearSelectionContentCommand } from "../commands/ClearSelectionContentCommand";
-	import { CutSelectionToNewLayerCommand } from "../commands/CutSelectionToNewLayerCommand";
-
+	// 国际化
+	const { t } = useI18n();
 	const props = defineProps({
 		canvas: {
 			type: Object,
@@ -137,32 +123,30 @@
 	const toolList = [
 		{
 			type: OperationType.PART,
-			label: "Point Selection",
+			label: t("Canvas.PointSelection"),
 			icon: "CPoint",
 			size: "20",
 		},
 		{
 			type: OperationType.PART_RECTANGLE,
-			label: "Marquee Selection",
+			label: t("Canvas.MarqueeSelection"),
 			icon: "CMarquee",
 			size: "20",
 		},
 		{
 			type: OperationType.PART_BRUSH,
-			label: "Brush Selection",
+			label: t("Canvas.BrushSelection"),
 			icon: "CBrush2",
 			size: "16",
 		},
 		{
 			type: OperationType.PART_ERASER,
-			label: "Erase",
+			label: t("Canvas.Erase"),
 			icon: "CEraser2",
 			size: "22",
 		},
 	];
 
-	// 国际化
-	const { t } = useI18n();
 
 	onMounted(() => {});
 
@@ -182,12 +166,6 @@
 				show();
 				// 根据工具类型设置选区类型
 				toolType.value = newTool;
-
-				// 更新选区管理器的选区类型
-				// if (props.partManager) {
-				// 	props.partManager.setPartType(toolType.value);
-				// 	props.partManager.setupPartEvents();
-				// }
 			} else {
 				close();
 			}
@@ -220,12 +198,6 @@
 		if (props.toolManager) {
 			props.toolManager.setToolWithCommand(type);
 		}
-
-		// // 备用方案：如果没有 toolManager，直接更新 partManager
-		// else if (props.partManager) {
-		// 	props.partManager.setPartType(type);
-		// 	props.partManager.setupPartEvents();
-		// }
 	}
 
 	// 创建
@@ -418,35 +390,11 @@
 
 	.tool-actions {
 		display: grid;
-		grid-template-columns: repeat(3, 1fr);
+		grid-template-columns: repeat(2, 1fr);
 		gap: 5px;
 		padding: 0 30px;
 	}
 
-	/* 平板适配 - 每行4个按钮 */
-	@media screen and (max-width: 768px) {
-		.tool-actions {
-			grid-template-columns: repeat(3, 1fr);
-			gap: 8px 6px;
-			padding: 0 8px;
-		}
-	}
-
-	/* 手机适配 - 每行3个按钮 */
-	@media screen and (max-width: 480px) {
-		.tool-actions {
-			grid-template-columns: repeat(3, 1fr);
-			gap: 6px 4px;
-			padding: 0 6px;
-		}
-
-		.header-btn {
-			font-size: 11px;
-			padding: 2px 4px;
-			min-width: 28px;
-		}
-	}
-
 	.action-btn {
 		display: flex;
 		// flex-direction: column;
diff --git a/src/component/Canvas/CanvasEditor/components/SelectMenuPanel/index.vue b/src/component/Canvas/CanvasEditor/components/SelectMenuPanel/index.vue
index 638f5237..a52d393b 100644
--- a/src/component/Canvas/CanvasEditor/components/SelectMenuPanel/index.vue
+++ b/src/component/Canvas/CanvasEditor/components/SelectMenuPanel/index.vue
@@ -22,7 +22,7 @@
 						v-for="v in activeObjects"
 						:key="v.id"
 					>
-						<div class="title">{{ v.layer?.name }}</div>
+						<!-- <div class="title">{{ v.layer?.name }}</div> -->
 						<div class="list">
 							<div
 								class="input"
@@ -125,7 +125,10 @@
 									"
 									:options="selectOptions"
 									@change="(e) => changeFillRepeat(e, v)"
-									:disabled="v.layer?.metadata?.level2Type === 'Embroidery'"
+									:disabled="
+										v.layer?.metadata?.level2Type ===
+										'Embroidery'
+									"
 								/>
 							</div>
 							<!-- 平铺设置 -->
@@ -283,10 +286,10 @@
 		activeObjects.value.forEach((v) => {
 			v.layer = props.layerManager.getLayerById(v.layerId);
 		});
-		if (activeObjects.value.length === 0) {
-			close();
-		} else {
+		if (activeObjects.value.length === 1) {
 			show();
+		} else {
+			close();
 		}
 	};
 	//取消当前选中
diff --git a/src/component/Canvas/CanvasEditor/index.vue b/src/component/Canvas/CanvasEditor/index.vue
index 80748145..30ab3427 100644
--- a/src/component/Canvas/CanvasEditor/index.vue
+++ b/src/component/Canvas/CanvasEditor/index.vue
@@ -398,7 +398,9 @@ onMounted(async () => {
     canvas: canvasManager.canvas,
     layerManager,
     canvasManager,
+	selectionManager,
     toolManager,
+	commandManager,
 	props,
   });
   canvasManager.setPartManager(partManager);
@@ -1043,11 +1045,7 @@ defineExpose({
 	width = 0,// 导出的图片宽度
 	height = 0, // 导出的图片高度
   } = {}) => {
-	console.log('导出图片',{isContainFixed,
-isContainFixedOther,
-isPrintTrimsNoRepeat,
-isPrintTrimsRepeat,
-isContainNormalLayer})
+	canvasManager?.canvas?.discardActiveObject();
     var base64 = await canvasManager.exportImage({
       isContainBg,
       isContainFixed,
diff --git a/src/component/Canvas/CanvasEditor/managers/CanvasManager.js b/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
index 0fc4f7cd..abce88de 100644
--- a/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/CanvasManager.js
@@ -178,7 +178,7 @@ export class CanvasManager {
     this.canvas.onBrushImageConverted = async (fabricImage) => {
 	  const activeTool = this.toolManager?.activeTool?.value;
 	  if(activeTool === OperationType.PART_BRUSH){
-		this.partManager?.addPartImage(fabricImage);
+		this.partManager?.addDrawPartImage(fabricImage);
       }else{
         await this.addImageToLayer({ fabricImage, targetLayerId: null });
 	  }
@@ -203,6 +203,10 @@ export class CanvasManager {
       console.log("擦除完成", e.targets);
       // 可以在这里保存状态到命令管理器
       const affectedObjects = e.targets || [];
+	  const activeTool = this.toolManager?.activeTool?.value;
+	  if(activeTool === OperationType.PART_ERASER){
+		return this.partManager?.onErasingEnd(affectedObjects);
+      }
       const command = this.eraserStateManager.endErasing(affectedObjects);
       if (command && this.commandManager) {
         await this.commandManager?.executeCommand?.(command);
diff --git a/src/component/Canvas/CanvasEditor/managers/PartManager.js b/src/component/Canvas/CanvasEditor/managers/PartManager.js
index 1c6262b3..66569b5b 100644
--- a/src/component/Canvas/CanvasEditor/managers/PartManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/PartManager.js
@@ -1,14 +1,12 @@
 import { fabric } from "fabric-with-all";
 import { traceImageContour, imageToCanvas } from "../utils/helper";
 import { OperationType } from "../utils/layerHelper";
-import { CreateSelectionCommand } from "../commands/SelectionCommands";
-import { ClearSelectionCommand } from "../commands/LassoCutoutCommand";
+import { LassoCutoutCommand } from "../commands/LassoCutoutCommand";
 import addIcon from "@/assets/images/canvas/add.png";
 import removeIcon from "@/assets/images/canvas/remove.png";
-import { Https } from "@/tool/https";
-import store from "@/store";
-import { createStaticCanvas } from "../utils/canvasFactory";
 import { getObjectAlphaToCanvas } from "../utils/objectHelper";
+import { Https } from "@/tool/https";
+import { PartDrawCommand, PartPointDrawCommand } from "../commands/PartCommands";
 
 
 /**
@@ -27,11 +25,31 @@ export class PartManager {
 	constructor(options = {}) {
 		this.canvas = options.canvas;
 		this.commandManager = options.commandManager;
+		this.selectionManager = options.selectionManager;
 		this.layerManager = options.layerManager;
 		this.canvasManager = options.canvasManager;
 		this.toolManager = options.toolManager;
 		this.props = options.props;
 
+		// 选区样式配置
+		this.selectionStyle = {
+			stroke: "#0096ff",
+			strokeWidth: 1,
+			strokeDashArray: [5, 5],
+			fill: "rgba(0, 150, 255, 0.1)",
+			strokeUniform: true, // 保持描边宽度不随缩放改变
+			// fill: "rgba(127, 255, 127, 0.3)",
+			// stroke: "#2AA81B",
+			// strokeWidth: 2,
+			// strokeDashArray: [8, 4],
+			// strokeLineCap: "round",// 折线端点样式
+			// strokeLineJoin: "bevel", // 折线连接样式
+			selectable: false,
+			evented: false,
+			excludeFromExport: true,
+			hoverCursor: "default",
+			moveCursor: "default",
+		};
 		// 状态
 		this.isActive = false;
 
@@ -54,14 +72,11 @@ export class PartManager {
 		this.activeTool = this.toolManager.activeTool;
 
 		this.rgba = { r: 0, g: 255, b: 0, a: 200 };
-		this.partGroup = null; // 当前选区对象
 		this.partId = "part_selector";
+		this.partGroup = null; // 当前选区对象
 		this.partCanvas = null;// 选区画布
-		// 点位列表
-		this.pointList = []; // 存储点选坐标
-
-		// 绘制列表
-		this.drawList = []; // 存储绘制对象
+		this.rectangleObject = null; // 矩形对象
+		this.pointList = []; // 点位列表 存储点选坐标
 	}
 
 	/**
@@ -75,6 +90,15 @@ export class PartManager {
 
 		if (toolId === OperationType.PART_ERASER) {
 			this.setEraserTool();
+		} else if (toolId === OperationType.PART || toolId === OperationType.PART_RECTANGLE) {
+			this.clearPointData();
+			this.resetPartObject();
+		}
+		if (toolId === OperationType.PART_ERASER || toolId === OperationType.PART_BRUSH) {
+			if (this.pointList.length > 0) {
+				this.clearPointData();
+				this.resetPartObject();
+			}
 		}
 
 		// 如果从非选区工具切换到选区工具，初始化事件
@@ -90,8 +114,7 @@ export class PartManager {
 		}
 		// 如果从选区工具切换到选区工具，重置选区
 		else if (wasActive && this.isActive) {
-			// this.clearPointData();
-			// this.resetPartObject();
+
 		}
 	}
 
@@ -218,12 +241,7 @@ export class PartManager {
 	}
 
 	/** 点选工具模式下点击事件处理 */
-	_pointDownkHandler(options) {
-		// const button = options.button;
-		// const isLeft = button === 1;// 左键1（添加）  右键3（删除）
-		// const icon = `url("${isLeft ? addIcon : removeIcon}") 16 16, default`
-		// this.canvas.upperCanvasEl.style.cursor = icon;
-	}
+	_pointDownkHandler(options) { }
 	/** 点选工具模式下移动事件处理 */
 	_pointMoveHandler(options) { }
 	/** 点选工具模式下抬起事件处理 */
@@ -236,7 +254,8 @@ export class PartManager {
 		const label = isLeft ? 1 : 0;
 		const points = [];
 		const labels = [];
-		this.pointList.forEach((item) => {
+		const pointList = [...this.pointList];
+		pointList.forEach((item) => {
 			points.push([item.x, item.y]);
 			labels.push(item.label);
 		});
@@ -247,34 +266,57 @@ export class PartManager {
 			points,
 			labels,
 		});
-		this.pointList.push({
+		pointList.push({
 			x: x,
 			y: y,
 			label: label,
 		})
 		const image1 = await this.loadImageToObject(url);
-		this.resetPartObject();
-		const group = this.partGroup;
 		const canvas = getObjectAlphaToCanvas(image1, null, 0, this.rgba);
+		this.partPointDrawCommand(pointList, canvas);
+	}
+	partPointDrawCommand(list, canvas) {
+		const cmd = new PartPointDrawCommand({
+			canvas: this.canvas,
+			partManager: this,
+			partCanvas: canvas,
+			pointList: [...list],
+		})
+		if (this.commandManager?.execute) {
+			this.commandManager.execute(cmd);
+		} else {
+			cmd.execute();
+		}
+	}
+	async pointDrawPartCanvas(list, canvas) {
+		this.selectionManager.clearSelection();
+		const fixedObject = this.canvasManager.getFixedLayerObject();
+		if (!fixedObject) {
+			console.warn("未找到固定图层")
+			return false;
+		}
+		this.resetPartObject();
+		this.pointList = [...list];
 		this.partCanvas = canvas;
 		const image2 = new fabric.Image(canvas);
 		image2.set({
 			originX: fixedObject.originX,
 			originY: fixedObject.originY,
 		});
-		group.add(image2);
-		for (let i = 0; i < this.pointList.length; i++) {
-			const item = this.pointList[i];
+		this.partGroup.add(image2);
+		for (let i = 0; i < list.length; i++) {
+			const item = list[i];
 			const icon = await this.loadImageToObject(item.label === 1 ? addIcon : removeIcon);
 			icon.set({
-				left: item.x - group.width / 2,
-				top: item.y - group.height / 2,
+				left: item.x - this.partGroup.width / 2,
+				top: item.y - this.partGroup.height / 2,
 				originX: fixedObject.originX,
 				originY: fixedObject.originY,
 			})
-			group.add(icon);
+			this.partGroup.add(icon);
 		}
 		this.canvas.renderAll();
+		return true;
 	}
 	/** 清空点选数据 */
 	clearPointData() {
@@ -285,16 +327,42 @@ export class PartManager {
 
 	/** 框选工具模式下点击事件处理 */
 	_rectangleDownHandler(options) {
-		this.clearPointData();
+		this.pointList = [];
 		const fixedObject = this.canvasManager.getFixedLayerObject();
 		if (!fixedObject) return console.warn("未找到固定图层");
 		const { x, y } = this.handleMousePosition(options, fixedObject);
 		this.pointList.push(x, y);
+
+		this.rectangleObject = new fabric.Rect({
+			left: x - fixedObject.width / 2,
+			top: y - fixedObject.height / 2,
+			width: 0,
+			height: 0,
+			...this.selectionStyle,
+			fill: "transparent", // 在绘制过程中不显示填充
+			strokeUniform: true,
+		});
+		this.partGroup.add(this.rectangleObject);
+		this.canvas.renderAll();
 	}
 	/** 框选工具模式下移动事件处理 */
-	_rectangleMoveHandler(options) { }
+	_rectangleMoveHandler(options) {
+		if (!this.rectangleObject) return console.warn("未找到框选对象");
+		const fixedObject = this.canvasManager.getFixedLayerObject();
+		if (!fixedObject) return console.warn("未找到固定图层");
+		const { x, y } = this.handleMousePosition(options, fixedObject);
+		this.rectangleObject.set({
+			width: x - this.rectangleObject.left - fixedObject.width / 2,
+			height: y - this.rectangleObject.top - fixedObject.height / 2,
+		});
+		this.canvas.renderAll();
+	}
 	/** 框选工具模式下抬起事件处理 */
 	async _rectangleUpHandler(options) {
+		if (this.rectangleObject) {
+			this.partGroup.remove(this.rectangleObject);
+			this.canvas.renderAll();
+		}
 		const fixedObject = this.canvasManager.getFixedLayerObject();
 		if (!fixedObject) return console.warn("未找到固定图层");
 		const { x, y } = this.handleMousePosition(options, fixedObject);
@@ -305,18 +373,9 @@ export class PartManager {
 			type: "box",
 			box: [...this.pointList],
 		});
-		const image1 = await this.loadImageToObject(url);
-		this.resetPartObject();
-		const group = this.partGroup;
-		const canvas = getObjectAlphaToCanvas(image1, null, 0, this.rgba);
-		this.partCanvas = canvas;
-		const image2 = new fabric.Image(canvas);
-		image2.set({
-			originX: fixedObject.originX,
-			originY: fixedObject.originY,
-		});
-		group.add(image2);
-		this.canvas.renderAll();
+		const image = await this.loadImageToObject(url);
+		const canvas = getObjectAlphaToCanvas(image, null, 0, this.rgba);
+		this.partDrawCommand(canvas);
 	}
 	/** 获取分隔后图片 */
 	async getSegAnythingImage(obj) {
@@ -360,7 +419,16 @@ export class PartManager {
 		}
 	}
 
-	async addPartImage(fabricImage) {
+
+
+	/** 绘制工具模式下点击事件处理 */
+	_brushDownHandler(options) { }
+	/** 绘制工具模式下移动事件处理 */
+	_brushMoveHandler(options) { }
+	/** 绘制工具模式下抬起事件处理 */
+	_brushUpHandler(options) { }
+	/** 绘制模式添加画笔 */
+	async addDrawPartImage(fabricImage) {
 		const scaleX = fabricImage.scaleX / this.partGroup.scaleX;
 		const scaleY = fabricImage.scaleY / this.partGroup.scaleY;
 		const top = (fabricImage.top - this.partGroup.top) / this.partGroup.scaleY;
@@ -371,15 +439,83 @@ export class PartManager {
 			top: top + this.partGroup.height / 2,
 			left: left + this.partGroup.width / 2,
 		})
-		this.drawList.push(fabricImage);
 		const tcanvas = new fabric.StaticCanvas(document.createElement("canvas"), {
 			width: this.partGroup.width,
 			height: this.partGroup.height,
 			enableRetinaScaling: false,
 		});
-		this.drawList.forEach(item => tcanvas.add(item))
+		if (this.partCanvas) {
+			let image = new fabric.Image(this.partCanvas);
+			tcanvas.add(image)
+		}
+		tcanvas.add(fabricImage)
 		tcanvas.renderAll();
 		const canvas = getObjectAlphaToCanvas(tcanvas, null, 0, this.rgba);
+		this.partDrawCommand(canvas);
+	}
+
+
+	/** 切换到擦除工具 */
+	setEraserTool() {
+		if (!this.canvas) return console.warn("未找到画布");
+		const objects = this.canvas.getObjects();
+		objects.forEach(obj => {
+			if (obj.id === this.partId) {
+				obj.set({
+					erasable: true
+				})
+			}
+		})
+	}
+	/** 擦除工具模式下擦除完成事件处理 */
+	async onErasingEnd(affectedObjects) {
+		console.log("擦除完成", affectedObjects);
+		const tcanvas = new fabric.StaticCanvas(document.createElement("canvas"), {
+			width: this.partGroup.width,
+			height: this.partGroup.height,
+			enableRetinaScaling: false,
+		});
+		await new Promise((resolve, reject) => {
+			this.partGroup.clone((clone) => {
+				clone.set({
+					scaleX: 1,
+					scaleY: 1,
+					top: this.partGroup.height / 2,
+					left: this.partGroup.width / 2,
+				})
+				tcanvas.add(clone);
+				resolve(clone);
+			})
+		});
+		tcanvas.renderAll();
+		const canvas = getObjectAlphaToCanvas(tcanvas, null, 0, this.rgba);
+		this.partDrawCommand(canvas);
+	}
+	/** 擦除工具模式下点击事件处理 */
+	_eraseDownHandler(options) {
+	}
+	/** 擦除工具模式下移动事件处理 */
+	_eraseMoveHandler(options) {
+	}
+	/** 擦除工具模式下抬起事件处理 */
+	_eraseUpHandler(options) {
+
+	}
+	partDrawCommand(canvas) {
+		const cmd = new PartDrawCommand({
+			canvas: this.canvas,
+			partManager: this,
+			partCanvas: canvas,
+		})
+		if (this.commandManager?.execute) {
+			this.commandManager.execute(cmd);
+		} else {
+			cmd.execute();
+		}
+	}
+	/** 绘制部件画布 */
+	drawPartCanvas(canvas) {
+		this.selectionManager.clearSelection();
 		this.partCanvas = canvas;
 		const image = new fabric.Image(canvas);
 		image.set({
@@ -392,40 +528,6 @@ export class PartManager {
 		this.canvas.renderAll();
 	}
 
-
-	/** 绘制工具模式下点击事件处理 */
-	_brushDownHandler(options) {
-	}
-	/** 绘制工具模式下移动事件处理 */
-	_brushMoveHandler(options) {
-
-	}
-	/** 绘制工具模式下抬起事件处理 */
-	_brushUpHandler(options) {
-	}
-
-
-	/** 切换到擦除工具 */
-	setEraserTool() {
-		if (!this.canvas) return console.warn("未找到画布");
-		const objects = this.canvas.getObjects();
-		objects.forEach(obj => {
-			obj.set({
-				erasable: true
-			})
-		})
-	}
-	/** 擦除工具模式下抬起事件处理 */
-	_eraseUpHandler(options) {
-	}
-	/** 擦除工具模式下点击事件处理 */
-	_eraseDownHandler(options) {
-	}
-	/** 擦除工具模式下移动事件处理 */
-	_eraseMoveHandler(options) {
-
-	}
-
 	/** 删除指定ID的对象 */
 	removeObjectsById(id) {
 		const objects = this.canvas.getObjects().filter(obj => obj.id === id);
@@ -462,7 +564,7 @@ export class PartManager {
 			originY: fixedObject.originY,
 			selectable: false,
 			evented: false,
-			erasable: false,
+			erasable: true,
 		})
 		this.canvas.add(group);
 		this.partGroup = group;
@@ -474,10 +576,33 @@ export class PartManager {
 	}
 
 	/** 创建当前选区 */
-	createPart() {
+	async createPart() {
 		if (!this.partCanvas) return console.warn("没有点位画布");
 		const fixedObject = this.canvasManager.getFixedLayerObject();
 		if (!fixedObject) return console.warn("未找到固定图层");
+		// const tcanvas = new fabric.StaticCanvas(document.createElement("canvas"), {
+		// 	width: fixedObject.width,
+		// 	height: fixedObject.height,
+		// 	enableRetinaScaling: false,
+		// });
+		// await new Promise((resolve, reject) => {
+		// 	fixedObject.clone((clone) => {
+		// 		const clipPath = new fabric.Image(this.partCanvas);
+		// 		clipPath.set({
+		// 			originX: fixedObject.originX,
+		// 			originY: fixedObject.originY,
+		// 		})
+		// 		clone.set({
+		// 			scaleX: 1,
+		// 			scaleY: 1,
+		// 			clipPath: clipPath,
+		// 		})
+		// 		tcanvas.add(clone);
+		// 		resolve(clone);
+		// 	})
+		// });
+		// tcanvas.renderAll();
+
 		const scaleY = fixedObject.scaleY
 		const scaleX = fixedObject.scaleX
 		const top = fixedObject.top - fixedObject.height * scaleY / 2;
@@ -496,23 +621,26 @@ export class PartManager {
 			top: top + minY * scaleY,
 			scaleX: scaleX,
 			scaleY: scaleY,
-			fill: "rgba(127, 255, 127, 0.3)",
-			stroke: "#2AA81B",
-			strokeWidth: 2,
-			strokeDashArray: [8, 4],
-			strokeLineCap: "round",// 折线端点样式
-			strokeLineJoin: "bevel", // 折线连接样式
-			strokeUniform: true, // 保持描边宽度不随缩放改变
+			...this.selectionStyle,
 		});
-		// this.partGroup.add(path);
-		this.canvas.add(path);
-		this.canvas.renderAll();
 		this.clearPart();
+		this.selectionManager.setSelectionObject(path);
+		const cmd = new LassoCutoutCommand({
+			canvas: this.canvas,
+			layerManager: this.layerManager,
+			selectionManager: this.selectionManager,
+			toolManager: this.toolManager,
+		})
+		this.commandManager.execute(cmd)
 	}
 	/** 清空点位 */
 	clearPart() {
-		this.pointList = [];
-		this.resetPartObject(true);
+		if (this.activeTool.value === OperationType.PART) {
+			this.partPointDrawCommand([], null);
+		} else {
+			this.pointList = [];
+			this.partDrawCommand(null);
+		}
 	}
 
 	/**
diff --git a/src/component/Canvas/CanvasEditor/managers/ToolManager.js b/src/component/Canvas/CanvasEditor/managers/ToolManager.js
index ee5d5759..74393864 100644
--- a/src/component/Canvas/CanvasEditor/managers/ToolManager.js
+++ b/src/component/Canvas/CanvasEditor/managers/ToolManager.js
@@ -197,7 +197,7 @@ export class ToolManager {
       [OperationType.PART_RECTANGLE]: {
         name: "部件选取工具-矩形",
         icon: "part",
-        cursor: "default",
+        cursor: "crosshair",
         setup: this.setupPartRectangleTool.bind(this),
       },
       [OperationType.PART_BRUSH]: {
@@ -721,7 +721,7 @@ export class ToolManager {
   setupPartRectangleTool(isExecute = false) {
     if (!this.canvas) return;
     this.canvas.isDrawingMode = false;
-    this.canvas.selection = true;
+    this.canvas.selection = false;
     if (!isExecute && this.canvasManager && this.canvasManager.partManager) {
       this.canvasManager.partManager.setCurrentTool(OperationType.PART_RECTANGLE);
     }
diff --git a/src/component/Canvas/CanvasEditor/utils/helper.js b/src/component/Canvas/CanvasEditor/utils/helper.js
index 63e2af8d..71b51f78 100644
--- a/src/component/Canvas/CanvasEditor/utils/helper.js
+++ b/src/component/Canvas/CanvasEditor/utils/helper.js
@@ -1045,6 +1045,7 @@ export async function imageToCanvas(image, scale = 1, sr = false) {
 /**
  * 图片边界跟踪算法(透明底)
  * @param {HTMLCanvasElement} canvas - canvas元素
+ * @param {Number} scale - 缩放比例
  * @returns {Array} 边界点数组 [{x, y}, ...]
 */
 export	function traceImageContour(canvas) {
diff --git a/src/component/Canvas/canvasExample.vue b/src/component/Canvas/canvasExample.vue
index ce7f0a2f..84e86170 100644
--- a/src/component/Canvas/canvasExample.vue
+++ b/src/component/Canvas/canvasExample.vue
@@ -444,7 +444,16 @@
 		</div>
 	</div>
 </template>
-
+<style>
+	body > .lower-canvas {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 800px !important;
+		height: 600px !important;
+		z-index: 99999999;
+	}
+</style>
 <style scoped lang="less">
 	* {
 		margin: 0;
diff --git a/src/component/Canvas/test.vue b/src/component/Canvas/test.vue
index bf297908..5b709fed 100644
--- a/src/component/Canvas/test.vue
+++ b/src/component/Canvas/test.vue
@@ -53,7 +53,7 @@
 		};
 	});
 	// 边界追踪
-	function traceImageContour(canvas) {
+	function traceImageContour(canvas, scale = 1) {
 		const ctx = canvas.getContext("2d");
 		const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
 		const data = imageData.data;

From 1e0bf83d1237116c93972c339243bac47024fddb Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 27 Jan 2026 14:18:00 +0800
Subject: [PATCH 07/12] fix

---
 src/component/Detail/canvas/index.vue        | 8 ++++++--
 src/component/HomePage/bindEmail.vue         | 1 -
 src/component/LoginPage/login/enterprise.vue | 1 -
 src/component/LoginPage/login/personal.vue   | 1 -
 src/component/LoginPage/login/school.vue     | 1 -
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index c132061a..beebcb63 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -245,8 +245,12 @@ export default defineComponent({
 		}
 
 
-		const frontBackChange = (value:any)=>{
-			let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.path
+		const frontBackChange = async (value:any)=>{
+			if(!detailData.selectDetail.partialDesign.partialDesignPath && !detailData.selectDetail.partialDesign.partialDesignBase64){
+				await privewDetail()
+			}
+			let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.partialDesign.partialDesignPath || detailData.selectDetail.path
+			console.log(full)
 			let size = {
 				...detailData.canvasConfig,
 			}
diff --git a/src/component/HomePage/bindEmail.vue b/src/component/HomePage/bindEmail.vue
index dfe73a96..d4b18e4d 100644
--- a/src/component/HomePage/bindEmail.vue
+++ b/src/component/HomePage/bindEmail.vue
@@ -595,7 +595,6 @@ export default defineComponent({
             .login_form_content {
                 margin-top: 4rem;
 				position: relative;
-				min-height: 34rem;
                 &[state="2"]{
 					height: 30rem;
 					>*{
diff --git a/src/component/LoginPage/login/enterprise.vue b/src/component/LoginPage/login/enterprise.vue
index dadf84ce..42507f04 100644
--- a/src/component/LoginPage/login/enterprise.vue
+++ b/src/component/LoginPage/login/enterprise.vue
@@ -790,7 +790,6 @@ export default defineComponent({
       .login_form_content {
         margin-top: 4rem;
         position: relative;
-		min-height: 34rem;
         &[state="2"] {
           > * {
             opacity: 0;
diff --git a/src/component/LoginPage/login/personal.vue b/src/component/LoginPage/login/personal.vue
index 2712e61d..a597ba09 100644
--- a/src/component/LoginPage/login/personal.vue
+++ b/src/component/LoginPage/login/personal.vue
@@ -799,7 +799,6 @@ export default defineComponent({
 
       .login_form_content {
         position: relative;
-		min-height: 34rem;
         &[state="2"] {
           > * {
             opacity: 0;
diff --git a/src/component/LoginPage/login/school.vue b/src/component/LoginPage/login/school.vue
index 93e8c38f..c854e09e 100644
--- a/src/component/LoginPage/login/school.vue
+++ b/src/component/LoginPage/login/school.vue
@@ -826,7 +826,6 @@ export default defineComponent({
       .login_form_content {
         margin-top: 4rem;
         position: relative;
-		min-height: 34rem;
         &[state="2"] {
           > * {
             opacity: 0;

From 9f09a2f31be637615a0f557fc47c64edd32c0841 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Tue, 27 Jan 2026 14:18:14 +0800
Subject: [PATCH 08/12] fix

---
 src/component/Detail/canvas/index.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index beebcb63..5ba14efa 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -250,7 +250,6 @@ export default defineComponent({
 				await privewDetail()
 			}
 			let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.partialDesign.partialDesignPath || detailData.selectDetail.path
-			console.log(full)
 			let size = {
 				...detailData.canvasConfig,
 			}

From 76047b763d5d2cf588b131bd94739cdb30ffe20e Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 28 Jan 2026 09:32:52 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E4=BF=AE=E5=A4=8Ddetail=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=A1=A3=E6=9C=8D=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignDetail.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 2891ce4a..8d867904 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -579,11 +579,11 @@ export default defineComponent({
 					}
 					segmentImage(detailData.selectDetail.maskUrl,partialDesign,size).then(async (rv)=>{
 						let front = detailData.frontBack.front[detailData.imgDomIndex]
+						if(!front)return resolve()
 						let back = detailData.frontBack.back[detailData.imgDomIndex]
-
-						front.oldImageUrl = ''
-						front.oldMaskUrl = ''
-						back.oldImageUrl = ''
+						if(front?.oldImageUrl)front.oldImageUrl = ''
+						if(front?.oldMaskUrl)front.oldMaskUrl = ''
+						if(back?.oldImageUrl)back.oldImageUrl = ''
 						front.imageUrl = rv.targetFrontUrl
 						back.imageUrl = rv.targetBackUrl
 						store.commit('DesignDetail/canvasPreviewUpdata',{type:detailData.isEditPattern.value?'all':detailData.currentDetailType,callBack:setRevocation})

From a18dead4ff2ceb1cbd78dc8738869c505fc57740 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 28 Jan 2026 10:05:08 +0800
Subject: [PATCH 10/12] 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 8d867904..78bf27d8 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -547,6 +547,7 @@ export default defineComponent({
 			if((detailData.currentDetailType == 'models' && !detailData.isEditPattern.value) || (detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){
 				await getSubmitData('preview')
 				if(detailData.currentDetailType == 'models')return detailData.loadingShow = false
+				detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == detailData.selectDetail.id)
 				await getSketchSize()
 				detailDom.canvasBox.changeSketchUpdateFrontBack = async ()=>{
 					await detailDom.canvasBox.privewDetail()
@@ -579,7 +580,6 @@ export default defineComponent({
 					}
 					segmentImage(detailData.selectDetail.maskUrl,partialDesign,size).then(async (rv)=>{
 						let front = detailData.frontBack.front[detailData.imgDomIndex]
-						if(!front)return resolve()
 						let back = detailData.frontBack.back[detailData.imgDomIndex]
 						if(front?.oldImageUrl)front.oldImageUrl = ''
 						if(front?.oldMaskUrl)front.oldMaskUrl = ''

From 7cda2cce27c8008cf22c60016a0b4fe3f172311b Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 28 Jan 2026 14:23:31 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=BB=E5=B8=83?=
 =?UTF-8?q?=E9=81=AE=E7=BD=A9=E4=BF=AE=E6=94=B9=E4=BA=86=E5=8F=8A=E6=97=B6?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignDetail.vue | 2 ++
 src/component/Detail/canvas/index.vue | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 78bf27d8..acb7e80b 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -331,6 +331,7 @@ export default defineComponent({
 			store.commit('DesignDetail/setCurrentDetailType',str)
 		}
 		const setClothes = async (list:any,str:string)=>{
+			console.log(JSON.parse(JSON.stringify(list)))
 			let clothesList:any = []
 			if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{
 				detailData.selectDetail.sketchString = rv
@@ -372,6 +373,7 @@ export default defineComponent({
 					gradient = list[i].gradient
 				if((detailData.currentDetailType == 'sketch' && newData?.sketch) || detailData.isEditPattern.value == 'editSketch'){
 					color = detailData.designDetail.clothes?.[0]?.color?.rgba?.r?`${detailData.designDetail.clothes?.[0].color.rgba.r} ${detailData.designDetail.clothes[0].color.rgba.g} ${detailData.designDetail.clothes[0].color.rgba.b}`:''
+					gradient = detailData.designDetail.clothes?.[0]?.gradient || null
 					detailData.selectDetail.maskUrl = ''
 					detailData.selectDetail.maskMinioUrl = ''
 				}
diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index 5ba14efa..17c08a9d 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -12,7 +12,7 @@
 							@canvasInit="editSketchCanvasInit"
 							is-edit
 							:clothingImageUrl="selectDetail.path"
-							:clothingImageUrl2="selectDetail.layersObject[0].maskUrl"
+							:clothingImageUrl2="selectDetail.maskUrl || selectDetail.layersObject[0].maskUrl"
 							showFixedLayer
 							:canvasJSON="canvasJSON"
 							@canvasLoadJsonSuccess="canvasLoadJsonSuccess"

From d94ade664110604e9728e3f0633946140ef944a2 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 28 Jan 2026 16:11:55 +0800
Subject: [PATCH 12/12] fix

---
 src/component/Detail/canvas/index.vue        |   1 -
 src/component/Detail/model/modelPosition.vue | 151 ++++++++++++-------
 2 files changed, 95 insertions(+), 57 deletions(-)

diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index ac0c3544..dde6d912 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -12,7 +12,6 @@
 							is-edit
 							:clothingImageUrl="selectDetail.path"
 							:clothingImageUrl2="selectDetail.maskUrl || selectDetail.layersObject[0].maskUrl"
-							:clothingMinIOPath="selectDetail.minIOPath"
 							showFixedLayer
 							:canvasJSON="canvasJSON"
 							@canvasLoadJsonSuccess="canvasLoadJsonSuccess"
diff --git a/src/component/Detail/model/modelPosition.vue b/src/component/Detail/model/modelPosition.vue
index a5c7de2c..fed41c82 100644
--- a/src/component/Detail/model/modelPosition.vue
+++ b/src/component/Detail/model/modelPosition.vue
@@ -222,89 +222,110 @@ export default defineComponent({
 				const currentTransform = element.style?.transform || '';
 				const currentRotates = (currentTransform.match(/rotate[XYZ]?\([^)]+\)/g) || []);
 				let otherTransforms = currentTransform
-					.replace(/scaleX\(-1\)|scaleY\(-1\)/g, '')
+					.replace(/scaleX\([^)]*\)/g, '')  // 移除所有 scaleX(...)
+					.replace(/scaleY\([^)]*\)/g, '')  // 移除所有 scaleY(...)
 					.replace(/rotate[XYZ]?\([^)]+\)/g, '')
 					.replace(/\s+/g, ' ')
 					.trim();
+				
 				const transforms = [];
-				if (element.mirror.x) transforms.push('scaleX(-1)');
-				if (element.mirror.y) transforms.push('scaleY(-1)');
+				if (element.mirror && element.mirror.x) transforms.push('scaleX(-1)');
+				if (element.mirror && element.mirror.y) transforms.push('scaleY(-1)');
 				if (otherTransforms) transforms.push(otherTransforms);
 				if (rotateDeg !== null) {
 					transforms.push(`rotate(${rotateDeg}deg)`);
 				} else if (currentRotates.length > 0) {
 					transforms.push(...currentRotates);
 				}
+				
 				element.style.transform = transforms.join(' ').trim();
 			};
 
 			moveableInstance.value.on('scale', ({ target, delta, direction }) => {
 				const frontStyle = detailData.frontBack.front[selectItem.imgDomIndex];
-				if (!frontStyle.mirror) frontStyle.mirror = { x: false, y: false };
-
+				
+				// 确保 mirror 对象存在并正确初始化
+				if (!frontStyle.mirror) {
+					frontStyle.mirror = { x: false, y: false };
+				}
+				
+				// 清除可能存在的重复镜像变换
+				updateElementTransform(frontStyle);
+				
 				let width = parseFloat(frontStyle.style.width);
 				let height = parseFloat(frontStyle.style.height);
 				let left = parseFloat(frontStyle.style.left) || 0;
 				let top = parseFloat(frontStyle.style.top) || 0;
 				let rotation = 0;
-
+				
 				const originalRatio = width / height;
+				
+				// 提取当前旋转角度
 				if (frontStyle.style.transform) {
 					const match = frontStyle.style.transform.match(/rotate\(([-\d.]+)deg\)/);
 					if (match) rotation = parseFloat(match[1]);
 				}
-
+				
 				const getAdjustedCorner = (corner, rot) => {
 					const rad = rot * (Math.PI / 180);
 					const x = corner.x * Math.cos(rad) - corner.y * Math.sin(rad);
 					const y = corner.x * Math.sin(rad) + corner.y * Math.cos(rad);
 					const threshold = 0.5;
-					return { x: Math.abs(x) > threshold ? (x > 0 ? 1 : -1) : 0, y: Math.abs(y) > threshold ? (y > 0 ? 1 : -1) : 0 };
+					return { 
+						x: Math.abs(x) > threshold ? (x > 0 ? 1 : -1) : 0, 
+						y: Math.abs(y) > threshold ? (y > 0 ? 1 : -1) : 0 
+					};
 				};
+				
+				// 根据旋转角度调整方向
 				if (rotation !== 0) {
 					direction = getAdjustedCorner({ x: direction[0], y: direction[1] }, rotation);
 					direction = [direction.x, direction.y];
 				}
-
+				
 				const isDiagonal = Math.abs(direction[0]) === 1 && Math.abs(direction[1]) === 1;
-
+				
 				const processAxis = (axis, val, deltaVal, dir, pos, keepRatio = false, otherAxisResult = null) => {
 					const mirrorKey = axis === 'width' ? 'x' : 'y';
 					const isWidth = axis === 'width';
-
+					
 					let newVal = val * deltaVal;
-
-					// 翻转处理
-					if (newVal <= 0) {
+					
+					// 翻转处理 - 只在值真正变为负值时触发镜像
+					if (newVal < 0) {
 						frontStyle.mirror[mirrorKey] = !frontStyle.mirror[mirrorKey];
 						newVal = Math.abs(newVal);
-						updateElementTransform(frontStyle);
+					} else if (newVal === 0) {
+						// 防止值变为0
+						newVal = 1;
 					}
-
+					
 					// 位置调整
 					const shouldMove = (!frontStyle.mirror[mirrorKey] && dir === -1) || (frontStyle.mirror[mirrorKey] && dir === 1);
-
+					
+					// 保持宽高比
 					if (keepRatio && otherAxisResult) {
 						newVal = isWidth ? otherAxisResult.newVal * originalRatio : otherAxisResult.newVal / originalRatio;
 					}
-
+					
 					const adjustPos = shouldMove ? pos - (newVal - val) : pos;
-
-					return { newVal, adjustPos, shouldFlip: newVal !== val && newVal <= 0 };
+					
+					return { newVal, adjustPos };
 				};
-
+				
+				// 处理缩放
 				if (isDiagonal) {
 					const mainAxis = Math.abs(delta[0] - 1) > Math.abs(delta[1] - 1) ? 'width' : 'height';
 					const crossAxis = mainAxis === 'width' ? 'height' : 'width';
-
+					
 					const mainDir = mainAxis === 'width' ? direction[0] : direction[1];
 					const crossDir = crossAxis === 'width' ? direction[0] : direction[1];
-
+					
 					const mainDelta = mainAxis === 'width' ? delta[0] : delta[1];
-
+					
 					const mainResult = processAxis(mainAxis, mainAxis === 'width' ? width : height, mainDelta, mainDir, mainAxis === 'width' ? left : top);
 					const crossResult = processAxis(crossAxis, crossAxis === 'width' ? width : height, 1, crossDir, crossAxis === 'width' ? left : top, true, mainResult);
-
+					
 					frontStyle.style.width = mainAxis === 'width' ? mainResult.newVal + 'px' : crossResult.newVal + 'px';
 					frontStyle.style.height = mainAxis === 'height' ? mainResult.newVal + 'px' : crossResult.newVal + 'px';
 					frontStyle.style.left = mainAxis === 'width' ? mainResult.adjustPos + 'px' : crossResult.adjustPos + 'px';
@@ -312,43 +333,55 @@ export default defineComponent({
 				} else {
 					const widthResult = processAxis('width', width, delta[0], direction[0], left);
 					const heightResult = processAxis('height', height, delta[1], direction[1], top);
-
+					
 					frontStyle.style.left = widthResult.adjustPos + 'px';
 					frontStyle.style.top = heightResult.adjustPos + 'px';
 					frontStyle.style.width = widthResult.newVal + 'px';
 					frontStyle.style.height = heightResult.newVal + 'px';
 				}
+				
+				// 更新变换，确保正确的顺序
+				updateElementTransform(frontStyle);
 			});
-
-			
-			// 旋转
 			moveableInstance.value.on('rotate', ({ target, beforeRotate }) => {
 				let frontStyle = detailData.frontBack.front[selectItem.imgDomIndex];
-				// 确保镜像状态存在
-				if (!frontStyle.mirror) frontStyle.mirror = { x: false, y: false };
-				
+				if (!frontStyle.mirror) {
+					frontStyle.mirror = { x: false, y: false };
+				}
 				const { x: isMirroredX, y: isMirroredY } = frontStyle.mirror;
-				
-				// 计算实际旋转角度
-				let actualRotate = beforeRotate;
-				
-				// 关键逻辑：当镜像状态不同时（一个true一个false），旋转方向反转
-				if (isMirroredX !== isMirroredY) {
-					actualRotate = -beforeRotate;
+				const currentTransform = frontStyle.style?.transform || '';
+				const rotateMatch = currentTransform.match(/rotate\(([-\d.]+)deg\)/);
+				let currentAngle = 0;
+				if (rotateMatch && rotateMatch[1]) {
+					const parsed = parseFloat(rotateMatch[1]);
+					if (!isNaN(parsed)) {
+						currentAngle = parsed;
+					}
 				}
-				
-				// 确保角度在 0-360 度范围内
-				actualRotate = actualRotate % 360;
-				
-				// 如果角度为负数，转换为正数
-				if (actualRotate < 0) {
-					actualRotate += 360;
+				const newBeforeRotate = parseFloat(beforeRotate) || 0;
+				if (!window._lastRotateData) {
+					window._lastRotateData = {
+						beforeRotate: newBeforeRotate,
+						angle: currentAngle
+					};
 				}
-				
-				// 确保角度在 [0, 360) 范围内
-				actualRotate = ((actualRotate % 360) + 360) % 360;
-				
-				updateElementTransform(frontStyle, actualRotate.toFixed(2));
+				const delta = newBeforeRotate - window._lastRotateData.beforeRotate;
+				const shouldReverse = (isMirroredX && !isMirroredY) || (!isMirroredX && isMirroredY);
+				let newAngle;
+				if (shouldReverse) {
+					newAngle = window._lastRotateData.angle - delta;
+				} else {
+					newAngle = window._lastRotateData.angle + delta;
+				}
+				newAngle = ((newAngle % 360) + 360) % 360;
+				window._lastRotateData.beforeRotate = newBeforeRotate;
+				window._lastRotateData.angle = newAngle;
+				updateElementTransform(frontStyle, newAngle);
+			});
+
+			// 可选：在rotateStart时重置
+			moveableInstance.value.on('rotateStart', () => {
+				window._lastRotateData = null;
 			});
 			// 调整大小
 			moveableInstance.value.on('resize', ({ target, width, height }) => {
@@ -370,12 +403,17 @@ export default defineComponent({
 				upDataDetail()
 			});
 		};
-		watch(()=>selectItem.selectDetail,(newValue,oldValue)=>{
-			if(!newValue && newValue?.id == oldValue?.id)return
-			selectItem.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id)
-			initMoveableForSelected()
+		// watch(()=>selectItem.selectDetail,(newValue,oldValue)=>{
+		// 	if(!newValue && newValue?.id == oldValue?.id)return
+		// },{immediate: true,})
+		watch(()=>selectItem.selectDetail?.id,(newValue,oldValue)=>{
+			if(newValue){
+				selectItem.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue)
+				setTimeout(()=>{
+					initMoveableForSelected()
+				},100)
+			}
 		},{immediate: true,})
-
 		const setRevocation = async ()=>{
 			let frontBack = JSON.parse(JSON.stringify(detailData.frontBack))	
 			let revocation:any = JSON.parse((await KeyValueDB.get("revocation") as any) || '[]')
@@ -536,6 +574,7 @@ export default defineComponent({
 			getMousePosition,
 			updataPosition,
 			updateRect,
+			initMoveableForSelected,
         }
     },