修复部分bug

src/component/Detail/DesignDetail.vue

@@ -123,7 +123,7 @@
 						<div class="clothes_detail_item clothes_detail_item_elements" :class="[current?.id?'':'hideCursor']">
                             <div class="clothes_item_header">
 								<i class="fi fi-rs-comments"></i>
-								<div>Current Elements</div>
+								<div>{{ $t('DesignDetail.CurrentElements') }}</div>
 								<i class="fi fi-rr-edit" @click.stop="openCurrent(4)"></i>
 							</div>
 							<div class="Guide_1_20 clothes_item_icon" :class="[driver__.driver?'showEvents':'']">

src/component/Detail/DesignDetailAlter.vue

@@ -589,8 +589,8 @@ export default defineComponent({
 				this.upload.level1Type = 'Sketchboard'
 				this.uploadList = this.apparelList
 				this.designTypeList = this.sketchCatecoryList
-				this.designType = this.current.type
+				// this.designType = this.current.type
-				// this.designType = this.designTypeList[0].value
+				this.designType = this.designTypeList[0].value
 			}else if (num == 2){
 				this.selectCode = 'Printboard'
 				this.upload.level1Type = 'Printboard'

src/component/Detail/DesignElements.vue

@@ -277,8 +277,6 @@ export default defineComponent({
 				location:[0,0]
 			})
 			this.refetchTemplate(currentIndex)
-		
-			
 		},
 		//设置移动
 		itemMoveMousedown(index,event){
@@ -378,7 +376,6 @@ export default defineComponent({
 			//判断尺寸是否到边
 			this.printStyleList[this.imgDomIndex].style.width = width
 			this.printStyleList[this.imgDomIndex].style.height = height
-
 		},
 		//鼠标抬起
 		sizeMouseup(e){
@@ -441,38 +438,44 @@ export default defineComponent({
 			await this.setPrintWH(item.path)
 			this.designSelectElementsList
 			let sketch = document.getElementsByClassName("designElements_modal")[0]?.getElementsByClassName('designElements_sketch')[0]
-			let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
+			let sketchImg = new Image()
-			let scale
+			sketchImg.onload = ()=>{
-			scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
+				let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
-			let zIndex = 1
+				let scale
-			let left = item.location[0]/sketchNum+'px'
+				scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
-			let top = item.location[1]/sketchNum+'px'
+				let zIndex = 1
-			if(sketch.offsetWidth < item.location[0]/sketchNum){
+				let left = item.location[0]/sketchNum+'px'
-				left = sketch.offsetWidth +'px'
+				let top = item.location[1]/sketchNum+'px'
-			}
+				if(sketch.offsetWidth < item.location[0]/sketchNum){
-			if(sketch.offsetHeight < item.location[1]/sketchNum){
+					left = sketch.offsetWidth +'px'
-				top = sketch.offsetHeight +'px'
+				}
-			}
+				if(sketch.offsetHeight < item.location[1]/sketchNum){
-			this.printStyleList[index]={
+					top = sketch.offsetHeight +'px'
-				centers:{
+				}
-					left:0,
+				this.printStyleList[index]={
-					top:0,
+					centers:{
-				},
+						left:0,
-				style:{
+						top:0,
-					left:left,
+					},
-					top:top,
+					style:{
-					right:"auto",
+						left:left,
-					bottom:"auto",
+						top:top,
-					width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px',
+						right:"auto",
-					height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px',
+						bottom:"auto",
-					zIndex:zIndex++
+						width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px',
-				},
+						height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px',
-				transform:{
+						zIndex:zIndex++
-					// scale:scale<.2?.2:scale,//0.2-3
+					},
-					rotateZ:item.angle,
+					transform:{
-				},
+						// scale:scale<.2?.2:scale,//0.2-3
-				designElementsBtn:false
+						rotateZ:item.angle,
+					},
+					designElementsBtn:false
+				}
+				sketchImg.remove()
 			}
+			sketchImg.src = sketch.src
+			
         },
 		computeZindex(resolve,prints){
 			prints.sort((a, b) => {

src/component/Detail/DesignElementsMobile.vue

@@ -43,7 +43,7 @@
 								v-for="item,index in exhibitionElementsList" 
 								:key="item"
 								:style="[printStyleList?.[index]?.style]" 
-								@touchstart.stop="itemMoveMousedown(index,$event)"
+								@touchstart.passive="itemMoveMousedown(index,$event)"
 								class="modal_imgItem" 
 								ref="content" >
 								<img crossOrigin="anonymous" :src="item?.path" :style="{transform:`rotateZ(${printStyleList[index]?.transform?.rotateZ}deg)`}" class="designElementsMobile_imgItme" draggable="false"> 
@@ -52,7 +52,7 @@
 						<!-- <img :src="current?.path" alt="" class="designElementsMobile_sketch"> -->
 						<img :src="current?.undividedLayer?current.undividedLayer:current.path" alt="" class="designElementsMobile_sketch">
 						<div class="designElementsMobile_btn">
-							<ul v-for="item,index in printStyleList" :key="item" :class="{active:item?.designElementsBtn?item?.designElementsBtn:false}" class="designElementsMobile_Mousingle" :style="item.style" @touchstart.stop="itemMoveMousedown(index,$event)">
+							<ul v-for="item,index in printStyleList" :key="item" :class="{active:item?.designElementsBtn?item?.designElementsBtn:false}" class="designElementsMobile_Mousingle" :style="item?.style" @touchstart.stop="itemMoveMousedown(index,$event)">
 								<li class="designElementsMobile_btn_top" @touchstart.stop="itemSizeMousedown('top',$event)"></li>
 								<li class="designElementsMobile_btn_bottom" @touchstart.stop="itemSizeMousedown('bottom',$event)"></li>
 								<li class="designElementsMobile_btn_left" @touchstart.stop="itemSizeMousedown('left',$event)"></li>
@@ -305,12 +305,12 @@ export default defineComponent({
 		itemSizeMousedown(direction,event){
 			this.direction = direction
 			this.imgDom = document.getElementsByClassName('designElementsMobile_modal')[0].getElementsByClassName("modal_imgItem")[this.imgDomIndex]
-			let scale = Number(this.imgDom.style.transform?.split('scale(')[1]?.split(')')[0])
+			let scale = Number(this.imgDom.children[0].style.transform?.split('scale(')[1]?.split(')')[0])
-			let rotateZ = Number(this.imgDom.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
+			let rotateZ = Number(this.imgDom.children[0].style.transform?.split('rotateZ(')[1]?.split('deg')[0])
 			this.printStyleList[this.imgDomIndex].designElementsBtn = true
 			this.printStyleList[this.imgDomIndex].transform = {
 				scale:scale,
-				rotateZ:rotateZ,
+				rotateZ:rotateZ?rotateZ:0,
 			}
 			let imgDomWH = this.imgDom.getBoundingClientRect()
 			let li = document.getElementsByClassName('designElementsMobile_modal')[0].getElementsByClassName("designElementsMobile_btn_top")[0].offsetWidth/2
@@ -393,13 +393,9 @@ export default defineComponent({
 			document.removeEventListener("touchmove", this.sizeMousemove);
 		},
 		touchend(e) {
-
 			document.removeEventListener("touchend", this.touchend);
 			document.removeEventListener("touchmove", this.moveMousemove);
 		},
-
-
-		
 		deletePrint(){
 			this.exhibitionElementsList.splice(this.imgDomIndex,1)
 			this.printStyleList.splice(this.imgDomIndex,1)
@@ -442,38 +438,46 @@ export default defineComponent({
 			await this.setPrintWH(item.path)
 			this.designElementsList
 			let sketch = document.getElementsByClassName("designElementsMobile_modal")[0]?.getElementsByClassName('designElementsMobile_sketch')[0]
-			let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
+			let sketchImg = new Image()
-			let scale
+			sketchImg.onload = ()=>{
-			scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
+				let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
-			let zIndex = 1
+				let scale
-			let left = item.location[0]/sketchNum+'px'
+				scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
-			let top = item.location[1]/sketchNum+'px'
+				let zIndex = 1
-			if(sketch.offsetWidth < item.location[0]/sketchNum){
+				let left = item.location[0]/sketchNum+'px'
-				left = sketch.offsetWidth +'px'
+				let top = item.location[1]/sketchNum+'px'
-			}
+				if(sketch.offsetWidth < item.location[0]/sketchNum){
-			if(sketch.offsetHeight < item.location[1]/sketchNum){
+					left = sketch.offsetWidth +'px'
-				top = sketch.offsetHeight +'px'
+				}
-			}
+				if(sketch.offsetHeight < item.location[1]/sketchNum){
-			this.printStyleList[index]={
+					top = sketch.offsetHeight +'px'
-				centers:{
+				}
-					left:0,
+				console.log(sketch.offsetWidth,this.sketch.width.replace(/rem/g,''));
-					top:0,
+				
-				},
+				this.printStyleList[index]={
-				style:{
+					centers:{
-					left:left,
+						left:0,
-					top:top,
+						top:0,
-					right:"auto",
+					},
-					bottom:"auto",
+					style:{
-					width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px',
+						left:left,
-					height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px',
+						top:top,
-					zIndex:zIndex++
+						right:"auto",
-				},
+						bottom:"auto",
-				transform:{
+						width:this.print.width.replace(/px/g,'')/sketchNum*item.scale+'px',
-					// scale:scale<.2?.2:scale,//0.2-3
+						height:this.print.height.replace(/px/g,'')/sketchNum*item.scale+'px',
-					rotateZ:item.angle,
+						zIndex:zIndex++
-				},
+					},
-				designElementsBtn:false
+					transform:{
+						// scale:scale<.2?.2:scale,//0.2-3
+						rotateZ:item.angle,
+					},
+					designElementsBtn:false
+				}
+				sketchImg.remove()
 			}
+			sketchImg.src = sketch.src
+			
         },
 		computeZindex(resolve,prints){
 			prints.sort((a, b) => {
@@ -523,9 +527,6 @@ export default defineComponent({
 					index = ind
 				}
 			})
-			let priority = designItemDetail.clothes.map((v)=>{
-                return v.type
-            })
 			// let data = {
             //     ...designItemDetail,
             //     priority:priority,

src/component/Detail/DesignPrintOperation.vue

@@ -474,7 +474,7 @@ export default defineComponent({
 			this.printStyleList[this.stateOverallSingle][this.imgDomIndex].designOpenrtionBtn = true
 			this.printStyleList[this.stateOverallSingle][this.imgDomIndex].transform = {
 				scale:scale,
-				rotateZ:rotateZ,
+				rotateZ:rotateZ?rotateZ:0,
 			}
 			let imgDomWH = this.imgDom.getBoundingClientRect()
 			let li = document.getElementsByClassName('designOpenrtion_modal')[0].getElementsByClassName("designOpenrtion_btn_top")[0].offsetWidth/2

src/component/Detail/DesignPrintOperationMobile.vue

@@ -467,12 +467,12 @@ export default defineComponent({
 		itemSizeMousedown(direction,event){
 			this.direction = direction
 			this.imgDom = document.getElementsByClassName('designOpenrtionMobile_modal')[0].getElementsByClassName("modal_imgItem")[this.imgDomIndex]
-			let scale = Number(this.imgDom.style.transform?.split('scale(')[1]?.split(')')[0])
+			let scale = Number(this.imgDom.children[0].style.transform?.split('scale(')[1]?.split(')')[0])
-			let rotateZ = Number(this.imgDom.style.transform?.split('rotateZ(')[1]?.split('deg')[0])
+			let rotateZ = Number(this.imgDom.children[0].style.transform?.split('rotateZ(')[1]?.split('deg')[0])
 			this.printStyleList[this.stateOverallSingle][this.imgDomIndex].designOpenrtionBtn = true
 			this.printStyleList[this.stateOverallSingle][this.imgDomIndex].transform = {
 				scale:scale,
-				rotateZ:rotateZ,
+				rotateZ:rotateZ?rotateZ:0,
 			}
 			let imgDomWH = this.imgDom.getBoundingClientRect()
 			let li = document.getElementsByClassName('designOpenrtionMobile_modal')[0].getElementsByClassName("designOpenrtionMobile_btn_top")[0].offsetWidth/2

src/component/LibraryPage/searchLabel.vue

@@ -235,13 +235,13 @@ export default defineComponent({
 					let arr:any = []
 					rv.forEach((item:any) => {
 						arr.push({
-							name:item.name,
+							name:item.value,
-							value:item.value,
+							value:item.name,
 						})
 					});
-					this.designType = rv[0]
+					this.designType = arr[0]
-					this.editDesignType = rv[0]
+					this.editDesignType = arr[0]
-					this.disignTypeList = rv
+					this.disignTypeList = arr
 					// this.workspaceItem.position = this.singleTypeList[0].label
 				}
 			})

src/lang/cn.ts

@@ -450,6 +450,7 @@ export default {
 		editSketchTitle:'修改草图',
 		CurrentPrint:'当前印花',
 		CurrentColor:'当前颜色',
+		CurrentElements:'当前元素',
 	},
 	DesignDetailAlter:{
 		Upload:'上传',

src/lang/en.ts

@@ -451,6 +451,7 @@ export default {
 		editSketchTitle:'Modify sketch',
 		CurrentPrint:'Current Print',
 		CurrentColor:'Current Color',
+		CurrentElements:'Current Elements',
 	},
 	DesignDetailAlter:{
 		Upload:'Upload',

src/store/userHabit/userHabit.ts

@@ -103,7 +103,7 @@ const userHabit : Module<UserHabit,RootState> = {
 				});
 			})
 		},
-		getLangType(context){
+		async getLangType(context){
 			let allPromise = [];
 			let getList = ['DesignElementsEnum','PrintboardLevel2TypeEnum','FemalePosition','MalePosition']
 			let axiosGet = (item:any)=>{
@@ -130,7 +130,7 @@ const userHabit : Module<UserHabit,RootState> = {
 					})
 			    })
 			}
-			return Promise.all(getList.map(item => axiosGet(item)))
+			return await Promise.all(getList.map(item => axiosGet(item)))
 			// Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:'DesignElementsEnum'}}).then((rv: any) => {
 			// 	if (rv) {
 			// 		rv.forEach((item:any) => {

src/views/HomeView/library.vue

@@ -342,7 +342,7 @@
 		<createSlogan ref="createSlogan" @setSloganData="setSloganData"></createSlogan>
 
         <!-- 蒙层 start-->
-        <div class="mark_loading" v-show="isShowMark">
+        <div class="mark_loading" v-show="isShowMark || getLangIsShowMark">
             <a-spin size="large" />
 		
 			<!-- <div v-show="remGenerate" class="mark_loading_btn" @click="removeGenerate">{{$t('Generate.Close')}}</div> -->
@@ -388,6 +388,11 @@ export default defineComponent({
 		sketchCategory,
 		createSlogan,
     },
+	props:{
+		getLangIsShowMark:{
+			type:Boolean,
+		}
+	},
     setup() {
         const store = useStore();
         let menuList = computed(()=>{
@@ -613,7 +618,6 @@ export default defineComponent({
         this.uploadUrl = getUploadUrl()
         this.getLibraryList('')
 		this.getClass()
-		this.getSex()
         this.token = getCookie("token") || "";
 		this.workspace = computed(()=>{
 			return  this.store?.state?.Workspace?.workspace
@@ -646,7 +650,8 @@ export default defineComponent({
 			// 	params = 'MalePosition'
 			// }
 			this.store.commit('setPosition',this.sex)
-			this.designType = this.designTypeList.Sketchboard?.[0].value
+			this.designType = this.store.state.UserHabit.Position?.[0].value
+			// this.designType = this.designTypeList?.Sketchboard?.[0].value
 
 			// await Https.axiosGet(Https.httpUrls.workspaceenumValues,{params:{enumName:params}}).then((rv: any) => {
 			// 	if (rv) {
@@ -722,6 +727,9 @@ export default defineComponent({
 					if(this.selectCode != 'DesignElements'){
 						this.getClass()
 					}
+					if(this.selectCode == 'Sketchboard')this.getSex()
+					
+
 					this.getLibraryList('')
 					this.captionGeneration = ''
 					this.selectGenerateList = []