Merge branch 'dev_vite' of http://18.167.251.121:10003/aidlab/aida_front into dev_vite

src/component/Detail/canvas/index.vue

@@ -13,6 +13,8 @@
 							:clothingImageUrl="selectDetail.path"
 							:clothingImageUrl2="selectDetail.layersObject[0].maskUrl"
 							showFixedLayer
+							:width="sketchWidth"
+							:height="sketchHeight"
 							:canvasJSON="canvasJSON"
 							@canvasLoadJsonSuccess="canvasLoadJsonSuccess"
 							:clothing-image-opts="{
@@ -119,6 +121,8 @@ export default defineComponent({
 				printObject: store.state.DesignDetail.selectDetail.printObject,
 				trims: store.state.DesignDetail.selectDetail.trims,
 			})),
+			sketchWidth:0,
+			sketchHeight:0,
 		})
 		watch(()=>detailData.selectDetail,(newValue,oldValue)=>{
 			detailData.imgDomIndex = detailData.frontBack.front.findIndex((item:any)=>item.id == newValue.id)
@@ -342,6 +346,18 @@ export default defineComponent({
 		const submitBase64Data = ()=>{
 			return detailDom.generalMiniCanvas.submitBase64Data()
 		}
+		const sketchSize:any = async ()=>{
+			let img = new Image();
+			img.src = detailData.selectDetail.path;	
+			await new Promise((resolve, reject) => {
+				img.onload = () => {
+					detailData.sketchWidth = img.width
+					detailData.sketchHeight = img.height
+					resolve([img.width, img.height]);
+				}
+				img.onerror = reject;
+			});
+		}
 		onBeforeUnmount(()=>{
 			let front = detailData.frontBack.front[detailData.imgDomIndex]
 			let back = detailData.frontBack.back[detailData.imgDomIndex]
@@ -382,6 +398,7 @@ export default defineComponent({
 						});
 					})
 				}
+				await sketchSize()
 				setCanvas(detailData.selectDetail.path).then(()=>{
 					detailData.canvasLoad = true
 				})

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

@@ -100,7 +100,6 @@ export default defineComponent({
 			tcxToColor:'',
 		})
 		watch(()=>colorData.selectColor,async (newVal,oldVal)=>{
-			console.log(newVal)
 		    if(newVal.rgba && newVal.rgba?.r){
 				let data:any = await getColorName(newVal.rgba)
 				newVal.name = data.name
@@ -138,13 +137,12 @@ export default defineComponent({
 				item = colorData.allBoardData.colorBoards[index]
 				let color = colorData.allBoardData.colorBoards?.[index]
 				if(!color?.rgba && color?.rgbValue)color.rgba = color.rgbValue
-
 				if(
 					colorData.allBoardData.colorBoards?.[index] &&
 					colorData.selectDetail.color.rgba?.r == color?.rgba?.r &&
 					colorData.selectDetail.color.rgba?.g == color?.rgba?.g &&
-					colorData.selectDetail.color.rgba?.b == color?.rgba?.b &&
-					JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient)
+					colorData.selectDetail.color.rgba?.b == color?.rgba?.b ||
+					(JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && JSON.stringify(colorData.selectDetail.color.gradient))
 					&& colorData.selectDetail.color.rgba?.r
 				){
 					isNoSelect = true