1

.env.dev

@@ -7,5 +7,7 @@ VITE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 # VITE_APP_BASE_URL = 'https://www.api.aida.com.hk'
 # 徐佩
 # VITE_APP_BASE_URL = 'http://192.168.31.118:5567'
+# 李天祥
+# VITE_APP_BASE_URL = 'http://192.168.31.82:5567'
 # 海波
 # VITE_APP_BASE_URL = 'http://192.168.31.34:5567'

.env.dev_build

@@ -5,4 +5,3 @@ VITE_USER_NODE_ENV = 'development'
 VITE_APP_BASE_URL = 'https://develop.api.aida.com.hk'
 
 # VITE_APP_BASE_URL = 'http://localhost:22170'
-

.prettierrc.js

@@ -0,0 +1,33 @@
+/** @type {import('prettier').Config} */
+module.exports = {
+  // 打印宽度
+  printWidth: 100,
+  // 使用 4 空格缩进
+  tabWidth: 4,
+  // 使用 4 空格缩进，不使用制表符
+  useTabs: true,
+  // 行尾使用 LF (Unix 风格)
+  endOfLine: 'lf',
+  // 语句末尾使用分号
+  semi: false,
+  // 使用单引号
+  singleQuote: false,
+  // 对象和数组末尾不添加尾随逗号
+  trailingComma: 'none',
+  // JSX 引号使用单引号
+  jsxSingleQuote: false,
+  // 括号内侧空格
+  bracketSpacing: true,
+  // JSX 标签不换行
+  bracketSameLine: false,
+  // 箭头函数参数始终使用括号
+  arrowParens: 'always',
+  // HTML、Vue、Angular 和 Markdown 使用 LF
+  htmlWhitespaceSensitivity: 'css',
+  // Vue 文件脚本和样式缩进
+  vueIndentScriptAndStyle: false,
+  // 行注释位置在注释上方，不加空格
+  proseWrap: 'preserve',
+  // 根据文件类型自动推断
+  embeddedLanguageFormatting: 'auto',
+};

public/css/fonts/fontFamily.css

@@ -0,0 +1,41 @@
+/* 字体定义 */
+@font-face {
+  font-family: 'Arial';
+  src: url('./fonts/ARIAL.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'ArialBold';
+  src: url('./fonts/ARIALBD.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'ArialMedium';
+  src: url('./fonts/ArialMdm.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Poppins';
+  src: url('./fonts/Poppins-Regular.ttf') format('truetype');
+  font-weight: normal;
+}
+
+@font-face {
+  font-family: 'PoppinsMedium';
+  src: url('./fonts/Poppins-Medium.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'PoppinsBold';
+  src: url('./fonts/Poppins-SemiBold.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'Instrument';
+  src: url('./InstrumentSans-Regular.ttf') format('truetype');
+}
+
+@font-face {
+  font-family: 'InstrumentBold';
+  src: url('./InstrumentSans-Bold.ttf')  format('truetype');
+}

src/assets/fonts/fontFamily.css

@@ -1,31 +0,0 @@
-/* 字体定义 */
-@font-face {
-  font-family: 'Arial';
-  src: url('./fonts/ARIAL.ttf') format('ttf');
-}
-
-@font-face {
-  font-family: 'ArialBold';
-  src: url('./fonts/ARIALBD.ttf') format('ttf');
-}
-
-@font-face {
-  font-family: 'ArialMedium';
-  src: url('./fonts/ArialMdm.ttf') format('ttf');
-}
-
-@font-face {
-  font-family: 'Poppins';
-  src: url('./fonts/Poppins-Regular.ttf') format('ttf');
-  font-weight: normal;
-}
-
-@font-face {
-  font-family: 'PoppinsMedium';
-  src: url('./fonts/Poppins-Medium.ttf') format('ttf');
-}
-
-@font-face {
-  font-family: 'PoppinsBold';
-  src: url('./fonts/Poppins-SemiBold.ttf') format('ttf');
-}

src/assets/icons/CFile.svg

@@ -0,0 +1 @@
+<svg focusable="false" class="" data-icon="paper-clip" width="1em" height="1em" fill="#00000073" aria-hidden="true" viewBox="64 64 896 896"><path d="M779.3 196.6c-94.2-94.2-247.6-94.2-341.7 0l-261 260.8c-1.7 1.7-2.6 4-2.6 6.4s.9 4.7 2.6 6.4l36.9 36.9a9 9 0 0012.7 0l261-260.8c32.4-32.4 75.5-50.2 121.3-50.2s88.9 17.8 121.2 50.2c32.4 32.4 50.2 75.5 50.2 121.2 0 45.8-17.8 88.8-50.2 121.2l-266 265.9-43.1 43.1c-40.3 40.3-105.8 40.3-146.1 0-19.5-19.5-30.2-45.4-30.2-73s10.7-53.5 30.2-73l263.9-263.8c6.7-6.6 15.5-10.3 24.9-10.3h.1c9.4 0 18.1 3.7 24.7 10.3 6.7 6.7 10.3 15.5 10.3 24.9 0 9.3-3.7 18.1-10.3 24.7L372.4 653c-1.7 1.7-2.6 4-2.6 6.4s.9 4.7 2.6 6.4l36.9 36.9a9 9 0 0012.7 0l215.6-215.6c19.9-19.9 30.8-46.3 30.8-74.4s-11-54.6-30.8-74.4c-41.1-41.1-107.9-41-149 0L463 364 224.8 602.1A172.22 172.22 0 00174 724.8c0 46.3 18.1 89.8 50.8 122.5 33.9 33.8 78.3 50.7 122.7 50.7 44.4 0 88.8-16.9 122.6-50.7l309.2-309C824.8 492.7 850 432 850 367.5c.1-64.6-25.1-125.3-70.7-170.9z"></path></svg>

src/assets/icons/CPart.svg

@@ -1,68 +1,29 @@
-<?xml version="1.0" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+<svg id="_图层_1" data-name="图层 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 184.06 163.52">
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+  <defs>
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+    <style>
- width="103.000000pt" height="92.000000pt" viewBox="0 0 103.000000 92.000000"
+      .cls-1, .cls-2 {
- preserveAspectRatio="xMidYMid meet">
+        fill: #333;
+      }
 
-<g transform="translate(0.000000,92.000000) scale(0.100000,-0.100000)"
+      .cls-2 {
-fill="#000000" stroke="none">
+        stroke: #333;
-<path d="M365 895 c-5 -2 -36 -6 -67 -10 -45 -5 -58 -10 -59 -23 0 -11 -2 -12
+        stroke-miterlimit: 10;
--6 -4 -7 17 -32 15 -40 -4 -4 -11 -8 -12 -13 -4 -5 8 -13 9 -21 4 -7 -4 -22
+      }
--9 -34 -10 -11 -1 -41 -11 -66 -21 l-47 -18 20 -63 c11 -38 23 -60 30 -56 6 4
+    </style>
-8 -1 3 -15 -3 -11 -3 -21 2 -21 4 0 9 -12 9 -26 1 -14 5 -28 8 -32 4 -3 33 3
+  </defs>
-66 15 33 11 61 19 62 18 2 -2 1 -139 -2 -304 l-5 -301 309 2 309 3 -2 108 c-2
+  <path class="cls-2" d="M35.53,54.52c-.76-.96-.84-1.16-2.06-1.12-4.02.13-16.7,6.5-19.81,4.48C12.45,52.21-1.21,21.14.68,18.17c56.98-23.47,125.74-23.63,182.7,0,1.88,2.98-11.77,34.04-12.98,39.72-3.11,2.01-15.78-4.36-19.81-4.48-1.23-.04-1.3.16-2.06,1.12v48c2.87,3.81,14.6,2.98,14.05,8.95-1.06,5.75-12.53,3.84-13.85,8.24l.34,39.85c.08.98-1.55,3.46-2.04,3.46H37.03c-2.08,0-1.5-3.59-1.5-4.5V54.52ZM41.53,47.52v108.5h101v-36c-7.66,1.58-6.82,23.41-12.7,24.86-1.18.17-2.67-.14-3.63-.79-2.98-2.02-6.47-24.26-10.3-25.81-.94-.38-4.46.95-5.31-1.9-1.01-3.4,3.85-4,4.01-5.02-.12-4.15-6.85-15.14-3.84-18.1,4.45-3.04,8.95,1.93,13.76,1.74-1.35-3.15-2.75-11.61,2.46-11.03s3.05,9.89,1.55,13.02l14,4.01v-53.5c0-5.17,22.25,4.69,23.94,3.46,1.7-8.98,7.54-18.42,9.64-26.94.32-1.3.79-1.48-.58-2.5-2.81-2.08-21.4-6.93-25.98-8.02-10.05-2.4-20.36-3.72-30.52-5.53-2.44.17-3.98,7.98-6.05,10.97-13.1,18.91-41.58,12.05-45.92-9.95l-2-1.02c-19.44,3.3-39.69,6.08-57.48,14.6l10.03,28.4c4.22.52,22.41-8.34,23.94-3.46ZM110.53,8.02h-37c4,20.53,33,20.53,37,0Z"/>
-77 2 113 11 125 10 12 10 14 1 8 -7 -4 -13 -2 -13 4 0 6 10 8 23 5 18 -5 26
+  <path class="cls-1" d="M89.27,117.8c-.94.96-10.2,1.42-11.25-.78-4.1-8.61,17.67-5.76,11.25.78Z"/>
--1 36 17 9 17 10 18 6 3 -5 -16 -4 -18 6 -7 18 17 -1 34 -40 37 l-32 2 -2 151
+  <path class="cls-1" d="M94.79,117.8c-6.42-6.54,15.35-9.39,11.25-.78-1.05,2.19-10.31,1.74-11.25.78Z"/>
-c-1 82 0 147 3 144 9 -12 44 -11 52 1 5 8 8 7 8 -4 0 -14 26 -28 52 -29 11 0
+  <path class="cls-1" d="M60.62,113.11c1.1-1.64,14.59-2.57,12.84,3.27-1.14,3.81-16.87,2.76-12.84-3.27Z"/>
-39 70 33 80 -3 5 1 11 7 13 10 4 9 8 -2 16 -13 10 -8 15 12 12 8 -1 38 91 32
+  <path class="cls-1" d="M62.18,46.17h9.69s1.53,3.19,1.53,3.19c-1.22,4.73-18.53,3.97-11.22-3.19Z"/>
-98 -2 2 -10 -2 -18 -8 -9 -7 -17 -8 -20 -2 -3 5 0 11 6 14 7 2 -18 14 -56 26
+  <path class="cls-1" d="M112.19,46.18l10.91.77.34,3.47c-.87,2.65-12.93,2.92-12.96-1.9l1.7-2.34Z"/>
--38 12 -71 19 -74 16 -3 -3 -11 0 -18 6 -8 6 -20 9 -28 6 -8 -3 -16 -2 -18 3
+  <path class="cls-1" d="M56.23,84.18c6.63-1.86,6.45,14.76-.7,11.35-2.24-1.07-2.61-10.42.7-11.35Z"/>
--5 15 -154 30 -286 29 -70 0 -131 -2 -137 -4z m21 -30 c-6 -18 3 -47 14 -40 4
+  <path class="cls-1" d="M89.37,46.16l.96,3.22c-.81,4.5-16.92,3.98-12.37-2.43l11.42-.79Z"/>
-2 18 -7 30 -20 27 -29 17 -34 -14 -7 -20 16 -20 16 -7 -1 23 -29 66 -47 112
+  <path class="cls-1" d="M94.68,46.16l11.42.79.34,3.47c-1.03,3.13-16.69,2.9-11.76-4.26Z"/>
--47 34 0 40 3 35 16 -5 14 -4 15 9 4 13 -11 19 -9 36 6 12 11 29 35 38 54 15
+  <path class="cls-1" d="M54.75,63.76c-1.01-.99-2.01-12.94,3.11-11.63,5.4,1.38,2.78,17.42-3.11,11.63Z"/>
-31 20 35 58 35 24 0 43 -2 43 -5 0 -11 115 -27 121 -18 3 5 9 2 13 -7 4 -13
+  <path class="cls-1" d="M129.31,63.76c-5.88,5.78-8.51-10.25-3.11-11.63,5.12-1.31,4.12,10.64,3.11,11.63Z"/>
-14 -16 34 -12 15 2 36 1 47 -4 16 -7 14 -8 -10 -5 l-30 5 32 -14 c39 -18 39
+  <path class="cls-1" d="M59.44,68.12c1.19.8,3.28,13.19-3.02,12.43l-2.23-1.77c-.57-2.83-.34-14.39,5.25-10.66Z"/>
--19 14 -83 -15 -38 -17 -52 -8 -61 9 -9 8 -11 -7 -5 -16 6 -18 4 -12 -19 3
+  <path class="cls-1" d="M59.44,111.92c-5.59,3.73-5.82-7.83-5.25-10.66l2.23-1.77c6.3-.76,4.22,11.63,3.02,12.43Z"/>
--14 2 -29 -4 -32 -6 -3 -7 1 -4 9 6 16 -9 20 -73 19 -12 0 -20 4 -17 8 3 5 -4
+  <path class="cls-1" d="M129.32,79.79c-5.12,5.18-7.81-7.81-4.7-11.67l3.28.02,1.48,1.52c-.35,2.45,1.51,8.54-.07,10.13Z"/>
-9 -15 9 -20 0 -21 -5 -21 -151 l0 -151 -27 8 c-16 4 -38 7 -50 7 -19 -1 -21 2
--13 17 15 28 12 57 -6 57 -11 0 -15 -8 -12 -27 4 -24 1 -27 -23 -26 -15 1 -25
-4 -22 9 2 4 -2 7 -10 7 -9 0 -14 -10 -14 -25 0 -13 3 -22 8 -19 5 3 6 -1 3 -9
--2 -7 0 -25 5 -40 8 -20 7 -25 -3 -21 -7 3 -13 -2 -13 -11 0 -12 7 -15 26 -11
-14 3 21 3 14 0 -7 -3 -9 -12 -6 -20 3 -7 10 -11 16 -7 5 3 7 1 4 -4 -9 -14 3
--74 12 -68 4 2 7 -6 7 -18 -1 -32 32 -34 44 -3 5 14 7 34 5 46 -3 13 0 18 7
-14 8 -5 9 -1 5 10 -4 9 -3 15 2 12 5 -3 12 1 15 10 3 8 2 12 -4 9 -6 -3 -10
--1 -10 4 0 13 3 13 24 5 13 -5 16 -24 16 -103 0 -63 4 -102 13 -111 10 -12 9
--12 -4 -2 -13 10 -88 12 -300 10 l-284 -3 3 303 3 302 -26 0 c-14 0 -25 -4
--25 -10 0 -5 -7 -6 -17 -3 -9 4 -14 2 -10 -3 4 -6 -6 -9 -24 -6 -28 4 -41 -11
--19 -21 6 -3 5 -4 -2 -3 -7 2 -13 11 -13 22 -1 32 -25 104 -35 104 -5 0 -6 7
--3 17 4 10 2 14 -5 9 -7 -4 -10 2 -8 17 3 29 14 47 29 47 7 0 3 -8 -8 -17
-l-20 -16 20 8 c11 4 28 10 37 12 10 3 18 9 18 13 0 4 6 7 12 7 22 -2 158 26
-158 32 0 3 20 6 45 5 25 0 45 3 45 8 0 4 3 8 6 8 3 0 4 -7 0 -15z m237 -5 c-3
--9 1 -8 11 4 9 11 16 15 16 9 0 -6 -7 -16 -15 -23 -8 -7 -15 -9 -15 -4 0 10
--29 -28 -30 -40 0 -4 8 -5 17 -2 15 6 15 4 -2 -14 -22 -24 -37 -26 -28 -4 5
-14 3 15 -15 5 -26 -14 -77 -14 -103 -1 -10 6 -27 27 -38 48 l-19 37 113 0 c95
-0 112 -2 108 -15z"/>
-<path d="M346 641 c-3 -5 1 -12 10 -15 23 -9 36 -7 29 4 -3 6 1 7 9 4 9 -3 16
--1 16 5 0 13 -56 15 -64 2z"/>
-<path d="M440 640 c0 -16 33 -26 38 -12 2 7 8 10 13 6 5 -3 9 0 9 5 0 6 -13
-11 -30 11 -16 0 -30 -5 -30 -10z"/>
-<path d="M530 641 c0 -12 37 -24 50 -16 20 12 10 25 -20 25 -16 0 -30 -4 -30
--9z"/>
-<path d="M620 641 c0 -12 37 -24 50 -16 20 12 10 25 -20 25 -16 0 -30 -4 -30
--9z"/>
-<path d="M310 593 c0 -20 5 -30 16 -30 10 0 14 8 12 25 -4 37 -28 40 -28 5z"/>
-<path d="M697 613 c-13 -13 -7 -50 8 -50 10 0 15 10 15 29 0 27 -9 35 -23 21z"/>
-<path d="M317 534 c-4 -4 -7 -20 -7 -36 0 -35 23 -34 28 1 4 25 -10 46 -21 35z"/>
-<path d="M692 503 c4 -39 28 -42 28 -4 0 21 -5 31 -16 31 -11 0 -14 -8 -12
--27z"/>
-<path d="M312 415 c4 -33 22 -33 26 0 2 18 -1 25 -13 25 -12 0 -15 -7 -13 -25z"/>
-<path d="M312 329 c2 -19 8 -33 13 -31 15 3 12 55 -3 60 -10 3 -13 -5 -10 -29z"/>
-<path d="M342 278 c3 -7 19 -14 37 -16 24 -3 32 0 29 10 -3 7 -19 14 -37 16
--24 3 -32 0 -29 -10z"/>
-<path d="M443 275 c0 -10 10 -15 29 -15 18 0 28 5 28 15 0 10 -10 15 -28 15
--19 0 -29 -5 -29 -15z"/>
-<path d="M530 275 c0 -10 10 -15 33 -15 22 0 28 3 18 9 -11 7 -11 9 0 14 8 3
--1 6 -18 6 -23 1 -33 -4 -33 -14z"/>
-</g>
 </svg>

src/assets/images/award/arrow_down.svg

@@ -0,0 +1,3 @@
+<svg width="22" height="12" viewBox="0 0 22 12" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M1 1L11 11L21 1" stroke="#585858" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

src/assets/json/events.json

@@ -4,13 +4,41 @@
 			"id": 1,
 			"title": "Just post your design work, you could have the chance to come to Hong Kong and interact with industry leaders face-to-face！",
 			"imgUrl": "/image/events/workshop-En.jpg"
-		},{
+		},
+		{
 			"id": 2,
 			"title": "AiDA X SFT AI Fashion Award 2024",
 			"imgUrl": "/image/events/Fashion-Award-2024.png"
+		},
+		{
+			"id": 3,
+			"title": "AiDA Global Design Awards 2026",
+			"imgUrl": "/image/events/award-poster.gif"
 		}
 	],
 	"eventsItem": [
+		{
+			"id": 3,
+			"title": "AiDA Global Design Awards 2026",
+			"imgUrl": "/image/events/award-poster.gif",
+			"tips": "For inquiries: awards2026@code-create.com.hk",
+			"textList": [
+				{
+					"paragraph": [
+						{
+							"text": "Click the “View Details” button for more information and to join the competition! The AiDA Global Design Award 2026 is an international design competition hosted by Code‑Create, a globally leading AI fashion solutions provider, celebrating the future of creativity powered by artificial intelligence. Open to designers worldwide the competition brings together global talent, empowering AI as a creative partner—pushing fashion beyond traditional boundaries and unlocking new possibilities where technology amplifies human imagination."
+						}
+					]
+				},
+				{
+					"paragraph": [
+						{
+							"text": "Participants have the opportunity to compete for cash prizes totaling up to US$9,000, gain global media exposure showcased by top international platforms, and connect with designers and industry leaders worldwide. Finalists will also attend an exclusive award ceremony in Hong Kong, with travel allowance, allowing them to showcase their talent, network with professionals, and celebrate their achievements on an international stage."
+						}
+					]
+				}
+			]
+		},
 		{
 			"id": 1,
 			"title": "Just post your design work, you could have the chance to come to Hong Kong and interact with industry leaders face-to-face！",
@@ -22,45 +50,53 @@
 							"text": "🎨AiDA Workshop!"
 						}
 					]
-			  },{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "The process is simple: use AiDA to post your design work on the 'Gallery', and the one with the most likes(at least 20 likes) will be invited to the AiDA Workshop offline event in Hong Kong on November 14th, to exchange ideas with the Royal College of Art (RCA), Jae Lim, co-founder of the renowned fashion brand BESFXXK, and outstanding designers! "
 						}
 					]
-			  },{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "<b>⚠️ATTENTION❗❗</b>"
 						}
 					]
-			  },{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "1. Add the tag in the work description #AiDAworkshop_2024"
-					  },{
+						},
+						{
 							"text": "2. One winner only"
 						}
 					]
-			  },{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "<b>🤩Code-Create will provide (Terms and conditions apply):</b>"
 						}
 					]
-			  },{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "✅Round-trip transportation fee (only within China)"
 						}
 					]
-			  },{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "✅One night accommodation fee"
 						}
 					]
-			  },{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "⌛️Deadline: October 31, 2024"
@@ -80,7 +116,8 @@
 							"text": "With the aim of inspiring students to innovate in fashion design using AI, Code-Create and The Hong Kong Polytechnic University School of Fashion and Textiles (SFT) have jointly launched the 'AiDA X SFT AI Fashion Award 2024'. This competition provides students with valuable practical AiDA experience, laying the foundation for the future fashion design industry and positioning them as pioneers in AI fashion."
 						}
 					]
-			},{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "The competition is open to all SFT students, with the winners having the chance to win cash prizes (up to 20,000 HKD), internship opportunity at BESFXXK (will work with the renowned designer, Mr Jae Hyuk Lim, for the BESFXXK collection, that will be featured at NY Fashion Week and Paris Fashion Week) and more surprises! Scan the QR code to learn more."

src/assets/json/events_cn.json

@@ -4,13 +4,41 @@
 			"id": 1,
 			"title": "什么？只要发布设计作品就有机会来香港与大佬面对面交流？！",
 			"imgUrl": "/image/events/workshop-Cn.jpg"
-      },{
+		},
+		{
 			"id": 2,
 			"title": "AiDA X SFT AI时尚设计比赛2024",
 			"imgUrl": "/image/events/Fashion-Award-2024.png"
+		},
+		{
+			"id": 3,
+			"title": "AiDA全球设计奖 2026",
+			"imgUrl": "/image/events/award-poster-zh.gif"
 		}
 	],
 	"eventsItem": [
+		{
+			"id": 3,
+			"title": "AiDA全球设计奖 2026",
+			"imgUrl": "/image/events/award-poster-zh.gif",
+			"tips": "如有疑问，请联系：awards2026@code-create.com.hk",
+			"textList": [
+				{
+					"paragraph": [
+						{
+							"text": "秉承推动 AI 赋能创意设计的初衷，Code‑Create 举办了「AiDA 全球设计大奖 2026」，面向来全球的设计师，鼓励大家探索 AI 与时尚设计的无限可能，突破传统界限，释放科技与想象力的创新潜能。点击“查看详情”按钮获取更多比赛信息，抓住成为 AI 时尚先锋的机会吧！"
+						}
+					]
+				},
+				{
+					"paragraph": [
+						{
+							"text": "参赛者将有机会赢取总奖金 9,000 美元，作品还将获得国际媒体展示机会，并与全球设计师和行业领袖建立联系。入围决赛者将受邀参加在香港举办的 专属颁奖典礼，主办方提供差旅津贴，让设计师在国际舞台展示才华、拓展人脉，并共同庆祝创意成果。"
+						}
+					]
+				}
+			]
+		},
 		{
 			"id": 1,
 			"title": "什么？只要发布设计作品就有机会来香港与大佬面对面交流？！",
@@ -22,45 +50,53 @@
 							"text": "🎨这是一趟艺术巅峰之旅！AiDA Workshop！"
 						}
 					]
-			},{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "参与过程很简单，利用AiDA 在 “Gallery广场 ”发布设计作品，最终获赞最高者(至少20个赞）将被邀请至11月14日 举办的AiDA Workshop香港线下活动，与英国皇家艺术学院（RCA）、韩国知名时尚品牌BESFXXK创始人JAE以及优秀设计师一同交流！(名额仅限1名）"
 						}
 					]
-			},{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "<b>⚠️注意❗❗</b>"
 						}
 					]
-			},{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "1. 作品描述添加tag: #AiDAworkshop_2024"
-					},{
+						},
+						{
 							"text": "2. 一个冠军名额"
 						}
 					]
-			},{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "<b>🤩Code-Create将提供（适用条款条规）：</b>"
 						}
 					]
-			},{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "✅往返机票/动车费用(仅限中国地区）"
 						}
 					]
-			},{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "✅一晚酒店住宿费用"
 						}
 					]
-			},{
+				},
+				{
 					"paragraph": [
 						{
 							"text": "⌛️截止时间：2024.10.31"
@@ -80,7 +116,8 @@
 							"text": "秉承着激发学生使用AI进行时尚设计的创新能力的初衷，Code-Create和香港理工大学时装及纺织学院（SFT）共同举办了“AiDA X SFT AI时尚设计比赛2024”让学生们在比赛中获得宝贵的AiDA实践经验，为未来的时尚设计行业打下了坚实的基础，成为时尚界的AI先锋。"
 						}
 					]
-			},{
+				},
+				{
 					"paragraph": [
 						{
 							"text": " 此次比赛面向全体SFT 学生，最终获奖者将赢取丰厚奖金（最高可达2万港币），获得在BESFXXK的实习机会（将与著名设计师Lim Jae Hyuk先生合作设计BESFXXK 系列，该系列将在纽约时装周和巴黎时装周上展出）及更多惊喜哦！扫描二维码获取更多比赛信息。"

src/assets/style/style.css

@@ -2507,3 +2507,6 @@ textarea:focus {
 .justify-center {
   justify-content: center;
 }
+.flex-1{
+	flex: 1;
+}

src/assets/style/style.less

@@ -2425,3 +2425,6 @@ textarea:focus{
 .justify-center {
   justify-content: center;
 }
+.flex-1{
+	flex: 1;
+}

src/component/Account/message/system.vue

@@ -2,21 +2,36 @@
 	<div class="account_systemMessage">
 		<div class="account_generalMessage_title modal_title_text">
 			<!-- <span>系统消息</span> -->
-			<div class="account_generalMessage_title_setting" @click="allRead">{{$t('account.AllRead')}}</div>
+			<div class="account_generalMessage_title_setting" @click="allRead">
+				{{ $t("account.AllRead") }}
 			</div>
-		<div class="account_generalMessage_item modal_title_text" v-for="item in dataList" :key="item.id" @click="setRead(item)">
+		</div>
+		<div
+			class="account_generalMessage_item modal_title_text"
+			v-for="item in dataList"
+			:key="item.id"
+			@click="setRead(item)"
+		>
 			<a-badge :dot="item.isRead == 0"></a-badge>
 			<div class="account_generalMessage_item_title">
-				<div class="account_generalMessage_item_title_text" :title="item.content">{{ item.content.title }}</div>
+				<div class="account_generalMessage_item_title_text" :title="item.content">
+					{{ item.content.title }}
+				</div>
 				<div class="modal_title_text_intro">{{ item.createTime }}</div>
 			</div>
 			<div class="modal_title_text_intro">
 				{{ item.content.content }}
-				<span v-if="item.content.link" class="account_generalMessage_item_link">{{ item.content.link }}</span>
+				<span v-if="item.content.link" class="account_generalMessage_item_link">{{
+					item.content.link
+				}}</span>
 			</div>
 		</div>
-		<div class="account_generalMessage_item  modal_title_text" style="display:flex;justify-content: center;" v-if="dataList.length == 0 && isNoData">
+		<div
-			{{$t('account.dataNull')}}
+			class="account_generalMessage_item modal_title_text"
+			style="display: flex; justify-content: center"
+			v-if="dataList.length == 0 && isNoData"
+		>
+			{{ $t("account.dataNull") }}
 		</div>
 		<div class="page_loading_box" v-show="!isNoData">
 			<span class="page_loading" ref="loadingDom" v-show="!isShowMark"></span>
@@ -27,34 +42,44 @@
 	</div>
 </template>
 <script lang="ts">
-import { defineComponent,computed,ref,reactive,nextTick,toRefs,createVNode, onMounted} from 'vue'
+import {
-import { Https } from "@/tool/https";
+	defineComponent,
-import { useRouter,useRoute } from 'vue-router'
+	computed,
-import { useStore } from "vuex";
+	ref,
-import { useI18n } from 'vue-i18n'
+	reactive,
+	nextTick,
+	toRefs,
+	createVNode,
+	onMounted
+} from "vue"
+import { Https } from "@/tool/https"
+import { useRouter, useRoute } from "vue-router"
+import { useStore } from "vuex"
+import { useI18n } from "vue-i18n"
+import { isValidUrl } from "@/tool/util"
 export default defineComponent({
-    components:{
+	components: {},
-    },
 	// emits:['putListData'],
-    props:['setReadStatus','setAllmessage','getHistory'],
+	props: ["setReadStatus", "setAllmessage", "getHistory"],
 	setup(prop, { emit }) {
 		const router = useRouter()
-        const store = useStore();
+		const store = useStore()
 		let accountMessage = reactive({
 			dataList: [],
 			page: 1,
 			size: 10,
 			isNoData: false,
-			isShowMark: false,
+			isShowMark: false
 		})
 		let loadingDom: any = ref(null)
 		let setmessageList = () => {
 			accountMessage.isShowMark = true
 			let data = {
 				page: accountMessage.page,
-				size: accountMessage.size,
+				size: accountMessage.size
 			}
-			prop.getHistory(data).then((rv:any)=>{
+			prop.getHistory(data)
+				.then((rv: any) => {
 					accountMessage.isShowMark = false
 
 					if (rv.content.length == 0) {
@@ -62,58 +87,67 @@ export default defineComponent({
 					} else {
 						rv.content.forEach((item: any) => {
 							item.content = JSON.parse(item.content)
-					});
+						})
 						accountMessage.dataList.push(...rv.content)
 					}
-			}).catch(() => {
+				})
+				.catch(() => {
 					accountMessage.isShowMark = false
 					accountMessage.isNoData = true
 				})
 		}
 		let setRead = (item: any) => {
-			prop.setReadStatus(item).then((rv:any)=>{
+			let content = item.content.content
+			if (isValidUrl(content)) {
+				if (import.meta.env.VITE_APP_BASE_URL === "https://develop.api.aida.com.hk") {
+					content += "&env=dev"
+				}
+				window.open(content, "_blank")
+			}
+
+			prop.setReadStatus(item)
+				.then((rv: any) => {
 					item.isRead = 1
-			}).catch((err:any)=>{
 				})
+				.catch((err: any) => {})
 		}
 		let allRead = () => {
 			// emit('setAllmessage')
-			prop.setAllmessage().then(()=>{
+			prop.setAllmessage()
+				.then(() => {
 					accountMessage.dataList.forEach((item: any) => {
 						item.isRead = 1
 					})
-			}).catch((err:any)=>{
 				})
+				.catch((err: any) => {})
 		}
 		// provide('exhibitionList',exhibitionList)
 		onMounted(() => {
 			accountMessage.isNoData = false
 			accountMessage.page = 0
-			let imgParent:any = document.querySelector('.account_systemMessage .page_loading')
+			let imgParent: any = document.querySelector(".account_systemMessage .page_loading")
 			new IntersectionObserver(
 				(entries, observer) => {
 					// 如果不是相交，则直接返回
 					// console.log(entries[0]);
-					if (!entries[0].intersectionRatio) return;
+					if (!entries[0].intersectionRatio) return
 					accountMessage.page += 1
 					setmessageList()
-				},
+				}
 				// { root:worksPage }
-			).observe(loadingDom.value);
+			).observe(loadingDom.value)
 		})
 		return {
 			...toRefs(accountMessage),
 			setmessageList,
 			setRead,
 			allRead,
-		   loadingDom,
+			loadingDom
 		}
 	},
 	data() {
-        return{
+		return {}
-            
 	}
-    },
 })
 </script>
 <style lang="less" scoped>
@@ -133,7 +167,6 @@ export default defineComponent({
 			}
 			.modal_title_text_intro {
 				margin-left: 4rem;
-				
 			}
 		}
 	}

src/component/Administrator/SE/allUser/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="admin_page">
+	<div class="admin_page all-user">
 	  <div class="admin_table_search">
 		<div class="admin_state">
 		  <div class="admin_state_item">
@@ -18,7 +18,18 @@
 		  </div>
 		  <div class="admin_state_item">
 			<span>{{ $t('admin.UserName') }}:</span>
-          <SelectUser v-model:value="ids" multiple valueKey="label" labelKey="email" />
+			<!-- <a-select
+			  v-model:value="ids"
+			  mode="multiple"
+			  style="width: 230px"
+			  :field-names="{ label: 'label', value: 'label' }"
+			  :filter-option="filterOption"
+			  :placeholder="$t('admin.selectUserName')"
+			  max-tag-count="responsive"
+			  :options="allUserList"
+			  @keydown.enter="gettrialList"
+			></a-select> -->
+			 <SelectUser v-model="ids" labelKey="label" valueKey="label" multiple />
 		  </div>
 		</div>
 		<div class="admin_search">
@@ -81,18 +92,11 @@
 			}"
 			@click="plan.status !== 'PENDING' && selectPlanFilter(plan.id)"
 		  >
-          <a-tooltip v-if="plan.status === 'PENDING'">
-            <template #title>{{ $t('admin.PlanStart') }} {{ plan.startTime }}</template>
-            <span class="plan_name">{{ plan.name }}</span>
-            <MoreOutlined class="plan_more_icon" />
-          </a-tooltip>
-          <template v-else>
 			<span class="plan_name">{{ plan.name }}</span>
 			<MoreOutlined
 			  class="plan_more_icon"
 			  @click.stop="plan.status !== 'PENDING' && openPlanRenameModal(plan)"
 			/>
-          </template>
 		  </div>
 		</div>
 		<a-table
@@ -193,6 +197,9 @@ export default defineComponent({
 	  let filter: any = reactive({
 		dataList: [],
 		tableLoading: false,
+		allUserList: computed(() => {
+		  return store.state.adminPage.allUserList
+		}),
 		allCountry: [],
 		rowSelection: computed(() => {
 		  return {
@@ -432,9 +439,6 @@ export default defineComponent({
 		  organizationId: orgId,
 		  status: ['ACTIVE', 'PENDING']
 		}).then(res => {
-        res.forEach(plan => {
-          plan.startTime = formatTime(plan.currentPeriodStart, 'YYYY-MM-DD hh:mm:ss')
-        })
 		  // 将与当前用户 subscriptionPlanId 相同的订阅计划放到第一个
 		  const userSubscriptionPlanId = store.state.UserHabit.userDetail.subscriptionPlanId
 		  if (userSubscriptionPlanId && Array.isArray(res)) {
@@ -449,7 +453,6 @@ export default defineComponent({
 		  } else {
 			planFilterOptions.value = res
 		  }
-        console.log(planFilterOptions.value)
 		})
 	  }
 	  // 监听组织ID，获取到值后再拉取订阅计划
@@ -766,4 +769,12 @@ export default defineComponent({
 	  }
 	}
   }
+  .all-user {
+	.admin_table_content {
+	  :deep(.ant-table-wrapper) {
+		overflow: hidden;
+	  }
+	}
+  }
   </style>
+  

src/component/Administrator/Transaction/TransactionTable.vue

@@ -148,6 +148,7 @@
                     total: total,
                     showQuickJumper: true,
                     bordered: false,
+                    showTotal: (total) => `Total Transaction: ${total}`
                 }"
             >
 				<template #bodyCell="{ column, text, record, index }">
@@ -465,13 +466,16 @@ export default defineComponent({
                 (rv: any) => {
                     if (rv) {
                         // this.dataList = rv
+                        // console.log('rv----',rv);
+                        
                         filter.dataList = rv.content;
                         filterData.total = rv.total;
                         filter.tableLoading = false;
-                        filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
+                        filterData.totalPayer = rv.totalAmount;
-                            const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
+                        // filterData.totalPayer = rv.content.reduce((total: number, item: any) => {
-                            return total + (isNaN(value) ? 0 : value);
+                        //     const value = item && item.status === 'Success' ? parseFloat(item.payerTotal) : 0;
-                        }, 0);
+                        //     return total + (isNaN(value) ? 0 : value);
+                        // }, 0);
 
                         // this.workspaceItem.position = this.singleTypeList[0].label
                     }

src/component/Administrator/allUser.vue

@@ -8,16 +8,11 @@
 						style="width: 250px"
 						class="range_picker"
 						v-model:value="rangePickerValue"
-                        :placeholder="[
+						:placeholder="[$t('HistoryPage.StartDate'), $t('HistoryPage.EndDate')]"
-                            $t('HistoryPage.StartDate'),
-                            $t('HistoryPage.EndDate'),
-                        ]"
 						valueFormat="YYYY-MM-DD"
 					>
 						<template #suffixIcon>
-                            <span
+							<span class="icon iconfont range_picker_icon icon-rili"></span>
-                                class="icon iconfont range_picker_icon icon-rili"
-                            ></span>
 						</template>
 					</a-range-picker>
 				</div>
@@ -63,38 +58,50 @@
 						show-search
 					></a-select>
 				</div>
+				<div class="admin_state_item">
+					<span>Orgnization:</span>
+					<a-select
+						v-model:value="organizationId"
+						placeholder="Select the organization"
+						allow-clear
+						style="width: 250px"
+						@popupScroll="handleOrganizationScroll"
+					>
+						<a-select-option
+							v-for="item in organizationOptions"
+							:key="item.id"
+							:value="item.id"
+						>
+							{{ item.name }}
+						</a-select-option>
+					</a-select>
+				</div>
 			</div>
 			<div class="admin_search">
-                <div class="admin_search_item" @click="searchHistoryList" :style="{height:isAwayOrUnfold?'4rem':''}">
+				<div
+					class="admin_search_item"
+					@click="searchHistoryList"
+					:style="{ height: isAwayOrUnfold ? '4rem' : '' }"
+				>
 					Search
 				</div>
-                <div class="admin_search_item" @click="addhHistoryList">
+				<div class="admin_search_item" @click="addhHistoryList">Add</div>
-                    Add
-                </div>
 			</div>
 			<div class="admin_state_list">
-                <div
+				<div class="admin_state_list_item" @click="lastGeTrialList('year')">
-                    class="admin_state_list_item"
-                    @click="lastGeTrialList('year')"
-                >
 					Nearly a year
 				</div>
-                <div
+				<div class="admin_state_list_item" @click="lastGeTrialList('month')">
-                    class="admin_state_list_item"
-                    @click="lastGeTrialList('month')"
-                >
 					Last month
 				</div>
-                <div
+				<div class="admin_state_list_item" @click="lastGeTrialList('week')">Last week</div>
-                    class="admin_state_list_item"
-                    @click="lastGeTrialList('week')"
-                >
-                    Last week
-                </div>
 			</div>
 		</div>
 		<div class="awayOrUnfold" :class="{ active: isAwayOrUnfold }">
-			<span class="icon iconfont menu_icon icon-xiala" @click="()=>isAwayOrUnfold = !isAwayOrUnfold"></span>
+			<span
+				class="icon iconfont menu_icon icon-xiala"
+				@click="() => (isAwayOrUnfold = !isAwayOrUnfold)"
+			></span>
 		</div>
 		<div class="admin_table_content" ref="historyTable">
 			<a-table
@@ -104,24 +111,19 @@
 				:data-source="dataList"
 				:scroll="{ y: historyTableHeight }"
 				@change="changePage"
-				:showSorterTooltip='false'
+				:showSorterTooltip="false"
 				:pagination="{
 					showSizeChanger: true,
 					current: currentPage,
 					pageSize: pageSize,
 					total: total,
 					showQuickJumper: true,
-                    bordered: false,
+					bordered: false
 				}"
 			>
 				<template #bodyCell="{ column, text, record, index }">
 					<div class="operate_list" v-if="column?.Operations">
-                        <div
+						<div class="operate_item" @click="setAagree(record)">Edit</div>
-                            class="operate_item"
-                            @click="setAagree(record)"
-                        >
-                            Edit
-                        </div>
 						<!-- <div
 							class="operate_item"
 							@click="deleteGroup(record, index)"
@@ -132,24 +134,19 @@
 				</template>
 			</a-table>
 		</div>
-		<allUserPoerationsVue ref="allUserPoerationsVue" @searchHistoryList="searchHistoryList"></allUserPoerationsVue>
+		<allUserPoerationsVue
+			ref="allUserPoerationsVue"
+			@searchHistoryList="searchHistoryList"
+		/>
 	</div>
 </template>
 <script lang="ts">
-import {
+import { defineComponent, ref, createVNode, computed, reactive, toRefs, onMounted } from "vue"
-    defineComponent,
+import { formatTime } from "@/tool/util"
-    ref,
+import { useStore } from "vuex"
-    createVNode,
+import { Https } from "@/tool/https"
-    computed,
+import allUserPoerationsVue from "./allUserPoerations.vue"
-    reactive,
+import SelectUser from "@/component/common/SelectUser.vue"
-    toRefs,
-    onMounted,
-} from "vue";
-import { formatTime } from "@/tool/util";
-import { useStore } from "vuex";
-import { Https } from "@/tool/https";
-import allUserPoerationsVue from "./allUserPoerations.vue";
-import SelectUser from '@/component/common/SelectUser.vue'
 export default defineComponent({
 	components: { allUserPoerationsVue, SelectUser },
 	setup() {
@@ -159,7 +156,7 @@ export default defineComponent({
 			tableLoading: false,
 			allCountry: [],
 			isAwayOrUnfold: false
-        });
+		})
 		let filterData: any = reactive({
 			rangePickerValue: [],
 			currentPage: 1,
@@ -172,40 +169,41 @@ export default defineComponent({
 			occupation: "",
 			systemUser: "",
 			order: "", //'Ascending  升序 Descending 降序'
-			orderBy:'',
+			orderBy: "",
 			userName: "",
-        });
+			organizationId: null
+		})
 		let state: any = ref([
 			{
 				label: "all",
-                value: "",
+				value: ""
 			},
 			{
-				label:'visitor',
+				label: "visitor",
-				value:'0',
+				value: "0"
 			},
 			{
-				label:'yearly',
+				label: "yearly",
-				value:'1',
+				value: "1"
 			},
 			{
-				label:'monthly',
+				label: "monthly",
-				value:'2',
+				value: "2"
 			},
 			{
-				label:'trial',
+				label: "trial",
-				value:'3',
+				value: "3"
 			},
 			{
 				label: "userInEvent",
-                value: "4",
+				value: "4"
 			},
 			{
 				label: "Edu Admin",
-                value: "7",
+				value: "7"
-            },
+			}
-        ]);
+		])
-        let renameData: any = ref({}); //修改名字选中的数据
+		let renameData: any = ref({}) //修改名字选中的数据
 		const columns: any = computed(() => {
 			return [
 				{
@@ -215,7 +213,7 @@ export default defineComponent({
 					key: "id",
 					width: 100,
 					fixed: "left",
-					sorter: true,
+					sorter: true
 				},
 				{
 					title: "Email",
@@ -246,7 +244,7 @@ export default defineComponent({
 					dataIndex: "language",
 					key: "language",
 					width: 100,
-					ellipsis:true,
+					ellipsis: true
 				},
 				{
 					title: "Valid Start Time",
@@ -256,12 +254,12 @@ export default defineComponent({
 					width: 200,
 					ellipsis: true,
 					customRender: (record: any) => {
-						let time = ''
+						let time = ""
 						if (record.text) {
-							time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
+							time = formatTime(record.text / 1000, "YYYY-MM-DD hh:mm:ss")
 						}
 						return time
-                    },
+					}
 				},
 				{
 					title: "Valid End Time",
@@ -271,19 +269,19 @@ export default defineComponent({
 					width: 200,
 					ellipsis: true,
 					customRender: (record: any) => {
-						let time = ''
+						let time = ""
 						if (record.text) {
-							time = formatTime(record.text / 1000, 'YYYY-MM-DD hh:mm:ss')
+							time = formatTime(record.text / 1000, "YYYY-MM-DD hh:mm:ss")
 						}
 						return time
-                    },
+					}
 				},
 				{
 					title: "Country or Region",
 					align: "center",
 					dataIndex: "country",
 					key: "country",
-					width:200,
+					width: 200
 				},
 				{
 					title: "Create Date",
@@ -291,7 +289,7 @@ export default defineComponent({
 					dataIndex: "createDate",
 					key: "createDate",
 					width: 200,
-					sorter: true,
+					sorter: true
 				},
 				{
 					title: "Is Beginner",
@@ -301,21 +299,21 @@ export default defineComponent({
 					width: 80,
 					ellipsis: true,
 					customRender: (record: any) => {
-                        let str;
+						let str
 						if (record.value == 1) {
-                            str = "Yes";
+							str = "Yes"
 						} else {
-                            str = "No";
+							str = "No"
+						}
+						return str
 					}
-                        return str;
-                    },
 				},
 				{
-                    title: 'Machine Room Ip',
+					title: "Machine Room Ip",
 					align: "center",
 					dataIndex: "browserIdentifiers",
 					key: "browserIdentifiers",
-					width:200,
+					width: 200
 				},
 				{
 					title: "Credits",
@@ -327,10 +325,10 @@ export default defineComponent({
 					dataIndex: "credits",
 					key: "credits",
 					width: 100,
-					sorter: true,
+					sorter: true
 				},
 				{
-                    title: 'User Type',
+					title: "User Type",
 					align: "center",
 					// width: 150,
 					// minWidth: 100,
@@ -340,22 +338,22 @@ export default defineComponent({
 					key: "systemUser",
 					width: 100,
 					customRender: (record: any) => {
-                        let str;
+						let str
 						if (record.value == 0) {
-                            str = "visitor";
+							str = "visitor"
 						} else if (record.value == 1) {
-                            str = "yearly";
+							str = "yearly"
 						} else if (record.value == 2) {
-                            str = "monthly";
+							str = "monthly"
 						} else if (record.value == 3) {
-                            str = "trial";
+							str = "trial"
 						} else if (record.value == 4) {
-                            str = "userInEvent";
+							str = "userInEvent"
 						} else if (record.value == 7) {
-                            str = "Edu Admin";
+							str = "Edu Admin"
+						}
+						return str
 					}
-                        return str;
-                    },
 				},
 				{
 					title: "Operations",
@@ -364,58 +362,58 @@ export default defineComponent({
 					align: "center",
 					fixed: "right",
 					// slots:{customRender:'action'}
-                    Operations: true,
+					Operations: true
-                },
+				}
-            ];
+			]
-        });
+		})
 		//改变页码
 		let changePage = (e: any, filters: any, sorter: any) => {
-            filterData.currentPage = e.current;
+			filterData.currentPage = e.current
-            filterData.pageSize = e.pageSize;
+			filterData.pageSize = e.pageSize
 			if (sorter.order) {
-				if(sorter.columnKey == 'id'){
+				if (sorter.columnKey == "id") {
-					filterData.orderBy = 'id'
+					filterData.orderBy = "id"
 				} else if (sorter.columnKey == "createDate") {
-					filterData.orderBy = 'time'
+					filterData.orderBy = "time"
 				} else if (sorter.columnKey == "credits") {
-					filterData.orderBy = 'credits'
+					filterData.orderBy = "credits"
 				}
 			}
 			if (sorter.order) {
-				filterData.order = sorter.order == "descend" ? "Descending" : "Ascending";
+				filterData.order = sorter.order == "descend" ? "Descending" : "Ascending"
 			} else {
-				filterData.order = ''
+				filterData.order = ""
+			}
+			gettrialList()
 		}
-            gettrialList();
-        };
 
 		//查询列表
 		let searchHistoryList = () => {
-            filterData.currentPage = 1;
+			filterData.currentPage = 1
-            gettrialList();
+			gettrialList()
-        };
+		}
 		let clearHistoryList = () => {
-            filterData.rangePickerValue = [],
+			;((filterData.rangePickerValue = []),
-			filterData.currentPage = 1,
+				(filterData.currentPage = 1),
-			filterData.pageSize = 10,
+				(filterData.pageSize = 10),
-			filterData.total = 0,
+				(filterData.total = 0),
-			filterData.country = "",
+				(filterData.country = ""),
-			filterData.email = "",
+				(filterData.email = ""),
-			filterData.userType = "",
+				(filterData.userType = ""),
-			filterData.ids = [],
+				(filterData.ids = []),
-			filterData.occupation = "",
+				(filterData.occupation = ""),
-			filterData.order = "", //'Ascending  升序 Descending 降序'
+				(filterData.order = ""), //'Ascending  升序 Descending 降序'
-			filterData.orderBy = "", //'Ascending  升序 Descending 降序'
+				(filterData.orderBy = ""), //'Ascending  升序 Descending 降序'
-			filterData.systemUser = "",
+				(filterData.systemUser = ""),
-			filterData.userName = "";
+				(filterData.userName = ""))
-        };
+		}
 		let setHistoryListData = () => {
 			let startDate: any = filterData.rangePickerValue?.[0]
 				? filterData.rangePickerValue[0] + " " + "00:00:00"
-                : "";
+				: ""
 			let endDate: any = filterData.rangePickerValue?.[1]
 				? filterData.rangePickerValue[1] + " " + "23:59:59"
-                : "";
+				: ""
 			let data = {
 				endTime: endDate,
 				startTime: startDate,
@@ -430,63 +428,118 @@ export default defineComponent({
 				order: filterData.order,
 				orderBy: filterData.orderBy,
 				userName: filterData.userName,
-            };
+				organizationId: filterData.organizationId
-            return data;
+			}
-        };
+			return data
+		}
 		//获取列表
 		let gettrialList = () => {
-            filter.tableLoading = true;
+			filter.tableLoading = true
-            let data = setHistoryListData();
+			let data = setHistoryListData()
-            Https.axiosPost(Https.httpUrls.getUserInfo, data).then(
+			Https.axiosPost(Https.httpUrls.getUserInfo, data).then((rv: any) => {
-                (rv: any) => {
 				if (rv) {
 					// this.dataList = rv
-                        filter.dataList = rv.records;
+					filter.dataList = rv.records
-                        filterData.total = rv.total;
+					filterData.total = rv.total
-                        filter.tableLoading = false;
+					filter.tableLoading = false
 
 					// this.workspaceItem.position = this.singleTypeList[0].label
 				}
+			})
 		}
-            );
-        };
 		let lastGeTrialList = (str: string) => {
-            clearHistoryList();
+			clearHistoryList()
-            let currentDate = new Date();
+			let currentDate = new Date()
-            let currentTimestamp = Math.floor(currentDate.getTime() / 1000);
+			let currentTimestamp = Math.floor(currentDate.getTime() / 1000)
 			// 计算30天前的时间戳
-            let thirtyDaysAgoTimestamp;
+			let thirtyDaysAgoTimestamp
 			if (str == "year") {
-                thirtyDaysAgoTimestamp = currentTimestamp - 360 * 24 * 60 * 60;
+				thirtyDaysAgoTimestamp = currentTimestamp - 360 * 24 * 60 * 60
 			} else if (str == "month") {
-                thirtyDaysAgoTimestamp = currentTimestamp - 30 * 24 * 60 * 60;
+				thirtyDaysAgoTimestamp = currentTimestamp - 30 * 24 * 60 * 60
 			} else if (str == "week") {
-                thirtyDaysAgoTimestamp = currentTimestamp - 7 * 24 * 60 * 60;
+				thirtyDaysAgoTimestamp = currentTimestamp - 7 * 24 * 60 * 60
+			}
+			filterData.rangePickerValue[0] = formatTime(thirtyDaysAgoTimestamp, "YYYY-MM-DD")
+			gettrialList()
 		}
-            filterData.rangePickerValue[0] = formatTime(
-                thirtyDaysAgoTimestamp,
-                "YYYY-MM-DD"
-            );
-            gettrialList();
-        };
 		let filterOption = (input: any, option: any) => {
 			// 使用 option.label 进行搜索
-            return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0;
+			return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
-        };
+		}
 		let addhHistoryList = () => {
-			allUserPoerationsVue.value.init('Add','')
+			allUserPoerationsVue.value.init("Add", "")
-		};
+		}
 		let allUserPoerationsVue = ref()
 		let setAagree = (data: any) => {
-			allUserPoerationsVue.value.init('Edit',data)
+			allUserPoerationsVue.value.init("Edit", data)
 		}
+
+		const organizationOptions = ref([])
+		const organizationParams = reactive({
+			page: 1,
+			size: 10,
+			total: 0
+		})
+		const organizationLoading = ref(false)
+		const getOrganizationList = async (isLoadMore = false) => {
+			console.log("111111")
+			if (organizationLoading.value) return
+			if (isLoadMore) {
+				const loaded = organizationParams.page * organizationParams.size
+				if (organizationParams.total && loaded >= organizationParams.total) return
+				organizationParams.page += 1
+			} else {
+				organizationParams.page = 1
+				organizationOptions.value = []
+			}
+			organizationLoading.value = true
+			try {
+				const { total, ...requestParams } = organizationParams
+				const rv: any = await Https.axiosPost(
+					Https.httpUrls.queryOrganization,
+					requestParams
+				)
+				if (rv) {
+					const newRecords = rv.records || []
+					// 遍历新数据，如果已存在则覆盖，不存在则追加
+					newRecords.forEach((newOrg: any) => {
+						const newOrgId = String(newOrg.id)
+						const existingIndex = organizationOptions.value.findIndex(
+							(org: any) => String(org.id) === newOrgId
+						)
+						if (existingIndex !== -1) {
+							// 如果已存在，用新数据覆盖旧项
+							organizationOptions.value[existingIndex] = newOrg
+						} else {
+							// 如果不存在，追加到末尾
+							organizationOptions.value.push(newOrg)
+						}
+					})
+					organizationParams.total = rv.total || 0
+				}
+			} finally {
+				organizationLoading.value = false
+			}
+		}
+
+		const handleOrganizationScroll = (e: any) => {
+			const target = e?.target
+			if (!target) return
+			const nearBottom = target.scrollTop + target.clientHeight >= target.scrollHeight - 20
+			if (nearBottom) {
+				getOrganizationList(true)
+			}
+		}
+
 		onMounted(() => {
-			let allCountry: any = sessionStorage.getItem("allCountry");
+			let allCountry: any = sessionStorage.getItem("allCountry")
 			if (allCountry) {
-                filter.allCountry = JSON.parse(allCountry);
+				filter.allCountry = JSON.parse(allCountry)
 			}
-            gettrialList();
+			gettrialList()
-        });
+			getOrganizationList()
+		})
 		return {
 			...toRefs(filter),
 			...toRefs(filterData),
@@ -501,22 +554,26 @@ export default defineComponent({
 			filterOption,
 			allUserPoerationsVue,
 			setAagree,
-        };
+			handleOrganizationScroll,
+			getOrganizationList,
+			organizationOptions,
+			organizationParams
+		}
 	},
 	data() {
 		return {
 			historyTableHeight: 0,
 			handleResizeColumn: (w: any, col: any) => {
-                col.width = w;
+				col.width = w
-            },
+			}
-        };
+		}
 	},
 	mounted() {
-        let historyTable: any = this.$refs.historyTable;
+		let historyTable: any = this.$refs.historyTable
-        this.historyTableHeight = historyTable.clientHeight - 200;
+		this.historyTableHeight = historyTable.clientHeight - 200
 	},
-    methods: {},
+	methods: {}
-});
+})
 </script>
 <style lang="less" scoped>
 .admin_page .admin_table_search .admin_state {
@@ -524,6 +581,5 @@ export default defineComponent({
 	flex-wrap: wrap;
 }
 .admin_page {
-	
 }
 </style>

src/component/Administrator/allUserPoerations.vue

@@ -321,6 +321,7 @@ export default defineComponent({
         data = setEditData()
         if (!data.userName || !data.userEmail || !data.validEndTime || !data.systemUser)
           return message.warning('Please check the input box marked with *')
+		delete data.userName
         Https.axiosPost(Https.httpUrls.modifyUser, {}, { params: data }).then(rv => {
           if (rv) {
             cancelDsign()

src/component/Administrator/globalAwardPopularity.vue

@@ -0,0 +1,99 @@
+<template>
+    <div class="admin_page globalAwardPopularity" ref="adminPage">
+        <div class="admin_table_search">
+			<div class="admin_state">
+				<div class="admin_state_item">
+					<span>Current Time:</span>
+					<span>{{ currentTimeStr }}</span>
+				</div>
+				<div class="admin_state_item">
+					<span>Raw Visi Count:</span>
+					<span>{{ rawVisitCount }}</span>
+				</div>
+				<div class="admin_state_item">
+					<span>Unique Visit Count:</span>
+					<span>{{ uniqueVisitCount }}</span>
+				</div>
+				
+			</div>
+			<div class="admin_search">
+				<div class="admin_search_item" @click="getGlobalAwardPopularity">
+					<i class="fi fi-br-refresh"></i>
+				</div>
+			</div>
+		</div>
+        <!-- <div class="admin_table_content" ref="questionnaireTable">
+			
+        </div> -->
+    </div>
+</template>
+<script lang="ts">
+import { defineComponent, ref, createVNode,toRefs, computed,reactive, onMounted, nextTick } from "vue";
+import { Https } from "@/tool/https";
+import type { TableColumnsType } from 'ant-design-vue';
+
+export default defineComponent({
+    components: {},
+    setup() {
+		const currentTime = ref(new Date())
+		const currentTimeStr = computed(()=>{
+			return currentTime.value.toLocaleString()
+		})
+		const rawVisitCount = ref(0)
+		const uniqueVisitCount = ref(0)
+		const getGlobalAwardPopularity = () => {
+			Https.axiosGet(Https.httpUrls.getGlobalAwardPopularity,).then((rv)=>{
+				currentTime.value = new Date()
+				rawVisitCount.value = rv.rawVisitCount
+				uniqueVisitCount.value = rv.uniqueVisitCount
+			})
+        }
+		onMounted(()=>{
+			getGlobalAwardPopularity()
+		})
+        return {
+			currentTimeStr,
+			getGlobalAwardPopularity,
+			rawVisitCount,
+			uniqueVisitCount,
+		};
+    },
+    data() {
+        return {
+		};
+    },
+    mounted() {
+		
+	},
+    methods: {},
+});
+</script>
+<style lang="less" scoped>
+.admin_page.globalAwardPopularity{
+	.admin_table_search{
+		// flex: 1;
+		width: min-content;
+		justify-content: flex-start;
+		border-radius: 2rem;
+		box-shadow: 0 0 1rem rgba(0, 0, 0, 0.2);
+		margin-left: 2rem;
+		flex-wrap: nowrap;
+		gap: 3rem;
+	}
+	.admin_state{
+		flex-direction: column;
+		width: auto;
+		cursor: auto;
+		.admin_state_item{
+			> span{
+				font-size: 2rem;
+			}
+		}
+	}
+	.admin_search{
+		i{
+			display: flex;
+		}
+	}
+}
+</style>

src/component/Administrator/subscriptionPlan.vue

@@ -5,8 +5,8 @@
 				class="search-form"
 				layout="inline"
 				:model="searchForm"
-        :label-col="{ style: { width: '12rem' } }"
+				:label-col="{ style: { width: '14rem' } }"
-        :wrapper-col="{ style: { width: '22rem' } }"
+				:wrapper-col="{ style: { width: '20rem' } }"
 			>
 				<a-form-item label="ID">
 					<a-input v-model:value="searchForm.id" allow-clear placeholder="Input the id" />
@@ -72,7 +72,7 @@
 						:options="countryList"
 					/>
 				</a-form-item>
-        <a-form-item>
+				<a-form-item class="search-form__actions">
 					<a-space>
 						<a-button type="primary" @click="handleSearch">Search</a-button>
 						<a-button @click="handleReset">Reset</a-button>
@@ -92,6 +92,7 @@
 					:loading="tableLoading"
 					:bordered="false"
 					row-key="id"
+					:customRow="customPlanRow"
 					@change="changePage"
 					@resizeColumn="handleResizeColumn"
 					:scroll="{ y: historyTableHeight }"
@@ -107,10 +108,11 @@
 					<template #bodyCell="{ column, record }">
 						<template
 							v-if="
-                column.key === 'currentPeriodStart' || column.key === 'currentPeriodEnd'
+								column.key === 'currentPeriodStart' ||
+								column.key === 'currentPeriodEnd'
 							"
 						>
-              {{ formatTime(record[column.key], 'YYYY-MM-DD hh:mm:ss') }}
+							{{ formatTime(record[column.key], "YYYY-MM-DD hh:mm:ss") }}
 						</template>
 
 						<template v-if="column.key === 'status'">
@@ -120,15 +122,15 @@
 						</template>
 
 						<template v-else-if="column.key === 'actions'">
-              <a-space>
+							<a-space class="plan-row-actions" @click.stop>
-                <a @click="openEdit(record)">Edit</a>
+								<a @click.stop="openEdit(record)">Edit</a>
 								<a-popconfirm
 									title="Confirm to delete this subscription plan?"
 									ok-text="Confirm"
 									cancel-text="Cancel"
 									@confirm="removePlan(record.id)"
 								>
-                  <a class="danger-text">Delete</a>
+									<a class="danger-text" @click.stop>Delete</a>
 								</a-popconfirm>
 							</a-space>
 						</template>
@@ -137,6 +139,50 @@
 			</div>
 		</a-card>
 
+		<a-modal
+			v-model:visible="userInfoModalVisible"
+			title="User Info"
+			width="80%"
+			:footer="null"
+			:destroy-on-close="true"
+			class="user-info-modal"
+		>
+			<a-table
+				:columns="userInfoColumns"
+				:data-source="userInfoList"
+				:loading="userInfoLoading"
+				:pagination="{
+					showSizeChanger: true,
+					current: userInfoPage.current,
+					pageSize: userInfoPage.size,
+					total: userInfoPage.total,
+					showQuickJumper: true,
+					bordered: false
+				}"
+				row-key="id"
+				:scroll="{ x: 1280, y: 420 }"
+				@change="changeUserInfoPage"
+			>
+				<template #bodyCell="{ column, record }">
+					<template
+						v-if="
+							column.key === 'validStartTime' ||
+							column.key === 'validEndTime' ||
+							column.key === 'createDate'
+						"
+					>
+						{{ formatUserTime(record[column.key]) }}
+					</template>
+					<template v-else-if="column.key === 'systemUser'">
+						{{ getSystemUserLabel(record.systemUser) }}
+					</template>
+					<template v-else-if="column.key === 'isBeginner'">
+						{{ record.isBeginner == 1 ? "Yes" : "No" }}
+					</template>
+				</template>
+			</a-table>
+		</a-modal>
+
 		<div class="subscriptionPlanModal" ref="subscriptionPlanModal"></div>
 		<a-modal
 			class="subscriptionPlan_modal generalModel"
@@ -213,7 +259,10 @@
 							@select="handleOrganizationSelect"
 							@change="handleOrganizationChange"
 						>
-              <a-select-option value="ADD_ORGANIZATION" class="add-organization-option">
+							<a-select-option
+								value="ADD_ORGANIZATION"
+								class="add-organization-option"
+							>
 								+ Create Organization
 							</a-select-option>
 							<a-select-option
@@ -393,27 +442,30 @@ import {
 		ref,
 		onMounted,
 		onBeforeUnmount,
+		onActivated,
 		computed,
 		nextTick,
 		useTemplateRef
-} from 'vue'
+	} from "vue"
-import SelectUser from '@/component/common/SelectUser.vue'
+	import SelectUser from "@/component/common/SelectUser.vue"
-import { message } from 'ant-design-vue'
+	import { message } from "ant-design-vue"
-import { Https } from '@/tool/https'
+	import { Https } from "@/tool/https"
-import { formatTime } from '@/tool/util'
+	import { formatTime } from "@/tool/util"
-import store from '@/store'
+	import store from "@/store"
-import type { FormInstance, Rule } from 'ant-design-vue/es/form'
+	import type { FormInstance, Rule } from "ant-design-vue/es/form"
-import { debounce } from 'lodash-es'
+	import { debounce } from "lodash-es"
-import dayjs, { Dayjs } from 'dayjs'
+	import dayjs, { Dayjs } from "dayjs"
 
-type PlanStatus = 'PENDING' | 'ACTIVE' | 'EXPIRED'
+	type PlanStatus = "PENDING" | "ACTIVE" | "EXPIRED"
 	interface SubscriptionPlan {
 		id: number
+		userId?: string | number
 		name: string
 		currentPeriodStart: string
 		currentPeriodEnd: string
 		organizationId: string
 		adminAccId: string
+		adminAccEmail?: string
 		status: PlanStatus
 		creditLimit: number
 		accountNum?: number
@@ -421,17 +473,32 @@ interface SubscriptionPlan {
 		endStamp: number
 	}
 
+	interface UserInfoRecord {
+		id: number
+		userEmail?: string
+		userName?: string
+		language?: string
+		validStartTime?: number | string
+		validEndTime?: number | string
+		country?: string
+		createDate?: number | string
+		isBeginner?: number
+		browserIdentifiers?: string
+		credits?: number
+		systemUser?: number | string
+	}
+
 	const countryList = ref([])
 	const userRef = ref(null)
 
 	const searchForm = reactive({
-  name: '',
+		name: "",
-  startTime: '',
+		startTime: "",
-  endTime: '',
+		endTime: "",
 		organizationId: undefined as string | undefined,
 		adminAccId: undefined as string | undefined,
 		status: [] as PlanStatus[] | [],
-  id: '',
+		id: "",
 		countryOrRegion: null,
 		page: 1,
 		size: 10,
@@ -442,15 +509,24 @@ const toSeconds = (dateStr: string) => Math.floor(new Date(dateStr).getTime() /
 
 	const tableData = ref<SubscriptionPlan[]>([])
 	const tableLoading = ref(false)
+	const userInfoModalVisible = ref(false)
+	const userInfoLoading = ref(false)
+	const userInfoList = ref<UserInfoRecord[]>([])
+	const currentUserInfoPlanId = ref<string | number | null>(null)
+	const userInfoPage = reactive({
+		current: 1,
+		size: 10,
+		total: 0
+	})
 
 	const modalVisible = ref(false)
 	const confirmLoading = ref(false)
-const modalTitle = ref('New Subscription Plan')
+	const modalTitle = ref("New Subscription Plan")
 	const isEditMode = ref(false)
 	const formState = reactive({
-  name: '',
+		name: "",
-  currentPeriodStart: '',
+		currentPeriodStart: "",
-  currentPeriodEnd: '',
+		currentPeriodEnd: "",
 		organizationId: undefined as string | undefined,
 		adminAccId: undefined as string | undefined,
 		creditLimit: null as number | null,
@@ -461,44 +537,44 @@ const formState = reactive({
 
 	const organizationModalVisible = ref(false)
 	const organizationForm = reactive({
-  name: '',
+		name: "",
 		type: undefined as string | undefined
 	})
 
 	const statusLabelMap: Record<PlanStatus, string> = {
-  PENDING: 'Pending',
+		PENDING: "Pending",
-  ACTIVE: 'Active',
+		ACTIVE: "Active",
-  EXPIRED: 'Expired'
+		EXPIRED: "Expired"
 	}
 	const statusColorMap: Record<PlanStatus, string> = {
-  PENDING: 'blue',
+		PENDING: "blue",
-  ACTIVE: 'green',
+		ACTIVE: "green",
-  EXPIRED: 'red'
+		EXPIRED: "red"
 	}
 
 	const statusOption = ref([
 		{
-    label: 'Pending',
+			label: "Pending",
-    value: 'PENDING'
+			value: "PENDING"
 		},
 		{
-    label: 'Active',
+			label: "Active",
-    value: 'ACTIVE'
+			value: "ACTIVE"
 		},
 		{
-    label: 'Expired',
+			label: "Expired",
-    value: 'EXPIRED'
+			value: "EXPIRED"
 		}
 	])
 
 	const disabledDate = (current: Dayjs) => {
-  return current && current < dayjs().subtract(1, 'days').endOf('day')
+		return current && current < dayjs().subtract(1, "days").endOf("day")
 	}
 
 	const disableEndDate = (current: Dayjs) => {
 		if (isEditMode.value) {
 			const specificTime = dayjs(formState.currentPeriodEnd)
-    return current && current < dayjs(formState.currentPeriodEnd * 1000).startOf('day')
+			return current && current < dayjs(formState.currentPeriodEnd * 1000).startOf("day")
 		}
 		return disabledDate(current)
 	}
@@ -509,7 +585,7 @@ const range = (start: number, end: number) => {
 		}
 		return result
 	}
-const disableEndTime = date => {
+	const disableEndTime = (date) => {
 		if (!formState.currentPeriodEnd || !isEditMode.value)
 			return {
 				disabledHours: () => [],
@@ -519,7 +595,7 @@ const disableEndTime = date => {
 
 		const specificTime = dayjs.unix(formState.currentPeriodEnd)
 
-  if (date && date.isSame(specificTime, 'day')) {
+		if (date && date.isSame(specificTime, "day")) {
 			// 如果是指定日期当天，禁用时间戳之前的时间
 			const hour = specificTime.hour()
 			const minute = specificTime.minute()
@@ -527,7 +603,7 @@ const disableEndTime = date => {
 
 			return {
 				disabledHours: () => Array.from({ length: hour }, (_, i) => i), // 禁用小时之前
-      disabledMinutes: selectedHour => {
+				disabledMinutes: (selectedHour) => {
 					if (selectedHour === hour) {
 						return Array.from({ length: minute }, (_, i) => i) // 同小时，禁用分钟之前
 					}
@@ -555,114 +631,328 @@ const normalizeStatus = (status?: string): PlanStatus | undefined => {
 		return upper
 	}
 	const getStatusColor = (status?: string) =>
-  statusColorMap[normalizeStatus(status) as PlanStatus] || 'default'
+		statusColorMap[normalizeStatus(status) as PlanStatus] || "default"
 
 	const columns = [
-  { title: 'Name', dataIndex: 'name', key: 'name', align: 'center', width: 180 },
+		{ title: "Name", dataIndex: "name", key: "name", align: "center", width: 180 },
-  { title: 'ID', dataIndex: 'id', key: 'id', align: 'center', width: 80 },
+		{ title: "ID", dataIndex: "id", key: "id", align: "center", width: 80 },
 		{
-    title: 'Organization',
+			title: "Organization",
-    dataIndex: 'organizationName',
+			dataIndex: "organizationName",
-    key: 'organizationName',
+			key: "organizationName",
-    align: 'center',
+			align: "center",
 			width: 180
 		},
 		{
-    title: 'Admin Account',
+			title: "Admin Account",
-    dataIndex: 'adminAccEmail',
+			dataIndex: "adminAccEmail",
-    key: 'adminAccEmail',
+			key: "adminAccEmail",
-    align: 'center',
+			align: "center",
 			width: 180,
 			ellipsis: true
 		},
 		{
-    title: 'Sub-Account Num',
+			title: "Sub-Account Num",
-    dataIndex: 'accountNum',
+			dataIndex: "accountNum",
-    key: 'accountNum',
+			key: "accountNum",
-    align: 'center',
+			align: "center",
 			width: 120,
 			ellipsis: true
 		},
 		{
-    title: 'Country or Region',
+			title: "Country or Region",
-    dataIndex: 'countryOrRegion',
+			dataIndex: "countryOrRegion",
-    key: 'countryOrRegion',
+			key: "countryOrRegion",
-    align: 'center',
+			align: "center",
 			width: 120,
 			ellipsis: true
 		},
 		{
-    title: 'Start Time',
+			title: "Start Time",
-    dataIndex: 'currentPeriodStart',
+			dataIndex: "currentPeriodStart",
-    key: 'currentPeriodStart',
+			key: "currentPeriodStart",
-    align: 'center',
+			align: "center",
 			width: 200
 		},
 		{
-    title: 'End Time',
+			title: "End Time",
-    dataIndex: 'currentPeriodEnd',
+			dataIndex: "currentPeriodEnd",
-    key: 'currentPeriodEnd',
+			key: "currentPeriodEnd",
-    align: 'center',
+			align: "center",
 			width: 200
 		},
-  { title: 'Status', dataIndex: 'status', key: 'status', align: 'center', width: 100 },
+		{ title: "Status", dataIndex: "status", key: "status", align: "center", width: 100 },
 		{
-    title: 'Credit Limit',
+			title: "Credit Limit",
-    dataIndex: 'creditLimit',
+			dataIndex: "creditLimit",
-    key: 'creditLimit',
+			key: "creditLimit",
-    align: 'center',
+			align: "center",
 			width: 120
 		},
-  { title: 'Operations', key: 'actions', width: 160, align: 'center', fixed: 'right' }
+		{ title: "Operations", key: "actions", width: 160, align: "center", fixed: "right" }
 	]
 
-const historyTable = ref()
+	const userInfoColumns = [
+		{ title: "User Id", dataIndex: "id", key: "id", align: "center", width: 100 },
+		{
+			title: "Email",
+			dataIndex: "userEmail",
+			key: "userEmail",
+			align: "center",
+			width: 200,
+			ellipsis: true
+		},
+		{
+			title: "User Name",
+			dataIndex: "userName",
+			key: "userName",
+			align: "center",
+			width: 150,
+			ellipsis: true
+		},
+
+		{
+			title: "Valid Start Time",
+			dataIndex: "validStartTime",
+			key: "validStartTime",
+			align: "center",
+			width: 200
+		},
+		{
+			title: "Valid End Time",
+			dataIndex: "validEndTime",
+			key: "validEndTime",
+			align: "center",
+			width: 200
+		},
+		{
+			title: "Country or Region",
+			dataIndex: "country",
+			key: "country",
+			align: "center",
+			width: 180,
+			ellipsis: true
+		},
+		{
+			title: "Credits",
+			dataIndex: "credits",
+			key: "credits",
+			align: "center",
+			width: 100
+		},
+		{
+			title: "User Type",
+			dataIndex: "systemUser",
+			key: "systemUser",
+			align: "center",
+			width: 120
+		}
+	]
+
+	const systemUserLabelMap: Record<string, string> = {
+		"0": "visitor",
+		"1": "yearly",
+		"2": "monthly",
+		"3": "trial",
+		"4": "userInEvent",
+		"7": "Edu Admin"
+	}
+
+	const getSystemUserLabel = (systemUser?: number | string) => {
+		if (systemUser === undefined || systemUser === null) return ""
+		return systemUserLabelMap[String(systemUser)] || String(systemUser)
+	}
+
+	const formatUserTime = (value?: number | string) => {
+		if (!value) return ""
+		if (typeof value === "number") {
+			return formatTime(value / 1000, "YYYY-MM-DD hh:mm:ss")
+		}
+		if (/^\d+$/.test(value)) {
+			return formatTime(Number(value) / 1000, "YYYY-MM-DD hh:mm:ss")
+		}
+		return value
+	}
+
+	const normalizeUserInfoList = (res: any): UserInfoRecord[] => {
+		if (Array.isArray(res)) return res
+		if (Array.isArray(res?.records)) return res.records
+		if (res) return [res]
+		return []
+	}
+
+	const buildUserInfoParams = (id: string | number) => ({
+		endTime: "",
+		startTime: "",
+		size: userInfoPage.size,
+		page: userInfoPage.current,
+		systemUser: "",
+		country: "",
+		email: "",
+		userType: "",
+		ids: [],
+		occupation: "",
+		order: "",
+		orderBy: "",
+		userName: "",
+		subscriptionPlanId: id
+	})
+
+	const fetchUserInfo = async () => {
+		if (currentUserInfoPlanId.value === null) return
+		userInfoLoading.value = true
+		userInfoList.value = []
+
+		try {
+			const res = await Https.axiosPost(
+				Https.httpUrls.getUserInfo,
+				buildUserInfoParams(currentUserInfoPlanId.value)
+			)
+			const records = normalizeUserInfoList(res)
+			userInfoList.value = records
+			userInfoPage.total = Number(res?.total ?? records.length)
+		} catch (error: any) {
+			message.error(error.message || "Failed to load user info")
+			console.error(error)
+		} finally {
+			userInfoLoading.value = false
+		}
+	}
+
+	const openUserInfo = async (record: SubscriptionPlan) => {
+		console.log(record)
+		// debugger
+
+		currentUserInfoPlanId.value = record.id
+		userInfoPage.current = 1
+		userInfoModalVisible.value = true
+		await fetchUserInfo()
+	}
+
+	const changeUserInfoPage = (pagination: any) => {
+		userInfoPage.current = pagination.current
+		userInfoPage.size = pagination.pageSize
+		fetchUserInfo()
+	}
+
+	const customPlanRow = (record: SubscriptionPlan) => {
+		return {
+			onClick: (event: MouseEvent) => {
+				const target = event.target as HTMLElement | null
+				if (target?.closest(".plan-row-actions")) return
+				openUserInfo(record)
+			}
+		}
+	}
+
+	const historyTable = ref<HTMLElement | null>(null)
 	const historyTableHeight = ref(0)
+	const minTableBodyHeight = 120
+	let tableResizeObserver: ResizeObserver | null = null
+	let tableResizeTimer: ReturnType<typeof window.setTimeout> | null = null
+
 	const handleResizeColumn = (w: any, col: any) => {
 		col.width = w
 	}
 
-const calculateTableHeight = () => {
+	const getElementOuterHeight = (element: Element | null) => {
-  nextTick(() => {
+		if (!element) return 0
-    if (historyTable.value) {
+		const htmlElement = element as HTMLElement
-      historyTableHeight.value = historyTable.value.clientHeight - 200
+		const style = window.getComputedStyle(htmlElement)
+		return (
+			htmlElement.offsetHeight +
+			Number.parseFloat(style.marginTop || "0") +
+			Number.parseFloat(style.marginBottom || "0")
+		)
 	}
+
+	const calculateTableHeight = () => {
+		if (tableResizeTimer) {
+			window.clearTimeout(tableResizeTimer)
+		}
+		tableResizeTimer = window.setTimeout(() => {
+			nextTick(() => {
+				const tableWrapper = historyTable.value
+				if (!tableWrapper) {
+					tableResizeTimer = null
+					return
+				}
+
+				const tableHead = tableWrapper.querySelector(".ant-table-thead") ?? null
+				const pagination = tableWrapper.querySelector(".ant-pagination") ?? null
+				const tableHeadHeight = getElementOuterHeight(tableHead) || 55
+				const paginationHeight = getElementOuterHeight(pagination) || 48
+				const reservedHeight = tableHeadHeight + paginationHeight + 8
+
+				historyTableHeight.value = Math.max(
+					minTableBodyHeight,
+					tableWrapper.clientHeight - reservedHeight
+				)
+				tableResizeTimer = null
 			})
+		}, 50)
 	}
 
 	const handleResize = () => {
 		calculateTableHeight()
 	}
 
+	const setupTableResizeObserver = () => {
+		if (!historyTable.value || typeof ResizeObserver === "undefined") return
+		tableResizeObserver?.disconnect()
+		tableResizeObserver = new ResizeObserver(() => {
+			calculateTableHeight()
+		})
+		tableResizeObserver.observe(historyTable.value)
+
+		const searchCard = historyTable.value
+			.closest(".subscription-plan")
+			?.querySelector(".search-card")
+		if (searchCard) {
+			tableResizeObserver.observe(searchCard)
+		}
+	}
+
 	onMounted(async () => {
 		await getOrganizationList()
 		await handleSearch()
 		calculateTableHeight()
-  window.addEventListener('resize', handleResize)
+		setupTableResizeObserver()
-  const list = sessionStorage.getItem('allCountry')
+		window.addEventListener("resize", handleResize)
+		const list = sessionStorage.getItem("allCountry")
 		countryList.value = list ? JSON.parse(list) : []
 	})
 
+	onActivated(() => {
+		calculateTableHeight()
+	})
+
 	onBeforeUnmount(() => {
-  window.removeEventListener('resize', handleResize)
+		window.removeEventListener("resize", handleResize)
+		tableResizeObserver?.disconnect()
+		if (tableResizeTimer) {
+			window.clearTimeout(tableResizeTimer)
+			tableResizeTimer = null
+		}
 	})
 
 	const handleFetchTableData = async () => {
 		tableLoading.value = true
 		return Https.axiosPost(Https.httpUrls.searchAllSubscribePlan, searchForm)
-    .then(res => {
+			.then((res) => {
 				tableData.value = res.records
 				searchForm.total = res.total
 			})
 			.finally(() => {
 				tableLoading.value = false
+				calculateTableHeight()
 			})
 	}
 
 	const resetFormState = () => {
-  formState.name = ''
+		formState.name = ""
-  formState.currentPeriodStart = ''
+		formState.currentPeriodStart = ""
-  formState.currentPeriodEnd = ''
+		formState.currentPeriodEnd = ""
 		formState.organizationId = undefined
 		formState.adminAccId = undefined
 		formState.creditLimit = null
@@ -683,26 +973,26 @@ const handleSearch = () => {
 	}
 
 	const handleReset = () => {
-  searchForm.name = ''
+		searchForm.name = ""
-  searchForm.startTime = ''
+		searchForm.startTime = ""
-  searchForm.endTime = ''
+		searchForm.endTime = ""
 		searchForm.organizationId = undefined
 		searchForm.adminAccId = undefined
 		searchForm.status = []
-  searchForm.id = ''
+		searchForm.id = ""
 		searchForm.countryOrRegion = null
 		handleSearch()
 	}
 
 	const openCreate = () => {
-  modalTitle.value = 'New Subscription Plan'
+		modalTitle.value = "New Subscription Plan"
 		isEditMode.value = false
 		resetFormState()
 		modalVisible.value = true
 	}
 
 	const openEdit = (record: SubscriptionPlan) => {
-  modalTitle.value = 'Edit Subscription Plan'
+		modalTitle.value = "Edit Subscription Plan"
 		isEditMode.value = true
 		formState.name = record.name
 		formState.currentPeriodStart = String(record.currentPeriodStart)
@@ -755,25 +1045,25 @@ const validateForm = (): boolean => {
 		}
 
 		const requiredFields: FieldRule[] = [
-    { value: formState.currentPeriodStart, message: 'Please select the start time' },
+			{ value: formState.currentPeriodStart, message: "Please select the start time" },
-    { value: formState.currentPeriodEnd, message: 'Please select the end time' },
+			{ value: formState.currentPeriodEnd, message: "Please select the end time" },
-    { value: formState.adminAccId, message: 'Please select the admin account' },
+			{ value: formState.adminAccId, message: "Please select the admin account" },
 			{
 				value: formState.creditLimit,
-      message: 'Please input credit limit',
+				message: "Please input credit limit",
 				checkNull: true
 			},
 			{
 				value: formState.accountNum,
-      message: 'Please input account number',
+				message: "Please input account number",
 				checkNull: true
 			}
 		]
 
 		if (!isEditMode.value) {
 			requiredFields.push(
-      { value: formState.name, message: 'Please input the name' },
+				{ value: formState.name, message: "Please input the name" },
-      { value: formState.organizationId, message: 'Please select organization' }
+				{ value: formState.organizationId, message: "Please select organization" }
 			)
 		}
 
@@ -806,7 +1096,7 @@ const handleSubmit = async () => {
 				res = await Https.axiosPost(Https.httpUrls.createSubscribePlan, params)
 			}
 			message.success(
-      `${isEditMode.value ? 'Subscription plan updated' : 'Subscription plan created'}`
+				`${isEditMode.value ? "Subscription plan updated" : "Subscription plan created"}`
 			)
 		} catch (error: any) {
 			message.error(error.message)
@@ -835,8 +1125,8 @@ const cancelModal = () => {
 	const removePlan = (id: number) => {
 		tableLoading.value = true
 		Https.axiosGet(Https.httpUrls.deleteSubscribePlan, { params: { id } })
-    .then(res => {
+			.then((res) => {
-      message.success('Subscription plan deleted')
+				message.success("Subscription plan deleted")
 				handleReset()
 			})
 			.catch((error: any) => {
@@ -901,15 +1191,15 @@ const handleOrganizationScroll = (e: any) => {
 	}
 
 	const handleOrganizationSelect = (value: string) => {
-  if (value === 'ADD_ORGANIZATION') {
+		if (value === "ADD_ORGANIZATION") {
 			// 打开添加组织弹窗
 			organizationModalVisible.value = true
 			// 使用nextTick确保值被重置，使其不被选中
 			nextTick(() => {
-      if (searchForm.organizationId === 'ADD_ORGANIZATION') {
+				if (searchForm.organizationId === "ADD_ORGANIZATION") {
 					searchForm.organizationId = undefined
 				}
-      if (formState.organizationId === 'ADD_ORGANIZATION') {
+				if (formState.organizationId === "ADD_ORGANIZATION") {
 					formState.organizationId = undefined
 				}
 			})
@@ -918,12 +1208,12 @@ const handleOrganizationSelect = (value: string) => {
 
 	const handleOrganizationChange = (value: string) => {
 		// 如果change事件触发时值是"添加组织"，立即重置
-  if (value === 'ADD_ORGANIZATION') {
+		if (value === "ADD_ORGANIZATION") {
 			nextTick(() => {
-      if (searchForm.organizationId === 'ADD_ORGANIZATION') {
+				if (searchForm.organizationId === "ADD_ORGANIZATION") {
 					searchForm.organizationId = undefined
 				}
-      if (formState.organizationId === 'ADD_ORGANIZATION') {
+				if (formState.organizationId === "ADD_ORGANIZATION") {
 					formState.organizationId = undefined
 				}
 			})
@@ -932,13 +1222,13 @@ const handleOrganizationChange = (value: string) => {
 
 	const cancelOrganizationModal = () => {
 		organizationModalVisible.value = false
-  organizationForm.name = ''
+		organizationForm.name = ""
 		organizationForm.type = undefined
 	}
 
 	const handleCreateOrganization = async () => {
 		if (!organizationForm.name || !organizationForm.type) {
-    message.warning('Please fill in name and type')
+			message.warning("Please fill in name and type")
 			return
 		}
 		try {
@@ -948,7 +1238,7 @@ const handleCreateOrganization = async () => {
 					type: organizationForm.type
 				}
 			})
-    message.success('Organization created successfully')
+			message.success("Organization created successfully")
 			cancelOrganizationModal()
 			// 刷新组织列表
 			await getOrganizationList()
@@ -960,26 +1250,28 @@ const handleCreateOrganization = async () => {
 				}
 			}
 		} catch (error: any) {
-    message.error(error.message || 'Failed to create organization')
+			message.error(error.message || "Failed to create organization")
 			console.error(error)
 		}
 	}
 
 	const filterOption = (input: string, option: any) => {
-  const label = option?.label ?? option?.children ?? option?.key?.label ?? ''
+		const label = option?.label ?? option?.children ?? option?.key?.label ?? ""
 		return String(label).toLowerCase().includes(input.toLowerCase())
 	}
 </script>
 
 <style lang="less" scoped>
 	.subscription-plan {
-  padding: 2rem 2.4rem 3.2rem 0;
+		padding: 2rem 2.4rem 0 0;
 		display: flex;
 		height: 100%;
+		min-height: 0;
 		flex-direction: column;
 
 		.search-card {
 			margin-bottom: 1.6rem;
+			flex-shrink: 0;
 		}
 
 		.table-card {
@@ -987,13 +1279,15 @@ const filterOption = (input: string, option: any) => {
 			display: flex;
 			flex-direction: column;
 			overflow: hidden;
+			min-height: 0;
 
 			:deep(.ant-card-body) {
 				flex: 1;
 				display: flex;
 				flex-direction: column;
 				overflow: hidden;
-      padding: 2.4rem;
+				padding: 2.4rem 2.4rem 0;
+				min-height: 0;
 			}
 
 			.table-card__header {
@@ -1007,6 +1301,42 @@ const filterOption = (input: string, option: any) => {
 				flex: 1;
 				overflow: hidden;
 				min-height: 0;
+
+				:deep(.ant-table-wrapper),
+				:deep(.ant-spin-nested-loading),
+				:deep(.ant-spin-container) {
+					height: 100%;
+				}
+
+				:deep(.ant-spin-container) {
+					display: flex;
+					flex-direction: column;
+					overflow: hidden;
+				}
+
+				:deep(.ant-table) {
+					flex: 1;
+					min-height: 0;
+					overflow: hidden;
+				}
+
+				:deep(.ant-table-container) {
+					height: 100%;
+					display: flex;
+					flex-direction: column;
+				}
+
+				:deep(.ant-table-content) {
+					height: 100%;
+				}
+
+				:deep(.ant-table-body) {
+					overflow-y: auto !important;
+				}
+
+				:deep(.ant-pagination) {
+					flex-shrink: 0;
+				}
 			}
 
 			.danger-text {
@@ -1026,8 +1356,23 @@ const filterOption = (input: string, option: any) => {
 			:deep(.ant-table-tbody > tr:hover > td) {
 				background: rgb(202, 202, 202);
 			}
+
+			:deep(.ant-table-tbody > tr) {
+				cursor: pointer;
+			}
+
+			:deep(.plan-row-actions) {
+				cursor: default;
 			}
 		}
+	}
+
+	.user-info-modal {
+		:deep(.ant-modal-body) {
+			padding: 2.4rem;
+		}
+	}
+
 	:deep(.subscriptionPlan_modal) {
 		.ant-modal-body {
 			// height: calc(65rem * 1.2);
@@ -1079,11 +1424,69 @@ const filterOption = (input: string, option: any) => {
 	}
 
 	:deep(.search-form) {
-  column-gap: 2rem;
+		--search-label-width: 14rem;
-  row-gap: 2rem;
+		--search-control-width: 20rem;
+		align-items: flex-start;
+		column-gap: 1.8rem;
+		row-gap: 1.8rem;
+
+		.ant-form-item {
+			min-width: calc(var(--search-label-width) + var(--search-control-width));
+			margin-right: 0;
+			margin-bottom: 0;
+		}
+
+		.ant-form-item-label {
+			flex: 0 0 var(--search-label-width);
+			max-width: var(--search-label-width);
+			overflow: visible;
+			white-space: nowrap;
+
+			> label {
+				white-space: nowrap;
+			}
+		}
+
+		.ant-form-item-control {
+			flex: 0 0 var(--search-control-width);
+			max-width: var(--search-control-width);
+		}
+
+		.ant-input,
+		.ant-input-affix-wrapper,
+		.ant-picker,
 		.ant-select {
 			width: 100% !important;
 		}
+
+		.search-form__actions {
+			min-width: auto;
+
+			.ant-form-item-control {
+				flex: 0 0 auto;
+				max-width: none;
+			}
+		}
+	}
+
+	@media (min-width: 1600px) {
+		:deep(.search-form) {
+			--search-control-width: 22rem;
+		}
+	}
+
+	@media (max-width: 760px) {
+		:deep(.search-form) {
+			.ant-form-item {
+				flex: 1 1 100%;
+				min-width: 100%;
+			}
+
+			.ant-form-item-control {
+				flex: 1 1 auto;
+				max-width: calc(100% - var(--search-label-width));
+			}
+		}
 	}
 
 	:deep(.ant-select-dropdown) {

src/component/Canvas/CanvasEditor/commands/BackgroundCommands.js

@@ -207,7 +207,8 @@ export class BackgroundSizeCommand extends Command {
     this.bgLayer = this.layers.value.find((layer) => layer.isBackground);
 
     // 记录原尺寸
-    this.backgroundObject = findObjectById(this.canvas, this.bgLayer.fabricObject.id).object;
+	this.bgId = this.bgLayer.fabricObject?.id || this.bgLayer.fabricObjects?.[0]?.id;
+    this.backgroundObject = findObjectById(this.canvas, this.bgId).object;
 
     this.oldWidth = this.backgroundObject.width;
     this.oldHeight = this.backgroundObject.height;

src/component/Canvas/CanvasEditor/commands/FillGroupLayerBackgroundCommand.js

@@ -50,7 +50,6 @@ export class FillGroupLayerBackgroundCommand extends Command {
     );
     this.layer = layer;
     this.parent = parent;
-	console.log("==========",layer);
     if (!layer) return false;
 
 	if(!isUndo){
@@ -107,7 +106,6 @@ export class FillGroupLayerBackgroundCommand extends Command {
         });
       }
     }
-
     // 判断fabricObjects是否是组对象
     const firstObj = layer.fabricObjects?.[0] || null;
     // 如果没有找到第一个对象，则直接添加到当前画布
@@ -174,8 +172,8 @@ export class FillGroupLayerBackgroundCommand extends Command {
     }
     const canvasObj = findObjectById(this.canvas, firstObj?.id)?.object;
     if (
-      (canvasObj && canvasObj.type === "group") ||
+      canvasObj && (canvasObj.type === "group" ||
-      canvasObj._objects?.length > 0
+      canvasObj._objects?.length > 0)
     ) {
       this.newFill.set({
         left: 0,
@@ -343,10 +341,6 @@ export class FillGroupLayerBackgroundCommand extends Command {
       minTop = Infinity,
       maxRight = -Infinity,
       maxBottom = -Infinity;
-    console.log(
-      "计算当前所有对象的边界信息:===>",
-      this.originalfabricObjects.length
-    );
     this.originalfabricObjects?.forEach((obj) => {
       const { object } = findObjectById(this.canvas, obj.id) || {};
       if (object) {

src/component/Canvas/CanvasEditor/commands/FillRepeatCommand.js

@@ -7,12 +7,11 @@ import {
 	insertObjectAtZIndex,
 	removeCanvasObjectByObject,
 	createPatternTransform,
+	getTransformScaleAngle,
 	imageAddGapToCanvas,
 } from "../utils/helper";
 import { restoreFabricObject } from "../utils/objectHelper";
 
-const scale = 0.3;// 默认缩放比例
-
 export const FillSourceToBase64 = (source) => {
 	if (source?.toDataURL) {
 		return source.toDataURL?.();
@@ -39,7 +38,6 @@ export class FillRepeatCommand extends Command {
 		this.fillRepeat = options.fillRepeat;
 		this.oldObjects = null;
 		this.oldLocked = null;
-		this.oldIsDisableUnlock = null;
 	}
 
 	async execute() {
@@ -64,17 +62,15 @@ export class FillRepeatCommand extends Command {
 				);
 			});
 			image.set({
-				id: object.id,
+				...this.copyObjectProperties(object),
-				layerId: object.layerId,
-				layerName: object.layerName,
 				...(fill_.originalInfo || {
 					top: object.top,
 					left: object.left,
 				})
 			});
 			layer.fabricObjects = [image.toObject(["id", "layerId", "layerName"])];
-			this.oldLocked = layer.locked;
+			// this.oldLocked = layer.locked;
-			layer.locked = false;
+			// layer.locked = false;
 
 			this.canvas.add(image);
 			this.canvas.remove(object);
@@ -110,24 +106,35 @@ export class FillRepeatCommand extends Command {
 					height: object.height,
 				}
 			};
+			const fdObject = this.canvasManager.getFixedLayerObject();
 			const bgObject = this.canvasManager.getBackgroundLayerObject();
+			const tObject = fdObject || bgObject;
+			const tWidth = tObject.width;
+			const tHeight = tObject.height;
+
+			// const offsetX = object.fill?.hasOwnProperty("offsetX") ? object.fill.offsetX : tObject.width / 2;
+			// const offsetY = object.fill?.hasOwnProperty("offsetY") ? object.fill.offsetY : tObject.height / 2;
+			const scaleX_ = tWidth / img.width / 5;
+			const scaleY_ = tHeight / img.height / 5;
+			const scale_ = tWidth > tHeight ? scaleX_ : scaleY_;
+
+			const patternTransform = object.fill?.hasOwnProperty("patternTransform") ? object.fill.patternTransform : createPatternTransform(scale_, 0);
+			const scale = getTransformScaleAngle(patternTransform).scale;
+			const offsetX = tWidth / 2 - img.width * scale / 2;
+			const offsetY = tHeight / 2 - img.height * scale / 2;
 			const pattern = new fabric.Pattern({
 				source: img,
 				repeat: this.fillRepeat,
-				patternTransform: object.fill?.hasOwnProperty("patternTransform") ? object.fill.patternTransform : createPatternTransform(scale, 0),
+				patternTransform,
-				offsetX: object.fill?.hasOwnProperty("offsetX") ? object.fill.offsetX : bgObject.width / 2, // 水平偏移
+				offsetX, // 水平偏移
-				offsetY: object.fill?.hasOwnProperty("offsetY") ? object.fill.offsetY : bgObject.height / 2, // 垂直偏移
+				offsetY, // 垂直偏移
 			});
 			const rect = new fabric.Rect({
-				id: object.id,
+				...this.copyObjectProperties(object),
-				layerId: object.layerId,
-				layerName: object.layerName,
 				fill_,
 			});
 			layer.fabricObjects = [rect.toObject(["id", "layerId", "layerName"])];
-			this.oldLocked = layer.locked;
+			// this.oldLocked = layer.locked;
-			// this.oldIsDisableUnlock = layer.isDisableUnlock;
-			// layer.isDisableUnlock = true;
 			if (this.oldObjects.type === "rect") {
 				rect.set({
 					width: object.width,
@@ -143,17 +150,17 @@ export class FillRepeatCommand extends Command {
 					flipY: object.flipY,
 				});
 			} else {
-				let scaleX = bgObject.scaleX || 1;
+				let scaleX = tObject.scaleX || 1;
-				let scaleY = bgObject.scaleY || 1;
+				let scaleY = tObject.scaleY || 1;
 				rect.set({
-					width: bgObject.width,
+					width: tWidth,
-					height: bgObject.height,
+					height: tHeight,
-					top: bgObject.top - bgObject.height * scaleY / 2,
+					top: tObject.top - tHeight * scaleY / 2,
-					left: bgObject.left - bgObject.width * scaleX / 2,
+					left: tObject.left - tWidth * scaleX / 2,
 					scaleX,
 					scaleY,
 				});
-				layer.locked = true;
+				// layer.locked = true;
 			}
 			rect.set("fill", pattern);
 			this.canvas.add(rect);
@@ -182,14 +189,23 @@ export class FillRepeatCommand extends Command {
 		this.canvas.remove(object);
 		this.canvas.add(this.oldObjects);
 		layer.fabricObjects = [this.oldObjects.toObject(["id", "layerId", "layerName"])];
-		layer.locked = this.oldLocked;
+		// layer.locked = this.oldLocked;
-		// layer.isDisableUnlock = this.oldIsDisableUnlock;
 		await this.layerManager?.updateLayersObjectsInteractivity();
 		await this.layerManager?.sortLayersWithTool?.();
 		this.canvas.renderAll();
 		this.canvasManager.thumbnailManager?.generateLayerThumbnail(this.layerId);
 		return true;
 	}
+
+	// 复制原对象的属性
+	copyObjectProperties(object) {
+		return {
+			id: object.id,
+			layerId: object.layerId,
+			layerName: object.layerName,
+			isPrintTrims: object.isPrintTrims,
+		}
+	}
 }
 
 
@@ -228,6 +244,10 @@ export class FillRepeatChangeCommand extends Command {
 			...this.newPattern,
 		});
 		object.set("fill", pattern);
+		if (object.globalCompositeOperation_) {
+			object.globalCompositeOperation = object.globalCompositeOperation_;
+			object.globalCompositeOperation_ = null;
+		}
 		this.canvas.renderAll();
 		return true;
 	}
@@ -274,7 +294,7 @@ export class FillRepeatGapChangeCommand extends Command {
 		this.oldGapY = null;
 	}
 
-	async execute(isUndo = false) {
+	async execute(isCommand = true, isUndo = false) {
 		const { layer } = findLayerRecursively(this.layers.value, this.layerId);
 		if (!layer || !layer.fabricObjects || layer.fabricObjects.length === 0) {
 			console.warn("图层不存在或没有 fabric 对象");
@@ -305,6 +325,7 @@ export class FillRepeatGapChangeCommand extends Command {
 			object.fill_.gapY = this.newGapY;
 		}
 		const image = new Image();
+		image.crossOrigin = "anonymous";
 		image.src = object.fill_.source;
 		await image.decode();
 		object.fill_.width = image.width;
@@ -312,6 +333,10 @@ export class FillRepeatGapChangeCommand extends Command {
 		const fill = object.get("fill");
 		fill.source = imageAddGapToCanvas(image, object.fill_.gapX, object.fill_.gapY);
 		object.set("fill", new fabric.Pattern(fill));
+		if (isCommand && object.globalCompositeOperation_) {
+			object.globalCompositeOperation = object.globalCompositeOperation_;
+			object.globalCompositeOperation_ = null;
+		}
 		this.canvas.renderAll();
 		return true;
 	}
@@ -321,7 +346,7 @@ export class FillRepeatGapChangeCommand extends Command {
 			console.warn("没有旧间隙可恢复");
 			return false;
 		}
-		await this.execute(true);
+		await this.execute(true, true);
 		return true;
 	}
 

src/component/Canvas/CanvasEditor/commands/LassoCutoutCommand.js

@@ -147,11 +147,11 @@ export class LassoCutoutCommand extends CompositeCommand {
       }
 
       // 确定源图层
-      const sourceLayer = this.layerManager.getActiveLayer();
+    //   const sourceLayer = this.layerManager.getActiveLayer();
-      if (!sourceLayer) {
+    //   if (!sourceLayer) {
-        console.error("无法执行套索抠图：源图层无效");
+    //     console.error("无法执行套索抠图：源图层无效");
-        return false;
+    //     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) {

src/component/Canvas/CanvasEditor/commands/LayerCommands.js

@@ -280,8 +280,13 @@ export class PasteLayerCommand extends Command {
         isCut: undefined,
         serializedObjects: undefined,
       };
-
+      if(this.newLayer.isPrintTrims){
-      if (this.insertIndex !== undefined && this.insertIndex !== null) {
+		this.layers.value.forEach((layer) => {
+          if (layer.isPrintTrimsGroup) {
+            layer.children.unshift(this.newLayer);
+          }
+        })
+	  }else if (this.insertIndex !== undefined && this.insertIndex !== null) {
         this.layers.value.splice(this.insertIndex, 0, this.newLayer);
       } else {
         this.layers.value.push(this.newLayer);
@@ -3684,7 +3689,7 @@ export class ChangeFixedImageCommand extends Command {
         opacity: currentObj.opacity,
       };
 
-      console.log(`保存渲染顺序: z-index = ${this.previousZIndex}`);
+    //   console.log(`保存渲染顺序: z-index = ${this.previousZIndex}`);
     }
   }
 
@@ -3794,7 +3799,7 @@ export class ChangeFixedImageCommand extends Command {
           false
         );
         if (insertSuccess) {
-          console.log(`新图像插入到z-index位置: ${this.previousZIndex}`);
+        //   console.log(`新图像插入到z-index位置: ${this.previousZIndex}`);
         } else {
           // 如果插入失败，回退到普通添加
           this.canvas.add(newImage);

src/component/Canvas/CanvasEditor/commands/ObjectLayerCommands.js

@@ -600,7 +600,7 @@ export class ChangeFixedImageCommand extends Command {
         opacity: currentObj.opacity,
       };
 
-      console.log(`保存渲染顺序: z-index = ${this.previousZIndex}`);
+    //   console.log(`保存渲染顺序: z-index = ${this.previousZIndex}`);
     }
   }
 
@@ -716,7 +716,7 @@ export class ChangeFixedImageCommand extends Command {
           false
         );
         if (insertSuccess) {
-          console.log(`新图像插入到z-index位置: ${this.previousZIndex}`);
+        //   console.log(`新图像插入到z-index位置: ${this.previousZIndex}`);
         } else {
           // 如果插入失败，回退到普通添加
           this.canvas.add(newImage);

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;
+	}
+}

src/component/Canvas/CanvasEditor/commands/RasterizeLayerCommand.js

@@ -285,17 +285,15 @@ export class RasterizeLayerCommand extends Command {
     // 提取排序后的对象
     this.objectsToRasterize = objectsWithZIndex.map((item) => item.object);
 
-    console.log(
+    // console.log(`📊 收集到 ${this.layersToRasterize.length} 个图层，${this.objectsToRasterize.length} 个对象进行组合` );
-      `📊 收集到 ${this.layersToRasterize.length} 个图层，${this.objectsToRasterize.length} 个对象进行组合`
+    // console.log(
-    );
+    //   "🔢 对象z-index顺序:",
-    console.log(
+    //   objectsWithZIndex.map((item) => ({
-      "🔢 对象z-index顺序:",
+    //     id: item.object.id,
-      objectsWithZIndex.map((item) => ({
+    //     type: item.object.type,
-        id: item.object.id,
+    //     zIndex: item.zIndex,
-        type: item.object.type,
+    //   }))
-        zIndex: item.zIndex,
+    // );
-      }))
-    );
   }
 
   /**
@@ -611,17 +609,17 @@ export class ExportLayerToImageCommand extends Command {
     // 提取排序后的对象
     this.objectsToRasterize = objectsWithZIndex.map((item) => item.object);
 
-    console.log(
+    // console.log(
-      `📊 收集到 ${this.layersToRasterize.length} 个图层，${this.objectsToRasterize.length} 个对象进行组合`
+    //   `📊 收集到 ${this.layersToRasterize.length} 个图层，${this.objectsToRasterize.length} 个对象进行组合`
-    );
+    // );
-    console.log(
+    // console.log(
-      "🔢 对象z-index顺序:",
+    //   "🔢 对象z-index顺序:",
-      objectsWithZIndex.map((item) => ({
+    //   objectsWithZIndex.map((item) => ({
-        id: item.object.id,
+    //     id: item.object.id,
-        type: item.object.type,
+    //     type: item.object.type,
-        zIndex: item.zIndex,
+    //     zIndex: item.zIndex,
-      }))
+    //   }))
-    );
+    // );
   }
 
   /**

src/component/Canvas/CanvasEditor/commands/RedGreenCommands.js

@@ -159,6 +159,8 @@ export class BatchInitializeRedGreenModeCommand extends Command {
             absolutePositioned: true,
             opacity: 0.01, // 设置为几乎透明
             id: generateId("redGreenImageMask_"),
+			rx: 15,
+			ry: 15,
           });
           // this.canvas.add(this.redGreenImageMask);
           this.canvas.clipPath = this.redGreenImageMask;

src/component/Canvas/CanvasEditor/commands/StateCommands.js

@@ -25,7 +25,7 @@ export class TransformCommand extends Command {
     this.layerManager = options.layerManager;
     this.layers = options.layers || null;
     this.lastSelectLayerId = options.lastSelectLayerId || null; // 最后选择的图层ID
-
+	this.isCommand = options.isCommand == undefined ? true : options.isCommand
     const targetObject =
       findObjectById(this.canvas, this.objectId)?.object || null;
 
@@ -189,6 +189,11 @@ export class TransformCommand extends Command {
       object.set(key, value);
     });
 
+	if(this.isCommand && object.globalCompositeOperation_){
+		object.globalCompositeOperation = object.globalCompositeOperation_;
+		object.globalCompositeOperation_ = null;
+	}
+
     // 确保对象更新
     object.setCoords();
   }

src/component/Canvas/CanvasEditor/components/BrushControlPanel.vue

@@ -154,6 +154,8 @@ const isVisible = computed(() => {
     OperationType.ERASER,
     OperationType.RED_BRUSH,
     OperationType.GREEN_BRUSH,
+    OperationType.PART_BRUSH,
+    OperationType.PART_ERASER,
   ].includes(props.activeTool);
 });
 

src/component/Canvas/CanvasEditor/components/HeaderMenu.vue

@@ -11,6 +11,7 @@ const layerManager = inject("layerManager");
 const isShowLayerPanel = inject("isShowLayerPanel", ref(false));
 
 const props = defineProps({
+  title: String,
   activeTool: String,
   canvasWidth: Number,
   canvasHeight: Number,
@@ -22,6 +23,7 @@ const props = defineProps({
     default: true, // 是否显示图层面板
   },
   isBackgroundChangeable: Boolean,
+  isChangeCanvasSize: Boolean,
 });
 
 const emit = defineEmits([
@@ -273,7 +275,7 @@ onMounted(() => {
 <template>
   <div class="canvas-header">
     <div class="canvas-header-wrapper">
-      <span class="canvas-title">{{ $t('Canvas.Canvas') }}</span>
+      <span class="canvas-title">{{ props.title || $t("Canvas.Canvas") }}</span>
       <!-- 默认设置 -->
       <!-- v-if="
         !activeTool ||
@@ -284,6 +286,7 @@ onMounted(() => {
         <div class="setting-group">
           <span class="setting-label">{{ $t("Canvas.width") }}</span>
           <a-input-number
+		    :disabled="!isChangeCanvasSize"
             :value="canvasWidth?.toFixed(2)"
             class="setting-input"
             :min="1"
@@ -300,6 +303,7 @@ onMounted(() => {
         <div class="setting-group">
           <span class="setting-label">{{ $t("Canvas.height") }}</span>
           <a-input-number
+		    :disabled="!isChangeCanvasSize"
             :value="canvasHeight?.toFixed(2)"
             class="setting-input"
             :min="1"

src/component/Canvas/CanvasEditor/components/LayersPanel/LayersList.vue

@@ -242,7 +242,7 @@ const canDeleteComputed = computed(() => {
     return parentLayer?.children?.length > 1;
   }
   // 否则直接返回根图层的可删除状态
-  return props.layers.length > 3;
+  return true;
 });
 </script>
 

src/component/Canvas/CanvasEditor/components/LayersPanel/LayersPanel.vue

@@ -414,14 +414,14 @@ function deleteSelectedLayers() {
   }
 
   // 检查删除后是否还有足够的普通图层
-  const remainingNormalLayers = layers.value.filter(
+//   const remainingNormalLayers = layers.value.filter(
-    (layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id)
+//     (layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id)
-  ).length;
+//   ).length;
 
-  if (remainingNormalLayers < 1) {
+//   if (remainingNormalLayers < 1) {
-    console.warn("不能删除所有普通图层");
+//     console.warn("不能删除所有普通图层");
-    return;
+//     return;
-  }
+//   }
 
   // 确认删除
   if (selectedLayers.length > 1) {
@@ -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();
       }
     }
@@ -876,13 +877,15 @@ function toggleSelectedLayersVisibility() {
 
 function canDeleteLayers() {
   const selectedLayers = getSelectedLayers();
+  console.log(selectedLayers);
   if (selectedLayers.length === 0) return false;
-
   // 检查是否包含不能删除的图层
   const undeletableLayers = selectedLayers.filter((layer) => layer.isBackground || layer.isFixed);
 
   if (undeletableLayers.length > 0) return false;
 
+  return true
+
   // 检查删除后是否还有足够的普通图层
   const remainingNormalLayers = layers.value.filter(
     (layer) => !layer.isBackground && !layer.isFixed && !selectedLayerIds.value.includes(layer.id)

src/component/Canvas/CanvasEditor/components/PalletPanel/pallet.vue

@@ -119,7 +119,7 @@ export default defineComponent({
 		})
 		const palletRef = ref(null)
 		watch(()=>palletData.color_,(newVal:any)=>{
-			if(!newVal?.rgba?.r)return
+			if(newVal?.rgba?.r == null)return
 			if(palletData.color?.gradient?.gradientShow){
 				palletData.color.gradient.gradientList[palletData.color.gradient.selectIndex].rgba = {
 					r:newVal.rgba.r,
@@ -143,7 +143,7 @@ export default defineComponent({
 		},{deep: true })
 		const setOperate = ()=>{
 			if(!palletData.color.rgba)return message.info(t('DesignDetailAlter.jsContent7'))
-			palletData.color.rgba = palletData.color?.rgba?.r?palletData.color.rgba:{r:0,g:0,b:0,a:1}
+			palletData.color.rgba = palletData.color?.rgba?.r != null?palletData.color.rgba:{r:0,g:0,b:0,a:1}
 			palletData.gradient.selectIndex = 0
 			palletData.gradient.gradientShow = true
 			if(!palletData.color.gradient){
@@ -257,7 +257,7 @@ export default defineComponent({
 
 		}
 		const openPallet = ()=>{
-			if(palletData.palletShow && props.selectColor?.rgba?.r){
+			if(palletData.palletShow && props.selectColor?.rgba?.r != null){
 				if(props.selectColor.gradient){
 					palletData.color_.rgba = props.selectColor.gradient.gradientList[0].rgba
 				}else{

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;

src/component/Canvas/CanvasEditor/components/SelectMenuPanel/RepeatSetting.vue

@@ -14,7 +14,7 @@
 			<span class="label">{{ t("Canvas.scale") }}</span>
 			<slider
 				:min="1"
-				:max="500"
+				:max="1000"
 				:step="1"
 				is-input
 				:tipFormatter="(v) => `${scale}%`"
@@ -32,8 +32,8 @@
 				is-input
 				:tipFormatter="(v) => `${v}px`"
 				:value="gapX"
-				@input="(e) => emit('inputFill_Gap', e, gapY)"
+				@input="(e) => emit('inputFillGap', e, gapY)"
-				@change="(e) => emit('changeFill_Gap', e, gapY)"
+				@change="(e) => emit('changeFillGap', e, gapY)"
 			/>
 		</div>
 		<div class="repeat-setting-item">
@@ -45,26 +45,26 @@
 				is-input
 				:tipFormatter="(v) => `${v}px`"
 				:value="gapY"
-				@input="(e) => emit('inputFill_Gap', gapX, e)"
+				@input="(e) => emit('inputFillGap', gapX, e)"
-				@change="(e) => emit('changeFill_Gap', gapX, e)"
+				@change="(e) => emit('changeFillGap', gapX, e)"
 			/>
 		</div>
 		<div class="repeat-setting-item">
 			<span class="label">{{ t("Canvas.offset") }}</span>
 			<offset-tool
-				:left="offsetX"
+				:left="offset.x"
-				:top="offsetY"
+				:top="offset.y"
-				@input="(e) => emit('inputFillOffset', e)"
+				@input="inputFillOffset"
-				@change="(e) => emit('changeFillOffset', e)"
+				@change="changeFillOffset"
 				:show-dish="false"
 			/>
 		</div>
 		<div class="repeat-setting-item offset">
 			<offset-tool
-				:left="offsetX"
+				:left="offset.x"
-				:top="offsetY"
+				:top="offset.y"
-				@input="(e) => emit('inputFillOffset', e)"
+				@input="inputFillOffset"
-				@change="(e) => emit('changeFillOffset', e)"
+				@change="changeFillOffset"
 				:show-input="false"
 			/>
 		</div>
@@ -79,6 +79,16 @@
 	import Slider from "../tools/Slider.vue";
 	import { useI18n } from "vue-i18n";
 	const { t } = useI18n();
+	const emit = defineEmits([
+		"inputFillAngle",
+		"changeFillAngle",
+		"inputFillOffset",
+		"changeFillOffset",
+		"inputFillScale",
+		"changeFillScale",
+		"inputFillGap",
+		"changeFillGap",
+	]);
 
 	const props = defineProps({
 		object: {
@@ -89,36 +99,53 @@
 	const angle = computed(
 		() => getTransformScaleAngle(props.object.fill?.patternTransform).angle
 	);
-	const scale = computed(() => {
-		const patternTransform = props.object.fill?.patternTransform;
-		const scaleValue = getTransformScaleAngle(patternTransform).scale * 100;
-		return Number(Number(scaleValue).toFixed(2));
-	});
 	const gapX = computed(() => props.object.fill_?.gapX || 0);
 	const gapY = computed(() => props.object.fill_?.gapY || 0);
-	const offsetX = computed(
+
-		() => (props.object.fill?.offsetX / props.object.width) * 100
+	// 缩放比例
-	);
+	const scale = computed(() => {
-	const offsetY = computed(
+		const object = props.object;
-		() => (props.object.fill?.offsetY / props.object.height) * 100
+		const patternTransform = object.fill?.patternTransform;
-	);
+		const scaleValue = getTransformScaleAngle(patternTransform).scale;
-	const emit = defineEmits([
+		const scaleX = scaleValue / (object.width / object.fill_.width / 5);
-		"inputFillAngle",
+		const scaleY = scaleValue / (object.height / object.fill_.height / 5);
-		"changeFillAngle",
+		const scaleXY = object.width > object.height ? scaleX : scaleY;
-		"inputFillOffset",
+		return Number(Number(scaleXY * 100).toFixed(2));
-		"changeFillOffset",
+	});
-		"inputFillScale",
+	const inputFillScale = (e) => setFillScale(e, true);
-		"changeFillScale",
+	const changeFillScale = (e) => setFillScale(e, false);
-		"inputFill_Gap",
+	const setFillScale = (e, isInput) => {
-		"changeFill_Gap",
+		const object = props.object;
-	]);
-	const inputFillScale = (e) => {
 		const scale = e / 100;
-		emit("inputFillScale", scale);
+		const scaleX = (object.width / object.fill_.width / 5) * scale;
+		const scaleY = (object.height / object.fill_.height / 5) * scale;
+		const scaleXY = object.width > object.height ? scaleX : scaleY;
+		emit(isInput ? "inputFillScale" : "changeFillScale", scaleXY);
 	};
-	const changeFillScale = (e) => {
+
-		const scale = e / 100;
+	// 偏移量
-		emit("changeFillScale", scale);
+	const offset = computed(() => {
+		const object = props.object;
+		const patternTransform = object.fill?.patternTransform;
+		const scale = getTransformScaleAngle(patternTransform).scale;
+		const offsetX = object.fill?.offsetX;
+		const offsetY = object.fill?.offsetY;
+		const twidth = object.fill_?.width;
+		const theight = object.fill_?.height;
+		const x = ((offsetX + (twidth * scale) / 2) * 100) / object.width;
+		const y = ((offsetY + (theight * scale) / 2) * 100) / object.height;
+		return { x, y };
+	});
+	const inputFillOffset = (e) => setFillOffset(e, true);
+	const changeFillOffset = (e) => setFillOffset(e, false);
+	const setFillOffset = (e, isInput) => {
+		const { left, top } = e;
+		const object = props.object;
+		const patternTransform = object.fill?.patternTransform;
+		const scale = getTransformScaleAngle(patternTransform).scale;
+		const x = (left / 100) * object.width - (object.fill_?.width * scale) / 2;
+		const y = (top / 100) * object.height - (object.fill_?.height * scale) / 2;
+		emit(isInput ? "inputFillOffset" : "changeFillOffset", { x, y });
 	};
 </script>
 
@@ -126,6 +153,7 @@
 	.repeat-setting {
 		user-select: none;
 		width: 228px;
+		overflow: hidden;
 		> .title {
 			line-height: 35px;
 			font-size: 14px;

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,6 +125,10 @@
 									"
 									:options="selectOptions"
 									@change="(e) => changeFillRepeat(e, v)"
+									:disabled="
+										v.layer?.metadata?.sourceData?.type ===
+										'trims'
+									"
 								/>
 							</div>
 							<!-- 平铺设置 -->
@@ -154,11 +158,11 @@
 										@changeFillScale="
 											(e) => changeFillScale(e, v)
 										"
-										@inputFill_Gap="
+										@inputFillGap="
-											(x, y) => inputFill_Gap(x, y, v)
+											(x, y) => inputFillGap(x, y, v)
 										"
-										@changeFill_Gap="
+										@changeFillGap="
-											(x, y) => changeFill_Gap(x, y, v)
+											(x, y) => changeFillGap(x, y, v)
 										"
 									/>
 								</template>
@@ -282,10 +286,10 @@
 		activeObjects.value.forEach((v) => {
 			v.layer = props.layerManager.getLayerById(v.layerId);
 		});
-		if (activeObjects.value.length === 0) {
+		if (activeObjects.value.length === 1) {
-			close();
-		} else {
 			show();
+		} else {
+			close();
 		}
 	};
 	//取消当前选中
@@ -311,6 +315,7 @@
 			layerManager: props.layerManager,
 			layers: layers,
 			lastSelectLayerId: lastSelectLayerId,
+			isCommand,
 		});
 		if (isCommand) {
 			props.commandManager.execute(cmd);
@@ -332,6 +337,7 @@
 		const finalState = computeAngleState(angle, obj, initialState);
 		transformObject(obj, initialState, finalState, false);
 		if (!obj.hasOwnProperty("oldState")) obj.oldState = initialState;
+		props.canvasManager.beforeChangeCanvas([obj]);
 	};
 	const changeAngle = (angle, obj) => {
 		var initialState;
@@ -424,6 +430,7 @@
 		});
 		obj.set("fill", pattern);
 		props.canvas.renderAll();
+		props.canvasManager.beforeChangeCanvas([obj]);
 	};
 	const changeFillAngle = (angle, obj) => {
 		const fill = obj.get("fill");
@@ -438,16 +445,17 @@
 		if (!obj.oldPattern) obj.oldPattern = obj.get("fill");
 		const pattern = new fabric.Pattern({
 			...obj.get("fill"),
-			offsetX: (value.left / 100) * obj.width,
+			offsetX: value.x,
-			offsetY: (value.top / 100) * obj.height,
+			offsetY: value.y,
 		});
 		obj.set("fill", pattern);
 		props.canvas.renderAll();
+		props.canvasManager.beforeChangeCanvas([obj]);
 	};
 	const changeFillOffset = (value, obj) => {
 		const pattern = new fabric.Pattern({
-			offsetX: (value.left / 100) * obj.width,
+			offsetX: value.x,
-			offsetY: (value.top / 100) * obj.height,
+			offsetY: value.y,
 		});
 		changeFill(obj, pattern);
 	};
@@ -462,6 +470,7 @@
 		});
 		obj.set("fill", pattern);
 		props.canvas.renderAll();
+		props.canvasManager.beforeChangeCanvas([obj]);
 	};
 	const changeFillScale = (scale, obj) => {
 		const fill = obj.get("fill");
@@ -483,7 +492,7 @@
 		props.commandManager.execute(cmd);
 	};
 	// 改变填充间隙
-	const inputFill_Gap = (gapX, gapY, obj) => {
+	const inputFillGap = (gapX, gapY, obj) => {
 		const cmd = new FillRepeatGapChangeCommand({
 			canvas: props.canvas,
 			layers: layers,
@@ -494,9 +503,10 @@
 			newGapY: gapY,
 			record: true,
 		});
-		cmd.execute();
+		cmd.execute(false);
+		props.canvasManager.beforeChangeCanvas([obj]);
 	};
-	const changeFill_Gap = (gapX, gapY, obj) => {
+	const changeFillGap = (gapX, gapY, obj) => {
 		if (obj.oldFill_) {
 			obj.fill_ = { ...obj.oldFill_ };
 			delete obj.oldFill_;
@@ -760,7 +770,7 @@
 	}
 
 	.tool-content {
-		overflow-y: auto;
+		// overflow-y: auto;
 		max-height: 20rem;
 		margin-top: 1rem;
 		padding: 0 1.5rem;

src/component/Canvas/CanvasEditor/components/ToolsSidebar.vue

@@ -34,7 +34,6 @@ const props = defineProps({
     default: "", // 衣服底图URL-线稿
   },
 });
-console.log(props.clothingMinIOPath)
 const commandManager = inject("commandManager");
 const layerManager = inject("layerManager"); // 图层管理器
 
@@ -56,6 +55,7 @@ commandManager.setChangeCallback((info) => {
   emit("undo-redo-status-changed", {
     canUndo: canUndo.value,
     canRedo: canRedo.value,
+	type: info.type,
     commandManager,
   });
 });

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

@@ -409,7 +409,7 @@ export class BrushIndicator {
         //   this.show(e.e);
 		this._mouseEnterHandler && this._mouseEnterHandler(e)
         } else {
-          // requestIdleCallback(() => {
+          // setTimeout(() => {
           //   this.updatePosition(e.e);
           // });
 

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

@@ -9,7 +9,6 @@ import {
 	isGroupLayer,
 	OperationType,
 	OperationTypes,
-  findLayer,
 	createLayer,
 	LayerType,
 	SpecialLayerId,
@@ -20,7 +19,6 @@ import { AnimationManager } from "./animation/AnimationManager";
 import { createCanvas } from "../utils/canvasFactory";
 import { CanvasEventManager } from "./events/CanvasEventManager";
 import CanvasConfig from "../config/canvasConfig";
-import { RedGreenModeManager } from "./RedGreenModeManager";
 import { EraserStateManager } from "./EraserStateManager";
 import {
 	deepClone,
@@ -70,8 +68,11 @@ export class CanvasManager {
 		this.isFixedErasable = options.isFixedErasable || false; // 是否允许擦除固定图层
 		this.eraserStateManager = null; // 橡皮擦状态管理器引用
 		this.handleCanvasInit = null; // 画布初始化回调函数
+		this.partManager = options.partManager || null;
 		this.props = options.props || {};
 		this.emit = options.emit || (() => { });
+		this.awaitCanvasRun = null;
+		this.canvasChangeing = false;
 		// 初始化画布
 		this.initializeCanvas();
 	}
@@ -174,7 +175,12 @@ export class CanvasManager {
 	_initCanvasEvents() {
 		// 添加笔刷图像转换处理回调
 		this.canvas.onBrushImageConverted = async (fabricImage) => {
+			const activeTool = this.toolManager?.activeTool?.value;
+			if (activeTool === OperationType.PART_BRUSH) {
+				this.partManager?.addDrawPartImage(fabricImage);
+			} else {
 				await this.addImageToLayer({ fabricImage, targetLayerId: null });
+			}
 			// 返回false表示使用默认行为（直接添加到画布）
 			return false;
 		};
@@ -196,6 +202,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);
@@ -327,6 +337,7 @@ export class CanvasManager {
 	setupCanvasEvents(activeElementId, layerManager) {
 		// 创建画布事件管理器
 		this.eventManager = new CanvasEventManager(this.canvas, {
+			canvasManager: this,
 			toolManager: this.toolManager,
 			animationManager: this.animationManager,
 			thumbnailManager: this.thumbnailManager,
@@ -444,12 +455,41 @@ export class CanvasManager {
 		}
 
 		// 居中所有画布元素，包括背景层和其他元素
-    this.centerAllObjects();
+		await this.centerAllObjects();
 
 		// // 重新渲染画布使变更生效
 		// this.canvas.renderAll();
 	}
-
+	// 重置画布大小参照固定图层
+	async resetCanvasSizeByFixedLayer() {
+		// 重置画布大小为固定图层的大小
+		const fixedLayerObj = this.getFixedLayerObject();
+		const backgroundObject = this.getBackgroundLayerObject();
+		if (!fixedLayerObj || !backgroundObject) return
+		const fwidth = fixedLayerObj.width * fixedLayerObj.scaleX
+		const fheight = fixedLayerObj.height * fixedLayerObj.scaleY
+		const bwidth = backgroundObject.width * backgroundObject.scaleX
+		const bheight = backgroundObject.height * backgroundObject.scaleY
+		console.log(fixedLayerObj.width,
+			fixedLayerObj.scaleX,
+			fixedLayerObj.height,
+			fixedLayerObj.scaleY,
+			backgroundObject.width,
+			backgroundObject.scaleX,
+			backgroundObject.height,
+			backgroundObject.scaleY, 'CanvasManager resetCanvasSizeByFixedLayer')
+		if (Math.abs(fwidth / bwidth - fheight / bheight) < 0.1) return;
+		this.canvasWidth.value = fwidth
+		this.canvasHeight.value = fheight
+		backgroundObject.set({
+			width: this.canvasWidth.value,
+			height: this.canvasHeight.value,
+		})
+		this.canvas?.clipPath?.set?.({
+			width: this.canvasWidth.value,
+			height: this.canvasHeight.value,
+		})
+	}
 	/**
 	 * 重置视图变换，使元素回到原始位置
 	 * @private
@@ -469,7 +509,6 @@ export class CanvasManager {
 	 */
 	async centerAllObjects() {
 		if (!this.canvas) return;
-
 		// 获取所有可见对象（不是背景元素的对象）
 		const allObjects = this.canvas.getObjects();
 		if (allObjects.length === 0) return;
@@ -484,9 +523,6 @@ export class CanvasManager {
 		// 获取背景对象
 		const backgroundObject = visibleObjects.find((obj) => obj.isBackground);
 
-    // !this.canvas?.clipPath &&
-    //   this.centerBackgroundLayer(this.canvas.width, this.canvas.height);
-
 		this.canvas?.clipPath?.set?.({
 			left: this.width / 2,
 			top: this.height / 2,
@@ -579,22 +615,15 @@ export class CanvasManager {
 			});
 		}
 
+		!this.canvas?.clipPath &&
+			this.centerBackgroundLayer(this.canvas.width, this.canvas.height);
+
 		// 如果有背景层，更新蒙层位置
 		if (backgroundObject && CanvasConfig.isCropBackground) {
 			this.updateMaskPosition(backgroundObject);
 		}
 
-	// 更新颜色层信息
+		this.setSpecialCliptInfo(false, true)
-	// const colorObject = this.getLayerObjectById(SpecialLayerId.COLOR);
-	// if(colorObject){
-	// 	await this.setObjecCliptInfo(colorObject);
-	// }
-	const groupLayer = this.layerManager.getLayerById(SpecialLayerId.SPECIAL_GROUP);
-	if(groupLayer){
-		const groupRect = new fabric.Rect({});
-		await this.setObjecCliptInfo(groupRect);
-		groupLayer.clippingMask = groupRect.toObject();
-	}
 
 		// 重新渲染画布
 		this.canvas.renderAll();
@@ -829,9 +858,9 @@ export class CanvasManager {
 
 		return layerObjectByLayerId;
 	}
-  getObjectsByIds(ids){
+	getObjectsByIdOrLayerId(ids) {
 		const objects = this.canvas.getObjects().filter((obj) => {
-      return ids.includes(obj.id);
+			return ids.includes(obj.id) || ids.includes(obj.layerId);
 		});
 		return objects;
 	}
@@ -843,7 +872,6 @@ export class CanvasManager {
 	updateMaskPosition(backgroundLayerObject) {
 		if (!backgroundLayerObject || !this.maskLayer || !this.canvas.clipPath)
 			return;
-    console.log("backgroundLayerObject");
 		const left = backgroundLayerObject.left;
 		const top = backgroundLayerObject.top;
 
@@ -1109,7 +1137,7 @@ export class CanvasManager {
 		const glayer = this.layerManager.getLayerById(SpecialLayerId.SPECIAL_GROUP);
 		if (!glayer) return Promise.reject("印花和元素图层组不存在");
 		const ids = glayer.children.map((v) => v.id);
-	const objects = this.getObjectsByIds(ids);
+		const objects = this.getObjectsByIdOrLayerId(ids);
 		const fixedLayerObj = this.getFixedLayerObject();
 		if (!fixedLayerObj) return Promise.reject("固定图层不存在");
 		const flWidth = fixedLayerObj.width
@@ -1120,8 +1148,9 @@ export class CanvasManager {
 		const flScaleY = fixedLayerObj.scaleY
 		const prints = [];
 		const trims = [];
-	objects.forEach((v) => {
+		objects.forEach((v, i) => {
-		const sourceData = glayer.children.find((v_) => v_.id === v.id)?.metadata?.sourceData;
+			const label = glayer.children.find((v_) => (v_.id === v.layerId || v_.id === v.id));
+			const sourceData = label?.metadata?.sourceData;
 			if (!sourceData) return;
 			const obj = {
 				ifSingle: typeof v.fill === "string",
@@ -1133,7 +1162,7 @@ export class CanvasManager {
 				scale: [0, 0],
 				angle: v.angle,
 				name: sourceData.name,
-			priority: sourceData.priority,
+				priority: i + 1,
 				object: {
 					top: 0,
 					left: 0,
@@ -1146,6 +1175,7 @@ export class CanvasManager {
 					blendMode: v.globalCompositeOperation,
 					gapX: 0,// 平铺模式下的间距
 					gapY: 0,// 平铺模式下的间距
+					fill_repeat: "",
 				}
 			}
 			let left = (v.left - (flLeft - flWidth * flScaleX / 2));
@@ -1187,17 +1217,19 @@ export class CanvasManager {
 				obj.scale = [scaleXY, scaleXY];
 				obj.angle = angle;
 				obj.location = [left, top];
-			obj.gap = [fill_.gapX, fill_.gapY];
+				obj.object.gapX = fill_.gapX;
+				obj.object.gapY = fill_.gapY;
+				obj.object.fill_repeat = fill.repeat;
 			}
-		if(obj.level2Type === "Pattern"){
+			if (sourceData.type === "print") {
 				prints.push(obj);
-		}else if(obj.level2Type === "Embroidery"){
+			} else if (sourceData.type === "trims") {
 				trims.push(obj);
 			}
 		})
 		// prints.sort((a, b) => a.ifSingle ? 1 : -1);
-	prints.forEach((v, i) => v.priority = i + 1);
+		// prints.forEach((v, i) => v.priority = i + 1);
-	trims.forEach((v, i) => v.priority = i + 1);
+		// trims.forEach((v, i) => v.priority = i + 1);
 		return { prints, trims };
 	}
 
@@ -1284,6 +1316,7 @@ export class CanvasManager {
 				canvasColor: this.canvasColor.value,
 				activeLayerId: this.layerManager?.activeLayerId?.value,
 			};
+			this.FixJsonIdLoss(data);
 			console.log("获取画布JSON数据...", data);
 			return JSON.stringify(data);
 		} catch (error) {
@@ -1291,10 +1324,8 @@ export class CanvasManager {
 			throw new Error("获取画布JSON失败");
 		}
 	}
-
 	loadJSON(json, calllBack) {
-    console.log("加载画布JSON数据:", json);
+		this.canvas.loading.value = true;
-
 		// 确保传入的json是字符串格式
 		if (typeof json === "object") {
 			json = JSON.stringify(json);
@@ -1303,7 +1334,9 @@ export class CanvasManager {
 		}
 		// 解析JSON字符串
 		try {
-      const parsedJson = JSON.parse(json);
+			const parsedJson = window.testCanvasJson || JSON.parse(json);
+			console.log("加载画布JSON数据:", parsedJson);
+			this.FixJsonIdLoss(parsedJson);
 			this.canvasWidth.value = parsedJson.canvasWidth || this.width;
 			this.canvasHeight.value = parsedJson.canvasHeight || this.height;
 			this.canvasColor.value = parsedJson.canvasColor || this.backgroundColor;
@@ -1329,7 +1362,7 @@ export class CanvasManager {
 				// this.canvasHeight.value = parsedJson.canvasHeight || this.height;
 				// this.canvasColor.value = parsedJson.canvasColor || this.backgroundColor;
 
-        console.log("是否检测到红绿图模式内容:", this.enabledRedGreenMode);
+				// console.log("是否检测到红绿图模式内容:", this.enabledRedGreenMode);
 
 				// 重置视图变换以确保元素位置正确
 				this._resetViewportTransform(1);
@@ -1341,7 +1374,7 @@ export class CanvasManager {
 
 				// 清除当前画布内容
 				// this.canvas.clear();  // 清除画布内容  可以先去掉   这样加载闪动的情况就比较少  如果有问题 可以再打开
-        console.log("清除当前画布内容", canvasData);
+				// console.log("清除当前画布内容", canvasData);
 				delete canvasData.clipPath; // 删除当前裁剪路径
 				// 加载画布数据
 				this.canvas.loadFromJSON(canvasData, async () => {
@@ -1370,7 +1403,7 @@ export class CanvasManager {
 							// 重置画布数据
 							await this.setCanvasSize(this.canvas.width, this.canvas.height);
 							await this.centerBackgroundLayer(this.canvas.width, this.canvas.height);
-			  await this.createOtherLayers(this.props.otherData);
+							await this.resetCanvasSizeByFixedLayer();
 							// 重新构建对象关系
 							// restoreObjectLayerAssociations(this.layers.value, this.canvas.getObjects());
 							// 验证图层关联关系  -  稳定后可以注释
@@ -1382,7 +1415,7 @@ export class CanvasManager {
 							// console.log("图层关联验证结果:", isValidate);
 							// 排序
 							// 使用LayerSort工具重新排列画布对象（如果可用）
-              await this?.layerManager?.layerSort?.rearrangeObjects();
+							await this?.layerManager?.layerSort?.rearrangeObjectsAsync();
 
 							this.layerManager.activeLayerId.value = this.layers.value[0]
 								.children?.length
@@ -1400,7 +1433,6 @@ export class CanvasManager {
 							await this.layerManager?.updateLayersObjectsInteractivity?.();
 
 							await calllBack?.();
-			  this.emit("canvas-load-json-success");
 							// 更新所有缩略图
 							setTimeout(() => {
 								this.updateAllThumbnails();
@@ -1422,27 +1454,56 @@ export class CanvasManager {
 			throw new Error("解析JSON失败，请检查输入格式: " + error.message);
 		}
 	}
+	/** 修复JSON数据中的ID丢失问题 */
+	FixJsonIdLoss(json) {
+		const layerIds = [];
+		const layers = json?.layers || [];
+		const objects = json?.canvas?.objects || [];
+		layers.forEach((layer) => {
+			layerIds.push(layer.id);
+			layer.children?.forEach((child) => layerIds.push(child.id));
+			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;
+		})
+		// 排除的对象id
+		const excludedObjects = [SpecialLayerId.PART_SELECTOR];
+		json.canvas.objects = objects.filter((v) => {
+			// 指定ID排除
+			if (excludedObjects.includes(v.id)) return false;
+
+			if (v.isBackground || v.isFixed) return true;
+			// 当前图层不存在当前对象
+			if (!layerIds.includes(v.layerId)) return false;
+			return true
+		});
+	}
+
 
 	/**
 	 * 创建其他图层：印花、颜色、元素...
 	 * @param {Object} otherData - 其他图层数据
 	*/
-  async createOtherLayers(otherData, isUpdate = false) {
+	async createOtherLayers(otherData) {
 		if (!otherData) return console.warn("otherData 为空不需要添加");
+		let resolve = () => { };
+		this.awaitCanvasRun = () => (new Promise((v) => resolve = v))
 		const otherData_ = JSON.parse(JSON.stringify(otherData));
 		console.log("==========创建其他图层", otherData_);
 
-	const updateColor = !!otherData_.color;
-	const updateSpecialGroup = !!otherData_.printObject || !!otherData_.trims;
 		// 删除颜色图层和特殊组图层
-	const ids = [];
+		const ids = [SpecialLayerId.COLOR, SpecialLayerId.SPECIAL_GROUP];
-	if(isUpdate){
-		updateColor && ids.push(SpecialLayerId.COLOR)
-		updateSpecialGroup && ids.push(SpecialLayerId.SPECIAL_GROUP)
-	}else{
-		ids.push(SpecialLayerId.COLOR)
-		ids.push(SpecialLayerId.SPECIAL_GROUP)
-	}
 		this.layers.value = this.layers.value.filter((layer) => {
 			if (ids.includes(layer.id)) {
 				ids.push(...layer.children?.map((child) => child.id));
@@ -1450,32 +1511,61 @@ export class CanvasManager {
 			}
 			return true;
 		})
-	this.canvas.getObjects().forEach((v) => ids.includes(v.id) && this.canvas.remove(v))
+		this.canvas.getObjects().forEach((v) => {
+			if (ids.includes(v.id) || ids.includes(v.layerId)) {
+				this.canvas.remove(v)
+			}
+		})
 
 
 		// 创建颜色图层
-	otherData_.color && await this.createColorLayer(otherData_.color);
+		await this.createColorLayer(otherData_.color);
 
 		const printTrimsLayers = [];// 印花和元素图层
 		const singleLayers = [];// 平铺图层
-	otherData_.printObject?.prints?.forEach((print, index) => {
+		otherData_.printObject?.prints?.forEach((print, index) => {// 印花
 			print.name = t("Canvas.Print") + (index + 1);
+			print.type = "print";
 			if (print.ifSingle) {
 				printTrimsLayers.unshift({ ...print });
 			} else {
 				singleLayers.unshift({ ...print });
 			}
 		})
-	otherData_.trims?.prints?.forEach((trims, index) => {
+		otherData_.trims?.prints?.forEach((trims, index) => {// 元素
 			trims.name = t("Canvas.Elements") + (index + 1);
+			trims.type = "trims";
 			printTrimsLayers.unshift({ ...trims });
 		})
-	if(isUpdate ? updateSpecialGroup : true){
+		if (printTrimsLayers.length || singleLayers.length) {
 			await this.createPrintTrimsLayers(printTrimsLayers, singleLayers);
 		}
 		await this.changeCanvas();
+		console.log("==========创建其他图层成功");
+		resolve();
+		this.awaitCanvasRun = null;
 	}
 
+	//设置印花元素颜色的裁剪信息
+	async setSpecialCliptInfo(isColor = true, isGroup = true) {
+		// 更新颜色层信息
+		if (isColor) {
+			const colorObject = this.getLayerObjectById(SpecialLayerId.COLOR);
+			if (colorObject) {
+				await this.setObjecCliptInfo(colorObject);
+			}
+
+		}
+		// 更新特殊组图层信息
+		if (isGroup) {
+			const groupLayer = this.layerManager.getLayerById(SpecialLayerId.SPECIAL_GROUP);
+			if (groupLayer) {
+				const groupRect = new fabric.Rect({});
+				await this.setObjecCliptInfo(groupRect);
+				groupLayer.clippingMask = groupRect.toObject();
+			}
+		}
+	}
 	// 设置画布对象的裁剪信息
 	async setObjecCliptInfo(tagObject, data) {
 		const fixedLayerObj = this.getFixedLayerObject();
@@ -1577,25 +1667,44 @@ export class CanvasManager {
 			let name = item.name;
 			let image = await new Promise(resolve => {
 				fabric.Image.fromURL(item.path, (fabricImage) => {
-          const left = flLeft - flWidth * flScaleX / 2 + (item.location?.[0] || 0) * flScaleX
+					resolve(fabricImage);
-		  const top = flTop - flHeight * flScaleY / 2 + (item.location?.[1] || 0) * flScaleY
+				}, { crossOrigin: "anonymous" });
-		  const scaleX = flWidth * (item.scale?.[0] || 1) / fabricImage.width * flScaleX
+			})
-		  const scaleY = flHeight * (item.scale?.[1] || 1) / fabricImage.height * flScaleY
+			let left = flLeft - flWidth * flScaleX / 2 + (item.location?.[0] || 0) * flScaleX
-		  const {x, y} = calculateRotatedTopLeftDeg(
+			let top = flTop - flHeight * flScaleY / 2 + (item.location?.[1] || 0) * flScaleY
-			fabricImage.width * scaleX,
+			let scaleX = flWidth * (item.scale?.[0] || 1) / image.width * flScaleX
-			fabricImage.height * scaleY,
+			let scaleY = flHeight * (item.scale?.[1] || 1) / image.height * flScaleY
+			let { x, y } = calculateRotatedTopLeftDeg(
+				image.width * scaleX,
+				image.height * scaleY,
 				left,
 				top,
 				0,
 				item.angle || 0
 			)
-		  const angle = item.angle || 0
+			let angle = item.angle || 0
-		  fabricImage.set({
+
+			let opacity = 1
+			let flipX = false;
+			let flipY = false;
+			let blendMode = BlendMode.NORMAL;
+			//   if(item.type === "trims") blendMode = BlendMode.NORMAL;// 元素正常
+			if (item.object) {
+				opacity = item.object.opacity
+				flipX = item.object.flipX
+				flipY = item.object.flipY
+				if (item.object.blendMode) blendMode = item.object.blendMode;
+			}
+			image.set({
 				left: x,
 				top: y,
 				scaleX: scaleX,
 				scaleY: scaleY,
 				angle: angle,
+				opacity: opacity,
+				flipX: flipX,
+				flipY: flipY,
+				globalCompositeOperation: blendMode,
 				id: id,
 				layerId: id,
 				layerName: name,
@@ -1603,23 +1712,20 @@ export class CanvasManager {
 				hasControls: true,
 				hasBorders: true,
 				isPrintTrims: true,
-			globalCompositeOperation: BlendMode.MULTIPLY,
 			});
-		  resolve(fabricImage);
+			//   this.canvas.add(image);
-		}, { crossOrigin: "anonymous" });
-	  })
-      this.canvas.add(image);
 			let layer = createLayer({
 				id: id,
 				name: name,
 				type: LayerType.BITMAP,
 				visible: true,
 				locked: false,
-	    opacity: 1.0,
+				opacity: opacity,
 				isPrintTrims: true,
-		blendMode: BlendMode.MULTIPLY,
+				blendMode: blendMode,
 				fabricObjects: [image.toObject(["id", "layerId", "layerName"])],
 				metadata: { sourceData: item },
+				object: image,
 			})
 			children.push(layer);
 		};
@@ -1640,15 +1746,15 @@ export class CanvasManager {
 					resolve(tcanvas);
 				}, { crossOrigin: "anonymous" });
 			})
-	  let scaleX_ = fixedLayerObj.width / image.width * (item.scale?.[0] || 1) / 5;
+			let scaleX_ = flWidth / image.width * (item.scale?.[0] || 1) / 5;
-	  let scaleY_ = fixedLayerObj.height / image.height * (item.scale?.[1] || 1) / 5;
+			let scaleY_ = flHeight / image.height * (item.scale?.[1] || 1) / 5;
-	  let scale = fixedLayerObj.width > fixedLayerObj.height ? scaleX_ : scaleY_;
+			let scale = flWidth > flHeight ? scaleX_ : scaleY_;
 			let offsetX = (item.location?.[0] || 0) - image.width * scale / 2
 			let offsetY = (item.location?.[1] || 0) - image.height * scale / 2
-	  let top = fixedLayerObj.top - fixedLayerObj.height * fixedLayerObj.scaleY / 2
+			let top = flTop - flHeight * flScaleY / 2
-	  let left = fixedLayerObj.left - fixedLayerObj.width * fixedLayerObj.scaleX / 2
+			let left = flLeft - flWidth * flScaleX / 2
-	  let scaleX = fixedLayerObj.scaleX
+			let scaleX = flScaleX
-	  let scaleY = fixedLayerObj.scaleY
+			let scaleY = flScaleY
 			let opacity = 1
 			let angle = 0
 			let gapX = 0
@@ -1656,27 +1762,29 @@ export class CanvasManager {
 			let fillSource = image
 			let flipX = false;
 			let flipY = false;
-	  let blendMode = BlendMode.MULTIPLY;
+			let blendMode = BlendMode.NORMAL;
+			let fill_repeat = "repeat"
 			if (item.object) {
-	    top += item.object.top * fixedLayerObj.scaleY
+				top += item.object.top * flScaleY
-	    left += item.object.left * fixedLayerObj.scaleX
+				left += item.object.left * flScaleX
 				scaleX *= item.object.scaleX
 				scaleY *= item.object.scaleY
 				opacity = item.object.opacity
 				angle = item.object.angle
 				flipX = item.object.flipX
 				flipY = item.object.flipY
-		blendMode = item.object.blendMode || BlendMode.MULTIPLY;
+				if (item.object.blendMode) blendMode = item.object.blendMode;
 				gapX = item.object.gapX
 				gapY = item.object.gapY
 				fillSource = imageAddGapToCanvas(image, gapX, gapY);
+				if (item.object.fill_repeat) fill_repeat = item.object.fill_repeat;
 			}
 			let rect = new fabric.Rect({
 				id: id,
 				layerId: id,
 				layerName: name,
-      	width: fixedLayerObj.width,
+				width: flWidth,
-      	height: fixedLayerObj.height,
+				height: flHeight,
 				top: top,
 				left: left,
 				scaleX: scaleX,
@@ -1688,7 +1796,7 @@ export class CanvasManager {
 				globalCompositeOperation: blendMode,
 				fill: new fabric.Pattern({
 					source: fillSource,
-          repeat: "repeat",
+					repeat: fill_repeat,
 					patternTransform: createPatternTransform(scale, item.angle || 0),
 					offsetX: offsetX, // 水平偏移
 					offsetY: offsetY, // 垂直偏移
@@ -1702,18 +1810,19 @@ export class CanvasManager {
 				},
 				isPrintTrims: true,
 			});
-      this.canvas.add(rect);
+			//   this.canvas.add(rect);
 			let layer = createLayer({
 				id: id,
 				name: name,
 				type: LayerType.BITMAP,
 				visible: true,
-	    locked: true,
+				locked: false,
 				opacity: opacity,
 				isPrintTrims: true,
-		blendMode: BlendMode.MULTIPLY,
+				blendMode: blendMode,
 				fabricObjects: [rect.toObject(["id", "layerId", "layerName"])],
 				metadata: { sourceData: item },
+				object: rect,
 			})
 			children.push(layer);
 		};
@@ -1730,6 +1839,13 @@ export class CanvasManager {
 		//   children.push(layer);
 		// }
 		if (children.length === 0) return;
+		// 印花元素排序
+		if (new Set(children.map(v => v.metadata.sourceData.priority)).size === children.length) {
+			children.sort((a, b) => b.metadata.sourceData.priority - a.metadata.sourceData.priority);
+		}
+		children.forEach(layer => {
+			this.canvas.add(layer.object);
+		});
 		const groupRect = new fabric.Rect({});
 		await this.setObjecCliptInfo(groupRect);
 		// 插入组图层
@@ -1752,12 +1868,13 @@ export class CanvasManager {
 	/**
 	 * 画布事件变更后
 	*/
-  async changeCanvas(){
+	async changeCanvas(fids = [], isBeforeChange = false) {
+		if (!isBeforeChange) this.canvasChangeing = false;
 		const fixedLayerObj = this.getFixedLayerObject();
 		if (!fixedLayerObj) return console.warn("固定图层对象不存在", fixedLayerObj)
 		const colorObject = this.getLayerObjectById(SpecialLayerId.COLOR);
 		if (colorObject) {
-		const ids = this.layerManager.getBlendModeLayerIds(SpecialLayerId.SPECIAL_GROUP);
+			const ids = this.layerManager.getBlendModeLayerIds(SpecialLayerId.SPECIAL_GROUP).filter(id => !fids.includes(id));
 			if (ids.length === 0) {
 				ids.unshift(SpecialLayerId.SPECIAL_GROUP);
 				await this.setObjecCliptInfo(colorObject);
@@ -1777,6 +1894,24 @@ export class CanvasManager {
 			this.canvas.renderAll();
 		}
 	}
+	/** 画布变更之前 */
+	async beforeChangeCanvas(objects) {
+		if (this.canvasChangeing) return;
+		const ids = objects.filter(v => {
+			return v.isPrintTrims && v.globalCompositeOperation && v.globalCompositeOperation !== BlendMode.NORMAL
+		}).map(v => v.layerId);
+		if (ids.length > 0) {
+			this.canvasChangeing = true;
+			this.canvas.getObjects().forEach(v => {
+				if (ids.includes(v.layerId)) {
+					v.globalCompositeOperation_ = v.globalCompositeOperation;
+					v.globalCompositeOperation = BlendMode.NORMAL;
+				}
+			})
+			this.canvas.renderAll();
+			await this.changeCanvas(ids, true);
+		}
+	}
 
 	/**
 	 * 缩放红绿图模式内容以适应当前画布大小

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

@@ -606,7 +606,9 @@ export class ExportManager {
 			imageSmoothingEnabled: true,
 		});
 		// tempFabricCanvas.setZoom(1);
-	console.log("==========", fixedLayerObject)
+		const ox = fixedLayerObject.left - fixedLayerObject.width * fixedLayerObject.scaleX / 2
+		const oy = fixedLayerObject.top - fixedLayerObject.height * fixedLayerObject.scaleY / 2
+		// console.log("==========", fixedLayerObject, ox, oy)
 		try {
 			// 克隆并添加所有对象到临时画布，需要调整位置相对于固定图层
 			for (let i = 0; i < objectsToExport.length; i++) {
@@ -616,15 +618,20 @@ export class ExportManager {
 					restoreOpacityInRedGreen && true
 				);
 				if (cloned) {
+					let scaleX = cloned.scaleX / fixedLayerObject.scaleX
+					let scaleY = cloned.scaleY / fixedLayerObject.scaleY
+					let top = (cloned.top - oy) * scaleY
+					let left = (cloned.left - ox) * scaleX
+					if (cloned.originX === "center" && cloned.originY === "center") {
+						top = canvasHeight / 2
+						left = canvasWidth / 2
+					}
 					cloned.set({
-            left: canvasWidth / 2,
+						left: left,
-            top: canvasHeight / 2,
+						top: top,
-			scaleX: cloned.scaleX / fixedLayerObject.scaleX,
+						scaleX: scaleX,
-			scaleY: cloned.scaleY / fixedLayerObject.scaleY,
+						scaleY: scaleY,
-			originX: "center",
-			originY: "center",
 					});
-		  console.log("==========", {...cloned})
 					// 更新对象坐标
 					cloned.setCoords();
 					tempFabricCanvas.add(cloned);
@@ -681,7 +688,7 @@ export class ExportManager {
 			isEnhanceImg, // 是否是增强图片
 		});
 
-    console.log("导出图片数据URL:", dataURL);
+		// console.log("导出图片数据URL:", dataURL);
 		return dataURL;
 
 		// // 创建与画布相同尺寸的临时画布

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

@@ -149,7 +149,7 @@ export class LayerManager {
    */
   initCommandManager() {
     // 命令注册逻辑已移除，现在直接使用命令类实例化和执行
-    console.log("CommandManager 已初始化，使用直接命令调用模式");
+    // console.log("CommandManager 已初始化，使用直接命令调用模式");
   }
 
   /**
@@ -161,7 +161,7 @@ export class LayerManager {
       this.layerSort = createLayerSort(this.canvas, this.layers, {
         commandManager: this.commandManager,
       });
-      console.log("图层排序工具已初始化");
+    //   console.log("图层排序工具已初始化");
     }
   }
 
@@ -180,7 +180,7 @@ export class LayerManager {
     // 更新所有对象的交互性
     this.updateLayersObjectsInteractivity();
 
-    console.log(`已切换到${mode}模式`);
+    // console.log(`已切换到${mode}模式`);
   }
 
   setToolManager(toolManager) {
@@ -332,7 +332,7 @@ export class LayerManager {
 
   // 私有方法：应用交互规则
   async _applyInteractionRules({ isMoveing }) {
-    console.log("updateLayersObjectsInteractivity ===>", this.editorMode);
+    // console.log("updateLayersObjectsInteractivity ===>", this.editorMode);
     const objects = this.canvas.getObjects();
     const editorMode = this.editorMode || CanvasConfig.defaultTool;
     const layers = this.layers?.value || [];
@@ -697,6 +697,7 @@ export class LayerManager {
    * 初始化图层，确保有背景层、固定图层和一个空白图层
    */
   async initializeLayers() {
+	console.log("初始化图层",this.layers.value.length)
     // 如果没有任何图层，创建背景层、固定图层和一个空白图层
     if (this.layers.value.length === 0) {
       // 创建背景图层
@@ -975,7 +976,7 @@ export class LayerManager {
 		return !layer.isFixed && !layer.isFixedOther && !layer.isBackground
 	})
     // const normalLayers = this.layers.value.filter((l) => !l.isBackground && !l.isFixed && !l.isFixedOther);
-	console.log("普通图层:", normalLayers)
+	// console.log("普通图层:", normalLayers)
     if (isChild ? parentLength <= 1 : false) {//normalLayers.length <= 1
       console.warn("不能删除唯一的普通图层");
       message.warning(this.t("Canvas.cannotDeleteOnlyLayer"));
@@ -1096,14 +1097,14 @@ export class LayerManager {
     if (this.commandManager) {
       const result = this.commandManager.execute(command);
       if (result) {
-        console.log(`✅ 图层移动成功: ${direction}`);
+        // console.log(`✅ 图层移动成功: ${direction}`);
       }
       return result;
     } else {
       const result = command.execute();
       if (result) {
         // 更新画布渲染顺序
-        console.log(`✅ 图层移动成功: ${direction}`);
+        // console.log(`✅ 图层移动成功: ${direction}`);
       }
       return result;
     }
@@ -1147,7 +1148,6 @@ export class LayerManager {
 
       return acc;
     }, []);
-	console.log("==========", allObjects)
     // if (layer.fill) {
     //   // 如果图层有填充颜色，设置所有对象的填充颜色
     //   const { object } = findObjectById(this.canvas, layer.fill.id);
@@ -1580,7 +1580,7 @@ export class LayerManager {
   /**
    * 排序图层，确保图层顺序: 普通图层 > 固定图层 > 背景图层
    */
-  sortLayers() {
+  async sortLayers() {
     // 对图层进行排序：背景图层在最底层（数组最后），固定图层在中间
     this.layers.value.sort((a, b) => {
       // 如果a是背景图层，它应该排在后面（最底层）
@@ -1604,17 +1604,17 @@ export class LayerManager {
     });
 
     // 更新画布对象顺序
-    this._rearrangeObjects();
+    await this._rearrangeObjects();
   }
 
   /**
    * 重新排列画布上的对象以匹配图层顺序
    * @private
    */
-  _rearrangeObjects() {
+  async _rearrangeObjects() {
     if (this.layerSort) {
       // 使用LayerSort的高级排序
-      this.layerSort.rearrangeObjects();
+      await this.layerSort.rearrangeObjects();
       return;
     }
 
@@ -1750,7 +1750,7 @@ export class LayerManager {
         layer.serializedObjects = layer.fabricObjects
           .map((obj) => {
             if (typeof obj.toObject === "function") {
-              return obj.toObject(["id", "layerId", "layerName"]);
+              return obj.toObject(["id", "layerId", "layerName", "fill_"]);
             }
             return null;
           })
@@ -1763,7 +1763,7 @@ export class LayerManager {
       if (layer.fabricObject) {
         layer.serializedBackgroundObject =
           typeof layer.fabricObject.toObject === "function"
-            ? layer.fabricObject.toObject(["id", "layerId", "layerName"])
+            ? layer.fabricObject.toObject(["id", "layerId", "layerName", "fill_"])
             : null;
 
         delete layer.fabricObject;
@@ -1793,7 +1793,7 @@ export class LayerManager {
     return layer.fabricObjects
       .map((obj) => {
         const { object } = findObjectById(this.canvas, obj.id);
-        if (object) return object.toObject(["id", "layerId", "layerName"]);
+        if (object) return object.toObject(["id", "layerId", "layerName", "fill_"]);
         return false;
       })
       .filter(Boolean);
@@ -1839,13 +1839,14 @@ export class LayerManager {
 
     // 存储到剪贴板
     this.clipboardData = layerCopy;
+	console.log("复制图层:", layerCopy);
 	const input = document.createElement("input");
     input.value = "aida_copy_canvas_layer: " + layer.name;
     document.body.appendChild(input);
     input.select();
     document.execCommand("copy");
     document.body.removeChild(input);
-    console.log(`已复制图层：${layer.name}`);
+    // console.log(`已复制图层：${layer.name}`);
 
     return this.clipboardData;
   }
@@ -1870,7 +1871,7 @@ export class LayerManager {
 
     // 检查是否是唯一的普通图层
     const normalLayers = this.layers.value.filter((l) => !l.isBackground && !l.isFixed && !l.isFixedOther);
-	console.log("普通图层:", normalLayers)
+	// console.log("普通图层:", normalLayers)
     if (normalLayers.length <= 1) {
       console.warn("不能剪切唯一的普通图层");
       return null;
@@ -1884,7 +1885,7 @@ export class LayerManager {
       layerCopy.serializedObjects = layer.fabricObjects
         .map((obj) =>
           typeof obj.toObject === "function"
-            ? obj.toObject(["id", "layerId", "layerName"])
+            ? obj.toObject(["id", "layerId", "layerName", "fill_"])
             : null
         )
         .filter(Boolean);
@@ -1930,21 +1931,17 @@ export class LayerManager {
     // 更新对象交互性
     this.updateLayersObjectsInteractivity();
 
-    console.log(`已剪切图层：${layer.name}`);
+    // console.log(`已剪切图层：${layer.name}`);
 
     return this.clipboardData;
   }
 
-  /**
-   * 粘贴图层
-   * @returns {string} 新创建的图层ID
-   */
   /**
    * 粘贴图层
    * @returns {string} 新创建的图层ID
    */
   async pasteLayer(event) {
-	console.log("剪贴板数据:", this.clipboardData,event);
+	// console.log("剪贴板数据:", this.clipboardData,event);
     if (!this.clipboardData) {
       console.error("剪贴板中没有图层数据");
       return null;
@@ -2099,7 +2096,7 @@ export class LayerManager {
     // 重新初始化基本图层
     this.initializeLayers();
 
-    console.log("已清空画布");
+    // console.log("已清空画布");
   }
 
   /**
@@ -2312,7 +2309,7 @@ export class LayerManager {
     });
 
     if (emptyLayerIds.length > 0) {
-      console.log(`已清理 ${emptyLayerIds.length} 个空图层`);
+    //   console.log(`已清理 ${emptyLayerIds.length} 个空图层`);
     }
 
     return emptyLayerIds;
@@ -2344,7 +2341,7 @@ export class LayerManager {
     this.canvasManager = null;
     this.toolManager = null;
 
-    console.log("LayerManager 已销毁");
+    // console.log("LayerManager 已销毁");
   }
 
   /**
@@ -2652,13 +2649,13 @@ export class LayerManager {
   // 启用红绿图模式
   enableRedGreenMode() {
     this.isRedGreenMode = true;
-    console.log("图层管理器：红绿图模式已启用");
+    // console.log("图层管理器：红绿图模式已启用");
   }
 
   // 禁用红绿图模式
   disableRedGreenMode() {
     this.isRedGreenMode = false;
-    console.log("图层管理器：红绿图模式已禁用");
+    // console.log("图层管理器：红绿图模式已禁用");
   }
 
   // 检查是否为红绿图模式
@@ -2708,14 +2705,14 @@ export class LayerManager {
         : LayerSortUtils.shouldUseAsyncProcessing(objectsCount, layersCount);
 
     if (shouldUseAsync) {
-      console.log(
+    //   console.log(
-        `使用异步排序处理 ${objectsCount} 个对象, ${layersCount} 个图层`
+    //     `使用异步排序处理 ${objectsCount} 个对象, ${layersCount} 个图层`
-      );
+    //   );
       return this.layerSort.rearrangeObjectsAsync();
     } else {
-      console.log(
+    //   console.log(
-        `使用同步排序处理 ${objectsCount} 个对象, ${layersCount} 个图层`
+    //     `使用同步排序处理 ${objectsCount} 个对象, ${layersCount} 个图层`
-      );
+    //   );
       this.layerSort.rearrangeObjects();
     }
   }
@@ -2735,7 +2732,7 @@ export class LayerManager {
     const result = this.layerSort.smartSort(targetLayerIds);
 
     if (result) {
-      console.log("智能排序完成");
+    //   console.log("智能排序完成");
       // 更新对象交互性
       this.updateLayersObjectsInteractivity();
     }
@@ -2761,9 +2758,9 @@ export class LayerManager {
     const stats = this.layerSort.optimizeLayerStructure();
 
     if (stats.removedEmptyLayers > 0 || stats.reorderedLayers > 0) {
-      console.log(
+    //   console.log(
-        `图层结构优化完成: 清理空图层 ${stats.removedEmptyLayers} 个, 重新排序 ${stats.reorderedLayers} 个图层`
+    //     `图层结构优化完成: 清理空图层 ${stats.removedEmptyLayers} 个, 重新排序 ${stats.reorderedLayers} 个图层`
-      );
+    //   );
       // 更新对象交互性
       this.updateLayersObjectsInteractivity();
     }
@@ -2838,9 +2835,9 @@ export class LayerManager {
     });
 
     if (result) {
-      console.log(
+    //   console.log(
-        `图层 ${layerId}   - oldIndex: ${oldIndex} 已移动到位置 ${newIndex}`
+    //     `图层 ${layerId}   - oldIndex: ${oldIndex} 已移动到位置 ${newIndex}`
-      );
+    //   );
       // 更新对象交互性
       // this.updateLayersObjectsInteractivity();
     }
@@ -2917,9 +2914,9 @@ export class LayerManager {
     const result = this.layerSort.reorderLayers(oldIndex, newIndex, layerId);
 
     if (result) {
-      console.log(
+    //   console.log(
-        `高级排序完成: 图层 ${layerId} 从位置 ${oldIndex} 移动到 ${newIndex}`
+    //     `高级排序完成: 图层 ${layerId} 从位置 ${oldIndex} 移动到 ${newIndex}`
-      );
+    //   );
       // 更新对象交互性
       this.updateLayersObjectsInteractivity();
     }
@@ -2944,9 +2941,9 @@ export class LayerManager {
     );
 
     if (result) {
-      console.log(
+    //   console.log(
-        `高级子图层排序完成: 图层 ${layerId} 在父图层 ${parentId} 中从位置 ${oldIndex} 移动到 ${newIndex}`
+    //     `高级子图层排序完成: 图层 ${layerId} 在父图层 ${parentId} 中从位置 ${oldIndex} 移动到 ${newIndex}`
-      );
+    //   );
       // 重新排列画布对象
       this.rearrangeCanvasObjects();
     }
@@ -2971,7 +2968,7 @@ export class LayerManager {
     // 重新排列画布对象
     this.rearrangeCanvasObjects();
 
-    console.log("使用LayerSort工具完成图层排序");
+    // console.log("使用LayerSort工具完成图层排序");
   }
 
   /**
@@ -2979,7 +2976,7 @@ export class LayerManager {
    * 当图层顺序发生变化后调用此方法确保画布对象顺序正确
    */
   forceRebuildCanvasOrder() {
-    console.log("强制重建画布对象顺序");
+    // console.log("强制重建画布对象顺序");
 
     if (this.layerSort) {
       // 使用LayerSort的高级排序
@@ -3010,7 +3007,7 @@ export class LayerManager {
       return false;
     }
 
-    console.log(`开始批量重新排序 ${reorderOperations.length} 个图层`);
+    // console.log(`开始批量重新排序 ${reorderOperations.length} 个图层`);
 
     let allSuccessful = true;
 
@@ -3042,7 +3039,7 @@ export class LayerManager {
     }
 
     if (allSuccessful) {
-      console.log("批量图层排序完成");
+    //   console.log("批量图层排序完成");
     } else {
       console.warn("批量图层排序部分失败");
     }
@@ -3079,11 +3076,11 @@ export class LayerManager {
     // 执行命令
     if (this.commandManager) {
       const result = await this.commandManager.execute(command);
-      result && console.log(`✅ 成功合并组图层: ${groupLayer.name}`);
+    //   result && console.log(`✅ 成功合并组图层: ${groupLayer.name}`);
       return result;
     } else {
       const result = await command.execute();
-      result && console.log(`✅ 成功合并组图层: ${groupLayer.name}`);
+    //   result && console.log(`✅ 成功合并组图层: ${groupLayer.name}`);
       return result || [];
     }
   }
@@ -3132,13 +3129,13 @@ export class LayerManager {
     if (this.commandManager) {
       const result = await this.commandManager.execute(command);
       if (result) {
-        console.log(`✅ 成功栅格化图层: ${targetLayer.name}`);
+        // console.log(`✅ 成功栅格化图层: ${targetLayer.name}`);
       }
       return result;
     } else {
       const result = await command.execute();
       if (result) {
-        console.log(`✅ 成功栅格化图层: ${targetLayer.name}`);
+        // console.log(`✅ 成功栅格化图层: ${targetLayer.name}`);
       }
       return result;
     }
@@ -3209,13 +3206,13 @@ export class LayerManager {
     if (this.commandManager) {
       const result = await this.commandManager.execute(command);
       if (result) {
-        console.log(`✅ 成功导出图层: ${targetLayer.name}`);
+        // console.log(`✅ 成功导出图层: ${targetLayer.name}`);
       }
       return result;
     } else {
       const result = await command.execute();
       if (result) {
-        console.log(`✅ 成功导出图层: ${targetLayer.name}`);
+        // console.log(`✅ 成功导出图层: ${targetLayer.name}`);
       }
       return result;
     }
@@ -3259,7 +3256,7 @@ export class LayerManager {
     // 执行命令
 	const result = await command.execute(false);
 	if (result) {
-	console.log(`✅ 成功导出图层: ${targetLayer.name}`);
+	// console.log(`✅ 成功导出图层: ${targetLayer.name}`);
 	}
 	return result;
   }
@@ -3294,12 +3291,12 @@ export class LayerManager {
       const isSginleObject = e.target === activeSelection?._objects?.[0];
       if (e.target === activeSelection || isSginleObject) {
         hasMoved = false; // 重置移动状态
-        console.log("🎯 开始移动组选择对象");
+        // console.log("🎯 开始移动组选择对象");
         // 记录遮罩初始位置
-        console.log(
+        // console.log(
-          "🖼️ 记录遮罩初始位置",
+        //   "🖼️ 记录遮罩初始位置",
-          `${layer.clippingMask.left || 0}, ${layer.clippingMask.top || 0}`
+        //   `${layer.clippingMask.left || 0}, ${layer.clippingMask.top || 0}`
-        );
+        // );
         // 记录初始位置
         initialLeft = isSginleObject ? e.target.left : activeSelection.left;
         initialTop = isSginleObject ? e.target.top : activeSelection.top;
@@ -3366,12 +3363,12 @@ export class LayerManager {
       const isSginleObject = e.target === activeSelection?._objects?.[0];
       if (isSginleObject) {
         // 如果是单个对象，不处理
-        console.log("🚫 单个对象不处理移动完成");
+        // console.log("🚫 单个对象不处理移动完成");
         hasMoved = false; // 重置移动状态
         return;
       }
       if ((target === activeSelection || isSginleObject) && hasMoved) {
-        console.log("✅ 组选择对象移动完成");
+        // console.log("✅ 组选择对象移动完成");
 
         // 计算最终移动距离
         const deltaX = target.left - initialLeft;
@@ -3410,7 +3407,7 @@ export class LayerManager {
     // 鼠标抬起事件处理 - 备用方案
     const handleMouseUp = (e) => {
       if (hasMoved && this.canvas.getActiveObject() === activeSelection) {
-        console.log("🖱️ 鼠标抬起 - 备用移动完成处理");
+        // console.log("🖱️ 鼠标抬起 - 备用移动完成处理");
         handleModified(e);
       }
     };
@@ -3424,7 +3421,7 @@ export class LayerManager {
       this.canvas.off("selection:cleared", cleanup);
       this.canvas.off("selection:updated", cleanup);
 
-      console.log("🧹 清理组遮罩移动同步事件监听器");
+    //   console.log("🧹 清理组遮罩移动同步事件监听器");
     };
 
     // 绑定事件监听器
@@ -3437,7 +3434,7 @@ export class LayerManager {
     this.canvas.on("selection:cleared", cleanup);
     this.canvas.on("selection:updated", cleanup);
 
-    console.log("🎨 已设置组遮罩移动同步 - 使用 object:modified 事件");
+    // console.log("🎨 已设置组遮罩移动同步 - 使用 object:modified 事件");
   }
 
   /**

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 { OperationType, SpecialLayerId } from "../utils/layerHelper";
-import { CreateSelectionCommand } from "../commands/SelectionCommands";
+import { LassoCutoutCommand } from "../commands/LassoCutoutCommand";
-import { ClearSelectionCommand } 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;
 
@@ -53,11 +71,12 @@ export class PartManager {
 		// 当前工具
 		this.activeTool = this.toolManager.activeTool;
 
+		this.rgba = { r: 0, g: 255, b: 0, a: 200 };
+		this.partId = SpecialLayerId.PART_SELECTOR;
 		this.partGroup = null; // 当前选区对象
-		this.partId = "part_selector";
 		this.partCanvas = null;// 选区画布
-		// 点选工具相关
+		this.rectangleObject = null; // 矩形对象
-		this.pointList = []; // 存储点选坐标
+		this.pointList = []; // 点位列表 存储点选坐标
 	}
 
 	/**
@@ -69,6 +88,20 @@ export class PartManager {
 		const wasActive = this.isActive;
 		this.isActive = this.tools.includes(toolId);
 
+		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();
+		// 	}
+		// }
+
 		// 如果从非选区工具切换到选区工具，初始化事件
 		if (!wasActive && this.isActive) {
 			this.initEvents();
@@ -80,6 +113,10 @@ export class PartManager {
 			this.clearPartObject();
 			this.clearPointData();
 		}
+		// 如果从选区工具切换到选区工具，重置选区
+		else if (wasActive && this.isActive) {
+
+		}
 	}
 
 	/** 初始化选区相关事件 */
@@ -205,12 +242,7 @@ export class PartManager {
 	}
 
 	/** 点选工具模式下点击事件处理 */
-	_pointDownkHandler(options) {
+	_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;
-	}
 	/** 点选工具模式下移动事件处理 */
 	_pointMoveHandler(options) { }
 	/** 点选工具模式下抬起事件处理 */
@@ -219,57 +251,79 @@ export class PartManager {
 		const isLeft = button === 1;// 左键1（添加）  右键3（删除）
 		const fixedObject = this.canvasManager.getFixedLayerObject();
 		if (!fixedObject) return console.warn("未找到固定图层");
-		const { x, y } = options.absolutePointer;
+		const { x, y } = this.handleMousePosition(options, fixedObject);
-		const width = fixedObject.width * fixedObject.scaleX;
-		const height = fixedObject.height * fixedObject.scaleY;
-		const X = (x - (fixedObject.left - width / 2)) / fixedObject.scaleX;
-		const Y = (y - (fixedObject.top - height / 2)) / fixedObject.scaleY;
 		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);
 		});
-		points.push([X, Y]);
+		points.push([x, y]);
 		labels.push(label);
 		const url = await this.getSegAnythingImage({
-			image_path: this.props.clothingMinIOPath,
 			type: "point",
 			points,
 			labels,
-			// type: "box",
-			// box: [0,0,0,0],
 		});
-		this.pointList.push({
+		pointList.push({
-			x: X,
+			x: x,
-			y: Y,
+			y: y,
 			label: label,
 		})
 		const image1 = await this.loadImageToObject(url);
+		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();
-		const group = this.partGroup;
+		this.pointList = [...list];
-		const rgba = { r: 0, g: 255, b: 0, a: 200 }
-		const canvas = getObjectAlphaToCanvas(image1, null, 0, rgba);
 		this.partCanvas = canvas;
 		const image2 = new fabric.Image(canvas);
 		image2.set({
 			originX: fixedObject.originX,
 			originY: fixedObject.originY,
 		});
-		group.add(image2);
+		this.partGroup.add(image2);
-		for (let i = 0; i < this.pointList.length; i++) {
+		for (let i = 0; i < list.length; i++) {
-			const item = this.pointList[i];
+			const item = list[i];
 			const icon = await this.loadImageToObject(item.label === 1 ? addIcon : removeIcon);
+			let size = 20;
+			let scaleX = size / (icon.width * this.partGroup.scaleX);
+			let scaleY = size / (icon.height * this.partGroup.scaleY);
 			icon.set({
-				left: item.x - group.width / 2,
+				scaleX: scaleX,
-				top: item.y - group.height / 2,
+				scaleY: scaleY,
+				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);
 		}
+		console.log(this.partGroup);
 		this.canvas.renderAll();
+		return true;
 	}
 	/** 清空点选数据 */
 	clearPointData() {
@@ -280,43 +334,57 @@ export class PartManager {
 
 	/** 框选工具模式下点击事件处理 */
 	_rectangleDownHandler(options) {
-		console.log(options.absolutePointer);
+		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) {
-
+		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();
 	}
 	/** 框选工具模式下抬起事件处理 */
-	_rectangleUpHandler(options) {
+	async _rectangleUpHandler(options) {
-		console.log(options.absolutePointer);
+		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);
+		this.pointList.push(x, y);
 
-
+		if (this.pointList.length !== 4) return console.warn("框选工具选择区域必须是矩形");
-	/** 绘制工具模式下点击事件处理 */
+		const url = await this.getSegAnythingImage({
-	_brushDownHandler(options) {
+			type: "box",
+			box: [...this.pointList],
+		});
+		const image = await this.loadImageToObject(url);
+		const data = this.partCanvas?.getContext("2d")?.getImageData(0, 0, this.partCanvas.width, this.partCanvas.height);
+		const canvas = getObjectAlphaToCanvas(image, data, 0, this.rgba, !!data);
+		this.partDrawCommand(canvas);
 	}
-	/** 绘制工具模式下移动事件处理 */
-	_brushMoveHandler(options) {
-
-	}
-	/** 绘制工具模式下抬起事件处理 */
-	_brushUpHandler(options) {
-	}
-
-
-	/** 擦除工具模式下抬起事件处理 */
-	_eraseUpHandler(options) {
-	}
-	/** 擦除工具模式下点击事件处理 */
-	_eraseDownHandler(options) {
-	}
-	/** 擦除工具模式下移动事件处理 */
-	_eraseMoveHandler(options) {
-
-	}
-
-
-
 	/** 获取分隔后图片 */
 	async getSegAnythingImage(obj) {
 		setTimeout(() => {
@@ -326,6 +394,7 @@ export class PartManager {
 			// const user_id = store.state.UserHabit.userDetail.userId;
 			const user_id = 24299;
 			const data = {
+				image_path: this.props.clothingMinIOPath,
 				user_id,
 				...obj,
 			}
@@ -344,6 +413,128 @@ export class PartManager {
 				});
 		});
 	}
+	/** 处理鼠标点位 */
+	handleMousePosition(options, fixedObject) {
+		const pos = options.absolutePointer;
+		const { x, y } = options.absolutePointer;
+		const width = fixedObject.width * fixedObject.scaleX;
+		const height = fixedObject.height * fixedObject.scaleY;
+		const X = (x - (fixedObject.left - width / 2)) / fixedObject.scaleX;
+		const Y = (y - (fixedObject.top - height / 2)) / fixedObject.scaleY;
+		return {
+			x: Math.round(X),
+			y: Math.round(Y),
+		}
+	}
+
+
+
+	/** 绘制工具模式下点击事件处理 */
+	_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;
+		const left = (fabricImage.left - this.partGroup.left) / this.partGroup.scaleX;
+		fabricImage.set({
+			scaleX,
+			scaleY,
+			top: top + this.partGroup.height / 2,
+			left: left + this.partGroup.width / 2,
+		})
+		const tcanvas = new fabric.StaticCanvas(document.createElement("canvas"), {
+			width: this.partGroup.width,
+			height: this.partGroup.height,
+			enableRetinaScaling: false,
+		});
+		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({
+			originX: this.partGroup.originX,
+			originY: this.partGroup.originY,
+			erasable: true,
+		});
+		this.resetPartObject();
+		this.partGroup.add(image);
+		this.canvas.renderAll();
+	}
 
 	/** 删除指定ID的对象 */
 	removeObjectsById(id) {
@@ -381,6 +572,7 @@ export class PartManager {
 			originY: fixedObject.originY,
 			selectable: false,
 			evented: false,
+			erasable: true,
 		})
 		this.canvas.add(group);
 		this.partGroup = group;
@@ -392,10 +584,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;
@@ -414,22 +629,26 @@ export class PartManager {
 			top: top + minY * scaleY,
 			scaleX: scaleX,
 			scaleY: scaleY,
-			fill: "rgba(127, 255, 127, 0.3)",
+			...this.selectionStyle,
-			stroke: "#2AA81B",
-			strokeWidth: 2,
-			strokeDashArray: [8, 4],
-			strokeLineCap: "round",// 折线端点样式
-			strokeLineJoin: "bevel", // 折线连接样式
-			strokeUniform: true, // 保持描边宽度不随缩放改变
 		});
-		// this.partGroup.add(path);
+		this.clearPart();
-		this.canvas.add(path);
+		this.selectionManager.setSelectionObject(path);
-		this.canvas.renderAll();
+		const cmd = new LassoCutoutCommand({
+			canvas: this.canvas,
+			layerManager: this.layerManager,
+			selectionManager: this.selectionManager,
+			toolManager: this.toolManager,
+		})
+		this.commandManager.execute(cmd)
 	}
 	/** 清空点位 */
 	clearPart() {
+		if (this.activeTool.value === OperationType.PART) {
+			this.partPointDrawCommand([], null);
+		} else {
 			this.pointList = [];
-		this.resetPartObject(true);
+			this.partDrawCommand(null);
+		}
 	}
 
 	/**

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

@@ -133,11 +133,12 @@ export class RedGreenModeManager {
     this.canvas.on("mouse:up", (event) => {
       // 可以在这里添加更多逻辑，比如生成图片或更新状态
       nextTick(() => {
-        requestIdleCallback(async () => {
+        setTimeout(async () => {
           if (!this.isInitialized) {
             console.warn("红绿图模式未初始化，无法处理鼠标事件");
             return;
           }
+		  console.log("鼠标抬起事件触发", this.onImageGenerated);
           if (this.onImageGenerated) {
             const imageData = await this.canvasManager.exportImage({
               restoreOpacityInRedGreen: true, // 恢复红绿图模式下的透明度

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

@@ -27,7 +27,7 @@ export class ThumbnailManager {
     const { layer } = findLayerRecursively(this.layers.value, layerId);
 
     if (!fabricObjects || fabricObjects.length === 0) {
-      console.warn("⚠️ 无法生成缩略图：没有可栅格化的对象  返回空缩略图");
+    //   console.warn("⚠️ 无法生成缩略图：没有可栅格化的对象  返回空缩略图");
       // 如果没有对象，返回默认缩略图
       if (layer) {
         layer.thumbnailUrl = this.defaultThumbnail; // 更新图层对象的缩略图
@@ -37,7 +37,6 @@ export class ThumbnailManager {
 
     // 延迟执行，避免阻塞UI
     fabricObjects.length > 0 &&
-      requestIdleCallback(() => {
         setTimeout(async () => {
           const base64 = await this._generateLayerThumbnailNow(fabricObjects, layer);
           // this.layerThumbnails.set(layerId, base64);
@@ -55,7 +54,6 @@ export class ThumbnailManager {
             console.error("生成图层缩略图时出错:", error);
           }
         });
-      });
   }
 
   /**
@@ -65,7 +63,7 @@ export class ThumbnailManager {
   generateAllLayerThumbnails(layers) {
     if (!layers || !Array.isArray(layers)) return;
 
-    requestIdleCallback(() => {
+    setTimeout(() => {
       setTimeout(() => {
         layers.forEach((layer) => {
           if (layer && layer.id) {
@@ -123,7 +121,7 @@ export class ThumbnailManager {
    */
   _collectLayersAndObjects(layerId) {
     if (!layerId) {
-      console.warn("⚠️ 无效的图层ID，无法收集对象");
+    //   console.warn("⚠️ 无效的图层ID，无法收集对象");
       return [];
     }
 
@@ -199,17 +197,17 @@ export class ThumbnailManager {
     // 提取排序后的对象
     const objectsToRasterize = objectsWithZIndex.map((item) => item.object);
 
-    console.log(
+    // console.log(
-      `📊 收集到 ${layersToRasterize.length} 个图层，${objectsToRasterize.length} 个对象进行栅格化`
+    //   `📊 收集到 ${layersToRasterize.length} 个图层，${objectsToRasterize.length} 个对象进行栅格化`
-    );
+    // );
-    console.log(
+    // console.log(
-      "🔢 对象z-index顺序:",
+    //   "🔢 对象z-index顺序:",
-      objectsWithZIndex.map((item) => ({
+    //   objectsWithZIndex.map((item) => ({
-        id: item.object.id,
+    //     id: item.object.id,
-        type: item.object.type,
+    //     type: item.object.type,
-        zIndex: item.zIndex,
+    //     zIndex: item.zIndex,
-      }))
+    //   }))
-    );
+    // );
 
     return objectsToRasterize;
   }

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]: {
@@ -420,9 +420,9 @@ export class ToolManager {
 
     // 设置工具特定的状态
     if (tool && typeof tool.setup === "function") {
-	  console.log(`画布切换工具:${tool.name}(${toolId})`)
+	//   console.log(`画布切换工具:${tool.name}(${toolId})`)
 	  this.canvas.toolId = toolId;
-      tool.setup();
+      tool.setup(true);
     }
 
     // 通知选区管理器工具已改变
@@ -482,7 +482,7 @@ export class ToolManager {
 
     // 如有必要，可以调用当前工具的setup方法来全面恢复状态
     if (tool && typeof tool.setup === "function") {
-      tool.setup();
+      tool.setup(true);
     }
   }
 
@@ -695,7 +695,7 @@ export class ToolManager {
 
     // // 设置矩形选区模式
     // // 这里需要具体的矩形选区工具实现
-    console.log("矩形选区工具已激活");
+    // console.log("矩形选区工具已激活");
 
     if (this.canvasManager && this.canvasManager.selectionManager) {
       this.canvasManager.selectionManager.setCurrentTool(
@@ -707,45 +707,69 @@ export class ToolManager {
   /**
    * 设置部件选取工具
    */
-  setupPartTool() {
+  setupPartTool(isExecute = false) {
     if (!this.canvas) return;
     this.canvas.isDrawingMode = false;
     this.canvas.selection = false;
-	
+    if (!isExecute && this.canvasManager && this.canvasManager.partManager) {
-    if (this.canvasManager && this.canvasManager.partManager) {
       this.canvasManager.partManager.setCurrentTool(OperationType.PART);
     }
   }
   /**
    * 设置部件选取工具--矩形
    */
-  setupPartRectangleTool() {
+  setupPartRectangleTool(isExecute = false) {
     if (!this.canvas) return;
     this.canvas.isDrawingMode = false;
-    this.canvas.selection = true;
+    this.canvas.selection = false;
-    if (this.canvasManager && this.canvasManager.partManager) {
+    if (!isExecute && this.canvasManager && this.canvasManager.partManager) {
       this.canvasManager.partManager.setCurrentTool(OperationType.PART_RECTANGLE);
     }
   }
   /**
    * 设置部件选取工具--画笔
    */
-  setupPartBrushTool() {
+  setupPartBrushTool(isExecute = false) {
     if (!this.canvas) return;
     this.canvas.isDrawingMode = true;
     this.canvas.selection = false;
-    if (this.canvasManager && this.canvasManager.partManager) {
+    if (!isExecute && this.canvasManager && this.canvasManager.partManager) {
       this.canvasManager.partManager.setCurrentTool(OperationType.PART_BRUSH);
     }
+	const greenColor = "#0f0";
+	    // 确保有笔刷管理器
+    if (this.brushManager) {
+      // 设置绿色笔刷
+      this.brushManager.setBrushColor(greenColor); // 纯绿色
+      this.brushManager.setBrushOpacity(200/255); // 完全不透明
+      this.brushManager.setBrushType("pencil"); // 铅笔类型
+
+      // 更新笔刷大小（使用当前大小）
+      if (BrushStore && BrushStore.state.size) {
+        this.brushManager.setBrushSize(BrushStore.state.size);
+      }
+
+      // 更新应用到画布
+      this.brushManager.updateBrush();
+    }
+
+    // 启用笔刷指示器并设置绿色
+    this._enableBrushIndicator(greenColor);
   }
    /**
    * 设置部件选取工具--橡皮擦
    */
-  setupPartEraserTool() {
+  setupPartEraserTool(isExecute = false) {
     if (!this.canvas) return;
-    this.canvas.isDrawingMode = false;
+    this.canvas.isDrawingMode = true;
     this.canvas.selection = false;
-    if (this.canvasManager && this.canvasManager.partManager) {
+	 if (this.brushManager) {
+      this.brushManager.createEraser();
+    }
+    // 启用笔刷指示器
+    this._enableBrushIndicator();
+
+	if (!isExecute && this.canvasManager && this.canvasManager.partManager) {
       this.canvasManager.partManager.setCurrentTool(OperationType.PART_ERASER);
     }
   }
@@ -894,7 +918,7 @@ export class ToolManager {
         this._rasterizeLayerForLiquify(layerId);
       },
       onCancel: () => {
-        console.log("用户取消了栅格化操作");
+        // console.log("用户取消了栅格化操作");
         // 用户取消，触发液化面板显示事件但不能液化
         document.dispatchEvent(
           new CustomEvent("showLiquifyPanel", {
@@ -1286,7 +1310,7 @@ export class ToolManager {
    */
   showTextEditor(textObject, layer) {
     // 这个方法将在TextEditorPanel组件实现后调用
-    console.log("显示文本编辑面板", textObject, layer);
+    // console.log("显示文本编辑面板", textObject, layer);
     // 将发出一个事件，让Vue组件捕获并显示编辑面板
     document.dispatchEvent(
       new CustomEvent("showTextEditor", {
@@ -1302,7 +1326,7 @@ export class ToolManager {
    */
   hideTextEditor() {
     // 这个方法将在TextEditorPanel组件实现后调用
-    console.log("隐藏文本编辑面板");
+    // console.log("隐藏文本编辑面板");
     // 将发出一个事件，让Vue组件捕获并隐藏编辑面板
     document.dispatchEvent(
       new CustomEvent("hideTextEditor", {
@@ -1323,7 +1347,7 @@ export class ToolManager {
     if (this.brushIndicator) {
       this.brushIndicator.dispose();
       this.brushIndicator = null;
-			console.log("笔刷指示器已清理");
+			// console.log("笔刷指示器已清理");
     }
 
     // 移除文本编辑相关事件监听器
@@ -1348,7 +1372,7 @@ export class ToolManager {
     this.canvas.isDrawingMode = false;
     this.canvas.selection = false;
 
-    console.log("文本工具已激活");
+    // console.log("文本工具已激活");
   }
 
   /**
@@ -1424,7 +1448,7 @@ export class ToolManager {
     // 切换到红色笔刷工具作为默认工具
     this.setTool(OperationType.RED_BRUSH);
 
-    console.log("工具管理器已进入红绿图模式");
+    // console.log("工具管理器已进入红绿图模式");
   }
 
   /**
@@ -1437,7 +1461,7 @@ export class ToolManager {
     // 切换回选择工具
     this.setTool(OperationType.SELECT);
 
-    console.log("工具管理器已退出红绿图模式");
+    // console.log("工具管理器已退出红绿图模式");
   }
 
   /**
@@ -1495,7 +1519,7 @@ export class ToolManager {
     // 更新指示器颜色
     this.brushIndicator.updateColor(brushColor);
 
-    console.log(`笔刷指示器已启用，大小: ${brushSize}, 颜色: ${brushColor}`);
+    // console.log(`笔刷指示器已启用，大小: ${brushSize}, 颜色: ${brushColor}`);
   }
 
   /**
@@ -1506,7 +1530,7 @@ export class ToolManager {
     if (!this.brushIndicator) return;
 
     this.brushIndicator.disable();
-    console.log("笔刷指示器已禁用");
+    // console.log("笔刷指示器已禁用");
   }
 
   /**
@@ -1517,7 +1541,7 @@ export class ToolManager {
     if (!this.brushIndicator) return;
 
     this.brushIndicator.updateSize(size);
-    console.log(`笔刷指示器大小已更新为: ${size}`);
+    // console.log(`笔刷指示器大小已更新为: ${size}`);
   }
 
   /**
@@ -1528,7 +1552,7 @@ export class ToolManager {
     if (!this.brushIndicator) return;
 
     this.brushIndicator.updateColor(color);
-		console.log(`笔刷指示器颜色已更新为: ${color}`);
+		// console.log(`笔刷指示器颜色已更新为: ${color}`);
   }
 
   /**
@@ -1604,6 +1628,8 @@ export class ToolManager {
       OperationType.RED_BRUSH,
       OperationType.GREEN_BRUSH,
 	  OperationType.LIQUIFY,
+	  OperationType.PART_BRUSH,
+	  OperationType.PART_ERASER,
     ];
 
     return brushTools.includes(currentTool);

src/component/Canvas/CanvasEditor/managers/command/CommandManager.js

@@ -180,7 +180,7 @@ export class CommandManager {
       this._recordPerformance("execute", command.constructor.name, duration);
 
       // 通知状态变化
-      this._notifyStateChange();
+      this._notifyStateChange("execute");
 
       console.log(`✅ 命令执行成功: ${command.constructor.name}`);
       return result;
@@ -219,7 +219,7 @@ export class CommandManager {
       this._recordPerformance("undo", command.constructor.name, duration);
 
       // 通知状态变化
-      this._notifyStateChange();
+      this._notifyStateChange("undo");
 
       console.log(`✅ 命令撤销成功: ${command.constructor.name}`);
       return result;
@@ -258,7 +258,7 @@ export class CommandManager {
       this._recordPerformance("redo", command.constructor.name, duration);
 
       // 通知状态变化
-      this._notifyStateChange();
+      this._notifyStateChange("redo");
 
       console.log(`✅ 命令重做成功: ${command.constructor.name}`);
       return result;
@@ -298,8 +298,8 @@ export class CommandManager {
 
     this.undoStack = [];
     this.redoStack = [];
-    this._notifyStateChange();
+    this._notifyStateChange("clear");
-    console.log("📝 命令历史已清空");
+    // console.log("📝 命令历史已清空");
   }
 
   /**
@@ -417,10 +417,12 @@ export class CommandManager {
    * 通知状态变化
    * @private
    */
-  _notifyStateChange() {
+  _notifyStateChange(type) {
     if (this.onStateChange) {
       try {
-        this.onStateChange(this.getState());
+		const obj = this.getState();
+		obj.type = type;
+        this.onStateChange(obj);
       } catch (error) {
         console.error("状态变化回调执行失败:", error);
       }

src/component/Canvas/CanvasEditor/managers/events/CanvasEventManager.js

@@ -6,6 +6,7 @@ import { OperationType, OperationTypes } from "../../utils/layerHelper";
 export class CanvasEventManager {
   constructor(canvas, options = {}) {
     this.canvas = canvas;
+	this.canvasManager = options.canvasManager;
     this.toolManager = options.toolManager || null;
     this.animationManager = options.animationManager;
     this.thumbnailManager = options.thumbnailManager;
@@ -485,7 +486,7 @@ export class CanvasEventManager {
 
         // 调试信息
         if (process.env.NODE_ENV === "development") {
-          console.log("iPad touchstart:", e.touches.length, "fingers");
+        //   console.log("iPad touchstart:", e.touches.length, "fingers");
         }
 
         if (e.touches.length === 2) {
@@ -500,11 +501,11 @@ export class CanvasEventManager {
           this.touchState.zoomCenter = { x: centerX, y: centerY };
 
           if (process.env.NODE_ENV === "development") {
-            console.log("iPad双指缩放开始:", {
+            // console.log("iPad双指缩放开始:", {
-              distance: lastTouchDistance,
+            //   distance: lastTouchDistance,
-              zoom: lastZoom,
+            //   zoom: lastZoom,
-              center: this.touchState.zoomCenter,
+            //   center: this.touchState.zoomCenter,
-            });
+            // });
           }
 
           e.preventDefault();
@@ -554,14 +555,14 @@ export class CanvasEventManager {
           const clampedZoom = Math.max(0.1, Math.min(5, newZoom));
 
           if (process.env.NODE_ENV === "development") {
-            console.log("iPad双指缩放中:", {
+            // console.log("iPad双指缩放中:", {
-              currentDistance,
+            //   currentDistance,
-              lastTouchDistance,
+            //   lastTouchDistance,
-              scale,
+            //   scale,
-              currentZoom,
+            //   currentZoom,
-              newZoom,
+            //   newZoom,
-              clampedZoom,
+            //   clampedZoom,
-            });
+            // });
           }
 
           // 使用缩放中心点进行缩放
@@ -691,6 +692,8 @@ export class CanvasEventManager {
           // 清除临时状态记录
           delete activeObj._initialTransformState;
         }
+      }else{
+		this.canvasManager.changeCanvas();
 	  }
 
       if (this.thumbnailManager && e.target) {
@@ -839,7 +842,7 @@ export class CanvasEventManager {
     const hasNewImage = !!fabricImage;
 
     if (!hasExistingObjects && !hasNewImage) {
-      console.log("没有对象需要合并");
+    //   console.log("没有对象需要合并");
       return;
     }
 
@@ -851,7 +854,7 @@ export class CanvasEventManager {
 
     // 执行高保真合并操作
     try {
-      console.log(`开始合并图层 ${activeLayer.name} 中的对象为组...`);
+    //   console.log(`开始合并图层 ${activeLayer.name} 中的对象为组...`);
 
       const command = await this.layerManager.LayerObjectsToGroup(
         activeLayer,
@@ -869,7 +872,7 @@ export class CanvasEventManager {
 
       // 降级处理：如果合并失败，至少保证新图像能添加到图层
       if (fabricImage && this.layerManager) {
-        console.log("执行降级处理：直接添加图像到图层");
+        // console.log("执行降级处理：直接添加图像到图层");
         this.layerManager.addObjectToLayer(fabricImage, activeLayer.id);
       }
     }
@@ -975,6 +978,13 @@ export class CanvasEventManager {
       // 添加调试日志(可选)
       // console.log(`捕获对象 ${obj.id} (${obj.type}) 的初始变换状态`);
     }
+    const arrs = [];
+    if (e.target._objects) {
+      e.target._objects.forEach((v) => arrs.push(v));
+    } else {
+      arrs.push(e.target);
+    }
+    this.canvasManager.beforeChangeCanvas(arrs);
   }
 
   /**
@@ -1011,15 +1021,15 @@ export class CanvasEventManager {
 
     // 调试日志 - 仅在开发环境输出
     if (process.env.NODE_ENV === "development") {
-      console.log("设备检测结果:", {
+    //   console.log("设备检测结果:", {
-        userAgent,
+    //     userAgent,
-        platform,
+    //     platform,
-        isMobile,
+    //     isMobile,
-        isTablet,
+    //     isTablet,
-        isDesktop,
+    //     isDesktop,
-        hasTouchSupport,
+    //     hasTouchSupport,
-        maxTouchPoints: navigator.maxTouchPoints,
+    //     maxTouchPoints: navigator.maxTouchPoints,
-      });
+    //   });
     }
 
     return {

src/component/Canvas/CanvasEditor/managers/events/KeyboardManager.js

@@ -219,7 +219,7 @@ export class KeyboardManager {
 	const text = event.clipboardData?.getData("text/plain") || "";
 	if(/^aida_copy_canvas_layer/.test(text)) return;
 	const items = event.clipboardData?.items || [];
-		console.log(this);
+		// console.log(this);
 	for (const item of items) {
         if (item.type.indexOf("text/plain") !== -1) {
             item.getAsString((text) => {
@@ -249,7 +249,7 @@ export class KeyboardManager {
       this.container.addEventListener("touchcancel", this._handleTouchEnd);
     }
 
-    console.log(`键盘管理器已初始化，平台: ${this.platform}, 触摸设备: ${this.isTouchDevice}`);
+    // console.log(`键盘管理器已初始化，平台: ${this.platform}, 触摸设备: ${this.isTouchDevice}`);
   }
 
   /**
@@ -437,35 +437,35 @@ export class KeyboardManager {
 
       case "copy":
         // 复制逻辑
-        console.log("复制当前选中图层");
+        // console.log("复制当前选中图层");
 		if(this.isRedGreenMode.value) return;
         this.layerManager.copyLayer(this.layerManager.activeLayerId.value);
         break;
 
       case "paste":
         // 粘贴逻辑
-        console.log("粘贴");
+        // console.log("粘贴");
 		if(this.isRedGreenMode.value) return;
         this.layerManager.pasteLayer();
         break;
 
       case "cut":
         // 剪切逻辑
-        console.log("剪切");
+        // console.log("剪切");
 		if(this.isRedGreenMode.value) return;
         this.layerManager.cutLayer(this.layerManager.activeLayerId.value);
         break;
 
       case "delete":
         // 删除逻辑
-        console.log("删除");
+        // console.log("删除");
 		if(this.isRedGreenMode.value) return;
         this.layerManager.removeLayer(this.layerManager.activeLayerId.value);
         break;
 
       case "selectAll":
         // 全选逻辑
-        console.log("全选");
+        // console.log("全选");
 		if(this.isRedGreenMode.value) return;
         // 这里需要实现全选逻辑 TODO:  是否在选择模式下才可以全选？
         if (this.layerManager) {
@@ -475,7 +475,7 @@ export class KeyboardManager {
 
       case "clearSelection":
         // 清除选择逻辑
-        console.log("清除选择");
+        // console.log("清除选择");
         // 这里需要实现清除选择逻辑
         if (this.layerManager) {
           this.layerManager.clearSelection();
@@ -484,7 +484,7 @@ export class KeyboardManager {
 
       case "save":
         // 保存逻辑
-        console.log("保存");
+        // console.log("保存");
         break;
 
       case "selectTool":
@@ -591,7 +591,7 @@ export class KeyboardManager {
 
       case "contextMenu":
         // 上下文菜单（通常由右击或触控设备上的特定手势触发）
-        console.log("显示上下文菜单");
+        // console.log("显示上下文菜单");
         // 这里需要实现显示上下文菜单的逻辑
         break;
 

src/component/Canvas/CanvasEditor/managers/liquify/LiquifyRealTimeUpdater.js

@@ -85,7 +85,7 @@ export class LiquifyRealTimeUpdater {
 
     if (isDrawing && this.config.useDirectUpdate) {
       // 拖拽过程中使用快速更新（降低质量以提高性能）
-      this._fastUpdate(imageData);
+      await this._fastUpdate(imageData);
     } else {
       // 拖拽结束后使用完整更新（最高质量）
       await this._fullUpdate(imageData);
@@ -124,7 +124,7 @@ export class LiquifyRealTimeUpdater {
    * @param {ImageData} imageData 图像数据
    * @private
    */
-  _fastUpdate(imageData) {
+  async _fastUpdate(imageData) {
     if (!this.targetObject || !this.targetObject._element) {
       return;
     }
@@ -138,12 +138,14 @@ export class LiquifyRealTimeUpdater {
 
       // 直接更新fabric对象的图像源（使用PNG格式保持质量）
       const targetElement = this.targetObject._element;
-
       // 方案1: 直接设置src属性（最高性能）
       const dataURL = this.tempCanvas.toDataURL("image/png", quality);
-
       if (targetElement.src !== dataURL) {
-        targetElement.src = dataURL;
+        // targetElement.src = dataURL;
+		const image = new Image();
+		image.src = dataURL;
+		await image.decode();
+		this.targetObject.setElement(image);
 
         // 关键优化：直接设置fabric对象为脏状态，但不立即渲染
         // this.targetObject.dirty = false; // 标记为不需要立即渲染
@@ -153,7 +155,7 @@ export class LiquifyRealTimeUpdater {
         // 使用requestAnimationFrame进行批量渲染优化
         // if (!this.renderingScheduled && !this.config.skipRenderDuringDrag) {
         //   this.renderingScheduled = true;
-        //   requestIdleCallback(() => {
+        //   setTimeout(() => {
         //     this.canvas.renderAll();
         //     this.renderingScheduled = false;
         //   });

src/component/Canvas/CanvasEditor/managers/liquify/LiquifyStateManager.js

@@ -30,7 +30,7 @@ export class LiquifyStateManager {
     // 设备性能检测
     this.devicePerformance = this._detectDevicePerformance();
 
-    console.log("🎯 液化状态管理器已初始化，设备性能等级:", this.devicePerformance);
+    // console.log("🎯 液化状态管理器已初始化，设备性能等级:", this.devicePerformance);
   }
 
   /**
@@ -48,7 +48,7 @@ export class LiquifyStateManager {
     // 显示操作反馈
     this._showOperationFeedback();
 
-    console.log("🚀 开始液化操作");
+    // console.log("🚀 开始液化操作");
   }
 
   /**
@@ -68,7 +68,7 @@ export class LiquifyStateManager {
     // 禁用不必要的画布功能
     this._disableCanvasFeatures();
 
-    console.log("🖱️ 开始拖拽操作");
+    // console.log("🖱️ 开始拖拽操作");
   }
 
   /**
@@ -98,7 +98,7 @@ export class LiquifyStateManager {
       }
     }
 
-    console.log("✅ 结束拖拽操作");
+    // console.log("✅ 结束拖拽操作");
   }
 
   /**
@@ -116,7 +116,7 @@ export class LiquifyStateManager {
     // 隐藏操作反馈
     this._hideOperationFeedback();
 
-    console.log(`⏱️ 液化操作完成，耗时: ${operationTime.toFixed(2)}ms`);
+    // console.log(`⏱️ 液化操作完成，耗时: ${operationTime.toFixed(2)}ms`);
   }
 
   /**
@@ -158,11 +158,11 @@ export class LiquifyStateManager {
     // 根据性能数据动态调整设置
     this._adaptivePerformanceOptimization(operationTime);
 
-    console.log(
+    // console.log(
-      `📊 记录性能指标: ${operationType}/${mode}, 耗时: ${operationTime.toFixed(
+    //   `📊 记录性能指标: ${operationType}/${mode}, 耗时: ${operationTime.toFixed(
-        2
+    //     2
-      )}ms, 渲染模式: ${renderMode}`
+    //   )}ms, 渲染模式: ${renderMode}`
-    );
+    // );
   }
 
   /**
@@ -179,7 +179,7 @@ export class LiquifyStateManager {
       const currentQuality = this.realtimeUpdater.config.imageQuality || 1.0;
       if (currentQuality > 0.7) {
         this.realtimeUpdater.setImageQuality(Math.max(0.7, currentQuality - 0.1));
-        console.log("⚡ 自动降低图像质量以提升性能");
+        // console.log("⚡ 自动降低图像质量以提升性能");
       }
 
       // 增加节流时间
@@ -188,7 +188,7 @@ export class LiquifyStateManager {
           33,
           this.realtimeUpdater.config.throttleTime + 8
         );
-        console.log("⏱️ 自动增加节流时间以提升性能");
+        // console.log("⏱️ 自动增加节流时间以提升性能");
       }
     }
 
@@ -228,7 +228,7 @@ export class LiquifyStateManager {
     this._updateCursor("default");
     this.cursorCache.clear();
 
-    console.log("🧹 液化状态管理器已清理");
+    // console.log("🧹 液化状态管理器已清理");
   }
 
   // === 私有方法 ===

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

@@ -30,7 +30,8 @@ export class LayerSort {
     if (canvasObjects.length === 0) return;
 
     // 使用画布渲染优化
-    await optimizeCanvasRendering(this.canvas, () => {
+	await new Promise((resolve) => {
+		optimizeCanvasRendering(this.canvas, () => {
 		// 计算每个对象应该在的 z-index 位置
 		const objectZIndexMap = this.calculateObjectZIndexes();
 
@@ -51,6 +52,8 @@ export class LayerSort {
 			this.canvas.moveTo(item.object, index);
 			}
 		});
+		resolve();
+		});
     });
   }
 
@@ -71,17 +74,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 && layer.fabricObject) {
+      } else if (layer.isFixedOther && id) {
         // 其他固定图层对象
-        zIndexMap.set(layer.fabricObject.id, currentZIndex++);
+        zIndexMap.set(id, currentZIndex++);
       } else if (!layer.isBackground && !layer.isFixed) {
         // 普通图层
         currentZIndex = this.processLayerObjects(
@@ -91,7 +94,6 @@ export class LayerSort {
         );
       }
     }
-
     return zIndexMap;
   }
 

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) {

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

@@ -2208,8 +2208,13 @@ export const resizeImage = async (base64, width, height) => {
       const canvas = document.createElement("canvas");
       canvas.width = width;
       canvas.height = height;
+	  const scale = height / img.height;
+	  const w = img.width * scale;
+	  const h = img.height * scale;
+	  const x = (width - w) / 2;
+	  const y = 0;
       const ctx = canvas.getContext("2d");
-      ctx.drawImage(img, 0, 0, width, height);
+      ctx.drawImage(img, x, y, w, h);
       resolve(canvas.toDataURL());
     };
     img.onerror = reject;

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

@@ -24,6 +24,7 @@ export const LayerType = {
 export const SpecialLayerId = {
   SPECIAL_GROUP: "group_special", // 特殊组
   COLOR: "special_color", // 颜色图层
+  PART_SELECTOR: "part_selector", // 部件选择器图层
 }
 
 

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

@@ -65,10 +65,15 @@ export async function restoreFabricObject(serializedObject, canvas) {
  * @param {ImageData} revData - 相反的ImageData，白通道的相同位置是否为透明，revData为白色为透明，黑色为不透明
  * @param {number} diff - 差值，默认 25
  * @param {Object} rgba - 自定义 rgba 值，默认 { r: 255, g: 255, b: 255, a: 255 }
+ * @param {boolean} isMerge - 是否合并，true=合并revData，false=反转revData
  * @returns {HTMLCanvasElement|null} 包含黑白通道的画布，或 null 如果失败
 */
-export function getObjectAlphaToCanvas(object, revData, diff = 30, rgba = { r: 255, g: 255, b: 255, a: 255 }) {
+export function getObjectAlphaToCanvas(object, revData, diff = 30, rgba = { r: 255, g: 255, b: 255, a: 255 }, isMerge = false) {
 	const image = object.getElement();
+	if (image.nodeName !== "IMG" && image.nodeName !== "CANVAS") {
+		console.warn("对象不是图片");
+		return null;
+	}
 	const { width, height } = image;
 	if (!width || !height) {
 		console.warn("对象没有元素");
@@ -89,18 +94,20 @@ export function getObjectAlphaToCanvas(object, revData, diff = 30, rgba = { r: 2
 		const revG = revData?.data[i + 1] || 0;
 		const revB = revData?.data[i + 2] || 0;
 		const revA = revData?.data[i + 3] || 0;
+		let isHave = false;
 		if (r || g || b || a) {
 			if (revR > diff || revG > diff || revB > diff || revA > diff) {
-				data.data[i + 0] = 0;
+				isHave = false;
-				data.data[i + 1] = 0;
-				data.data[i + 2] = 0;
-				data.data[i + 3] = 0;
 			} else {
+				isHave = true;
+			}
+		}
+		if (isMerge && (revR || revG || revB || revA)) isHave = true;
+		if (isHave) {
 			data.data[i + 0] = rgba.r;
 			data.data[i + 1] = rgba.g;
 			data.data[i + 2] = rgba.b;
 			data.data[i + 3] = rgba.a;
-			}
 		} else {
 			data.data[i + 0] = 0;
 			data.data[i + 1] = 0;

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

@@ -22,7 +22,7 @@ export const createRasterizedImage = async ({
   isGroupWithMask = false, // 是否为带遮罩的组图层
 } = {}) => {
   try {
-    console.log(`📊 开始栅格化 ${fabricObjects.length} 个对象${maskObject ? "（带遮罩）" : ""}`);
+    // console.log(`📊 开始栅格化 ${fabricObjects.length} 个对象${maskObject ? "（带遮罩）" : ""}`);
 
     // 确保有对象需要栅格化
     if (fabricObjects.length === 0) {
@@ -36,7 +36,7 @@ export const createRasterizedImage = async ({
 
     if (isThumbnail) scaleFactor = 0.2; // 缩略图使用较小的高清倍数
 
-    console.log(`高清倍数: ${scaleFactor}, 当前缩放: ${currentZoom}`);
+    // console.log(`高清倍数: ${scaleFactor}, 当前缩放: ${currentZoom}`);
 
     // 如果有遮罩且保持原始质量，使用高质量的遮罩处理方法
     if (maskObject && preserveOriginalQuality) {
@@ -58,7 +58,7 @@ export const createRasterizedImage = async ({
       }
 
       if (isReturenDataURL) {
-        console.log("✅ 带遮罩的栅格化图像创建成功，返回DataURL");
+        // console.log("✅ 带遮罩的栅格化图像创建成功，返回DataURL");
         return rasterizedImage;
       }
 
@@ -77,7 +77,7 @@ export const createRasterizedImage = async ({
         },
       });
 
-      console.log(`✅ 带遮罩的栅格化图像创建完成`);
+    //   console.log(`✅ 带遮罩的栅格化图像创建完成`);
       return rasterizedImage;
     }
 
@@ -101,7 +101,7 @@ export const createRasterizedImage = async ({
     }
 
     if (isReturenDataURL) {
-      console.log("✅ 栅格化图像创建成功，返回DataURL");
+    //   console.log("✅ 栅格化图像创建成功，返回DataURL");
       return rasterizedImage;
     }
 
@@ -120,7 +120,7 @@ export const createRasterizedImage = async ({
         },
       });
 
-      console.log(`✅ 栅格化图像创建完成`);
+    //   console.log(`✅ 栅格化图像创建完成`);
     }
 
     return rasterizedImage;
@@ -172,7 +172,7 @@ const createRasterizedImageWithGroup = async ({
 
     // 获取组的绝对边界框
     const groupBounds = group.getBoundingRect(true, true);
-    console.log("📏 组边界框:", groupBounds);
+    // console.log("📏 组边界框:", groupBounds);
 
     // 设置离屏画布尺寸，使用组的边界大小
     const canvasWidth = Math.ceil(groupBounds.width * scaleFactor);
@@ -184,7 +184,7 @@ const createRasterizedImageWithGroup = async ({
       hasControls: false,
     });
 
-    console.log(`🎨 离屏画布尺寸: ${canvasWidth}x${canvasHeight}, 缩放: ${scaleFactor}`);
+    // console.log(`🎨 离屏画布尺寸: ${canvasWidth}x${canvasHeight}, 缩放: ${scaleFactor}`);
 
     // 调整组的位置，让它位于画布的左上角
     group.set({
@@ -266,11 +266,11 @@ const createRasterizedImageWithMask = async ({
   isGroupWithMask,
 }) => {
   try {
-    console.log("🎭 使用遮罩创建栅格化图像");
+    // console.log("🎭 使用遮罩创建栅格化图像");
 
     // 获取遮罩的边界框，这将作为最终图像的边界
     const maskBounds = maskObject.getBoundingRect(true, true);
-    console.log("📏 遮罩边界框:", maskBounds);
+    // console.log("📏 遮罩边界框:", maskBounds);
 
     // 克隆所有对象，并清除它们的遮罩，避免重复应用
     const clonedObjects = [];
@@ -308,7 +308,7 @@ const createRasterizedImageWithMask = async ({
       height: canvasHeight,
     });
 
-    console.log(`🎨 离屏画布尺寸: ${canvasWidth}x${canvasHeight}, 缩放: ${scaleFactor}`);
+    // console.log(`🎨 离屏画布尺寸: ${canvasWidth}x${canvasHeight}, 缩放: ${scaleFactor}`);
 
     // 调整对象位置，相对于遮罩边界重新定位
     clonedObjects.forEach((obj) => {
@@ -376,7 +376,7 @@ const createRasterizedImageWithMask = async ({
     // 确保图像位置正确
     fabricImage.setCoords();
 
-    console.log("✅ 带遮罩的栅格化图像创建完成");
+    // console.log("✅ 带遮罩的栅格化图像创建完成");
     return fabricImage;
   } catch (error) {
     console.error("带遮罩的栅格化失败:", error);
@@ -430,12 +430,12 @@ const createFabricImageFromDataURL = (dataURL) => {
  */
 const applyMaskToCanvas = async (canvas, maskObject, bounds) => {
   if (!maskObject) {
-    console.log("没有遮罩对象，跳过遮罩应用");
+    // console.log("没有遮罩对象，跳过遮罩应用");
     return;
   }
 
   try {
-    console.log("🎭 应用遮罩到画布");
+    // console.log("🎭 应用遮罩到画布");
 
     // 克隆遮罩对象，避免影响原对象
     const clonedMask = await cloneObjectAsync(maskObject);
@@ -459,7 +459,7 @@ const applyMaskToCanvas = async (canvas, maskObject, bounds) => {
     // 将遮罩设置为画布的clipPath
     canvas.clipPath = clonedMask;
 
-    console.log("✅ 遮罩应用完成");
+    // console.log("✅ 遮罩应用完成");
   } catch (error) {
     console.error("应用遮罩失败:", error);
   }

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

@@ -24,7 +24,7 @@ export const createRasterizedImage = async ({
 	isEnhanceImg, // 是否是增强图片
 } = {}) => {
   try {
-    console.log(`📊 开始栅格化 ${fabricObjects.length} 个对象`);
+    // console.log(`📊 开始栅格化 ${fabricObjects.length} 个对象`);
 
     // 确保有对象需要栅格化
     if (fabricObjects.length === 0) {
@@ -86,14 +86,14 @@ const createClippedObjects = async ({
 	isEnhanceImg, // 是否是增强图片
 }) => {
   try {
-    console.log("🎯 使用新的图像遮罩裁剪方法创建对象");
+    // console.log("🎯 使用新的图像遮罩裁剪方法创建对象");
 
     // 使用优化后的边界计算，确保包含描边区域
     const optimizedBounds = calculateOptimizedBounds(
       clippingObject,
       fabricObjects
     );
-    console.log("📐 优化后的选区边界框:", optimizedBounds);
+    // console.log("📐 优化后的选区边界框:", optimizedBounds);
 
     // 获取羽化值
     let featherAmount = 0;
@@ -102,7 +102,7 @@ const createClippedObjects = async ({
       typeof selectionManager.getFeatherAmount === "function"
     ) {
       featherAmount = selectionManager.getFeatherAmount();
-      console.log(`🌟 应用羽化效果: ${featherAmount}px`);
+    //   console.log(`🌟 应用羽化效果: ${featherAmount}px`);
     }
 
     // 方法1：如果只需要返回DataURL，使用画布裁剪方法
@@ -160,7 +160,7 @@ const createClippedObjects = async ({
     // 更新坐标
     fabricImage.setCoords();
 
-    console.log("✅ 返回裁剪后的fabric对象，已恢复到优化后的原始大小和位置");
+    // console.log("✅ 返回裁剪后的fabric对象，已恢复到优化后的原始大小和位置");
     return fabricImage;
   } catch (error) {
     console.warn("创建裁剪对象失败:", error);
@@ -181,36 +181,37 @@ const createClippedDataURLByCanvas = async ({
   isEnhanceImg = false, // 是否是增强图片
 }) => {
   try {
-    console.log("🖼️ 使用图像遮罩裁剪方法生成DataURL");
+    // console.log("🖼️ 使用图像遮罩裁剪方法生成DataURL");
 
     // 使用优化后的边界计算，确保包含描边区域
-    // const optimizedBounds = calculateOptimizedBounds(
+    const optimizedBounds = calculateOptimizedBounds(
-    //   clippingObject,
+      clippingObject,
-    //   fabricObjects
+      fabricObjects
-    // );
+    );
-	const optimizedBounds = {
+	console.log("📐 优化后的选区边界框:", optimizedBounds);
-		left: clippingObject.left - clippingObject.width / 2,
+	// const optimizedBounds = {
-		top: clippingObject.top - clippingObject.height / 2,
+	// 	left: clippingObject.left - clippingObject.width / 2,
-		width: clippingObject.width,
+	// 	top: clippingObject.top - clippingObject.height / 2,
-		height: clippingObject.height,
+	// 	width: clippingObject.width,
-	}
+	// 	height: clippingObject.height,
+	// }
 
     // 使用高分辨率以保证质量
     const pixelRatio = window.devicePixelRatio || 1;
 		const qualityMultiplier = !!isEnhanceImg ? Math.max(2, pixelRatio) : 1;
 		
-		console.log("使用高分辨率以保证质量:" + isEnhanceImg, optimizedBounds);
+		// console.log("使用高分辨率以保证质量:" + isEnhanceImg, optimizedBounds);
 
     const canvasWidth = Math.ceil(optimizedBounds.width * qualityMultiplier);
     const canvasHeight = Math.ceil(optimizedBounds.height * qualityMultiplier);
 
-    console.log(
+    // console.log(
-      `📏 优化后画布尺寸: ${canvasWidth}x${canvasHeight} (质量倍数: ${qualityMultiplier})`
+    //   `📏 优化后画布尺寸: ${canvasWidth}x${canvasHeight} (质量倍数: ${qualityMultiplier})`
-    );
+    // );
-    console.log("🎯 边界框对比:", {
+    // console.log("🎯 边界框对比:", {
-      original: selectionBounds,
+    //   original: selectionBounds,
-      optimized: optimizedBounds,
+    //   optimized: optimizedBounds,
-    });
+    // });
 
     // 步骤1: 先将路径转换为遮罩图像（支持羽化）
     const maskImageDataURL =
@@ -242,7 +243,7 @@ const createClippedDataURLByCanvas = async ({
       canvasHeight,
     });
 
-    console.log("✅ 图像遮罩裁剪完成，生成DataURL");
+    // console.log("✅ 图像遮罩裁剪完成，生成DataURL");
     return clippedDataURL;
   } catch (error) {
     console.error("图像遮罩裁剪失败:", error);
@@ -262,7 +263,7 @@ const createSimpleClone = async ({
   format,
 }) => {
   try {
-    console.log("📋 创建简单克隆对象");
+    // console.log("📋 创建简单克隆对象");
 
     const clonedObjects = [];
 
@@ -370,7 +371,7 @@ const renderObjectsToDataURL = async (objects, quality, format) => {
  */
 const renderClippedObjectsToDataURL = async (clippedObjects) => {
   try {
-    console.log("🖼️ 渲染裁剪对象为DataURL");
+    // console.log("🖼️ 渲染裁剪对象为DataURL");
 
     // 计算所有裁剪对象的总边界框
     let totalBounds = null;
@@ -450,7 +451,7 @@ const renderClippedObjectsToDataURL = async (clippedObjects) => {
     // 清理临时画布
     tempCanvas.dispose();
 
-    console.log("✅ 裁剪对象渲染完成");
+    // console.log("✅ 裁剪对象渲染完成");
     return dataURL;
   } catch (error) {
     console.error("渲染裁剪对象失败:", error);
@@ -472,7 +473,7 @@ const createLegacyRasterization = async ({
 	isCropByBg, // 是否根据背景裁剪
 	isEnhanceImg, // 是否是增强图片
 }) => {
-  console.log("⚠️ 使用兼容的离屏渲染方法");
+//   console.log("⚠️ 使用兼容的离屏渲染方法");
 
   // 这里保留原有的离屏渲染逻辑作为备选方案
   const currentZoom = canvas.getZoom?.() || 1;
@@ -522,12 +523,12 @@ const calculateBounds = (fabricObjects) => {
     // 获取绝对边界框（原始大小和位置）
     const absoluteBound = obj.getBoundingRect(true, true);
 
-    console.log(`对象 ${obj.id || index} 边界框比较:`, {
+    // console.log(`对象 ${obj.id || index} 边界框比较:`, {
-      relative: relativeBound,
+    //   relative: relativeBound,
-      absolute: absoluteBound,
+    //   absolute: absoluteBound,
-      scaleX: obj.scaleX,
+    //   scaleX: obj.scaleX,
-      scaleY: obj.scaleY,
+    //   scaleY: obj.scaleY,
-    });
+    // });
 
     // 计算绝对边界框的累积范围
     if (!absoluteBounds) {
@@ -600,7 +601,7 @@ const createOffscreenRasterization = async ({
     let renderBounds = absoluteBounds;
     if (clippingObject) {
       const clippingBounds = clippingObject.getBoundingRect(true, true);
-      console.log("🎯 使用裁剪对象边界框:", clippingBounds);
+    //   console.log("🎯 使用裁剪对象边界框:", clippingBounds);
       renderBounds = clippingBounds;
     }
 
@@ -613,9 +614,9 @@ const createOffscreenRasterization = async ({
       height: canvasHeight,
     });
 
-    console.log(
+    // console.log(
-      `🎨 离屏画布尺寸: ${canvasWidth}x${canvasHeight}, 缩放: ${scaleFactor}`
+    //   `🎨 离屏画布尺寸: ${canvasWidth}x${canvasHeight}, 缩放: ${scaleFactor}`
-    );
+    // );
 
     // 克隆对象到离屏画布
     const clonedObjects = [];
@@ -786,7 +787,7 @@ const createMaskImageFromPath = async ({
   qualityMultiplier,
 }) => {
   try {
-    console.log("🎭 创建路径遮罩图像");
+    // console.log("🎭 创建路径遮罩图像");
 
     // 创建专门用于渲染遮罩的画布
     const maskCanvas = new fabric.StaticCanvas();
@@ -820,7 +821,7 @@ const createMaskImageFromPath = async ({
     // 清理遮罩画布
     maskCanvas.dispose();
 
-    console.log("✅ 遮罩图像创建完成");
+    // console.log("✅ 遮罩图像创建完成");
     return maskDataURL;
   } catch (error) {
     console.error("创建遮罩图像失败:", error);
@@ -841,7 +842,7 @@ const renderContentToImage = async ({
   qualityMultiplier,
 }) => {
   try {
-    console.log("🖼️ 渲染内容图像");
+    // console.log("🖼️ 渲染内容图像");
 
     // 创建内容渲染画布
     const contentCanvas = new fabric.StaticCanvas();
@@ -880,7 +881,6 @@ const renderContentToImage = async ({
 	//   if(obj.globalCompositeOperation === "multiply"){
 	// 	clonedObj.clipPath = null;
 	//   }
-	console.log("==========", obj.id, obj.layerName);
       contentCanvas.add(clonedObj);
     }
 
@@ -897,7 +897,7 @@ const renderContentToImage = async ({
     // 清理内容画布
     contentCanvas.dispose();
 
-    console.log("✅ 内容图像渲染完成");
+    // console.log("✅ 内容图像渲染完成");
     return contentDataURL;
   } catch (error) {
     console.error("渲染内容图像失败:", error);
@@ -920,7 +920,7 @@ const applyImageMask = async ({
   canvasHeight,
 }) => {
   try {
-    console.log("🎯 应用图像遮罩");
+    // console.log("🎯 应用图像遮罩");
 
     return new Promise((resolve, reject) => {
       // 创建用于合成的Canvas元素
@@ -952,7 +952,7 @@ const applyImageMask = async ({
             // 获取最终结果
             const resultDataURL = compositeCanvas.toDataURL("image/png", 1.0);
 
-            console.log("✅ 图像遮罩应用完成");
+            // console.log("✅ 图像遮罩应用完成");
             resolve(resultDataURL);
           } catch (error) {
             console.error("合成图像失败:", error);
@@ -994,7 +994,7 @@ const createAdvancedMaskImage = async ({
   featherAmount = 0,
 }) => {
   try {
-    console.log(`🎭 创建高级遮罩图像 (羽化: ${featherAmount})`);
+    // console.log(`🎭 创建高级遮罩图像 (羽化: ${featherAmount})`);
 
     // 创建专门用于渲染遮罩的画布
     const maskCanvas = new fabric.StaticCanvas();
@@ -1047,7 +1047,7 @@ const createAdvancedMaskImage = async ({
     // 清理遮罩画布
     maskCanvas.dispose();
 
-    console.log("✅ 高级遮罩图像创建完成");
+    // console.log("✅ 高级遮罩图像创建完成");
     return maskDataURL;
   } catch (error) {
     console.error("创建高级遮罩图像失败:", error);
@@ -1116,7 +1116,7 @@ const createSolidMaskPath = async (
   qualityMultiplier
 ) => {
   try {
-    console.log("🔧 创建实体遮罩路径，处理描边转填充");
+    // console.log("🔧 创建实体遮罩路径，处理描边转填充");
 
     // 克隆原始对象
     const maskPath = await cloneObjectAsync(clippingObject);
@@ -1125,9 +1125,9 @@ const createSolidMaskPath = async (
     const hasStroke = maskPath.stroke && maskPath.strokeWidth > 0;
 
     if (hasStroke) {
-      console.log(
+    //   console.log(
-        `📏 检测到描边: ${maskPath.stroke}, 宽度: ${maskPath.strokeWidth}`
+    //     `📏 检测到描边: ${maskPath.stroke}, 宽度: ${maskPath.strokeWidth}`
-      );
+    //   );
 
       // 对于有描边的路径，我们需要更精确的处理
       const strokeWidth = maskPath.strokeWidth;
@@ -1182,7 +1182,7 @@ const createSolidMaskPath = async (
         });
       }
 
-      console.log(`✅ 描边已转换为填充，类型: ${maskPath.type}`);
+    //   console.log(`✅ 描边已转换为填充，类型: ${maskPath.type}`);
     } else {
       // 没有描边，直接处理位置和缩放
       maskPath.set({
@@ -1216,7 +1216,7 @@ const createSolidMaskPath = async (
  */
 const calculateOptimizedBounds = (clippingObject, fabricObjects) => {
   try {
-    console.log("📐 计算优化后的边界框");
+    // console.log("📐 计算优化后的边界框");
 
     // 获取裁剪对象的边界框（包含描边）
     const clippingBounds = clippingObject.getBoundingRect(true, true);
@@ -1232,7 +1232,7 @@ const calculateOptimizedBounds = (clippingObject, fabricObjects) => {
       clippingBounds.width += strokeWidth;
       clippingBounds.height += strokeWidth;
 
-      console.log(`🖊️ 调整描边边界框，描边宽度: ${strokeWidth}`);
+    //   console.log(`🖊️ 调整描边边界框，描边宽度: ${strokeWidth}`);
     }
 
     // 计算内容对象的边界框
@@ -1246,11 +1246,11 @@ const calculateOptimizedBounds = (clippingObject, fabricObjects) => {
       height: Math.max(1, clippingBounds.height),
     };
 
-    console.log("✅ 边界框优化完成", {
+    // console.log("✅ 边界框优化完成", {
-      original: clippingObject.getBoundingRect(true, true),
+    //   original: clippingObject.getBoundingRect(true, true),
-      optimized: optimizedBounds,
+    //   optimized: optimizedBounds,
-      hasStroke: !!(clippingObject.stroke && clippingObject.strokeWidth > 0),
+    //   hasStroke: !!(clippingObject.stroke && clippingObject.strokeWidth > 0),
-    });
+    // });
 
     return optimizedBounds;
   } catch (error) {

src/component/Canvas/ExistsImageList/index.vue

@@ -375,6 +375,7 @@ const confirm = ()=>{
 /* 图片网格 */
 .image-grid {
   display: grid;
+  align-content: start;
   grid-template-columns: repeat(auto-fill, minmax(20rem, 1fr));
   gap: 16px;
   min-height: 20rem;

src/component/Canvas/OverallCanvas/demo.vue

@@ -137,7 +137,6 @@
 		<button @click="onAdd">添加</button>
 		<div class="box">
 			<pingpu
-				:list="list"
 				ref="pingpuRef"
 				:width="600"
 				:height="900"
@@ -161,58 +160,7 @@
 	const convertDotNotationToBracket = (str) =>
 		str.replace(/(?:^|\.)(\d+)(?=\.|$)/g, "[#$1]").replace(/\[#/g, "[");
 	const activeToken = ref("1");
-	const list = ref([
+	const list = ref([]);
-		{
-			token: "1",
-			ifSingle: false,
-			level2Type: "Pattern",
-			designType: "Library",
-			path: "/src/assets/images/canvas/yinhua1.jpg",
-			location: [0, 0],
-			scale: [1, 1],
-			angle: 0,
-			name: "Print1",
-			priority: 1,
-			object: {
-				top: 0,
-				left: 0,
-				scaleX: 1,
-				scaleY: 1,
-				opacity: 1,
-				angle: 0,
-				flipX: false,
-				flipY: false,
-				blendMode: "multiply",
-				gapX: 10,
-				gapY: 20,
-			},
-		},
-		{
-			token: "2",
-			ifSingle: false,
-			level2Type: "Pattern",
-			designType: "Library",
-			path: "/src/assets/images/canvas/yinhua1.jpg",
-			location: [0, 0],
-			scale: [2, 2],
-			angle: -45,
-			name: "Print2",
-			priority: 1,
-			object: {
-				top: 450,
-				left: 300,
-				scaleX: 0.5,
-				scaleY: 0.5,
-				opacity: 1,
-				angle: 0,
-				flipX: false,
-				flipY: false,
-				blendMode: "multiply",
-				gapX: 0,
-				gapY: 0,
-			},
-		},
-	]);
 	// 深拷贝
 	const deepCopy = (obj) => JSON.parse(JSON.stringify(obj));
 	const oldList = ref(deepCopy(list.value));

src/component/Canvas/OverallCanvas/index.vue

@@ -3,8 +3,11 @@
 </template>
 
 <script setup>
+	import TaskQueue from "../utils/TaskQueue.js";
 	import { fabric } from "fabric-with-all";
-	import { ref, watch, onMounted } from "vue";
+	import { ref, watch, onMounted, nextTick } from "vue";
+	// 任务队列
+	const taskQueue = new TaskQueue();
 	const KEYS = {
 		FILL_X: "location[0]",
 		FILL_Y: "location[1]",
@@ -22,6 +25,7 @@
 		O_FLIPX: "object.flipX",
 		O_FLIPY: "object.flipY",
 		O_BLENDMODE: "object.blendMode",
+		O_FILL_REPEAT: "object.fill_repeat",
 	};
 	const ACTIONS = {
 		ADD: "add",
@@ -32,45 +36,36 @@
 	};
 	const emit = defineEmits(["change-canvas", "init-canvas"]);
 	const props = defineProps({
-		list: { type: Array, default: () => [] },
+		// list: { type: Array, default: () => [] },
 		width: { type: Number, required: true },
 		height: { type: Number, required: true },
 	});
+	const list = ref([]);
 	const el = ref(null);
 	const canvasRef = ref(null);
 	const observer = ref(null);
 	var canvas = null;
 	onMounted(async () => {
 		initCanvas();
-		await setCanvasData();
+		// taskQueue.addTask(async () => await setCanvasData());
-		let throttleTimeout = null;
+		emit("init-canvas", list.value);
-		let lastRunTime = 0;
+		let throttleDelay = 100;
 		let trailingTimeout = null;
 		observer.value = new ResizeObserver((entries) => {
-			const now = Date.now();
-			const throttleDelay = 100;
-			if (!throttleTimeout) {
-				updateCanvasSize();
-				lastRunTime = now;
-				throttleTimeout = setTimeout(() => {
-					throttleTimeout = null;
-				}, throttleDelay);
-			} else {
 			clearTimeout(trailingTimeout);
 			trailingTimeout = setTimeout(() => {
-					updateCanvasSize();
+				console.log("OverallCanvas: resize");
-					lastRunTime = Date.now();
+				taskQueue.addTask(async () => await updateCanvasSize());
 			}, throttleDelay);
-			}
 		});
 		observer.value.observe(el.value);
-		emit("init-canvas", props.list);
 	});
 	onBeforeUnmount(() => {
 		observer.value.disconnect();
 		unbindEvent();
 	});
 	const initCanvas = () => {
+		console.log("OverallCanvas: initCanvas");
 		canvas = new fabric.Canvas(canvasRef.value, {
 			selection: false,
 			preserveObjectStacking: true,
@@ -80,6 +75,7 @@
 		bindEvent();
 	};
 	const updateCanvasSize = async () => {
+		console.log("OverallCanvas: updateCanvasSize");
 		canvas.setWidth(el.value.offsetWidth);
 		canvas.setHeight(el.value.offsetHeight);
 		await setCanvasData();
@@ -98,7 +94,7 @@
 	};
 	// 处理对象修改事件
 	const onObjectModified = (e) => {
-		console.log(e);
+		console.log("OverallCanvas: onObjectModified", e);
 		const object = e.target;
 		const action = e.action;
 		const list = [];
@@ -150,7 +146,7 @@
 	const onDeleteItem = (object) => {
 		const list = [{ token: object.token, action: ACTIONS.DELETE }];
 		emit("change-canvas", list);
-		canvas.remove(object);
+		DeleteItemByToken(object.token);
 		canvas.renderAll();
 	};
 	const urlToCanvas = (url) => {
@@ -174,18 +170,20 @@
 	};
 	const setCanvasData = async () => {
 		canvas.clear();
-		for (let i = 0; i < props.list.length; i++) {
+		console.log("OverallCanvas: setCanvasData", list.value);
-			let item = props.list[i];
+		for (let i = 0; i < list.value.length; i++) {
+			let item = list.value[i];
 			await addObject(item);
 		}
 		canvas.renderAll();
 	};
 	const addObject = async (item) => {
+		const token = item.token;
 		const cwidth = canvas.width;
 		const cheight = canvas.height;
 		let pattern = await setFill(item);
 		let rect = new fabric.Rect({
-			token: item.token,
+			token: token,
 			width: cwidth,
 			height: cheight,
 			fill: pattern,
@@ -194,7 +192,6 @@
 			left: item.object.left / (props.width / canvas.width),
 			onDelete: (v) => onDeleteItem(v),
 		});
-		console.log("==========", props)
 		canvas.add(rect);
 	};
 	const setFill = async (item) => {
@@ -202,11 +199,14 @@
 		const cwidth = canvas.width;
 		const cheight = canvas.height;
 		let image = await urlToCanvas(item.path);
-		let offsetX = item.location[0];
-		let offsetY = item.location[1];
 		let scaleX = ((cwidth / image.width) * item.scale[0]) / 5;
 		let scaleY = ((cheight / image.height) * item.scale[1]) / 5;
 		let scale = cwidth > cheight ? scaleX : scaleY;
+		let offsetX =
+			(item.location[0] * cwidth) / props.width - (image.width * scale) / 2;
+		let offsetY =
+			(item.location[1] * cheight) / props.height -
+			(image.height * scale) / 2;
 		let angle = item.angle;
 		let gapX = item.object.gapX;
 		let gapY = item.object.gapY;
@@ -224,28 +224,35 @@
 		ctx.drawImage(image, 0, 0);
 		let pattern = new fabric.Pattern({
 			source: tcanvas,
-			repeat: "repeat",
+			repeat: item.object?.fill_repeat || "repeat",
 			patternTransform,
 			offsetX, // 水平偏移
 			offsetY, // 垂直偏移
 		});
 		return pattern;
 	};
-	const updataList = async (list) => {
+	const updataList = async (list_) => {
-		console.log(list);
+		const cd = async (list_) => {
+			console.log("OverallCanvas: updataList", list_);
 			const objects = canvas.getObjects();
-		for (let i = 0; i < list.length; i++) {
+			for (let i = 0; i < list_.length; i++) {
-			let item = list[i];
+				let item = list_[i];
 				let object = objects.find((o) => o.token === item.token);
 				if (item.action === ACTIONS.UPDATE) {
 					if (!object) continue;
 					let value = item.value;
 					switch (item.key) {
 						case KEYS.O_TOP:
-						object.set("top", value / (props.height / canvas.height));
+							object.set(
+								"top",
+								value / (props.height / canvas.height)
+							);
 							break;
 						case KEYS.O_LEFT:
-						object.set("left", value / (props.width / canvas.width));
+							object.set(
+								"left",
+								value / (props.width / canvas.width)
+							);
 							break;
 						case KEYS.O_OPACITY:
 							object.set("opacity", value);
@@ -275,8 +282,9 @@
 						case KEYS.FILL_SCALEY:
 						case KEYS.FILL_GAPX:
 						case KEYS.FILL_GAPY:
+						case KEYS.O_FILL_REPEAT:
 							let pattern = await setFill(
-							props.list.find((v) => v.token === item.token)
+								list.value.find((v) => v.token === item.token)
 							);
 							object.set("fill", pattern);
 							break;
@@ -286,19 +294,33 @@
 				} else if (item.action === ACTIONS.SORT) {
 					let tokens = item.tokens;
 					canvas.clear();
+					const list_ = [];
 					for (let j = 0; j < tokens.length; j++) {
+						let item_ = list.value.find((v) => v.token === tokens[j]);
+						if (item_) list_.push(item_);
 						let object = objects.find((o) => o.token === tokens[j]);
 						if (object) canvas.add(object);
 					}
+					list.value = list_;
 					canvas.renderAll();
 				} else if (item.action === ACTIONS.DELETE) {
-				if (object) canvas.remove(object);
+					DeleteItemByToken(item.token);
 				} else if (item.action === ACTIONS.ADD) {
+					DeleteItemByToken(item.data.token);
+					list.value.push(item.data);
 					await addObject(item.data);
 				}
 			}
 			canvas.renderAll();
 		};
+		taskQueue.addTask(async () => await cd(list_));
+	};
+	/** 删除 */
+	const DeleteItemByToken = (token) => {
+		list.value = list.value.filter((v) => v.token !== token);
+		const objects = canvas.getObjects().filter((o) => o.token === token);
+		objects.forEach((o) => canvas.remove(o));
+	};
 	defineExpose({
 		updataList,
 	});

src/component/Canvas/canvasExample.vue

@@ -331,7 +331,10 @@
 			class: "export-btn",
 		},
 	]);
-	const otherData = {
+	const canvasLoadJsonSuccess = () => {
+		console.log("画布加载JSON成功");
+		return;
+		canvasEditor.value?.updateOtherLayers({
 			color: { rgba: { r: 255, g: 0, b: 0, a: 1 } },
 			printObject: {
 				prints: [
@@ -340,32 +343,34 @@
 						level2Type: "Pattern",
 						designType: "Library",
 						path: "/src/assets/images/canvas/yinhua1.jpg",
-					location: [250, 780],
+						location: [800, 600],
-					scale: [1.2, 1.6],
+						scale: [1, 1],
 						angle: 0,
+						priority: 1,
 						object: {
-						top: 600,
+							top: 300,
-						left: 800,
+							left: 400,
 							scaleX: 0.5,
 							scaleY: 0.5,
 							opacity: 1,
-						angle: 45,
+							angle: 0,
 							flipX: false,
 							flipY: false,
-						blendMode: "multiply",
+							// blendMode: "multiply",
 							gapX: 0,
 							gapY: 0,
 						},
 					},
-				// {
+					{
-				// 	ifSingle: true,
+						ifSingle: true,
-				// 	level2Type: "Pattern",
+						level2Type: "Pattern",
-				// 	designType: "Library",
+						designType: "Library",
-				// 	path: "/src/assets/images/canvas/yinhua1.jpg",
+						path: "/src/assets/images/canvas/yinhua1.jpg",
-				// 	location: [550, 650],
+						location: [550, 650],
-				// 	scale: [0.15, 0.2],
+						scale: [0.15, 0.2],
-				// 	angle: 0,
+						angle: 0,
-				// },
+						priority: 2,
+					},
 					// {
 					// 	ifSingle: true,
 					// 	level2Type: "Pattern",
@@ -374,9 +379,11 @@
 					// 	location: [700, 400],
 					// 	scale: [0.1, 0.133],
 					// 	angle: 0,
+					// 	priority: 3,
 					// },
 				],
 			},
+		});
 	};
 </script>
 
@@ -408,14 +415,13 @@
 				:clothingMinIOPath="clothingMinIOPath"
 				:clothingImageUrl="clothingImageUrl"
 				:clothingImageUrl2="clothingImageUrlInit"
-				:otherData="otherData"
+				@canvasLoadJsonSuccess="canvasLoadJsonSuccess"
 				:config="editorConfig"
 				:clothing-image-opts="{
 					imageMode: 'contains', // 设置底图包含在画布内
 				}"
 				@change-canvas="changeCanvas"
 				@canvas-init="canvasInit"
-				isFixedErasable
 				showFixedLayer
 			>
 				<template #existsImageList>
@@ -441,9 +447,26 @@
 				</template>
 			</CanvasEditor>
 		</div>
+		<img src="" alt="" id="canvas-test-dom">
 	</div>
 </template>
-
+<style>
+	body > .lower-canvas {
+		position: fixed;
+		top: 0;
+		left: 0;
+		width: 800px !important;
+		height: 600px !important;
+		z-index: 99999999;
+	}
+	#canvas-test-dom{
+		position: fixed;
+		z-index: 9999999999;
+		top: 0;
+		left: 0;
+		pointer-events: none;
+	}
+</style>
 <style scoped lang="less">
 	* {
 		margin: 0;

src/component/Canvas/index.vue

@@ -7,7 +7,7 @@
         :enabledRedGreenMode="false"
       />
     </div>
-	<div class="btn">123
+	<div class="btn">
 		<div class="gallery_btn" @click="exportElement">Export</div>
 	</div>
   </div>

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;

src/component/Canvas/utils/TaskQueue.js

@@ -0,0 +1,28 @@
+export default class TaskQueue {
+	constructor() {
+		this.tasks = [];
+		this.running = false;
+	}
+	// 添加任务
+	addTask(task) {
+		this.tasks.push(task);
+		// 执行任务
+		this.executeTasks();
+	}
+	// 执行任务
+	async executeTasks() {
+		if (this.running) {
+			return;
+		}
+		this.running = true;
+		for (const task of this.tasks) {
+			await task();
+		}
+		this.running = false;
+		this.clearTasks();
+	}
+	// 清空任务队列
+	clearTasks() {
+		this.tasks = [];
+	}
+}

src/component/Detail/DesignDetail.vue

@@ -101,7 +101,7 @@
 						</div>
 					</div>
 					<div class="contentRight canvas" v-if="selectDetail && selectDetail.id && currentDetailType" :class="{'active': isEditPattern.value}">
-						<canvasBox ref="canvasBox" :key="canvasKey" :sketchSize="sketchSize" @setSloganData="setSloganData" :isEditPattern="isEditPattern.value" :updateOtherLayers="updateOtherLayers"></canvasBox>
+						<canvasBox ref="canvasBox" v-model:loadingShow="loadingShow" :key="canvasKey" :sketchSize="sketchSize" @setSloganData="setSloganData" :isEditPattern="isEditPattern.value" :updateOtherLayers="updateOtherLayers"></canvasBox>
 					</div>
 					<!-- 画布 -->
 					<!-- <div class="content" v-else-if="selectDetail && selectDetail.id">
@@ -129,7 +129,9 @@ import { Modal,message } from 'ant-design-vue';
 import {getUploadUrl,segmentImage,setGradual,rgbToHsv,rgbaToHex} from '@/tool/util'
 import { useStore } from "vuex";
 import { openGuide,driverObj__ } from "@/tool/guide";
+import { KeyValueDB } from "@/tool/indexedDB";
 import { useI18n } from 'vue-i18n'
+import { convertToEC4StyleForCustomSerise } from 'echarts/types/src/util/styleCompat.js'
 export default defineComponent({
     components:{
 		detailLeft,model,detailRight,canvasBox
@@ -161,7 +163,7 @@ export default defineComponent({
 			isEditPattern:{
 				value:'' as any,
 			},// 是否编辑图案
-			canvasKey:0,
+			canvasKey:computed(()=>store.state.DesignDetail.canvasKey),
 			singleOveral:{
 				value:'overall'
 			},
@@ -190,15 +192,17 @@ export default defineComponent({
 		watch(()=>detailData.selectDetail,async (newValue,oldValue)=>{
 			detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id)
 			if(newValue?.path)await getSketchSize()
-			detailData.canvasKey += 1
+			if(newValue?.id && (newValue?.id != oldValue?.id)){
+				store.commit('DesignDetail/changeCanvasKey')
+			}
 			// privewDetail(oldValue)
 		},{immediate: true})
 		provide('getCanvasIfEdit',detailData.getCanvasIfEdit)
 		provide('singleOveral',detailData.singleOveral)
 		provide('isEditPattern',detailData.isEditPattern)
-		const closeModal = ()=>{
+		const closeModal = async ()=>{
-			sessionStorage.removeItem('oppositeRevocation')
+			await KeyValueDB.remove('oppositeRevocation')
-			sessionStorage.removeItem('revocation')
+			await KeyValueDB.remove('revocation')
 			detailData.designDetailShow = false
 			emit('destroy')
 		}
@@ -212,10 +216,9 @@ export default defineComponent({
 				Https.axiosGet(url).then(
 					async (rv: any) => {
 						//清除画布JSON数据
-						sessionStorage.removeItem('canvasList');
+						await KeyValueDB.remove('canvasList');
-						sessionStorage.removeItem('revocation');
+						await KeyValueDB.remove('revocation');
-						sessionStorage.removeItem('oppositeRevocation');
+						await KeyValueDB.remove('oppositeRevocation');
-						sessionStorage.setItem('key', 'value');
 						store.commit('DesignDetail/setDesignDetail',rv)
 						rv.clothes.forEach((item:any)=>{
 							let a
@@ -259,7 +262,7 @@ export default defineComponent({
 						}
 
 
-						detailData.loadingShow = false
+						// detailData.loadingShow = false
 						resolve(rv)
 					}
 				).catch(rv=>{
@@ -270,24 +273,24 @@ export default defineComponent({
 			
 		}
 		//撤回
-		const setRevocation = ()=>{//设置撤销
+		const setRevocation = async ()=>{//设置撤销
 			let itemDetail = JSON.parse(JSON.stringify(detailData.designDetail))
-			let revocation:any = JSON.parse((sessionStorage.getItem("revocation") as any))
+			let revocation:any = JSON.parse((await KeyValueDB.get("revocation") as any) || 'null')
 			if(!revocation)revocation = []
-			// let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any))
+			// let oppositeRevocation = JSON.parse((await KeyValueDB.get("oppositeRevocation") as any))
 			// if(revocation?.[0]?.designItemId != itemDetail.designItemId || revocation?.[0]?.designItemId == undefined){
 			// 	revocation = []
 			// }
 			revocation.push({designData:itemDetail,position:null})
 			detailData.revocationShow = revocation?.length
-			sessionStorage.setItem('revocation', JSON.stringify(revocation));
+			await KeyValueDB.set('revocation', JSON.stringify(revocation));
-			sessionStorage.setItem('oppositeRevocation',JSON.stringify([]));
+			await KeyValueDB.set('oppositeRevocation',JSON.stringify([]));
 		}
 		provide('setRevocation',setRevocation)
 
-		const revocation = ()=>{//撤回
+		const revocation = async ()=>{//撤回
-			let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any))
+			let oppositeRevocation = JSON.parse((await KeyValueDB.get("oppositeRevocation") as any) || 'null')
-			let revocation = JSON.parse((sessionStorage.getItem("revocation") as any))
+			let revocation = JSON.parse((await KeyValueDB.get("revocation") as any) || 'null')
 			if(revocation.length <= 1)return
 			oppositeRevocation.push(revocation[revocation.length-1])
 			revocation.splice(revocation.length-1,1)
@@ -299,14 +302,14 @@ export default defineComponent({
 				store.commit('DesignDetail/setFrontBack',revocation[revocation.length-1].position)
 			}
 			store.commit('DesignDetail/setDesignColthes',detailData.selectDetail.id)
-			sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation));
+			await KeyValueDB.set('oppositeRevocation', JSON.stringify(oppositeRevocation));
-			sessionStorage.setItem('revocation', JSON.stringify(revocation));
+			await KeyValueDB.set('revocation', JSON.stringify(revocation));
 			// clearSelect()
 			detailData.positionKey++
 		}
-		const oppositeRevocation = ()=>{//反撤回
+		const oppositeRevocation = async ()=>{//反撤回
-			let oppositeRevocation = JSON.parse((sessionStorage.getItem("oppositeRevocation") as any))
+			let oppositeRevocation = JSON.parse((await KeyValueDB.get("oppositeRevocation") as any) || 'null')
-			let revocation = JSON.parse((sessionStorage.getItem("revocation") as any))
+			let revocation = JSON.parse((await KeyValueDB.get("revocation") as any) || 'null')
 			// if(!oppositeRevocation[oppositeRevocation.length-1].designData)return
 			if(oppositeRevocation.length < 1)return
 			if(oppositeRevocation[oppositeRevocation.length-1]?.designData){
@@ -319,8 +322,8 @@ export default defineComponent({
 			detailData.revocationShow = revocation.length
 			oppositeRevocation.splice(oppositeRevocation.length-1,1)
 			detailData.oppositeRevocationShow = oppositeRevocation.length
-			sessionStorage.setItem('oppositeRevocation', JSON.stringify(oppositeRevocation));
+			await KeyValueDB.set('oppositeRevocation', JSON.stringify(oppositeRevocation));
-			sessionStorage.setItem('revocation', JSON.stringify(revocation));
+			await KeyValueDB.set('revocation', JSON.stringify(revocation));
 			// this.clearSelect()
 			detailData.positionKey++
 		}
@@ -329,16 +332,23 @@ export default defineComponent({
 		}
 		const setClothes = async (list:any,str:string)=>{
 			let clothesList:any = []
-			await nextTick()
 			if(detailData.isEditPattern.value == 'editSketch')await detailDom.canvasBox.submitBase64Data().then((rv)=>{
 				detailData.selectDetail.sketchString = rv
 			})
+			if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+			if(detailDom.canvasBox && (detailData.currentDetailType != 'sketch' || detailData.isEditPattern.value == 'canvasEditor')){
+				// if(detailData.isEditPattern.value !== 'editSketch'){
+				// 	let otherDataupDateFrontBackSketch = await updateOtherLayers(detailData.isEditPattern.value == 'canvasEditor'?'all':'single')
+				// 	await detailDom.canvasBox.updateOtherLayers(otherData)
+				// }
+				await detailDom.canvasBox.privewDetail()
+				await uploadSelectDetail()
+				// await uploadElement()
+			}
 			for(let i = 0;i<list.length;i++){
 				detailData.selectDetail
 			    let {scale,offset,priority,transpose,rotate,maskUrl,maskMinioUrl} = await (detailDom.model as any).getSubmitData(list[i])
-				if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+				let newData = list[i]?.newDetail
-				let gradient = null
-				let newData = list[i]?.newDetail?.[detailData.currentDetailType]
 				// newData[0].location=[
 				// 	-233.13985,
 				// 	406.90964
@@ -348,13 +358,26 @@ export default defineComponent({
 				// 0.35822305
 				// ]	
 				let isCurrent = list[i].id == detailData?.selectDetail?.id
-				let color = (detailData.currentDetailType == 'color' && isCurrent && !detailData.isEditPattern.value)?
+				let color = ''
-				(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):
+				let gradient = null
-				(list[i].color?.rgba?.r?
+				// if((detailData.currentDetailType == 'color' && detailData.isEditPattern.value == 'canvasEditor') && isCurrent){
-				`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:
+				// 	color = newData?.color?.rgba?.r != null?`${newData?.color.rgba.r} ${newData?.color.rgba.g} ${newData?.color.rgba.b}`:''
-				'')
+				// 	if(newData?.color?.gradient){
-				if(detailData.currentDetailType == 'sketch' && newData){
+				// 		gradient = newData?.color.gradient
+				// 	}
+				// }else if(isCurrent){
+					
+				// }
+				color = list[i].color?.rgba?.r != null?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:''
+					gradient = list[i].gradient
+				if((detailData.currentDetailType == 'sketch' && newData?.sketch) || detailData.isEditPattern.value == 'editSketch'){
+					if(detailData.isEditPattern.value == 'editSketch'){
+						color = detailData.selectDetail?.color?.rgba?.r != null?`${detailData.selectDetail.color.rgba.r} ${detailData.selectDetail.color.rgba.g} ${detailData.selectDetail.color.rgba.b}`:''
+						gradient = detailData.selectDetail?.gradient || null
+					}else{
 						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 = ''
 				}
@@ -368,9 +391,10 @@ export default defineComponent({
 				let data:any = {
 					changed:false,
 					color,
-					designType:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.designType:list[i].designType,
+					gradient,
-					id:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.id:list[i].id,
+					designType:(newData?.sketch && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData?.sketch.designType:list[i].designType,
-					maskMinioUrl:((newData && detailData.currentDetailType == 'sketch') || list[i].sketchString)?'':list[i]?.maskMinioUrl,
+					id:(newData?.sketch && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData?.sketch.id:list[i].id,
+					maskMinioUrl:((newData?.sketch && detailData.currentDetailType == 'sketch') || list[i].sketchString)?'':list[i]?.maskMinioUrl,
 					// maskUrl:'',
 					maskUrl:list[i]?.maskUrl || '',
 					// offset:[
@@ -382,28 +406,29 @@ export default defineComponent({
 					rotate,
 					partialDesign:list[i].partialDesign,
 					// partialDesign:detailData.isEditPattern.value?list[i].partialDesign:{},
-					path:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.minIOPath:list[i].minIOPath,
+					path:(newData?.sketch && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData?.sketch.minIOPath:list[i].minIOPath,
-					printObject:(newData && detailData.currentDetailType == 'print' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].printObject?list[i].printObject:{prints:[]},
+					printObject:((newData?.print?.length>0 && (detailData.currentDetailType == 'print' || detailData.isEditPattern.value == 'canvasEditor')) && isCurrent)?{prints:newData.print}:list[i].printObject?list[i].printObject:{prints:[]},
 					priority,
 					// scale:[
                     //                 0.5,
                     //                 0.35822305
                     //             ],
 					scale:[scale[0]?scale[0]:1,scale[1]?scale[1]:1],
-					type:(newData && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData.level2Type || newData.categoryValue:list[i].type,
+					type:(newData?.sketch && detailData.currentDetailType == 'sketch' && isCurrent && !detailData.isEditPattern.value)?newData?.sketch.level2Type || newData?.sketch.categoryValue:list[i].type,
 					sketchString:list[i].sketchString?list[i].sketchString:'',
-					trims:(newData && detailData.currentDetailType == 'element' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
+					trims:((newData?.element?.length>0 && (detailData.currentDetailType == 'element' || detailData.isEditPattern.value == 'canvasEditor')) && isCurrent)?{prints:newData.element}:list[i].trims?.prints?list[i].trims:{prints:[]},
-					accessory:(newData && detailData.currentDetailType == 'accessory' && isCurrent && !detailData.isEditPattern.value)?{prints:newData}:list[i].trims?.prints?list[i].trims:{prints:[]},
 				}
-				// if(!data.partialDesign.partialDesignMinioPath){
-				// 	data.partialDesign.partialDesignMinioPath = data.path
-				// }
 				printObjectToJSON(data.printObject.prints)
 				printObjectToJSON(data.trims.prints)
-				if((detailData.isEditPattern.value && list[i].color?.gradient) || (!detailData.isEditPattern.value && (list[i].newDetail?.color?.gradient || list[i].color?.gradient))){
+				console.log(list[i],'=======',isCurrent)
-					gradient = list[i].newDetail?.color?.gradient || list[i].color.gradient
+				if((list[i]?.color?.gradient)){
+				// if(list[i].color?.gradient || (!detailData.isEditPattern.value && (list[i].newDetail?.color?.gradient || list[i].color?.gradient))){
+					gradient = list[i]?.color?.gradient
+					console.log(gradient,list[i],gradient)
 					gradient.colorImg = await setGradual(gradient,320,700)
 					data.gradient = gradient
+				}else{
+					data.gradient = null
 				}
 				clothesList.push(data)
 			}
@@ -411,6 +436,7 @@ export default defineComponent({
 		}
 		const getSubmitData = async (str:string)=>{
 			// return
+			await new Promise<void>(async (resolve, reject) => {
 				let workspace = store.state.Workspace.probjects
 				if(!detailData?.selectDetail?.path && !detailData?.selectDetail?.newDetail?.sketch?.minIOPath)return
 				let clothes:any
@@ -419,6 +445,7 @@ export default defineComponent({
 				}else{
 					clothes = await setClothes([detailData.selectDetail],str)
 				}
+				let isDefault = detailData.selectDetail.sketchString || (!detailData.selectDetail.id || (detailData.selectDetail?.newDetail?.sketch && detailData.currentDetailType == 'sketch')) 
 				let data = {
 					designItemId:detailData.designDetail.designItemId,
 					designSingleItemDTOList:clothes,
@@ -428,30 +455,54 @@ export default defineComponent({
 					sketchString:'',
 					modelId:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.id:detailData.designDetail.oldModel?detailData.designDetail.oldModel.id:'',
 					modelType:(detailData.currentDetailType == 'models' && detailData.designDetail.newModel)?detailData.designDetail.newModel.type:detailData.designDetail.oldModel?detailData.designDetail.oldModel.type:'',
-				designType:detailData.selectDetail.id?'merge':'default',
+					designType:isDefault?'default':'merge',
 					timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
 					processId:userDetail.value.userId,
 					probjectId:store.state.Workspace.probjects.id,
 				}
-			detailData.loadingShow = true
+				await Https.axiosPost(Https.httpUrls.designSingle, data).then(async (rv)=>{
-			Https.axiosPost(Https.httpUrls.designSingle, data).then((rv)=>{
 					let value = {
 						currentType : JSON.parse(JSON.stringify(detailData.currentDetailType)),
 						rv:rv,
-					fun:setRevocation
 					}
 					if(detailData?.designDetail?.newModel)detailData.designDetail.oldModel = JSON.parse(JSON.stringify(detailData.designDetail.newModel))
+
 					// delete detailData.designDetail.newModel
-				detailData.selectDetail.sketchString = null
+					let el:any = document.querySelector('.molepositon .perview_img')
+					let scale = 0
+					await new Promise<void>(async (resolve, reject) => {
+						if(!detailData.frontBack.body.path)resolve(true)
+						const img = new Image();
+						img.src = detailData.frontBack.body.path;
+						img.onload = () => {
+							scale = el.parentNode.offsetWidth / img.width;
+							resolve(true)
+						};
+					})
+					value.scale = scale
 					store.commit('DesignDetail/setPraeview',value)
-				detailData.loadingShow = false
+					store.commit('DesignDetail/changeCanvasKey')
+					// console.log(detailData.selectDetail)
+					// if(detailData.selectDetail.sketchString || (detailData.selectDetail?.newDetail?.sketch && detailData.currentDetailType == 'sketch')){
+					// 	detailData.canvasKey += 1
+					// }
+					detailData.selectDetail.sketchString = null
+					resolve(true)
 					canvasReload()
 					// setRevocation()
 				}).catch(res=>{ 
-				detailData.loadingShow = false
+					resolve(true)
 				});
+			})
+			
 		}
 		const submit = async ()=>{
+			detailData.loadingShow = true
+			if(detailData.isEditPattern.value !== 'canvasEditor' && detailDom.canvasBox){
+				if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+				let otherData = await updateOtherLayers('single')
+				await detailDom.canvasBox.updateOtherLayers(otherData)
+			}
 			let workspace = store.state.Workspace.probjects
 			let clothes:any = await setClothes(detailData.designDetail.clothes,'sub')
 			let data = {
@@ -468,11 +519,10 @@ export default defineComponent({
 				processId:userDetail.value.userId,
 				probjectId:store.state.Workspace.probjects.id,
 			}
-			detailData.loadingShow = true
 			Https.axiosPost(Https.httpUrls.designSingle, data).then(async (rv)=>{
 				saveCanvasJSONToSession()
 				// store.commit('DesignDetail/setPraeview',rv)
-				const sessionCanvasList = sessionStorage.getItem('canvasList');
+				const sessionCanvasList = await KeyValueDB.get('canvasList');
 				const canvasList = sessionCanvasList ? JSON.parse(sessionCanvasList) : []
 				for (let i = 0; i < canvasList.length; i++) {
 					const index = detailData.designDetail.clothes.findIndex(item => item.id === canvasList[i].id);
@@ -499,17 +549,37 @@ export default defineComponent({
             });
 		}
 		const previwe = async ()=>{ 
-			if((detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){
+			detailData.loadingShow = true
-				let data = getSubmitData('preview')
+			if((detailData.currentDetailType == 'models' && !detailData.isEditPattern.value) || (detailData.currentDetailType == 'sketch' && !detailData.isEditPattern.value) || detailData.isEditPattern.value == 'editSketch'){
-				store.dispatch('DesignDetail/setSubmit',data)
+				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()
+					detailDom?.model?.updateRect()
+					await upDateFrontBackSketch()
+					detailData.loadingShow = false
+				}
 			}else{
 				//走画布合成图片并且直接分割
+				if(detailData.isEditPattern.value !== 'canvasEditor' && detailData.isEditPattern.value !== 'redGreenExample'){
 					if(detailData.isEditPattern.value !== 'canvasEditor'){
 						if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+					}
 					let otherData = await updateOtherLayers('single')
 					await detailDom.canvasBox.updateOtherLayers(otherData)
 				}
+				
 				await detailDom.canvasBox.privewDetail()
+				await upDateFrontBackSketch()
+				await uploadSelectDetail()
+				saveCanvasJSONToSession()
+				detailData.loadingShow = false
+			}
+		}
+		const upDateFrontBackSketch = async ()=>{//更新模特身上的分割图
+			await new Promise<void>(async(resolve, reject) => {
 				let img = new Image()
 				img.onload = ()=>{
 					let partialDesign = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.partialDesign.partialDesignPath
@@ -520,23 +590,22 @@ export default defineComponent({
 					segmentImage(detailData.selectDetail.maskUrl,partialDesign,size).then(async (rv)=>{
 						let front = detailData.frontBack.front[detailData.imgDomIndex]
 						let back = detailData.frontBack.back[detailData.imgDomIndex]
-						if(!front?.oldImageUrl)front.oldImageUrl = front.imageUrl
-						if(!front?.oldMaskUrl)front.oldMaskUrl = front.maskUrl
-						if(!back?.oldImageUrl)back.oldImageUrl = back.imageUrl
-						if(!front?.oldMaskUrl)store.commit('DesignDetail/updataDetailItem',{maskUrl:front.oldMaskUrl})
 
+						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})
+						resolve()
 					})
 				}
 				img.src = detailData.selectDetail.path
-				saveCanvasJSONToSession()
+			})
 		}
-		}
+		const saveCanvasJSONToSession = async ()=>{
-		const saveCanvasJSONToSession = ()=>{
 			let canvasJSON = detailDom.canvasBox.getCanvasJSON()
-			const sessionCanvasList = sessionStorage.getItem('canvasList');
+			const sessionCanvasList = await KeyValueDB.get('canvasList');
 			const list = sessionCanvasList ? JSON.parse(sessionCanvasList) : []
 			let index = -1
 			list.forEach((item:any,i:number)=>{
@@ -549,27 +618,36 @@ export default defineComponent({
 			}else{
 				list[index].canvasJSON = canvasJSON
 			}
-			sessionStorage.setItem('canvasList', JSON.stringify(list));
+			await KeyValueDB.set('canvasList', JSON.stringify(list));
 		}
 		const detailEdit = async (str:any)=>{
+			detailData.loadingShow = true
 			if(str){
 				if(detailData.isEditPattern.value && detailData.isEditPattern.value == str){
 					// await detailDom.canvasBox.saveCanvas()
 					await (detailDom.canvasBox as any).privewDetail()
-					if(detailData.isEditPattern.value == 'canvasEditor')await uploadElement()
+					if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample')await uploadSelectDetail()
 					detailData.isEditPattern.value = ''
 				}else{
 					// if(detailData.isEditPattern.value && (str == 'canvasEditor' || str == 'redGreenExample')){
 					// 	detailDom.canvasBox.editFront(str)
 					// }
 					detailDom.canvasBox.editFront(str)
+					if(str == 'canvasEditor'){
+						if((detailData.currentDetailType == 'print' || detailData.currentDetailType == 'element') && !detailDom.detailRight?.privewDetail){
+							store.commit('DesignDetail/changeCanvasKey')
+						}else{
+							if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
 							let otherData = await updateOtherLayers('single')
 							await detailDom.canvasBox.updateOtherLayers(otherData)
+						}
+					}
 					detailData.isEditPattern.value = str
 				}
 			}else{
 				detailData.isEditPattern.value = ''
 			}
+			detailData.loadingShow = false
 		}
 		const getColorName = (color:any)=>{
 			let rgb:any = [color.r, color.g, color.b];
@@ -591,14 +669,14 @@ export default defineComponent({
 					});
 			})
 		}
-		const updateOtherLayers = async (str:any='all')=>{//更新到画布图层
+		const updateOtherLayers = async (str:any='all',type:any='noFirst')=>{//更新到画布图层
 			let otherData:any = {}
-			if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
 			if(str == 'all'){
+				// await uploadSelectDetail()
 				otherData = {
-					color: detailData.selectDetail.newDetail?.color?.r?detailData.selectDetail.newDetail?.color:detailData.selectDetail.color,
+					color: detailData.selectDetail.color,
-					printObject: detailData.selectDetail.newDetail?.print?.length>0?{prints:detailData.selectDetail.newDetail?.print}:detailData.selectDetail.printObject || null,
+					printObject: detailData.selectDetail.printObject || null,
-					trims: detailData.selectDetail.newDetail?.element?.length>0?detailData.selectDetail.newDetail?.element:detailData.selectDetail.trims || null,
+					trims: detailData.selectDetail.trims || null,
 				}	
 			}else if(str == 'single'){
 				otherData = {
@@ -610,7 +688,7 @@ export default defineComponent({
 					let color = detailData.selectDetail.newDetail?.color
 					// let colorData:any = await getColorName(color?.rgba)
 					if(detailData.selectDetail.newDetail?.color){
-						if(color.r){
+						if(color.r != null){
 							color.rgba = {r:color.r,g:color.g,b:color.b,a:color.a}
 						}else{
 							color.rgba = {}
@@ -619,40 +697,38 @@ export default defineComponent({
 					}
 				}
 				if(detailData.currentDetailType == 'print'){
-					otherData.printObject = detailData.selectDetail.newDetail?.print?.length>0?{prints:detailData.selectDetail.newDetail?.print}:detailData.selectDetail.printObject || null
+					if(detailDom.detailRight?.privewDetail)await (detailDom.detailRight as any).privewDetail()
+					otherData.printObject = {prints:detailData.selectDetail.newDetail?.print || []}
 				}
 				if(detailData.currentDetailType == 'element'){
-					otherData.trims = detailData.selectDetail.newDetail?.element?.length>0?{prints:detailData.selectDetail.newDetail?.element}:detailData.selectDetail.trims || null
+					otherData.trims = {prints:detailData.selectDetail.newDetail?.element || []}
 				}
 			}
-			console.log(JSON.parse(JSON.stringify(otherData)),'=======',JSON.parse(JSON.stringify(detailData.selectDetail)))
 			return otherData
 		}
 		const uploadElement = async ()=>{//取出画布数据更新到detail
 			if(detailData.isEditPattern.value == 'canvasEditor'){
 				// await detailDom.canvasBox.saveCanvas()
 				const allInfo = await (detailDom.canvasBox as any).getCanvasElement()
-				if(allInfo.trims?.length > 0){
+				let trimsValue = {
-					// detailData.selectDetail.trims.prints = allInfo.trims
+					data:allInfo.trims || [],
-					let value = {
-						data:allInfo.trims,
 					str:'element'
 				}
-					store.commit('DesignDetail/setNewDetail',value)
+				store.commit('DesignDetail/setNewDetail',trimsValue)
-				}
+				let printValue = {
-				if(allInfo.prints?.length > 0){
+					data:allInfo.prints || [],
-					// detailData.selectDetail.printObject.prints = allInfo.prints
-					let value = {
-						data:allInfo.prints,
 					str:'print'
 				}
-					store.commit('DesignDetail/setNewDetail',value)
+				store.commit('DesignDetail/setNewDetail',printValue)
-				}
+				if(allInfo.color?.color?.rgba || allInfo.color?.color?.gradient){
-				if(allInfo.color?.color?.rgba){
-					let canvasColor = allInfo.color.color;
-					let colorData:any = await getColorName(allInfo.color.color?.rgba)
 					let value:any = {
-						data:{
+						str:'color',
+						data:{},
+					}
+					let canvasColor = allInfo.color.color;
+					if(allInfo.color?.color?.rgba){
+						let colorData:any = await getColorName(allInfo.color.color?.rgba)
+						value.data = {
 							hsv:{
 								h:colorData.h,
 								s:colorData.s,
@@ -662,37 +738,88 @@ export default defineComponent({
 							tcx:colorData.tcx,
 							rgba:canvasColor.rgba,
 							hex:rgbaToHex([canvasColor.rgba.r,canvasColor.rgba.g,canvasColor.rgba.b]),
-						},
+						}
-						str:'color'
 					}
 					if(canvasColor.gradient){
 						value.data.gradient = canvasColor.gradient
 					}
-					console.log(value,'=======')
 					store.commit('DesignDetail/setNewDetail',value)
 					if(allInfo.color.color.gradient)detailData.selectDetail.color.gradient = allInfo.color.color.gradient
 					if(detailData.currentDetailType == 'color'){
 						detailData.detailLeftColorKey++
 					}
+				}else{
+					let value = {
+						data:{},
+						str:'color'
 					}
+					store.commit('DesignDetail/setNewDetail',value)
+				}
+			}
+		}
+		const uploadSelectDetail = async ()=>{//更新选中的detail
+			// await detailDom.canvasBox.saveCanvas()
+			const allInfo = await (detailDom.canvasBox as any).getCanvasElement()
+			let color:any = {}
+			if(allInfo.color?.color?.rgba || allInfo.color?.color?.gradient){
+				let canvasColor = allInfo.color.color;
+				if(canvasColor?.rgba?.r != null){
+					let colorData:any = await getColorName(allInfo.color.color?.rgba)
+					color = {
+						hsv:{
+							h:colorData.h,
+							s:colorData.s,
+							v:colorData.v,
+						},
+						name:colorData.name,
+						tcx:colorData.tcx,
+						rgba:canvasColor.rgba,
+						hex:rgbaToHex([canvasColor.rgba.r,canvasColor.rgba.g,canvasColor.rgba.b]),
+					}
+				}
+				if(canvasColor?.gradient){
+					color.gradient = canvasColor.gradient
+				}
+			}
+			if(detailData.isEditPattern.value == 'canvasEditor' || detailData.isEditPattern.value == 'redGreenExample'){
+				delete detailData.selectDetail.newDetail
+				detailData.selectDetail.trims.prints = allInfo.trims || []
+				detailData.selectDetail.printObject.prints = allInfo.prints || []
+				detailData.selectDetail.color = color
+			}else{
+				if(detailData.currentDetailType == 'color'){
+					if(detailData.selectDetail.newDetail?.color)delete detailData.selectDetail.newDetail.color
+					detailData.selectDetail.color = color
+					detailData.selectDetail.gradient = color.gradient
+				}
+				if(detailData.currentDetailType == 'print'){
+					if(detailData.selectDetail.newDetail?.print)delete detailData.selectDetail.newDetail.print
+					detailData.selectDetail.printObject.prints = allInfo.prints || []
+				}
+				if(detailData.currentDetailType == 'element'){
+					if(detailData.selectDetail.newDetail?.element)delete detailData.selectDetail.newDetail.element
+					detailData.selectDetail.trims.prints = allInfo.trims || []
+				}
+			}
+			if(detailData.currentDetailType == 'color'){
+				detailData.detailLeftColorKey++
 			}
 		}
 		const canvasReload = async ()=>{
 			if(detailData.isEditPattern.value){
 				await detailDom.canvasBox.saveCanvas()
 			}
-			detailData.canvasKey += 1
 		}
 		const sketchSysToLibrary = ()=>{//系统sketch添加到library更新library
 			coverRevocation()
 			detailDom.detailLeft.sketchSysToLibrary()
 		}
-		const coverRevocation = ()=>{
+		const coverRevocation = async ()=>{
 			let itemDetail = JSON.parse(JSON.stringify(detailData.designDetail))
-			let revocation = JSON.parse((sessionStorage.getItem("revocation") as any))
+			let revocation = JSON.parse((await KeyValueDB.get("revocation") as any) || 'null')
 			revocation.splice(revocation.length-1,1,{designData:itemDetail,position:null})
-			sessionStorage.setItem('revocation', JSON.stringify(revocation));
+			await KeyValueDB.set('revocation', JSON.stringify(revocation));
-			sessionStorage.setItem('oppositeRevocation',JSON.stringify([]));
+			await KeyValueDB.set('oppositeRevocation',JSON.stringify([]));
 		}
 		const setSloganData = (data:any)=>{
 			detailData.selectDetail.sketchString = data
@@ -702,10 +829,10 @@ export default defineComponent({
 		}
 		onMounted(()=>{
 		})
-		onBeforeUnmount(()=>{
+		onBeforeUnmount(async ()=>{
-			sessionStorage.removeItem('oppositeRevocation')
+			await KeyValueDB.remove('oppositeRevocation')
-			sessionStorage.removeItem('revocation')
+			await KeyValueDB.remove('revocation')
-			store.commit('DesignDetail/clearDesignDetail')
+			store.commit('DesignDetail/clearDetailData')
 
 		})
 		
@@ -737,36 +864,7 @@ export default defineComponent({
 			window.removeEventListener('beforeunload',beforeunload)
 		}
 		window.addEventListener('beforeunload',beforeunload)
-		// let url = Https.httpUrls.getDesignDetail + `?designItemId=34242&designPythonOutfitId=34004`
+		
-        //     this.loadingShow = true
-        //     Https.axiosGet(url).then(
-		// 		async (rv: any) => {
-		// 			rv.clothes.forEach((item:any)=>{
-		// 				let a
-		// 				if(item.layersObject[0].imageCategory.indexOf("back") == -1){
-		// 					a = item.layersObject[0]
-		// 					item.layersObject[0] = item.layersObject[1]
-		// 					item.layersObject[1] = a
-		// 				}
-		// 				if(item.printObject.prints == null){
-		// 					item.printObject.prints = [{}]
-		// 				}
-		// 			})
-        //             this.store.commit('setDesignItemDetail',rv)
-		// 			if(rv.others[0].printObject.path == null){
-		// 				this.body = false
-		// 			}else{
-		// 				this.body = true
-		// 			}
-		// 			this.setImgSize()
-        //             this.generateHighDesignImg = rv.highDesignUrl
-        //             this.designShowPrview = 1
-        //             this.designDetailShow = true
-        //             this.loadingShow = false
-        //         }
-        //     ).catch(rv=>{
-        //         this.loadingShow = false
-        //     })
 	},
 		
 })

src/component/Detail/canvas/index.vue

@@ -7,24 +7,26 @@
 				<div class="contet">
 					<div class="canvas" :class="{'active': currentView === 'canvasEditor'}"@click.stop>
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
+							:title="t('CanvasTitle.ModifyItem')"
 							@canvasInit="editSketchCanvasInit"
 							is-edit
-							:clothingMinIOPath="selectDetail.minIOPath"
 							:clothingImageUrl="selectDetail.path"
-							:clothingImageUrl2="selectDetail.layersObject[0].maskUrl"
+							:clothingImageUrl2="selectDetail.maskUrl || selectDetail.layersObject[0].maskUrl"
 							showFixedLayer
 							:canvasJSON="canvasJSON"
 							@canvasLoadJsonSuccess="canvasLoadJsonSuccess"
 							:clothing-image-opts="{
 								imageMode:'contains',
 							}"
-							:hideCanvas="hideCanvas"
+							:isChangeCanvasSize="false"
+							:hideCanvas="hideCanvas || !isEditPattern"
 							ref="editCanvas">
 						</editCanvas>
 						<!-- <canvasContent ref="canvasContent"></canvasContent> -->
 					</div>
 					<div class="editFrontBack" v-if="currentView === 'redGreenExample'" @click.stop>
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
+							:title="t('CanvasTitle.RedGreen')"
 							@canvasInit="editFrontBackCanvasInit"
 							:enabledRedGreenMode="true"
 							:clothingImageUrl="selectDetail.path" 
@@ -34,12 +36,12 @@
 							:clothing-image-opts="{
 								imageMode:'contains',
 							}"
-							:hideCanvas="hideCanvas"
+							:hideCanvas="hideCanvas || !isEditPattern"
 							ref="editCanvasBackFront">
 						</editCanvas>
 					</div>
 					<div class="editSketch" v-if="currentView === 'editSketch'" @click.stop>
-						<generalMiniCanvas ref="generalMiniCanvas" :btnShow="false" :imgUrl="selectDetail.sketchString || selectDetail.path"></generalMiniCanvas>
+						<generalMiniCanvas ref="generalMiniCanvas" :isChangeCanvasSize="false" :canvasTitle="t('CanvasTitle.ModifySketch')" :btnShow="false" :imgUrl="selectDetail.sketchString || selectDetail.path"></generalMiniCanvas>
 					</div>
 				</div>
 				
@@ -49,9 +51,9 @@
 			</div>
 		 </div>
 		
-		<div class="mark_loading" v-show="isShowMark">
+		<!-- <div class="mark_loading" v-show="isShowMark">
 			<a-spin size="large" />
-		</div>
+		</div> -->
     </div>
     
 </template>
@@ -85,6 +87,7 @@ export default defineComponent({
 			default:()=>{}
 		},
 	},
+	emits:['update:loadingShow'],
     setup(props,{emit}) {
         const store = useStore();
         const {t} = useI18n();
@@ -116,13 +119,14 @@ export default defineComponent({
 			getCanvasIfEdit:inject('getCanvasIfEdit')as any,
 			canvasInstance:null as any,
 			canvasJSON:'',
-			hideCanvas: computed(()=>(store.state.Workspace.projectPath !== route.fullPath && props.isEditPattern)),
+			hideCanvas: computed(()=>(store.state.Workspace.projectPath !== route.fullPath)),
 			otherData:computed(()=>({
 				canvasId: store.state.DesignDetail.selectDetail.canvasId,
 				color: store.state.DesignDetail.selectDetail.color,
 				printObject: store.state.DesignDetail.selectDetail.printObject,
 				trims: store.state.DesignDetail.selectDetail.trims,
 			})),
+			changeSketchUpdateFrontBack:null as any,//切换sketch后是否需要合成图片进行风格
 		})
 		watch(()=>detailData.selectDetail,(newValue,oldValue)=>{
 			detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id)
@@ -133,25 +137,8 @@ export default defineComponent({
 		
 		const editFront = (str:any)=>{//编辑前后片
 			let canvasJSON = '' as any
-			if(detailData.currentView === 'canvasEditor'){
-				sessionStorage.setItem('sketchEdit',detailDom.editCanvas.getJSON())
-				canvasJSON = sessionStorage.getItem('frontBackEdit');
-			}else if(detailData.currentView === 'redGreenExample'){
-				sessionStorage.setItem('frontBackEdit',detailDom.editCanvasBackFront.getJSON())
-				canvasJSON = sessionStorage.getItem('sketchEdit');
-			}
 			// detailData.canvasLoad = false
 			detailData.currentView = str
-			if(canvasJSON){
-				// detailData.canvasLoad = true
-				nextTick(()=>{
-					if(detailData.currentView === 'redGreenExample'){
-						detailDom.editCanvas.loadJSON(canvasJSON)
-					}else{
-						detailDom.editCanvasBackFront.loadJSON(canvasJSON)
-					}
-				})
-			}else{
 			if(detailData.currentView === 'redGreenExample'){
 				nextTick(()=>{
 					setCanvas(detailData.selectDetail.path).then(()=>{
@@ -166,7 +153,6 @@ export default defineComponent({
 				})
 			}
 		}
-		}
 		const updateOtherLayers = (obj:any)=>{
 			if(!detailDom.editCanvas)return
 			return new Promise(async (res,reject)=>{
@@ -184,14 +170,7 @@ export default defineComponent({
 				}).then((rv)=>{
 					if(oldSelectDetail?.partialDesign)oldSelectDetail.partialDesign.partialDesignBase64 = rv
 				})
-				//包含平铺图层 single+overall模式的图
+				
-				// await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:true,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{
-				// 	oldSelectDetail.undividedLayerWithSinglePrint = rv
-				// })
-				//不包含平铺图层overall模式的图
-				// await detailDom.editCanvas.exportImage({isContainFixed:true,isPrintTrimsNoRepeat:false,isPrintTrimsRepeat:true,isContainNormalLayer:false}).then((rv)=>{
-				// 	oldSelectDetail.undividedLayer = rv
-				// })
 				await setUndivideLayer()
 				res('')
 			})
@@ -215,6 +194,7 @@ export default defineComponent({
 					// detailData.canvasConfig.height = domHeight
 					detailData.canvasConfig.width = img.width
 					detailData.canvasConfig.height = img.height
+					detailData.canvasConfig.initZoom = true
 
 					res('')
 				}
@@ -263,15 +243,28 @@ export default defineComponent({
 		}
 
 
-		const frontBackChange = (value:any)=>{
+		const frontBackChange = async (value:any)=>{
-			let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.path
+			let front = detailData.frontBack.front[detailData.imgDomIndex]
+			let back = detailData.frontBack.back[detailData.imgDomIndex]
+			store.commit('DesignDetail/updataDetailItem',{maskUrl:value})
+			await nextTick()
+			if(!detailData.selectDetail.partialDesign.partialDesignPath && !detailData.selectDetail.partialDesign.partialDesignBase64){
+				await privewDetail()
+			}else{
+				await detailDom.editCanvas.exportImage({
+					isFrontBackUpdata: true,
+					isContainFixed:true,
+					width:props.sketchSize.width,
+					height:props.sketchSize.height,
+				}).then((rv)=>{
+					if(detailData.selectDetail?.partialDesign)detailData.selectDetail.partialDesign.partialDesignBase64 = rv
+				})
+			}
+			let full = detailData.selectDetail.partialDesign.partialDesignBase64 || detailData.selectDetail.partialDesign.partialDesignPath || detailData.selectDetail.path
 			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]
 				if(!front?.oldImageUrl)front.oldImageUrl = front.imageUrl
 				if(!front?.oldMaskUrl)front.oldMaskUrl = front.maskUrl
 				if(!back?.oldImageUrl)back.oldImageUrl = back.imageUrl
@@ -283,9 +276,8 @@ export default defineComponent({
 				back.imageUrl = rv.targetBackUrl
 				// store.commit('DesignDetail/updataDetailItem',{maskUrl:value})
 			})
-
 		}
-		const editSketchCanvasInit = (value:any)=>{
+		const editSketchCanvasInit = async (value:any)=>{
 			detailData.canvasInstance = value
 			detailData.getCanvasIfEdit.fun = getCanvasLength
 			detailData.isShowMark = false			
@@ -305,14 +297,29 @@ export default defineComponent({
 			return detailDom?.editCanvas?.getJSON()
 		}
 		const saveCanvas = async (canvasData:any)=>{
-			const index = detailData.designDetail.clothes.findIndex(item => item.id === canvasData.id);
+			const index = detailData.designDetail.clothes.findIndex(item => item.id === canvasData?.id);
 			await new Promise<void>((resolve, reject) => {
-				let canvasJSON = JSON.parse(canvasData.canvasJSON)
+				if(!detailDom?.editCanvas)return resolve()
-				if(!canvasJSON)return resolve()
+				let canvasJSON = detailDom?.editCanvas?.getJSON()
-				// canvasData.canvas.objects.forEach((objectsItem:any) => {
+				let canvasData = JSON.parse(canvasJSON)
-				// 	if(objectsItem.type == 'image')objectsItem.minioUrl = getMinioUrl(objectsItem.src)
+				if(!canvasData)return resolve()
-				// });
+				function deepProcessObjects(data:any, callback:any) {
-				let blob = new Blob([JSON.stringify(canvasJSON)], { type: "application/json" });
+					if (!Array.isArray(data)) return data;
+					return data.map(item => {
+						callback(item)
+						const processedItem = {...item};
+						if (processedItem.objects && 
+							Array.isArray(processedItem.objects) && 
+							processedItem.objects.length > 0) {
+						processedItem.objects = deepProcessObjects(processedItem.objects, callback);
+						}
+						return processedItem;
+					});
+				}
+				canvasData.canvas.objects = deepProcessObjects(canvasData.canvas.objects,(item:any)=>{
+					if(item.type == 'image')item.minioUrl = getMinioUrl(item.src)
+				})
+				let blob = new Blob([JSON.stringify(canvasData)], { type: "application/json" });
 				let formData = new FormData();
 				formData.append("file", blob, "data.json");
 				formData.append("designItemDetailId", detailData.selectDetail.id);
@@ -341,9 +348,14 @@ export default defineComponent({
 		// 	},3000)
 		// }
 		const canvasLoadJsonSuccess = async ()=>{
-			let otherData = await props.updateOtherLayers()
+			let otherData = await props.updateOtherLayers('all','first')
 			await updateOtherLayers(otherData)
-			await setUndivideLayer()
+			if(detailData.changeSketchUpdateFrontBack){
+				await detailData.changeSketchUpdateFrontBack()
+				detailData.changeSketchUpdateFrontBack = null
+			}
+			setUndivideLayer()
+			emit('update:loadingShow',false)
 		}
 		const setUndivideLayer = async ()=>{
 			await new Promise<void>(async (resolve, reject) => {
@@ -387,9 +399,6 @@ export default defineComponent({
 			if(front?.oldMaskUrl)front.maskUrl = front.oldMaskUrl
 			if(back?.oldImageUrl)back.imageUrl = back.oldImageUrl
 			if(front?.oldMaskUrl)store.commit('DesignDetail/updataDetailItem',{maskUrl:front.maskUrl})
-
-			sessionStorage.removeItem('frontBackEdit');
-			sessionStorage.removeItem('sketchEdit');
 			detailData.canvasLoad = false
 			// privewDetail()
 		})
@@ -420,7 +429,6 @@ export default defineComponent({
 						})
 					}
 				}
-				
 				setCanvas(detailData.selectDetail.path).then(()=>{
 					detailData.canvasLoad = true
 				})
@@ -429,6 +437,7 @@ export default defineComponent({
         return{
 			...toRefs(detailDom),
 			...toRefs(detailData),
+			t,
 			editFront,
 			privewDetail,
 			setFrontBackColor,

src/component/Detail/detailLeft/colorBox/index.vue

@@ -100,12 +100,15 @@ export default defineComponent({
 			tcxToColor:'',
 		})
 		watch(()=>colorData.selectColor,async (newVal,oldVal)=>{
-		    if(newVal.rgba && newVal.rgba?.r){
+		    if((newVal.rgba && newVal.rgba?.r != null) || newVal.gradient != null){
-				let data:any = await getColorName(newVal.rgba)
+				let data :any = {}
+				if(newVal.rgba?.r != null){
+					data = await getColorName(newVal.rgba)
 					newVal.name = data.name
 					newVal.tcx = data.tcx
 					colorData.colorList.list[colorData.selectDetail.id][colorData.colorList.index] = newVal
 					data.rgba = newVal.rgba
+				}
 				if(newVal.gradient){
 					data.gradient = newVal.gradient
 				}
@@ -124,13 +127,12 @@ export default defineComponent({
 		})
 		watch(()=>colorData.selectDetail.id,(newVal,oldVal)=>{
 			if(!newVal)return
-			console.log(12312)
-			if(!colorData.colorList?.list?.[newVal]){
 			colorData.colorList.list[newVal] = []
-			}else{
+			// if(!colorData.colorList?.list?.[newVal]){
-				return
+			// 	colorData.colorList.list[newVal] = []
-			}
+			// }else{
-			console.log(12312)
+			// 	// return
+			// }
 			let isNoSelect = false
 			let pushIndex = 0
 			for (let index = 0; index < 9; index++) {
@@ -140,14 +142,12 @@ export default defineComponent({
 				let color = colorData.allBoardData.colorBoards?.[index]
 				if(!color?.rgba && color?.rgbValue)color.rgba = color.rgbValue
 				if(
-					colorData.allBoardData.colorBoards?.[index] &&
+					(colorData.allBoardData.colorBoards?.[index] && color?.rgba &&
 					colorData.selectDetail.color.rgba?.r == color?.rgba?.r &&
 					colorData.selectDetail.color.rgba?.g == color?.rgba?.g &&
-					colorData.selectDetail.color.rgba?.b == color?.rgba?.b ||
+					colorData.selectDetail.color.rgba?.b == color?.rgba?.b) ||
-					(JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && colorData.selectDetail.color.gradient)
+					((JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && colorData.selectDetail.color.gradient))
-					&& colorData.selectDetail.color.rgba?.r
 				){
-					console.log(123)
 					isNoSelect = true
 					colorData.selectColor = item
 					colorData.colorList.index = index
@@ -173,9 +173,10 @@ export default defineComponent({
 				colorData.colorList.list[newVal].push(item)
 			}
 			if(!isNoSelect){
-				let color = colorData.selectDetail.newDetail?.color?.rgba?.r?colorData.selectDetail.newDetail?.color:colorData.selectDetail.color
+				let color = colorData.selectDetail.newDetail?.color?.rgba?.r != null?colorData.selectDetail.newDetail?.color:colorData.selectDetail.color
-				if(!color?.rgba?.r)return
+				let item:any = {}
-				let item = {
+				if(color?.rgba?.r != null){
+					item = {
 						hex:rgbaToHex([color.rgba.r,color.rgba.g,color.rgba.b]),
 						id:color.id,
 						rgba:{
@@ -186,6 +187,8 @@ export default defineComponent({
 						tcx:color.tcx,
 						name:color.name,
 					} as any
+				}
+
 				if(color.gradient){
 					item.gradient = color.gradient
 				} 

src/component/Detail/detailLeft/colorBox/pallet.vue

@@ -119,7 +119,7 @@ export default defineComponent({
 		})
 		const palletRef = ref(null)
 		watch(()=>palletData.color_,(newVal:any)=>{
-			if(!newVal?.rgba?.r)return
+			if(newVal?.rgba?.r == null)return
 			if(palletData.color?.gradient?.gradientShow){
 				palletData.color.gradient.gradientList[palletData.color.gradient.selectIndex].rgba = {
 					r:newVal.rgba.r,
@@ -146,7 +146,7 @@ export default defineComponent({
 		},{deep: true })
 		const setOperate = ()=>{
 			if(!palletData.color.rgba)return message.info(t('DesignDetailAlter.jsContent7'))
-			palletData.color.rgba = palletData.color?.rgba?.r?palletData.color.rgba:{r:0,g:0,b:0,a:1}
+			palletData.color.rgba = palletData.color?.rgba?.r != null?palletData.color.rgba:{r:0,g:0,b:0,a:1}
 			palletData.gradient.selectIndex = 0
 			palletData.gradient.gradientShow = true
 			if(!palletData.color.gradient){
@@ -262,7 +262,7 @@ export default defineComponent({
 		const openPallet = ()=>{
 			palletData.palletShow = !palletData.palletShow
 			console.log(props.selectColor,palletData.palletShow)
-			if(palletData.palletShow && props.selectColor?.rgba?.r){
+			if(palletData.palletShow && props.selectColor?.rgba?.r != null){
 				if(props.selectColor.gradient){
 					palletData.color_.rgba = props.selectColor.gradient.gradientList[0].rgba
 				}else{

src/component/Detail/detailLeft/module/currentList.vue

@@ -40,11 +40,29 @@ export default defineComponent({
     setup(props,{emit}) {
 		const {t} = useI18n();
         const store = useStore();
+		const updateCatecory = (arr)=>{
+			arr.forEach((v:any) => {
+				if(props.catecoryList)props.catecoryList.forEach((item:any) => {
+					if(v.level2Type == item.value && !v.category){
+						v.category=item.name
+						v.categoryValue=item.value
+					}
+				})
+			});
+		}
 		const detailData = reactive({
 			allBoardData:computed(()=>store.state.UploadFilesModule.allBoardData),
 			currentList:{
-				sketch:computed(()=>store.state.UploadFilesModule.allBoardData.sketchboardFiles),
+				sketch:computed(()=>{
-				print:computed(()=>store.state.UploadFilesModule.allBoardData.printboardFiles),
+					let sketch = store.state.UploadFilesModule.allBoardData.sketchboardFiles
+					updateCatecory(sketch)
+					return sketch
+				}),
+				print:computed(()=>{
+					let print = store.state.UploadFilesModule.allBoardData.printboardFiles
+					updateCatecory(print)
+					return print
+				}),
 				color:computed(()=>store.state.UploadFilesModule.allBoardData.colorBoards),
 				models:computed(()=>store.state.Workspace.probjects.model),
 			},

src/component/Detail/detailLeft/sketch.vue

@@ -76,10 +76,10 @@ export default defineComponent({
 				selectImgItem(data)
 				return
 			}
+			data.id = id
 			if(data?.imgUrl)data.url = data.imgUrl
 			let value = {
 				data,
-				id,
 			}
 			if(detailData.currentDetailType == 'sketch'){
 				detailData.selectDetail.sketchString = ''

src/component/Detail/detailRight/editPrintElement.vue

@@ -53,6 +53,7 @@
 			</a-slider> -->
 			<a-popover
 				trigger="click"
+				placement="leftTop"
 				destroyTooltipOnHide
 				:title="t('Canvas.repeatSetting')"
 			>
@@ -63,8 +64,8 @@
 						@inputFillOffset="inputFillOffset"
 						@inputFillScale="inputFillScale"
 						:sketchPath="selectDetail.path"
-						@inputFill_Gap="
+						@inputFillGap="
-							(x, y) => inputFill_Gap(x, y)"
+							(x, y) => inputFillGap(x, y)"
 					/>
 				</template>
 				<div class="btn">
@@ -88,8 +89,8 @@
 							<img crossOrigin="anonymous" :src="item?.path" :style="{transform:`rotateZ(${item.pattern?.transform?.rotateZ}deg)`}" class="designOpenrtion_imgItme" draggable="false"> 
 						</div>
 					</div>
-					<!-- <img :src="selectDetail.path" alt="" class="designOpenrtion_sketch" ref="sketchImg"> -->
+					<!-- <img :src="selectDetail.path" alt="" class="designOpenrtion_sketch" ref="sketchImg" @load="()=>isSketchLoad = true"> -->
-					<img :src="stateOverallSingle == 'single'?(selectDetail.undividedLayer||selectDetail.path):(selectDetail.undividedLayerColor || selectDetail.path)" alt="" class="designOpenrtion_sketch" ref="sketchImg" @load="()=>isSketchLoad = true">
+					<img :src="(selectDetail.path)" alt="" class="designOpenrtion_sketch" ref="sketchImg" @load="()=>isSketchLoad = true">
 					<img :src="selectDetail.sketchMask" alt="" class="designOpenrtion_sketchMask" ref="sketchMask">
 					<div class="designOpenrtion_btn" v-if="stateOverallSingle == 'single'" >
 						<ul v-for="item,index in printStyleList[type][stateOverallSingle]" :key="item" :class="{active:item?.pattern.designOpenrtionBtn?item?.pattern.designOpenrtionBtn:false}" class="designOpenrtion_Mousingle" :style="item?.pattern.style" @mousedown.stop="itemMoveMousedown(index,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(index,getMousePosition($event,true))">
@@ -110,7 +111,7 @@
 						</ul> -->
 					</div>
 					<div class="designOpenrtion_pingpu" v-else>
-						<pingpu :list="printStyleList[type].overall" :width="sketchSize.width" :height="sketchSize.height" ref="pingpuRef" @change-canvas="updateCanvas"></pingpu>
+						<pingpu :key="selectDetail?.id" :width="sketchSize.width" :height="sketchSize.height" ref="pingpuRef" @change-canvas="updateCanvas"></pingpu>
 					</div>
 				</div>
 			</div>
@@ -159,7 +160,6 @@ export default defineComponent({
 			selectDetail:computed(()=>store.state.DesignDetail.selectDetail),
 			currentDetailType:computed(()=>store.state.DesignDetail.currentDetailType),
 			currentPrintElement:computed(()=>store.state.DesignDetail.currentPrintElement),
-			systemDesignerPercentage:0,
 			printStyleList:{
 				print:{
 					single:[],
@@ -173,7 +173,6 @@ export default defineComponent({
 			type:props.type,
 			imgDomIndex:-1,
 			direction:'',//判断点的那条边
-			printZIndex:2,//印花优先级
 			sketchWH:{
 				width:0,
 				height:0,
@@ -207,10 +206,9 @@ export default defineComponent({
 			elList:[] as any,
 			selectIndex:0,
 		})
+		const setOveralSingle = async ()=>{
 
-		const setOveralSingle = ()=>{
+			await setItemPosition()
-
-			setItemPosition()
 		}
 		const formatter = (value:any)=>{
 			return `${value}%`;
@@ -225,6 +223,7 @@ export default defineComponent({
 				img.onload = ()=>{
 					let imgScale = img.width / img.height
 					let zoom = 2
+					console.log(editPrintElementData.sketchWH)
 					let width = editPrintElementData.sketchWH.width / zoom
 					let height = width / editPrintElementData.sketchWH.height
 					
@@ -234,36 +233,54 @@ export default defineComponent({
 					let sketchH = editPrintElementData.sketchWH.height * editPrintElementData.sketchWH.scale[1]
 					let x = sketchW / 2 - (sketchW * (width / editPrintElementData.sketchWH.width)/2)
 					let y = sketchH / 2 -(sketchH * height/2)
-					if(!editPrintElementData.stateOverallSingle == 'single'){
+					if(editPrintElementData.stateOverallSingle !== 'single'){
 						x = sketchW / 2
 						y = sketchH / 2
 					}
 					let location = [x,y]
 					resolve({scale,location})
 				}
-				img.src = item.url
+				img.src = item.url || item.path
 			})
 		}
 		const addPrintELement = async (data:any)=>{
 			if(!editPrintElementData.isSketchLoad)return
 			let {scale,location} = await setScaleLocation(data)
+			let printIndex = 1
+			let allElementPrint = []
+			if(props.type == 'print'){
+				allElementPrint = [
+					...(editPrintElementData.printStyleList.print.single || []),
+					...(editPrintElementData.printStyleList.print.overall || []),
+					...(editPrintElementData.selectDetail.trims.prints || []),
+				]
+			}else{
+				allElementPrint = [
+					...(editPrintElementData.printStyleList.element.single || []),
+					...(editPrintElementData.selectDetail.printObject.prints || []),
+				]
+			}
+			if(allElementPrint.length >= 1){
+				printIndex = Math.max(...allElementPrint.map(item => Number(item.priority))) + 1
+			}
 			let item = {
 				angle:0,
 				designType:data.designType,
 				ifSingle:editPrintElementData.stateOverallSingle == 'single',
 				level2Type:data.level2Type,
-				location,
+				location:location,
+				// location:editPrintElementData.stateOverallSingle == 'single'?location:[0,0],
 				minIOPath:data.minIOPath || data.originalUrl,
 				path:data.url,
-				priority:editPrintElementData.printZIndex,
+				priority:printIndex,
-				scale,
+				scale:editPrintElementData.stateOverallSingle == 'single'?scale:[1,1],
 				globalCompositeOperation:'',
 			}
 			getItemPosition(item)
 			setItemPosition()
 			store.commit('DesignDetail/setCurrentPrintElement',null)
 		}
-		const previewDetailPrintData = ()=>{
+		const previewDetailPrintData = (id:any = editPrintElementData.selectDetail?.id)=>{
 			let data:any = []
 			let index = 1
 			let setData = (item:any,index:number)=>{
@@ -276,16 +293,17 @@ export default defineComponent({
 				}else{
 					let x = Number(style.left.replace(/px/g,''))
 					let y = Number(style.top.replace(/px/g,''))
-					location = [(x*sketchWH[0]) ,(y*sketchWH[1])]
+					location = item.location
+					// location = [(x*sketchWH[0]) ,(y*sketchWH[1])]
 					scale = item.scale
 					// scale = [item.pattern.style.width/item.pattern.style.height,item.pattern.style.height/item.pattern.style.width]
 					// location = [item.pattern.style.left,item.pattern.style.top]
 				}
 				let value  ={
-					angle : item.pattern.transform.rotateZ,
+					angle:0,
 					// angle : !this.overallSingle ? 0:item.pattern.transform.rotateZ,
 					location : location,
-					priority:index,
+					priority:item.priority,
 					scale: scale,
 					designType:item.designType,
 					level2Type:item.level2Type,
@@ -294,24 +312,32 @@ export default defineComponent({
 					ifSingle:!!item.ifSingle,
 					globalCompositeOperation:'',
 				}
-				if(item.object)value.object = item.object
+				if(item.object)value.object = item.object;
+				value.angle = value.ifSingle?item.pattern.transform.rotateZ:item.angle
+				
 				return value
 			}
 			if(editPrintElementData.printStyleList[props.type].single.length>0){
 				sort(editPrintElementData.printStyleList[props.type].single)
 			}
+			if(editPrintElementData.printStyleList[props.type].overall.length>0){
+				sort(editPrintElementData.printStyleList[props.type].overall)
+			}
 			editPrintElementData.printStyleList[props.type].overall.forEach((item:any)=>{
 				data.push(setData(item,index))
 				index++ 
 			})
+			console.log(editPrintElementData.printStyleList[props.type].single)
 			editPrintElementData.printStyleList[props.type].single.forEach((item:any)=>{
 				data.push(setData(item,index))
 				index++ 
 			})
 			let value = {
 				data,
-				str:props.type
+				str:props.type,
+				id:id,
 			}
+			console.log('data',value)
 			store.commit('DesignDetail/setNewDetail',value)
 		}
 		const sort = (list:any)=>{
@@ -333,10 +359,9 @@ export default defineComponent({
 				top = item.location[1] / editPrintElementData.sketchWH.scale[1]
 			}else{
 				//overall
-				editPrintElementData.systemDesignerPercentage = item.scale[0]*1000
 				left = item.location[0] / editPrintElementData.sketchWH.scale[0]
 				top = item.location[1] / editPrintElementData.sketchWH.scale[1]
-				editPrintElementData.systemDesignerPercentage = item.scale?.[0]?item.scale[0]*100:30
+				item.scale = item.scale || [1,1]
 			}
 			let pattern = {
 				centers:{left:0,top:0},
@@ -354,7 +379,6 @@ export default defineComponent({
 				},
 				designOpenrtionBtn:false
 			}
-			editPrintElementData.printZIndex++
 			item.pattern = pattern
 			
 			if(item.object){
@@ -370,16 +394,22 @@ export default defineComponent({
 					flipX: false,
 					flipY: false,
 					blendMode: "multiply",
+					// blendMode: "source-over",
 					gapX: 0,
 					gapY: 0,
 				}
+				if(props.type == 'element'){
+					item.object.blendMode = 'source-over'
+				}
 			}
 			if(item.ifSingle){
 				editPrintElementData.printStyleList[props.type].single.push(item)
-			}else{
+			}
+			if(!item.ifSingle){
 				item.token = Date.now().toString() + (editPrintElementData.printStyleList[props.type].overall.length + '')
 				// editPrintElementData.printStyleList[props.type].overall = []
 				editPrintElementData.printStyleList[props.type].overall.push(item)
+				if(editPrintElementData.stateOverallSingle == 'overall'){
 					setTimeout(()=>{
 						editPrintElementDom.pingpuRef.updataList([
 							{
@@ -388,10 +418,11 @@ export default defineComponent({
 							},
 						]);
 					})
-				
 				}
 			}
-		const setPosition = ()=>{
+		}
+		const setPosition = async ()=>{
+			await new Promise<void>((resolve, reject) => {
 				nextTick(()=>{
 					let img = new Image
 					img.onload = ()=>{
@@ -408,32 +439,31 @@ export default defineComponent({
 						if(!editPrintElementData.selectDetail.printObject.prints)return
 						let state = true
 						// editPrintElementData.stateOverallSingle = 'single'
-					let arr:any = editPrintElementData.selectDetail.newDetail?.print || editPrintElementData.selectDetail.printObject.prints
+						let arr:any = editPrintElementData.selectDetail.printObject.prints
 						if(props.type == 'element'){
-						arr = editPrintElementData.selectDetail.newDetail?.element || editPrintElementData.selectDetail.trims.prints
+							arr = editPrintElementData.selectDetail.trims.prints
-					}
-					if(editPrintElementData.selectDetail.newDetail?.[editPrintElementData.currentDetailType]){
-						arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType]
 						}
+						// if(editPrintElementData.selectDetail.newDetail?.[editPrintElementData.currentDetailType]){
+						// 	arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType]
+						// }
 						if(arr && arr.length > 0){
+							editPrintElementData.printStyleList[props.type].single = []
+							editPrintElementData.printStyleList[props.type].overall = []
 							arr.forEach((item:any)=>{
-							if(!item.ifSingle){
+								// if(!item.ifSingle){
-								editPrintElementData.stateOverallSingle = 'overall',
+								// 	editPrintElementData.stateOverallSingle = 'overall',
-								state = false
+								// 	state = false
-							}
+								// }
 								getItemPosition(item)
 							})
 							setItemPosition()
 						}
-					// if(props.type == 'print'){
+						resolve('')
-					// 	editPrintElementData.overallSingle = state
-					// }
 					}
-				// undividedLayer
+					img.src = editPrintElementData.selectDetail.path
-				//计算宽高使用editPrintElementData.selectDetail.path
-				// img.src = editPrintElementData.selectDetail.path
-				img.src = editPrintElementData.selectDetail.undividedLayer?editPrintElementData.selectDetail.undividedLayer:editPrintElementData.selectDetail.path
 				})
+			})
+			
 		}
 		// watch(()=>editPrintElementData.selectDetail?.id,(newVal)=>{
 		// 	if(!newVal)return
@@ -448,9 +478,10 @@ export default defineComponent({
 				addPrintELement(newVal)
 			}
 		})
-		watch(()=>((editPrintElementData.selectDetail?.id)),(newVal)=>{
+		watch(()=>((editPrintElementData.selectDetail?.id)),(newVal,oldVal)=>{
 			if(!newVal)return
-			editPrintElementData.isSketchLoad = false,
+			if(oldVal)previewDetailPrintData(oldVal)
+			editPrintElementData.isSketchLoad = false
 			editPrintElementData.printStyleList[props.type] = {
 				single:[],
 				overall:[],
@@ -463,14 +494,21 @@ export default defineComponent({
 			setPosition()
 		},{immediate: true,})
 		watch(()=>editPrintElementData.stateOverallSingle,(newVal)=>{
-			let arr = editPrintElementData.printStyleList[props.type][newVal]
+			previewDetailPrintData()
+			let arr:any = editPrintElementData.selectDetail.newDetail?.print || editPrintElementData.selectDetail.printObject.prints
+			if(props.type == 'element'){
+				arr = editPrintElementData.selectDetail.newDetail?.element || editPrintElementData.selectDetail.trims.prints
+			}
+			if(editPrintElementData.selectDetail.newDetail?.[editPrintElementData.currentDetailType]){
+				arr = editPrintElementData.selectDetail.newDetail[editPrintElementData.currentDetailType]
+			}
 			if(arr.length > 0){
 				editPrintElementData.imgDomIndex = 0
-				if(newVal == 'overall'){
+					editPrintElementData.printStyleList[props.type].single = []
+					editPrintElementData.printStyleList[props.type].overall = []
 					arr.forEach((item:any,index:number) => {
-						item.id_ = index
+						getItemPosition(item)
 					});
-				}
 			}else{
 				editPrintElementData.imgDomIndex = -1
 			}
@@ -499,7 +537,6 @@ export default defineComponent({
 			let scale = Number(editPrintElementDom.imgDom.children[0].style.transform?.split('scale(')[1]?.split(')')[0])
 			let rotateZ = Number(editPrintElementDom.imgDom.children[0].style.transform?.split('rotateZ(')[1]?.split('deg')[0])
 			editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.designOpenrtionBtn = true
-			// editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.style.zIndex = editPrintElementData.printZIndex++
 			editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle][index].pattern.transform = {
 				scale:scale,
 				rotateZ:rotateZ?rotateZ:0,
@@ -633,7 +670,6 @@ export default defineComponent({
 				top:editPrintElementDom.imgDom.offsetTop+'px',
 				height:editPrintElementDom.imgDom.offsetHeight+'px',
 				width:editPrintElementDom.imgDom.offsetWidth+'px',
-				// zIndex:editPrintElementData.printZIndex
 			}
 			document.removeEventListener('mousemove',sizeMouseMove)
 			document.removeEventListener('touchmove',sizeTouchmove)
@@ -785,7 +821,8 @@ export default defineComponent({
 						};
 					}
 				};
-				elList[item.index].sort = moveIndex;
+				let index =  elList.findIndex((elListItem:any)=>item.id == elListItem.id)
+				elList[index].sort = moveIndex;
 				moveItem();
 			}
 		}
@@ -816,6 +853,7 @@ export default defineComponent({
 			collItemSize.elList.forEach((elItem:any)=>{
 				let clothesIndex = arr.findIndex((item:any)=>item.uniqueId == elItem.uniqueId)
 				arr[clothesIndex].pattern.style.zIndex = elItem.sort
+				arr[clothesIndex].priority = elItem.id.split('_')[0]
 				// let clothesId = editPrintElementData.designDetail.clothes[clothesIndex].id
 				// editPrintElementData.designDetail.clothes[clothesIndex].priority = elItem.sort
 				// let frontIndex = editPrintElementData.frontBack_.front.findIndex((item:any)=>item.id == clothesId)
@@ -836,7 +874,6 @@ export default defineComponent({
 			let arr:any = editPrintElementData.printStyleList[props.type][editPrintElementData.stateOverallSingle]
 
 			arr.forEach((item,index) => {item.uniqueId  = `${Date.now()}_${index}`});
-
 			const sortedArray = [...arr].sort((a, b) => a.priority - b.priority);
 			const sortMap = {} as any;
 			sortedArray.forEach((item, index) => {
@@ -847,7 +884,8 @@ export default defineComponent({
 					el: elArr[i], 
 					// sort: elArr.length - i -1, 
 					sort: sortMap[arr[i].priority],
-					index: i,
+					id: `${arr[i].priority}_${Date.now() + i}`,
+					// index: i,
 					uniqueId:arr[i]?.uniqueId || 99999,
 				});
 			}
@@ -872,11 +910,14 @@ export default defineComponent({
 					}
 				} else if (item.action === ACTIONS.SELECT) {
 					overallSetIndex(obj)
+				} else if(item.action === ACTIONS.DELETE){
+					navDelete(obj)
 				}
 			})
 		}
 		const inputFillAngle = (angle:any)=>{
 			let arr = editPrintElementData.printStyleList[props.type].overall
+			console.log(angle)
 			arr[editPrintElementData.imgDomIndex].angle = angle
 			editPrintElementDom.pingpuRef.updataList([
 				{
@@ -895,7 +936,7 @@ export default defineComponent({
 					action: ACTIONS.UPDATE,
 					token: arr[editPrintElementData.imgDomIndex].token,
 					key: 'location[0]',
-					value: offset.left,
+					value: location[0],
 				},
 			]);
 			editPrintElementDom.pingpuRef.updataList([
@@ -903,7 +944,7 @@ export default defineComponent({
 					action: ACTIONS.UPDATE,
 					token: arr[editPrintElementData.imgDomIndex].token,
 					key: 'location[1]',
-					value: offset.top,
+					value: location[1],
 				},
 			]);
 			// editPrintElementData.overallDetail.offsetX = offset.left
@@ -911,7 +952,6 @@ export default defineComponent({
 		}
 		const inputFillScale = (scale:any)=>{
 			let arr = editPrintElementData.printStyleList[props.type].overall
-			console.log(arr,scale,editPrintElementData.imgDomIndex)
 			arr[editPrintElementData.imgDomIndex].scale = [scale,scale]
 			editPrintElementDom.pingpuRef.updataList([
 				{
@@ -922,7 +962,7 @@ export default defineComponent({
 				},
 			]);
 		}
-		const inputFill_Gap = (x:any,y:any)=>{
+		const inputFillGap = (x:any,y:any)=>{
 			let arr = editPrintElementData.printStyleList[props.type].overall
 			arr[editPrintElementData.imgDomIndex].object.gapX = x
 			arr[editPrintElementData.imgDomIndex].object.gapY = y
@@ -982,7 +1022,7 @@ export default defineComponent({
 			inputFillAngle,
 			inputFillOffset,
 			inputFillScale,
-			inputFill_Gap,
+			inputFillGap,
 			overallSetIndex,
         }
     },
@@ -1100,9 +1140,8 @@ export default defineComponent({
 		.habit_System_Designer {
 			align-items: center;
 			display: flex;
-			justify-content: flex-end;
 			margin-top: 1.8rem;
-			margin-right: .8rem;
+			margin-left: .8rem;
 
 			.ant-slider-track,
 			.ant-slider-rail {
@@ -1152,7 +1191,7 @@ export default defineComponent({
 					border-radius: 1rem;
 					overflow: hidden;
 					&.active{
-						border: 2px solid #B4B4B4;
+						border: 2.5px solid #B4B4B4;
 					}
 					> img{
 						width: 100%;
@@ -1196,20 +1235,22 @@ export default defineComponent({
 				// width: 100%;
 				// max-height: 70%;
 				width: max-content;
+
+				overflow-y: auto;
+				overflow-x: hidden;
 				&.active{
 					flex-direction: row;
 				}
-				.designOpenrtion_imgMask{
-					width: auto;
-					height: auto;
-					min-width: 60%;
-					overflow-y: auto;
-					overflow-x: hidden;
-					// max-height: 80%;
-					position: relative;
 				&::-webkit-scrollbar {
 					display: none;
 				}
+				.designOpenrtion_imgMask{
+					width: 100%;
+					height: 100%;
+					min-width: 60%;
+					// max-height: 80%;
+					position: relative;
+					
 					>img{
 						z-index: 2;
 						position: relative;
@@ -1222,7 +1263,7 @@ export default defineComponent({
 							top: 0;
 							left: 0;
 							pointer-events: none;
-							height: 100%;
+							width: 100%;
 						}
 					}
 					.designOpenrtion_sketch_mask{

src/component/Detail/detailRight/overallSetting/RepeatSetting.vue

@@ -1,6 +1,5 @@
 <template>
-	<div class="repeat-setting">
+	<div class="repeat-setting" v-if="!mask">
-		{{  }}
 		<div class="repeat-setting-item">
 			<span class="label">{{ t("Canvas.angle") }}</span>
 			<angle-tool
@@ -17,7 +16,7 @@
 				:max="1000"
 				:step="1"
 				is-input
-				:tipFormatter="(v) => `${scale}%`"
+				:tipFormatter="(v) => `${Number(scale)?.toFixed(0)}%`"
 				:value="scale"
 				@input="inputFillScale"
 			/>
@@ -26,28 +25,28 @@
 		<div class="repeat-setting-item">
 			<span class="label">Gap X</span>
 			<slider
-				:min="0"
+				:min="1"
 				:max="1000"
 				:step="1"
 				is-input
 				:tipFormatter="(v) => `${v}px`"
 				:value="gapX"
-				@input="(e) => emit('inputFill_Gap', e, gapY)"
+				@input="(e) => emit('inputFillGap', e, gapY)"
-				@change="(e) => emit('changeFill_Gap', e, gapY)"
+				@change="(e) => emit('changeFillGap', e, gapY)"
 			/>
 		</div>
 		<p></p>
 		<div class="repeat-setting-item">
 			<span class="label">Gap Y</span>
 			<slider
-				:min="0"
+				:min="1"
 				:max="1000"
 				:step="1"
 				is-input
 				:tipFormatter="(v) => `${v}px`"
 				:value="gapY"
-				@input="(e) => emit('inputFill_Gap', gapX, e)"
+				@input="(e) => emit('inputFillGap', gapX, e)"
-				@change="(e) => emit('changeFill_Gap', gapX, e)"
+				@change="(e) => emit('changeFillGap', gapX, e)"
 			/>
 		</div>
 		<p></p>
@@ -85,13 +84,35 @@
 	const scale = computed(() => {
 		// let scaleValue = props.object?.scale/10;
 		// return props.object?.scale/10;
-		return props.object?.scale[0] * 100;
+		return (props.object?.scale[0] * 100).toFixed(0);
 	});
+	const scalePrint = computed(() => {
+		let index = sketchWH.value[0] > sketchWH.value[1]?0:1;
+		return sketchWH.value[index] / printWH.value[index] * scale.value / 5;
+	});
+	const printWH = ref([0,0])
+	const sketchWH = ref([0,0])
+	const mask = ref(false)
 	const offset = ref([0,0])
 	const sketchSize:any = async ()=>{
 		let img = new Image();
 		let size = [0,0];
 		img.src = props.sketchPath;	
+		console.log(props.sketchPath)
+		await new Promise((resolve, reject) => {
+			img.onload = () => {
+				size = [img.width, img.height]
+				resolve([img.width, img.height]);
+			}
+			img.onerror = reject;
+		});
+		return size
+	}
+	const printSize:any = async ()=>{
+		let img = new Image();
+		let size = [0,0];
+		img.src = props.sketchPath;	
+		console.log(props.sketchPath)
 		await new Promise((resolve, reject) => {
 			img.onload = () => {
 				size = [img.width, img.height]
@@ -102,9 +123,12 @@
 		return size
 	}
 	watch (() => props.object.path || props.object.location, async () => {
-		let size = await sketchSize();
+		mask.value = true
-		offset.value[0] = props.object.location[0] / size[0] * 100;
+		sketchWH.value = await sketchSize();
-		offset.value[1] = props.object.location[1] / size[1] * 100;
+		printWH.value = await printSize();
+		offset.value[0] = props.object.location[0] / sketchWH.value[0] * 100;
+		offset.value[1] = props.object.location[1] / sketchWH.value[1] * 100;
+		mask.value = false
 	},{immediate: true})
 	const gapX = computed(() => props.object.object?.gapX || 0);
 	const gapY = computed(() => props.object.object?.gapY || 0);
@@ -115,13 +139,12 @@
 		"changeFillOffset",
 		"inputFillScale",
 		"changeFillScale",
-		"inputFill_Gap",
+		"inputFillGap",
-		"changeFill_Gap",
+		"changeFillGap",
 	]);
 	const inputFillScale = (e) => {
 		const scale = e / 100;
-		console.log(scale)
+		emit("inputFillScale", scale.toFixed(2));
-		emit("inputFillScale", scale);
 	};
 	const inputOffset = async (e:any)=>{
 		emit('inputFillOffset', {...e,size: await sketchSize()})
@@ -132,6 +155,7 @@
 	.repeat-setting {
 		user-select: none;
 		width: 228px;
+		overflow: hidden;
 		> .title {
 			line-height: 35px;
 			font-size: 14px;