Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

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

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

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

@@ -100,7 +100,6 @@ export default defineComponent({
 			tcxToColor:'',
 		})
 		watch(()=>colorData.selectColor,async (newVal,oldVal)=>{
-			console.log('=======',123)
 		    if((newVal.rgba && newVal.rgba?.r != null) || newVal.gradient != null){
 			console.log('=======',123)
 				let data :any = {}
@@ -130,11 +129,12 @@ export default defineComponent({
 		})
 		watch(()=>colorData.selectDetail.id,(newVal,oldVal)=>{
 			if(!newVal)return
-			if(!colorData.colorList?.list?.[newVal]){
+			colorData.colorList.list[newVal] = []
-				colorData.colorList.list[newVal] = []
+			// if(!colorData.colorList?.list?.[newVal]){
-			}else{
+			// 	colorData.colorList.list[newVal] = []
-				return
+			// }else{
-			}
+			// 	// return
+			// }
 			let isNoSelect = false
 			let pushIndex = 0
 			for (let index = 0; index < 9; index++) {
@@ -151,6 +151,7 @@ export default defineComponent({
 					(JSON.stringify(colorData.selectDetail.color.gradient) == JSON.stringify(color?.gradient) && colorData.selectDetail.color.gradient)
 				){
 					isNoSelect = true
+			console.log('=======',123)
 					colorData.selectColor = item
 					colorData.colorList.index = index
 				}else if(color?.rgba?.r){
@@ -174,6 +175,7 @@ export default defineComponent({
 				}
 				colorData.colorList.list[newVal].push(item)
 			}
+			console.log('=======',isNoSelect)
 			if(!isNoSelect){
 				let color = colorData.selectDetail.newDetail?.color?.rgba?.r != null?colorData.selectDetail.newDetail?.color:colorData.selectDetail.color
 				let item:any = {}

src/store/Detail/designDetail.ts

@@ -81,7 +81,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 						left:v.layersObject[i].position?.[1],
 						width:v.layersObject[i].imageSize?.[0],
 						height:v.layersObject[i].imageSize?.[1],
-						transform:`rotate(${v.layersObject[i]?.rotate || 0}deg) scaleX(${v.layersObject[i].transpose?.[0] || 1}) scaleY(${v.layersObject[i].transpose?.[1] || 1})`,
+						transform:`scaleX(${v.layersObject[i].transpose?.[0] || 1}) scaleY(${v.layersObject[i].transpose?.[1] || 1}) rotate(${v.layersObject?.[i]?.rotate || 0}deg)`,
 					}
 					v.layersObject[i].centers={
 						left:0,
@@ -277,7 +277,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
 									width:item.layersObject[i].imageSize?.[0] * scale + 'px',
 									height:item.layersObject[i].imageSize?.[1] * scale + 'px',
 									zIndex:v?.style?.zIndex?v.style.zIndex:v.priority?v.priority:state.frontBack.front.length,
-									transform:`rotate(${item.layersObject?.[i]?.rotate || 0}deg) scaleX(${item.layersObject[i].transpose?.[0] || 1}) scaleY(${item.layersObject[i].transpose?.[1] || 1})`,
+									transform:`scaleX(${item.layersObject[i].transpose?.[0] || 1}) scaleY(${item.layersObject[i].transpose?.[1] || 1}) rotate(${item.layersObject?.[i]?.rotate || 0}deg)`,
 								}
 								item.layersObject[i].centers={
 									left:0,