Merge remote-tracking branch 'origin/StableVersion' into dev_vite

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;

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;

src/component/Detail/DesignDetail.vue

@@ -299,7 +299,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 = ''

src/component/Detail/canvas/index.vue

@@ -36,8 +36,7 @@
 						</editFrontBack> -->
 						<editCanvas v-if="canvasLoad" :config="canvasConfig" 
 							:enabledRedGreenMode="true"
-							@canvasInit="canvasInit"
+							:clothingImageUrl="selectDetail.path" 
-							:clothingImageUrl="selectDetail.undividedLayer || selectDetail.path" 
 							:redGreenImageUrl="frontBack.front[imgDomIndex].maskUrl"
 							@trigger-red-green-mouseup="frontBackChange"
 							:clothing-image-opts="{

src/component/HomePage/Generate.vue

@@ -339,7 +339,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]
@@ -351,6 +351,9 @@ export default defineComponent({
 		}
 		onMounted(() => {
 			instance.appContext.config.globalProperties.$dropdownEvents.onClose(removeOpenSpeed)
+			if(props.msg == 'Sketchboard'){
+				speed.speedData = speed.speedList[1]
+			}
 		})
 
 		onUnmounted(() => {
@@ -1009,6 +1012,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')

src/component/WorksPage/newScaleImage.vue

@@ -441,8 +441,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'))
 			}

src/views/HomeView/library.vue

@@ -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')