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

src/component/Detail/detailRight/editPrintElement.vue

@@ -300,7 +300,7 @@ export default defineComponent({
 					// 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:item.priority,
@@ -312,7 +312,9 @@ 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){
@@ -915,6 +917,7 @@ export default defineComponent({
 		}
 		const inputFillAngle = (angle:any)=>{
 			let arr = editPrintElementData.printStyleList[props.type].overall
+			console.log(angle)
 			arr[editPrintElementData.imgDomIndex].angle = angle
 			editPrintElementDom.pingpuRef.updataList([
 				{

src/tool/listData.js

@@ -272,12 +272,12 @@ const navTypeList = (t)=>{
 				// },
 
 
-				{
-					icon:'fi fi-rr-puzzle-alt',
-					value:'deReconstruction',
-					label:t('Header.toolsDeReconstruction'),
-					router:'tools=deReconstruction'
-				},
+				// {
+				// 	icon:'fi fi-rr-puzzle-alt',
+				// 	value:'deReconstruction',
+				// 	label:t('Header.toolsDeReconstruction'),
+				// 	router:'tools=deReconstruction'
+				// },
 				{
 					icon:'fi fi-ss-box-open',
 					value:'toProduct',
@@ -294,18 +294,18 @@ const navTypeList = (t)=>{
 					label:t('Header.toolsToTransferPose'),
 					router:'tools=poseTransfer'
 				},
-				{
-					icon:'fi fi-rr-cubes',
-					value:'patternMaking3D',
-					label:t('Header.toolsPatternMaking'),
-					router:'tools=patternMaking3D'
-				},
-				{
-					icon:'fi fi-rr-pen-swirl',
-					value:'canvasUpload',
-					label:t('Header.toolsCanvas'),
-					router:'tools=canvasUpload'
-				},
+				// {
+				// 	icon:'fi fi-rr-cubes',
+				// 	value:'patternMaking3D',
+				// 	label:t('Header.toolsPatternMaking'),
+				// 	router:'tools=patternMaking3D'
+				// },
+				// {
+				// 	icon:'fi fi-rr-pen-swirl',
+				// 	value:'canvasUpload',
+				// 	label:t('Header.toolsCanvas'),
+				// 	router:'tools=canvasUpload'
+				// },
 			]
 		},
 		library:{