Merge branch 'StableVersion' of https://e.coding.net/aidlabfashion/aida/aida_front into StableVersion

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,6 +438,8 @@ export default defineComponent({
 			await this.setPrintWH(item.path)
 			this.designSelectElementsList
 			let sketch = document.getElementsByClassName("designElements_modal")[0]?.getElementsByClassName('designElements_sketch')[0]
+			let sketchImg = new Image()
+			sketchImg.onload = ()=>{
 				let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
 				let scale
 				scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
@@ -473,6 +472,10 @@ export default defineComponent({
 					},
 					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,6 +438,8 @@ export default defineComponent({
 			await this.setPrintWH(item.path)
 			this.designElementsList
 			let sketch = document.getElementsByClassName("designElementsMobile_modal")[0]?.getElementsByClassName('designElementsMobile_sketch')[0]
+			let sketchImg = new Image()
+			sketchImg.onload = ()=>{
 				let sketchNum = this.sketch.width.replace(/rem/g,'')*10/sketch.offsetWidth
 				let scale
 				scale = (this.print.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
@@ -454,6 +452,8 @@ export default defineComponent({
 				if(sketch.offsetHeight < item.location[1]/sketchNum){
 					top = sketch.offsetHeight +'px'
 				}
+				console.log(sketch.offsetWidth,this.sketch.width.replace(/rem/g,''));
+				
 				this.printStyleList[index]={
 					centers:{
 						left:0,
@@ -474,6 +474,10 @@ export default defineComponent({
 					},
 					designElementsBtn:false
 				}
+				sketchImg.remove()
+			}
+			sketchImg.src = sketch.src
+			
         },
 		computeZindex(resolve,prints){
 			prints.sort((a, b) => {
@@ -522,9 +526,6 @@ export default defineComponent({
 				if(v.id == this.current.id){
 					index = ind
 				}
-			})
-			let priority = designItemDetail.clothes.map((v)=>{
-                return v.type
 			})
 			// let data = {
             //     ...designItemDetail,

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/HomePage/ExportModel.vue

@@ -277,7 +277,6 @@
 					<div>all</div>
 				</div>
 			</div>
-			
 			<div class="SRExport_img">
 				<div class="SRExport_img_item_box" v-for="item in allExportSR" @click="selectImg(item)">
 					<input type="checkbox" v-model="item.checked">
@@ -310,6 +309,7 @@ import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JScanvasMouseMov
 import { useI18n } from "vue-i18n";
 import {isMoible,calculateGradientCoordinate,base64ToFile} from '@/tool/util'
 import publish from "@/component/WorksPage/publish.vue";
+import { connect } from "echarts";
 
 export default defineComponent({
     components: {
@@ -326,7 +326,7 @@ export default defineComponent({
 		})
 
         let showUpgradePlan = ref(false);
-        let canvas = reactive({});
+        let canvas = ref({});
         // let canvasDom = ref()
         let canvasWH = ref({
             width: 400,
@@ -363,11 +363,11 @@ export default defineComponent({
 		let isLoadCanvas = false//撤回或者反撤回false为撤回
 		let userlikeGroupId = 0
         let init = (productData) => {
+            showUpgradePlan.value = true;
 			userlikeGroupId = productData.userlikeGroupId
 			canvasWH.value.height = 100
 			normalCanvasState.value = []
 			reverseCanvasState.value = []
-            showUpgradePlan.value = true;
 			allBoardData.value.likeDesignCollectionList =
                     likeDesignCollectionList;
 			allBoardData.value[productData.key] = productData.imgList;
@@ -470,6 +470,7 @@ export default defineComponent({
 									//循环渲染顺序
 										
 									let imgWidth = setImageWidth(key); //这是设置画布等宽
+									// alert(imgWidth)
 									let sketchGroupingItem = [];
 									if (
 										item == "moodboardFiles" &&
@@ -501,6 +502,8 @@ export default defineComponent({
 														allItem.designOutfitUrl;
 												}
 												fabric.Image.fromURL(itemCanvasImg,(img) => {
+													img.on('added', () => {
+														img.set({ crossOrigin: 'anonymous' });
 														let scaleWH = imgWidth / img.width; //计算放到画布上缩小倍率
 														if(key == "sketchboardFiles"){
 															if(allItemIndex == 0){
@@ -551,12 +554,14 @@ export default defineComponent({
 														}else{
 															position.x += img.width * scaleWH + margin;
 														}
+														let str = `${img.width} + ${scaleWH}`
 														img.lock_rotation = true;
-													canvas.add(img);
 														oldKey = key;
-													// setTimeout(() => {
 														resolve()
-													// }, 1000);
+													})
+													
+													canvas.add(img);
+													
 												},{ crossOrigin: "Anonymous" });
 											}
 										});
@@ -793,6 +798,7 @@ export default defineComponent({
                 let xmlhttp = new XMLHttpRequest();
                 xmlhttp.open("GET", url, true);
                 xmlhttp.responseType = "blob";
+				xmlhttp.withCredentials = false; 
                 xmlhttp.onload = function () {
                     if (this.status == 200) {
                         resolve(this.response);
@@ -812,15 +818,27 @@ export default defineComponent({
                     // 下载文件, 并存成ArrayBuffer对象(blob)
                     zip.file(item.name, data, { binary: true }); // 逐个添加文件
                     cache[item.title] = data;
-                });
+                })
                 promises.push(promise);
             }
 			Promise.all(promises)
                 .then(() => {
+					function downloadBlob(blob, filename) {
+						const link = document.createElement('a');
+						const url = URL.createObjectURL(blob);
+						link.href = url;
+						link.download = filename;
+						document.body.appendChild(link);
+						link.click();
+						URL.revokeObjectURL(url);
+						document.body.removeChild(link);
+					}
                     zip.generateAsync({ type: "blob" }).then((content) => {
                         // 生成二进制流
-                        FileSaver.saveAs(content, "DesignFiles"); // 利用file-saver保存文件  自定义文件名
+						downloadBlob(content,'DesignFiles')
+                        // FileSaver.saveAs(content, "DesignFiles"); // 利用file-saver保存文件  自定义文件名
                         isShowMark.value = false;
+
                     });
 					setSubmit()//导出的时候保存
 					initAligningGuidelines(canvas,true)

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 = []