From f4d91986bbd22815adb70a946ace105c0f97177a Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 22 Sep 2025 15:09:26 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E5=89=8D=E5=90=8E=E7=89=87=E5=BA=95=E5=9B=BE=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E7=BA=BF=E7=A8=BF=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/component/Detail/canvas/index.vue b/src/component/Detail/canvas/index.vue
index 875d8d6b..8ac6b936 100644
--- a/src/component/Detail/canvas/index.vue
+++ b/src/component/Detail/canvas/index.vue
@@ -35,7 +35,7 @@
 						</editFrontBack> -->
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
 							:enabledRedGreenMode="true"
-							:clothingImageUrl="selectDetail.undividedLayer || selectDetail.path" 
+							:clothingImageUrl="selectDetail.path" 
 							:redGreenImageUrl="frontBack.front[imgDomIndex].maskUrl"
 							@trigger-red-green-mouseup="frontBackChange"
 							:clothing-image-opts="{

From 824af53d6540327a0a8229a51e581754a121dda0 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 22 Sep 2025 16:23:31 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8A=E7=8F=AD?=
 =?UTF-8?q?=E5=89=8D=E7=9A=84=E4=BD=9C=E5=93=81=E8=AE=BE=E7=BD=AE=E4=B8=BA?=
 =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BA=8C=E5=88=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignDetail.vue     | 3 ++-
 src/component/WorksPage/newScaleImage.vue | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index fed0013e..92313e5b 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -298,7 +298,8 @@ export default defineComponent({
 				// 0.35822305
 				// ]	
 				let isCurrent = list[i].id == detailData?.selectDetail?.id
-				let color = (detailData.currentDetailType == 'color' && isCurrent && newData?.rgba?.r)?(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):(list[i].color?.rgba?.r?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'')
+				console.log(isCurrent,newData)
+				let color = (detailData.currentDetailType == 'color' && isCurrent)?(newData?.rgba?.r?`${newData.rgba.r} ${newData.rgba.g} ${newData.rgba.b}`:''):(list[i].color?.rgba?.r?`${list[i].color.rgba.r} ${list[i].color.rgba.g} ${list[i].color.rgba.b}`:'')
 				if(detailData.currentDetailType == 'sketch' && newData){
 					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}`:''
 					detailData.selectDetail.maskUrl = ''
diff --git a/src/component/WorksPage/newScaleImage.vue b/src/component/WorksPage/newScaleImage.vue
index 87573f2d..49b1caad 100644
--- a/src/component/WorksPage/newScaleImage.vue
+++ b/src/component/WorksPage/newScaleImage.vue
@@ -440,8 +440,13 @@ export default defineComponent({
 			if(userDetail.value.systemList.indexOf(1) == -1){
 				return message.info(t('newScaleImage.jsContent1'))
 			}
-			return message.info(t('newScaleImage.jsContent2'))
 
+			const targetDate = new Date('2025-09-01T00:00:00');
+			// 解析输入日期字符串
+			const inputDate = new Date(imgData.scaleImageData.createDate);
+			if(inputDate < targetDate){
+				return message.info(t('newScaleImage.jsContent2'))
+			}
 			if(imgData.scaleImageData.openSource == 0){
 				return message.info(t('newScaleImage.jsContent2'))
 			}

From 7883f24ca34368a9b9325bb18d4553b127cc91a9 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 22 Sep 2025 16:50:43 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=8D=E5=88=B6?=
 =?UTF-8?q?=E7=B2=98=E8=B4=B4=E5=9B=BE=E7=89=87=E5=8F=AF=E4=BB=A5=E6=AC=A1?=
 =?UTF-8?q?=E7=B2=98=E8=B4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/style/style.css          | 4 +++-
 src/assets/style/style.less         | 4 +++-
 src/component/HomePage/Generate.vue | 6 +++++-
 src/views/HomeView/library.vue      | 6 +++---
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/assets/style/style.css b/src/assets/style/style.css
index b1077c2d..0ebbe619 100644
--- a/src/assets/style/style.css
+++ b/src/assets/style/style.css
@@ -1989,7 +1989,7 @@ textarea:focus {
   display: flex;
   float: left;
   align-items: center;
-  padding: 1.5rem 2rem;
+  padding: 1rem 2rem;
   background-color: #fff;
   flex: 1;
   height: auto;
@@ -2314,6 +2314,8 @@ textarea:focus {
   top: 0rem;
   flex: 1;
   border: 1px solid #dcdfe6;
+  width: calc(var(--width) + 6rem);
+  padding: 1rem;
 }
 .generage_btn_box {
   position: relative;
diff --git a/src/assets/style/style.less b/src/assets/style/style.less
index ce1c3905..db55a3e7 100644
--- a/src/assets/style/style.less
+++ b/src/assets/style/style.less
@@ -2057,7 +2057,7 @@ textarea:focus{
 			display: flex;
 			float: left;
 			align-items: center;
-			padding: 1.5rem 2rem;
+			padding: 1rem 2rem;
 			// padding-right: 0;
 			background-color: #fff;
 			flex: 1;
@@ -2200,6 +2200,8 @@ textarea:focus{
 			top: 0rem;
 			flex: 1;
 			border: 1px solid #dcdfe6;
+			width: calc(var(--width) + 6rem);
+			padding: 1rem;
 		}
 		
 		// span{
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 2683c440..b1e3e95e 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -338,7 +338,7 @@ export default defineComponent({
 				speed.speedData.value = ''
 				speed.speedData.label = ''
 			}else{
-				if(newVal.value == "Pattern"){
+				if(newVal.value == "Pattern" || props.msg == 'Sketchboard'){
 					speed.speedData = speed.speedList[1]
 				}else{
 					speed.speedData = speed.speedList[0]
@@ -350,6 +350,9 @@ export default defineComponent({
 		}
 		onMounted(() => {
 			instance.appContext.config.globalProperties.$dropdownEvents.onClose(removeOpenSpeed)
+			if(props.msg == 'Sketchboard'){
+				speed.speedData = speed.speedList[1]
+			}
 		})
 
 		onUnmounted(() => {
@@ -1008,6 +1011,7 @@ export default defineComponent({
             this.searchPictureName = "";
         },
 		onPaste(e:any){
+			if(this.sketchboardList.length != 0)return
 			if(e.clipboardData.files[0] && !this.isTextarea && this.upload.level1Type !== 'Moodboard' && this.scene?.value != 'Slogan' && this.scene?.value != 'Logo'){
 				let param = new FormData(); 
 				param.append('inPin','0')
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index f858ef3a..56da44fd 100644
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -357,7 +357,7 @@
 												</i>
 												<i v-show="selectCode == 'Printboard' && scene?.value == 'Slogan'" :title="$t('Generate.sloganTitle')" @click.stop="setSlogan" class="fi fi-rr-poll-h"></i>
 												<i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="setTextareaShow"></i>
-												<i v-show="isTextarea" class="fi fi-bs-compress" @click.stop="setTextareaShow"></i>
+												<i v-show="isTextarea" class="fi fi-bs-compress" style="z-index: 100;" @click.stop="setTextareaShow"></i>
 											</div>
 											<div class="input_box_btnBox sketch" v-else>
 												<div class="upload_item"  v-show="selectGenerateList.length > 0">
@@ -857,7 +857,6 @@ export default defineComponent({
 			dataDom.createBrand.openAddBrand()
 		}
 		const editImg = (item:any,index:number)=>{
-			console.log(item)
 			pageData.editIndex = index
 			dataDom.modalCanvas.init(item,'')
 			// imgList
@@ -995,7 +994,7 @@ export default defineComponent({
 						label:''
 					}
 				}else{
-					if(newVal.value == "Pattern"){
+					if(newVal.value == "Pattern" || this.selectCode == 'Sketchboard'){
 						this.speedData = this.speedList[1]
 					}else{
 						this.speedData = this.speedList[0]
@@ -1935,6 +1934,7 @@ export default defineComponent({
 			scaleImage.init(list,index)
 		},
 		onPaste(e:any){
+			if(this.selectGenerateList.length != 0)return
 			if(e.clipboardData.files[0] && !this.isTextarea && this.selectCode !== 'Moodboard' && this.scene?.value != 'Slogan' && this.scene?.value != 'Logo'){
 				let param = new FormData(); 
 				param.append('inPin','0')