添加语言适配

src/component/Detail/DesignDetail.vue

@@ -356,7 +356,7 @@ export default defineComponent({
                     this.loadingShow = false
 					if(this.driver__.driver){
 						nextTick().then(()=>{
-							driverObj__.moveTo(20);
+							driverObj__.moveTo(18);
 						})
 					}
                 }

src/component/Detail/habit.vue

@@ -595,7 +595,7 @@ export default defineComponent({
 				if(this.driver__.driver){
 					nextTick().then(()=>{
 						// driverObj__.moveNext();
-						driverObj__.moveTo(30);
+						driverObj__.moveTo(28);
 
 					})
 				}

src/component/HomePage/ExportNewCoolection.vue

@@ -52,7 +52,7 @@
 		<div v-show="exportNav[3].change" class="img_block_item img_block_item_sketch">
             <div class="lager_img_item" :class="'lager_img_item'+index" v-for="(item,index) in sketch" :key="item">
 				<div class="all_img_item_block" v-for="v in item" :key="sketch">
-                    <img class="all_img_content" :src="v?.imgUrl">
+                    <img class="all_img_content" :src="v?.urlWithWhiteSide">
 				</div>
             </div>
         </div>
@@ -95,7 +95,7 @@ export default defineComponent({
         }
     },
 	watch: {
-		allBoardData:{
+		sketchList:{
 			handler(newVal:any,oldVal:any){
 				// this.sketchList = []
 				// this.sketch = [[],[],[]]
@@ -133,22 +133,31 @@ export default defineComponent({
 				if(this.sketchList){
 					for (let i = 0; i < this.sketchList.length; i++) {
 						let arr = [sketch1,sketch2,sketch3]
+						let image = new Image()
+						image.src = this.sketchList[i].urlWithWhiteSide
+						
 						arr.sort((a,b)=>{
 							var a_num = a["height"];
 							var b_num = b["height"];
 							return a_num - b_num;
 						})
+						// console.log(arr);
 						this.sketch[arr[0].num]?.push(this.sketchList[i])
+						// console.log([sketch1.height,sketch2.height,sketch3.height]);
 						await new Promise((resolve:any)=>{
+							image.onload = ()=>{
 								nextTick().then(()=>{
 									sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
 									sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
 									sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
+									
 									sketch1.num = 0
 									sketch2.num = 1
 									sketch3.num = 2
 									resolve()
 								})
+							}
+							
 						})
 					}
 				}

src/component/HomePage/Generate.vue

@@ -454,7 +454,7 @@ export default defineComponent({
 						this.loadingShow = false
 						})
 						if(this.driver__.driver){
-							driverObj__.moveTo(5)
+							driverObj__.moveTo(3)
 						}
 						// if(){
 						// 	// driverObj__.moveNext()

src/component/HomePage/MoodboardUpload.vue

@@ -266,14 +266,14 @@ export default defineComponent({
 				// }
 			}
 		},
-		driver__:{
+		// driver__:{
-			handler(newVal,oldVal){
+		// 	handler(newVal,oldVal){
-				if(newVal.index >= 1 && newVal.index <= 2){
+		// 		if(newVal.index >= 1 && newVal.index <= 2){
-					this.open(newVal.index)
+		// 			this.open(newVal.index)
-				}else{
+		// 		}else{
-				}
+		// 		}
-			}
+		// 	}
-		}
+		// }
 	},
 	directives:{
 		modelImg:{

src/component/HomePage/NewCollectionReview.vue

@@ -94,7 +94,7 @@ export default defineComponent({
 		}
 	},
 	watch: {
-		allBoardData:{
+		sketchList:{
 			handler(newVal:any,oldVal:any){
 				// this.sketchList = []
 				// this.sketch = [[],[],[]]
@@ -122,22 +122,31 @@ export default defineComponent({
 				if(this.sketchList){
 					for (let i = 0; i < this.sketchList.length; i++) {
 						let arr = [sketch1,sketch2,sketch3]
+						let image = new Image()
+						image.src = this.sketchList[i].urlWithWhiteSide
+						
 						arr.sort((a,b)=>{
 							var a_num = a["height"];
 							var b_num = b["height"];
 							return a_num - b_num;
 						})
+						// console.log(arr);
 						this.sketch[arr[0].num]?.push(this.sketchList[i])
+						// console.log([sketch1.height,sketch2.height,sketch3.height]);
 						await new Promise((resolve:any)=>{
+							image.onload = ()=>{
 								nextTick().then(()=>{
 									sketch1 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item0')[0]?.getBoundingClientRect()
 									sketch2 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item1')[0]?.getBoundingClientRect()
 									sketch3 = document.getElementsByClassName('collection_review')[0]?.getElementsByClassName('lager_img_item2')[0]?.getBoundingClientRect()
+									
 									sketch1.num = 0
 									sketch2.num = 1
 									sketch3.num = 2
 									resolve()
 								})
+							}
+							
 						})
 					}
 				}

src/component/HomePage/PrintboardUpload.vue

@@ -202,7 +202,7 @@ export default defineComponent({
 		printBoards:{
 			handler(newVal:any,oldVal:any){
 				if(newVal.length>=2 && this.driver__.driver && newVal.length!=oldVal.length){
-					driverObj__.moveTo(9)
+					driverObj__.moveTo(7)
 				}
 			}
 		}

src/component/HomePage/SketchboardUpload.vue

@@ -347,7 +347,7 @@ export default defineComponent({
 		sketchboardList:{
 			handler(newVal:any,oldVal:any){
 				if(newVal.length>=2 && this.driver__.driver&& newVal.length!=oldVal.length){
-					driverObj__.moveTo(16)
+					driverObj__.moveTo(14)
 				}
 			}
 		}

src/component/LibraryPage/ModelPlacement.vue

@@ -718,7 +718,7 @@ export default defineComponent({
         printPreview(){
             let file = this.printObject.templateId ? null :this.printObject.file,
                 models = {
-                    libraryId:this.printObject.libraryId || null,
+                    libraryId:this.printObject.relationId || null,
                     templateId:this.printObject.templateId || null,
                     timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
                     ...this.getPrintLocation()

src/component/LibraryPage/ModelPlacementMobile.vue

@@ -715,7 +715,7 @@ export default defineComponent({
         printPreview(){
             let file = this.printObject.templateId ? null :this.printObject.file,
                 models = {
-                    libraryId:this.printObject.libraryId || null,
+                    libraryId:this.printObject.relationId || null,
                     templateId:this.printObject.templateId || null,
                     timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
                     ...this.getPrintLocation()

src/component/LibraryPage/setLabel.vue

@@ -11,7 +11,7 @@
 	>
 		<div class="setLabel_centent">
 			<ul class="optionsItem">
-				<li class="optionsItem_title" v-for="optionsItem,optionsIndex in options" :key="optionsItem.id">
+				<li class="optionsItem_title" @click.stop="" v-for="optionsItem,optionsIndex in options" :key="optionsItem.id">
 					<div class="setLabel_text">
 						<a-checkbox v-model:checked="optionsItem.checkAll" @change="onCheckAllChange(optionsItem)"></a-checkbox>
 						<span v-show="!optionsItem.openType" :title="optionsItem.classificationName">{{ optionsItem.classificationName }}</span>
@@ -174,7 +174,7 @@ export default defineComponent({
 			let data:any 
 			if(v == 'put'){
 				this.clearOpenType()
-				
+				document.addEventListener('click',this.clearOpenType)
 				item.openType = true
 				this.itemName = item.classificationName
 				// this.options[index].openType = true
@@ -209,6 +209,7 @@ export default defineComponent({
 					item.openType = false
 				}
 				this.addLabel(data)
+				document.removeEventListener('click',this.clearOpenType)
 			}
 		},
 		newLabel(item:any,id:any){
@@ -259,6 +260,7 @@ export default defineComponent({
 					this.getClass()
                 }	
             ).catch((res)=>{
+				this.getClass()
             });
 		},
 		deleteClass(data:any){
@@ -317,6 +319,10 @@ export default defineComponent({
 </script>
 <style lang="less">
 .library_setLabel{
+	.ant-modal-content{
+		border-radius: 1rem;
+		overflow: hidden;
+	}
 	.setLabel_centent{
 		display: flex;
 		flex-direction: column;

src/lang/cn.ts

@@ -55,13 +55,15 @@ export default {
 		jsContent3:'导出文件失败。',
 	},
 	LibraryPage:{
-		Organize:'喜欢',
+		Organize:'我的',
 		Upload:'上传',
 		Generate:'生成',
 		Delete:'删除',
-		Rename:'重命名',
+		Rename:'编辑',
 		inputContent1:'输入名字进行搜索',
 		intersection:'交集',
+		Select:'选择',
+		NoLabel:'空标签',
 		unionSet:'并集',
 		all:'全选',
 		ImageOnly:'图片',

src/lang/en.ts

@@ -59,9 +59,11 @@ export default {
 		Upload:'Upload',
 		Generate:'Generate',
 		Delete:'Delete',
-		Rename:'Rename',
+		Rename:'Edit',
 		inputContent1:'Search by your style code',
 		intersection:'intersection',
+		Select:'Select',
+		NoLabel:'No Label',
 		unionSet:'union set',
 		all:'all',
 		ImageOnly:'Image Only',

src/lang/fr.ts

@@ -60,9 +60,11 @@ export default {
 		Upload:'Télécharger',
 		Generate:'Générer',
 		Delete:'Supprimer',
-		Rename:'Renommer',
+		Rename:'Modifier',
 		inputContent1:'Recherchez par votre code de style',
 		intersection:'intersection',
+		Select:'Sélectionner',
+		NoLabel:'Aucune étiquette',
 		unionSet:"ensemble d'unions",
 		all:'tout',
 		ImageOnly:'Image uniquement',

src/lang/it.ts

@@ -59,9 +59,11 @@ export default {
 		Upload:'Caricamento',
 		Generate:'creare',
 		Delete:'Eliminare',
-		Rename:'Rinominare',
+		Rename:'Modificare',
 		inputContent1:'Search by your style code',
 		intersection:'intersezione',
+		Select:'Seleziona',
+		NoLabel:'Nessuna etichetta',
 		unionSet:'insieme di unione',
 		all:'Tutto',
 		ImageOnly:'Solo immagine',

src/lang/ja.ts

@@ -59,9 +59,11 @@ export default {
 		Upload:'アップロード',
 		Generate:'生成する',
 		Delete:'消去',
-		Rename:'名前の変更',
+		Rename:'編集',
 		inputContent1:'スタイルコードで検索',
 		intersection:'交差点',
+		Select:'選択',
+		NoLabel:'ラベルなし',
 		unionSet:'ユニオンセット',
 		all:'全て',
 		ImageOnly:'画像のみ',

src/lang/kr.ts

@@ -59,9 +59,11 @@ export default {
 		Upload:'업로드',
 		Generate:'생성하다',
 		Delete:'삭제',
-		Rename:'이름 바꾸기',
+		Rename:'편집하다',
 		inputContent1:'스타일 코드로 검색',
 		intersection:'교차로',
+		Select:'선택',
+		NoLabel:'라벨 없음',
 		unionSet:'결합 세트',
 		all:'모두',
 		ImageOnly:'이미지만',

src/lang/ru.ts

@@ -59,9 +59,11 @@ export default {
 		Upload:'Загрузить',
 		Generate:'Генерировать',
 		Delete:'Удалить',
-		Rename:'Переименовать',
+		Rename:'Редактировать',
 		inputContent1:'Поиск по коду вашего стиля',
 		intersection:'пересечение',
+		Select:'Выбрать',
+		NoLabel:'Нет метки',
 		unionSet:'набор объединений',
 		all:'all',
 		ImageOnly:'Только изображение',

src/lang/th.ts

@@ -59,9 +59,11 @@ export default {
 		Upload:'อัปโหลด',
 		Generate:'กำเนิด',
 		Delete:'ลบ',
-		Rename:'เปลี่ยนชื่อ',
+		Rename:'แก้ไข',
 		inputContent1:'ค้นหาตามรหัสสไตล์ของคุณ',
 		intersection:'แยก',
+		Select:'เลือก',
+		NoLabel:'ไม่มีป้ายกำกับ',
 		unionSet:'ชุดยูเนี่ยน',
 		all:'ทั้งหมด',
 		ImageOnly:'รูปภาพเท่านั้น',

src/lang/vn.ts

@@ -59,9 +59,11 @@ export default {
 		Upload:'Tải lên',
 		Generate:'Phát ra',
 		Delete:'Xóa bỏ',
-		Rename:'Đổi tên',
+		Rename:'Biên tập',
 		inputContent1:'Tìm kiếm theo mã kiểu của bạn',
 		intersection:'ngã tư',
+		Select:'Chọn',
+		NoLabel:'Không có nhãn',
 		unionSet:'bộ đoàn',
 		all:'tất cả',
 		ImageOnly:'Chỉ hình ảnh',

src/tool/guide.js

@@ -12,8 +12,8 @@ let data = {
 const driverObj__ = driver({
 	steps: [
 		{ element: '.Guide_1_1', popover: { title: 'Title', description: 'Description' } },
-		{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
+		// { element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
-		{ element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
+		// { element: '.Guide_1_2', popover: { title: 'Title', description: 'Description' } },
 		{ element: '.Guide_1_4', popover: { title: 'Title', description: 'Description' } },
 		{ element: '.Guide_1_5', popover: { title: 'Title', description: 'Description' } },
 		{ element: '.Guide_1_6', popover: { title: 'Title', description: 'Description' } },
@@ -58,16 +58,21 @@ const driverObj__ = driver({
 	overlayOpacity:.4,
 	overlay: true,
 	onPopoverRender: (popover, options) => {//每个步骤的元素和所有信息
-		// console.log(popover,options);	
+		console.log(popover,options);	
 		if(element){
 			element.classList.remove('Guide_')
 		}
 		popover.previousButton.style.display = 'none'
 		let driver = document.querySelector('body')
+		if(options.state.activeIndex >= 2 && options.state.activeIndex < 3){
+			options.config.stagePadding = 0
+		}else{
+			options.config.stagePadding = 10
+		}
 		if(
-			options.state.activeIndex >= 1 && options.state.activeIndex <= 2 || 
+			// options.state.activeIndex >= 1 && options.state.activeIndex <= 2 || 
-			options.state.activeIndex >= 20 && options.state.activeIndex < 21 || 
+			options.state.activeIndex >= 18 && options.state.activeIndex < 19 || 
-			options.state.activeIndex >= 26 && options.state.activeIndex < 27
+			options.state.activeIndex >= 24 && options.state.activeIndex < 25
 		){
 			popover.footer.style.display = 'block'
 			driver.classList.add('showEvents')
@@ -90,7 +95,10 @@ const driverObj__ = driver({
 	},
 	//销毁前
 	onDestroyStarted:()=>{
-		data.driver = false
+		data = {
+			index : driverIndex__,
+			driver : false,
+		}
 		store?.commit("setGuide", data);
 		driverObj__.destroy();//销毁方法
 	},

src/views/HomeView.vue

@@ -823,8 +823,9 @@ export default defineComponent({
 					}
 				}]:[]
 			};
+			// console.log(data);
 			this.store.commit("setAllBoardDataChoose", collectionData);
-			this.store.commit("setShowSketchboard", collectionData.sketchboardFiles);
+			this.store.commit("setShowSketchboard", data.collection.sketchBoards);
 			this.store.commit(
 				"setDesignCollectionId",
 				data.collection.collectionId

src/views/LibraryPage.vue

@@ -116,6 +116,7 @@
 													:collapse-tags="true" 
 													:show-all-levels="false" 
 													:clearable="true"
+													:placeholder="$t('LibraryPage.Select')"
 													:max-collapse-tags=3
 													:props="props" 
 													:collapse-tags-tooltip="true"
@@ -125,7 +126,7 @@
 												>
 													<template #empty>
 														<div>
-															No Label
+															{{$t('LibraryPage.Select')}}
 														</div>
 													</template>
 												</el-cascader>
@@ -313,7 +314,7 @@
         <a-modal class="library_rename_modal_component" 
             v-model:visible="renameVisivle" 
             :footer="null" 
-            title="Rename Pic"
+            :title="$t('LibraryPage.Rename')"
             width="65%"
 			:keyboard="false"
             :maskClosable="false"
@@ -330,6 +331,7 @@
 					v-model="value.editLabelValue"
 					:collapse-tags="true" 
 					:show-all-levels="false" 
+					:placeholder="$t('LibraryPage.Select')"
 					:clearable="true"
 					:max-collapse-tags=6
 					:props="props" 
@@ -339,7 +341,7 @@
 				>
 				<template #empty>
 						<div>
-							No Label
+							{{$t('LibraryPage.Select')}}
 						</div>
 					</template>
 				</el-cascader>
@@ -1180,12 +1182,16 @@ export default defineComponent({
 		},
 		dropdownVisibleChange1(){
 			let element:any = this.$refs.cascader1
-			nextTick().then(()=>{
+			let el = element.contentRef?.getElementsByClassName('el-cascader-menu__empty-text')?.[0]
-				let el = element.contentRef?.getElementsByClassName('el-cascader-menu__empty-text')?.[0]?.innerHTML
+			if(el){
-				el = 'No Label'
+				el.innerHTML = 'No Label'
-			})
+			}
 		},
 		dropdownVisibleChange(){
+			console.log(this.$refs.cascader);
+			let element:any = this.$refs.cascader
+			// element.contentRef._value.textContent = 123123
+			// element.contentRef._value.outerText = 123123
 			nextTick().then(()=>{
 				let cascader = document.getElementsByClassName('libraryPageCascader')[0]
 				let cascaderChild = cascader
@@ -1204,13 +1210,14 @@ export default defineComponent({
 					divMax.appendChild(button1)
 					// divMax.appendChild(button2)
 					cascaderChild?.insertAdjacentElement("afterbegin", divMax);
-					nextTick().then(()=>{
+					
-						let el = element.contentRef?.getElementsByClassName('el-cascader-menu__empty-text')?.[0]?.innerHTML
-						el = 'No Label'
-					})
 					// cascader.addEventListener('click',this.cascaderClick)
 				}
 			})
+			let el = element.contentRef?.getElementsByClassName('el-cascader-menu__empty-text')?.[0]
+			if(el){
+				el.innerHTML = 'No Label'
+			}
 		},
 		// cascaderClick(e:Event){
 		// 	console.log(e.target)