2023-11-6-1

src/assets/style/style.css

@@ -334,6 +334,12 @@ li {
   width: 0.57142857rem;
   height: 0.91428571rem;
 }
+.ant-select-multiple .ant-select-selection-search {
+  height: 100%;
+}
+.ant-select-multiple .ant-select-selection-search-input {
+  height: 100%;
+}
 .ant-checkbox-checked .ant-checkbox-inner {
   background-color: #767676;
   border-color: #d9d9d9 !important;
@@ -343,6 +349,23 @@ li {
 .ant-checkbox-input:focus + .ant-checkbox-inner {
   border-color: #d9d9d9 !important;
 }
+.libraryPageCascader {
+  border-radius: 1rem;
+}
+.libraryPageCascader .cascader_btn_max {
+  height: 4rem;
+  position: absolute;
+  width: 100%;
+  border-bottom: 1px solid #e1e1e1;
+  display: flex;
+  align-items: center;
+}
+.libraryPageCascader .cascader_btn_max .cascader_btn1 {
+  margin: 0 1rem;
+}
+.libraryPageCascader .ant-cascader-menu {
+  margin-top: 4rem;
+}
 .collection_modal .ant-modal-body,
 .design_detail_modal_component .ant-modal-body,
 .designOpenrtion_modal .ant-modal-body,

src/assets/style/style.less

@@ -383,6 +383,12 @@ ul,li{
 		}
 	}
 }
+.ant-select-multiple .ant-select-selection-search{
+	height: 100%;
+}
+.ant-select-multiple .ant-select-selection-search-input{
+	height: 100%;
+}
 .ant-checkbox-checked .ant-checkbox-inner{
 	background-color: #767676;
 	border-color: #d9d9d9 !important;
@@ -390,6 +396,24 @@ ul,li{
 .ant-checkbox-wrapper:hover .ant-checkbox-inner, .ant-checkbox:hover .ant-checkbox-inner, .ant-checkbox-input:focus + .ant-checkbox-inner{
 	border-color: #d9d9d9 !important;
 }
+.libraryPageCascader{
+	border-radius: 1rem;
+	.cascader_btn_max{
+		height: 4rem;
+		position: absolute;
+		width: 100%;
+		border-bottom: 1px solid rgb(225 225 225);
+		display: flex;
+		align-items: center;
+		.cascader_btn1{
+			margin: 0 1rem;
+		}
+	}
+	.ant-cascader-menu{
+		margin-top: 4rem;
+	}
+}
+
 //collection 弹窗
 .collection_modal,.design_detail_modal_component,.designOpenrtion_modal,.library_page{
 

src/component/Detail/DesignDetail.vue

@@ -245,18 +245,6 @@ export default defineComponent({
 			window.removeEventListener('beforeunload',beforeunload)
 		}
 		window.addEventListener('beforeunload',beforeunload)
-		let onresizeTime:any
-		let this_ = this
-		window.onresize = () => {
-        return (() => {
-			clearTimeout(onresizeTime)
-			onresizeTime = setTimeout(async ()=>{
-				await this_.setImgSize()
-			},500)
-			
-			})()
-		}
-
 		let userInfo:any = getCookie("userInfo")
         this.userInfo = JSON.parse(userInfo);
 		// let url = Https.httpUrls.getDesignDetail + `?designItemId=34242&designPythonOutfitId=34004`
@@ -408,6 +396,17 @@ export default defineComponent({
 					height:body.layersObject[0].imageSize?.[1]*ratio+'px',
 				}
 			}
+			let onresizeTime:any
+			let this_ = this
+			window.onresize = () => {
+			return (() => {
+				clearTimeout(onresizeTime)
+				onresizeTime = setTimeout(async ()=>{
+					await this_.setImgSize()
+				},500)
+				
+				})()
+			}
 			this.frontBack = {
 				front:front,
 				back:back,

src/component/HomePage/ColorboardUpload.vue

@@ -259,14 +259,12 @@ export default defineComponent({
 				hex = '#FFFFFF'
 			}
             this.selectIndex = index
-            this.selectColor = color?.r ? {rgba:{r:color.r,g:color.g,b:color.b,a:color.a? color.a: 1},hex:hex} : {}
-            // this.fileList = []
             this.tcxColor = ''
             this.pantongName = ''
             this.pantongNameList = []
-			// this.selectColorList= []
 			this.reviewColor= {}
 			this.getColorBg = false
+            // this.selectColor = color?.r ? {rgba:{r:color.r,g:color.g,b:color.b,a:color.a? color.a: 1},hex:hex} : {}
         },
 
         //通过tcx获取颜色

src/component/HomePage/MoodboardUpload.vue

@@ -69,10 +69,11 @@
                                 :before-upload="beforeUpload"
                                 v-model:file-list="fileList"
                                 multiple
-                                :maxCount="8 - moodboarList.length+fileList.length"
+								:maxCount="8 - moodboarList.length+fileList.length"
                                 accept=".jpg,.png,.jpeg,.bmp"
                                 @change="(file) => fileUploadChange(file)"
                             >
+
                                 <div
                                     class="upload_tip_block"
                                     v-show=" moodboarList.length < 8"
@@ -84,6 +85,10 @@
                         </div>
                     </div>
                 </div>
+				<div class="upload_max_tip">
+					<span class="icon iconfont icon-zhuyi"></span>
+					<span>{{ $t('MoodboardUpload.Maximum') }}</span>
+				</div>
                 <!-- <div class="upload_max_tip">
                     <span class="icon iconfont icon-zhuyi"></span>
                     <span
@@ -536,6 +541,8 @@ export default defineComponent({
             height: 30rem;
             overflow-x: hidden;
             border-right: 1px solid #e5e5e5;
+			display: flex;
+			flex-direction: column;
             &.moodboard_body::-webkit-scrollbar {
                 display: none;
             }
@@ -592,6 +599,7 @@ export default defineComponent({
 					margin: 0 1rem 1rem 0;
 					position: relative;
 					cursor: pointer;
+					overflow: hidden;
 					img{
 						width: auto;
 						height: 100%;

src/component/HomePage/PrintboardUpload.vue

@@ -78,6 +78,10 @@
                         </div>
                     </div>
                 </div>
+				<div class="upload_max_tip">
+					<span class="icon iconfont icon-zhuyi"></span>
+					<span>{{ $t('PrintboardUpload.Maximum') }}</span>
+				</div>
             </div>
 			<Material v-show="openClick == 2" ref="Material" msg="Printboard" @confirmSelect="confirmSelect"></Material>
 			<Generate v-show="openClick == 3" ref="Generate" msg="Printboard" @generateCheckbox="getgenerateCheckbox"></Generate>
@@ -638,6 +642,8 @@ export default defineComponent({
         }
 
         .printboard_body{
+			display: flex;
+			flex-direction: column;
             // height: calc(100% - 5rem);
 			flex: 1;
 			padding-top: 2.5rem;
@@ -726,6 +732,18 @@ export default defineComponent({
 					}
 				}
 			}
+			.upload_max_tip {
+                display: flex;
+                align-items: center;
+                justify-content: center;
+                font-size: 1.4rem;
+                color: #030303;
+
+                .icon-zhuyi {
+                    font-size: 1.6rem;
+                    margin-right: 0.7rem;
+                }
+            }
         }
     }
 	.delete_like_file_block{
@@ -788,6 +806,7 @@ export default defineComponent({
 					position: relative;
 					cursor: pointer;
 					text-align: center;
+					overflow: hidden;
 					img{
 						width: auto;
 						height: 100%;

src/component/HomePage/SketchboardUpload.vue

@@ -138,6 +138,10 @@
                         </div>
                     </div>
                 </div>
+				<div class="upload_max_tip">
+					<span class="icon iconfont icon-zhuyi"></span>
+					<span>{{ $t('SketchboardUpload.Maximum') }}</span>
+				</div>
             </div>
 
             <Material
@@ -700,12 +704,14 @@ export default defineComponent({
             }
         }
 		.sketchboard_body {
-        // height: calc(100% - 5rem);
+			// height: calc(100% - 5rem);
-		flex: 1;
+			flex: 1;
-        padding-top: 2.5rem;
+			padding-top: 2.5rem;
-        height: 30rem;
+			height: 30rem;
-        overflow-x: hidden;
+			overflow-x: hidden;
-        border-right: 1px solid #e5e5e5;
+			border-right: 1px solid #e5e5e5;
+			display: flex;
+			flex-direction: column;
         &.moodboard_body::-webkit-scrollbar {
             display: none;
         }
@@ -783,7 +789,18 @@ export default defineComponent({
             }
 			
 		}
-       
+		.upload_max_tip {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			font-size: 1.4rem;
+			color: #030303;
+
+			.icon-zhuyi {
+				font-size: 1.6rem;
+				margin-right: 0.7rem;
+			}
+		}
     }
 	}
     .delete_like_file_block{
@@ -847,6 +864,7 @@ export default defineComponent({
 					position: relative;
 					text-align: center;
 					cursor: pointer;
+					overflow: hidden;
 					img{
 						// width: 100%;
 						width: auto;

src/component/LibraryPage/ModelPlacement.vue

@@ -280,13 +280,9 @@ export default defineComponent({
 				// imgBoxSize.style.backgroundImage = 'url('+require('@assets/images/library/lemaleBG.png')')'
 
 				let cropper:any = this.$refs.cropper
-				console.log(cropper);
-				
 				cropper.cropH = cropper.scale*cropper.trueHeight
 				cropper.cropW = cropper.cropH/2.125
 				cropper.cropOffsertX = cropper.getImgAxis().x1+(cropper.scale*cropper.trueWidth/2-cropper.cropW/2)
-				console.log(cropper.getImgAxis().x1,cropper.scale*cropper.trueWidth/2,cropper.cropW/2);
-				
 				cropper.cropOffsertY = cropper.getImgAxis().y1
 				imgBoxSize.addEventListener('mousemove',this.startMove)
                 this.setImageSize()
@@ -307,7 +303,6 @@ export default defineComponent({
 			let position = imgBoxSize.getBoundingClientRect()
 			let position1 = imgbox.getBoundingClientRect()
 			let cropper:any = this.$refs.cropper
-			console.log(position1,position);
 			this.imgBox = {
 				width:cropper.cropW,
 				height:cropper.cropH,
@@ -387,8 +382,8 @@ export default defineComponent({
            
         },
 		setPoint(){
-			console.log();
+			let file = this.printObject.file
-			let printObject = JSON.parse(JSON.stringify(this.printObject))
+			let url = this.printObject.url
 			this.printObject = {
 				"shoulderLeft": [
 					0.3338,
@@ -414,8 +409,8 @@ export default defineComponent({
 					0.6764,
 					0.4715
 				],
-				file:printObject.file,
+				file:file,
-				url:printObject.url
+				url:url
 			}
 			this.getDefaultPointList(this.imgBox,'setPoint')
 		},
@@ -506,8 +501,6 @@ export default defineComponent({
 				this.moveOriginal.posX = 0
                 this.moveOriginal.posY = 0 // 1为边框
 
-				console.log(this.moveOriginal);
-				
                 this.startDian = true
             }
             
@@ -554,8 +547,6 @@ export default defineComponent({
 
         restoreLocationList(){
 			this.locationList = []
-			console.log(this.locationList);
-			
             this.pointList = JSON.parse(JSON.stringify(this.oldPointList))
             this.locationList = JSON.parse(JSON.stringify(this.oldLocationList))
         },
@@ -571,27 +562,42 @@ export default defineComponent({
             // })
 			let cropper:any = this.$refs.cropper,
                 that = this
-				
+			if(this.userInfo.userId == 88 || this.userInfo.userId == 83){
-            cropper.getCropData(async (value:any) => {
+				if(this.modelType == 'System'){
-            // 转换为File对象
+					if(this.printObject.templateId){
-               
+						this.printObject.id = this.printObject.libraryId
-				if(this.printObject.templateId){
-					this.printObject.id = this.printObject.libraryId
-					this.confrimSubmit()
-				}else{
-					let file:any = base64toFile(value,this.printObject.file.name);
-					// console.log(file,this.printObject,'-=-=--==-');
-					file.uid = this.printObject.file.uid
-					this.printObject.file = file
-					this.customRequest().then((rv:any)=>{
-						this.isShowMark = false
-						this.printObject.id = rv.id
 						this.confrimSubmit()
-					}).catch((res:any)=>{
+					}else{
-						this.isShowMark = false
+						this.customRequest().then((rv:any)=>{
+							this.isShowMark = false
+							this.printObject.id = rv.id
+							this.confrimSubmit()
+						}).catch((res:any)=>{
+							this.isShowMark = false
+						})
+					}
+				}else{
+					cropper.getCropData(async (value:any) => {
+					// 转换为File对象
+						if(this.printObject.templateId){
+							this.printObject.id = this.printObject.libraryId
+							this.confrimSubmit()
+						}else{
+							let file:any = base64toFile(value,this.printObject.file.name);
+							file.uid = this.printObject.file.uid
+							this.printObject.file = file
+							this.customRequest().then((rv:any)=>{
+								this.isShowMark = false
+								this.printObject.id = rv.id
+								this.confrimSubmit()
+							}).catch((res:any)=>{
+								this.isShowMark = false
+							})
+						}
 					})
 				}
-            })
+			}
+           
         },
 
         confrimSubmit(){

src/lang/cn.ts

@@ -148,6 +148,7 @@ export default {
 		Library:'收藏',
 		Generate:'生成',
 		PIN:'PIN',
+		Maximum:'最多可上传10张图片，每张图片最大2M',
 		Thumbnail:'选择的服装缩略图',
 		inputContent1:'生成图片的标题',
 		maximumLength:'输入的内容超过允许输入的最大长度',
@@ -164,6 +165,7 @@ export default {
 		Library:'收藏',
 		Generate:'生成',
 		PIN:'PIN',
+		Maximum:'最多可上传10张图片，每张图片最大2M',
 		Thumbnail:'选择的印花缩略图',
 		inputContent1:'生成图片的标题',
 		maximumLength:'输入的内容超过允许输入的最大长度',
@@ -193,6 +195,7 @@ export default {
 		Library:'收藏',
 		Generate:'生成',
 		Delete:'删除',
+		Maximum:'最多可上传10张图片，每张图片最大2M',
 		Thumbnail:'选择的情绪板缩略图',
 		layout:'布局',
 		jsContent1:'您最多可以选择8张图片',

src/lang/en.ts

@@ -150,6 +150,7 @@ export default {
 		Library:'Library',
 		Generate:'Generate',
 		PIN:'PIN',
+		Maximum:'Maximum 10 images can be uploaded, Maximum 2M per image',
 		Thumbnail:'Thumbnail preview of selected sketchboard',
 		inputContent1:'Caption generation',
 		maximumLength:'The entered content exceeds the maximum length.',
@@ -166,6 +167,7 @@ export default {
 		Library:'Library',
 		Generate:'Generate',
 		PIN:'PIN',
+		Maximum:'Maximum 10 images can be uploaded, Maximum 2M per image',
 		Thumbnail:'Thumbnail preview of selected printboard',
 		inputContent1:'Caption generation',
 		maximumLength:'The entered content exceeds the maximum length.',
@@ -195,6 +197,7 @@ export default {
 		Library:'Library',
 		Generate:'Generate',
 		Delete:'Delete',
+		Maximum:'Maximum 10 images can be uploaded, Maximum 2M per image',
 		Thumbnail:'Thumbnail preview of selected moodboard',
 		layout:'layout',
 		jsContent1:'You can select up to 8 images',

src/lang/fr.ts

@@ -151,6 +151,7 @@ export default {
 		Library:'Bibliothèque',
 		Generate:'Générer',
 		PIN:'PIN',
+		Maximum:'Un maximum de 10 images peuvent être téléchargées, maximum 2 M par image',
 		Thumbnail:'Aperçu miniature du tableau de croquis sélectionné',
 		inputContent1:'Génération de sous-titres',
 		maximumLength:'Le contenu saisi dépasse la longueur maximale.',
@@ -167,6 +168,7 @@ export default {
 		Library:'Bibliothèque',
 		Generate:'Générer',
 		PIN:'PIN',
+		Maximum:'Un maximum de 10 images peuvent être téléchargées, maximum 2 M par image',
 		Thumbnail:"Aperçu miniature de la carte d'impression sélectionnée",
 		inputContent1:'Génération de sous-titres',
 		maximumLength:'Le contenu saisi dépasse la longueur maximale.',
@@ -196,6 +198,7 @@ export default {
 		Library:'Bibliothèque',
 		Generate:'Générer',
 		Delete:'Supprimer',
+		Maximum:'Un maximum de 10 images peuvent être téléchargées, maximum 2 M par image',
 		Thumbnail:'Aperçu miniature du moodboard sélectionné',
 		layout:'mise en page',
 		jsContent1:"Vous pouvez sélectionner jusqu'à 8 images",

src/lang/it.ts

@@ -150,6 +150,7 @@ export default {
 		Library:'Biblioteca',
 		Generate:'creare',
 		PIN:'PIN',
+		Maximum:'È possibile caricare un massimo di 10 immagini, massimo 2 milioni per immagine',
 		Thumbnail:'Anteprima in miniatura dello sketchboard selezionato',
 		inputContent1:'Generazione didascalie',
 		maximumLength:'Il contenuto inserito supera la lunghezza massima.',
@@ -166,6 +167,7 @@ export default {
 		Library:'Biblioteca',
 		Generate:'creare',
 		PIN:'PIN',
+		Maximum:'È possibile caricare un massimo di 10 immagini, massimo 2 milioni per immagine',
 		Thumbnail:'Anteprima in miniatura della scheda di stampa selezionata',
 		inputContent1:'Generazione didascalie',
 		maximumLength:'Il contenuto inserito supera la lunghezza massima.',
@@ -195,6 +197,7 @@ export default {
 		Library:'Biblioteca',
 		Generate:'creare',
 		Delete:'Eliminare',
+		Maximum:'È possibile caricare un massimo di 10 immagini, massimo 2 milioni per immagine',
 		Thumbnail:'Anteprima in miniatura della moodboard selezionata',
 		layout:'disposizione',
 		jsContent1:'È possibile selezionare fino a 8 immagini',

src/lang/ja.ts

@@ -150,6 +150,7 @@ export default {
 		Library:'集める',
 		Generate:'生成する',
 		PIN:'PIN',
+		Maximum:'画像は最大10枚アップロード可能、1枚あたり最大2M',
 		Thumbnail:'選択したスケッチボードのサムネイル プレビュー',
 		inputContent1:'キャプションの生成',
 		maximumLength:'入力した内容が最大長を超えています.',
@@ -166,6 +167,7 @@ export default {
 		Library:'集める',
 		Generate:'生成する',
 		PIN:'PIN',
+		Maximum:'画像は最大10枚アップロード可能、1枚あたり最大2M',
 		Thumbnail:'選択したプリントボードのサムネイル プレビュー',
 		inputContent1:'キャプションの生成',
 		maximumLength:'入力した内容が最大長を超えています.',
@@ -195,6 +197,7 @@ export default {
 		Library:'集める',
 		Generate:'生成する',
 		Delete:'消去',
+		Maximum:'画像は最大10枚アップロード可能、1枚あたり最大2M',
 		Thumbnail:'選択したムードボードのサムネイル プレビュー',
 		layout:'レイアウト',
 		jsContent1:'最大8枚の画像を選択できます',

src/lang/kr.ts

@@ -150,6 +150,7 @@ export default {
 		Library:'도서관',
 		Generate:'생성하다',
 		PIN:'PIN',
+		Maximum:'최대 10개의 이미지를 업로드할 수 있으며, 이미지당 최대 2M',
 		Thumbnail:'선택한 스케치보드의 썸네일 미리보기',
 		inputContent1:'캡션 생성',
 		maximumLength:'입력한 내용이 최대 길이를 초과했습니다.',
@@ -166,6 +167,7 @@ export default {
 		Library:'도서관',
 		Generate:'생성하다',
 		PIN:'PIN',
+		Maximum:'최대 10개의 이미지를 업로드할 수 있으며, 이미지당 최대 2M',
 		Thumbnail:'선택한 프린트보드의 썸네일 미리보기',
 		inputContent1:'캡션 생성',
 		maximumLength:'입력한 내용이 최대 길이를 초과했습니다.',
@@ -195,6 +197,7 @@ export default {
 		Library:'도서관',
 		Generate:'생성하다',
 		Delete:'삭제',
+		Maximum:'최대 10개의 이미지를 업로드할 수 있으며, 이미지당 최대 2M',
 		Thumbnail:'선택한 무드보드의 썸네일 미리보기',
 		layout:'정렬하려면',
 		jsContent1:'최대 8개의 이미지를 선택할 수 있습니다.',

src/lang/ru.ts

@@ -150,6 +150,7 @@ export default {
 		Library:'Библиотека',
 		Generate:'Генерировать',
 		PIN:'PIN',
+		Maximum:'Можно загрузить максимум 10 изображений, максимум 2 М на изображение.',
 		Thumbnail:'Предварительный просмотр миниатюр выбранной эскизной панели',
 		inputContent1:'Создание подписей',
 		maximumLength:'Введенный контент превышает максимальную длину.',
@@ -166,6 +167,7 @@ export default {
 		Library:'Библиотека',
 		Generate:'Генерировать',
 		PIN:'PIN',
+		Maximum:'Можно загрузить максимум 10 изображений, максимум 2 М на изображение.',
 		Thumbnail:'Предварительный просмотр миниатюр выбранной печатной платы',
 		inputContent1:'Создание подписей',
 		maximumLength:'Введенный контент превышает максимальную длину.',
@@ -195,6 +197,7 @@ export default {
 		Library:'Библиотека',
 		Generate:'Генерировать',
 		Delete:'Удалить',
+		Maximum:'Можно загрузить максимум 10 изображений, максимум 2 М на изображение.',
 		Thumbnail:'Предварительный просмотр миниатюр выбранного мудборда',
 		layout:'макет',
 		jsContent1:'Вы можете выбрать до 8 изображений',

src/lang/th.ts

@@ -148,6 +148,7 @@ export default {
 		Library:'ห้องสมุด',
 		Generate:'กำเนิด',
 		PIN:'PIN',
+		Maximum:'สามารถอัพโหลดภาพได้สูงสุด 10 ภาพ สูงสุด 2M ต่อภาพ',
 		Thumbnail:'ภาพตัวอย่างขนาดย่อของกระดานร่างภาพที่เลือก',
 		inputContent1:'การสร้างคำบรรยายภาพ',
 		maximumLength:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',
@@ -164,6 +165,7 @@ export default {
 		Library:'ห้องสมุด',
 		Generate:'กำเนิด',
 		PIN:'PIN',
+		Maximum:'สามารถอัพโหลดภาพได้สูงสุด 10 ภาพ สูงสุด 2M ต่อภาพ',
 		Thumbnail:'ภาพตัวอย่างขนาดย่อของบอร์ดพิมพ์ที่เลือก',
 		inputContent1:'การสร้างคำบรรยายภาพ',
 		maximumLength:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',
@@ -193,6 +195,7 @@ export default {
 		Library:'ห้องสมุด',
 		Generate:'กำเนิด',
 		Delete:'ลบ',
+		Maximum:'สามารถอัพโหลดภาพได้สูงสุด 10 ภาพ สูงสุด 2M ต่อภาพ',
 		Thumbnail:'ภาพตัวอย่างขนาดย่อของมูดบอร์ดที่เลือก',
 		layout:'เลย์เอาต์',
 		jsContent1:'คุณสามารถเลือกได้สูงสุด 8 ภาพ',

src/lang/vn.ts

@@ -150,6 +150,7 @@ export default {
 		Library:'Thư viện',
 		Generate:'Phát ra',
 		PIN:'PIN',
+		Maximum:'Có thể tải lên tối đa 10 hình ảnh, Tối đa 2M mỗi hình ảnh',
 		Thumbnail:'Xem trước hình thu nhỏ của bảng phác thảo đã chọn',
 		inputContent1:'Tạo phụ đề',
 		maximumLength:'Nội dung đã nhập vượt quá độ dài tối đa.',
@@ -166,6 +167,7 @@ export default {
 		Library:'Thư viện',
 		Generate:'Phát ra',
 		PIN:'PIN',
+		Maximum:'Có thể tải lên tối đa 10 hình ảnh, Tối đa 2M mỗi hình ảnh',
 		Thumbnail:'Xem trước hình thu nhỏ của bảng in đã chọn',
 		inputContent1:'Tạo phụ đề',
 		maximumLength:'Nội dung đã nhập vượt quá độ dài tối đa.',
@@ -195,6 +197,7 @@ export default {
 		Library:'Thư viện',
 		Generate:'Phát ra',
 		Delete:'Xóa bỏ',
+		Maximum:'Có thể tải lên tối đa 10 hình ảnh, Tối đa 2M mỗi hình ảnh',
 		Thumbnail:'Xem trước hình thu nhỏ của bảng tâm trạng đã chọn',
 		layout:'cách trình bày',
 		jsContent1:'Bạn có thể chọn tối đa 8 hình ảnh',

src/tool/flexible.js

@@ -2,7 +2,7 @@ let flexible = (designWidth, maxWidth,minWidth) =>{
     var doc = document, win = window, docEl = doc.documentElement, remStyle = document.createElement("style"), tid;
     designWidth = designWidth || 1920;
     maxWidth = maxWidth || 2560;
-    minWidth = minWidth || 1024;
+    minWidth = minWidth || 1440;
     function refreshRem() {
         var width = docEl.getBoundingClientRect().width;
         maxWidth = maxWidth || 1920;

src/views/HistoryPage.vue

@@ -233,7 +233,7 @@ export default defineComponent({
     height: 100%;
 	padding: 0 9rem;
 	overflow: hidden;
-	min-width: 1024px;
+	min-width: 1440px;
 	position: relative;
     .page_content {
         position: relative;

src/views/HomeView.vue

@@ -994,7 +994,7 @@ export default defineComponent({
 	height: 100%;
 	padding: 0 9rem;
 	overflow: hidden;
-	min-width: 1024px;
+	min-width: 1440px;
 	position: relative;
 	// left: 50%;
 	// margin-left: -50%;
@@ -1304,7 +1304,7 @@ export default defineComponent({
 
 	.ant-modal-mask{
 		background: linear-gradient(45deg, #eee4f3, #f3f4e6);
-		min-width: 1024px;
+		min-width: 1440px;
 		border-radius: 1rem;
 		overflow: hidden;
 		height: calc(100% - 7rem);
@@ -1314,11 +1314,11 @@ export default defineComponent({
 	}
 	.ant-modal-centered{
 	top: 7rem;
-	min-width: 1024px;
+	min-width: 1440px;
 	// left: 50%;
 	// margin-left: -50%;
 	.ant-modal{
-		min-width: .65*1024px;
+		min-width: .65*1440px;
 	}
 
 

src/views/LibraryPage.vue

@@ -90,13 +90,19 @@
 										<div class="content_search_block">
 											<input class="search_input" :placeholder="$t('LibraryPage.inputContent1')" v-model="searchPictureName"  @keydown.enter="getLibraryList()">
 											<a-cascader
+												@click.stop="dropdownVisibleChange"
+												ref="cascader"
 												v-model:value="value"
 												style="width: 60%"
 												multiple
 												max-tag-count="responsive"
 												:options="options"
 												placeholder="Please select"
-											></a-cascader>
+												:show-search="{ filter }"
+												:open="labelOpen"
+												dropdownClassName="libraryPageCascader"
+											>
+											</a-cascader>
 											<!-- <div class="search_icon_block" @click="getLibraryList()"><span class="icon iconfont icon-sousuo"></span></div> -->
 											<div class="generage_btn search_icon_block" @click="getLibraryList()"><span class="icon iconfont icon-sousuo"></span></div>
 
@@ -280,7 +286,7 @@
             v-model:visible="renameVisivle" 
             :footer="null" 
             title="Rename Pic"
-            width="56rem"
+            width="65%"
             :maskClosable="false"
             :centered="true"
             @onCancel="closeRenameModal"
@@ -322,7 +328,7 @@ import { useStore } from "vuex";
 import { Https } from "@/tool/https";
 import { getCookie } from "@/tool/cookie";
 import { useI18n } from "vue-i18n";
-
+import type { ShowSearchType } from 'ant-design-vue/es/cascader';
 export default defineComponent({
     components: {
         HeaderComponent,
@@ -409,7 +415,7 @@ export default defineComponent({
 					value: 'little',
 					children: [
 					{
-						label: 'Toy Fish',
+						label: `'Toy Fish'`,
 						value: 'fish',
 					},
 					{
@@ -425,6 +431,10 @@ export default defineComponent({
 				],
 			},
 		];
+		const filter: ShowSearchType['filter'] = (inputValue, path) => {
+			return path.some(option => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
+		};
+		let labelOpen = ref(false)
         return {
             menuList,
             selectImgList,
@@ -457,7 +467,9 @@ export default defineComponent({
 			printModel,
 			value: ref<string[]>([]),
 			options,
+			filter,
 			t,
+			labelOpen,
         }
     },
 	data(this_) {
@@ -483,6 +495,7 @@ export default defineComponent({
         this.getLibraryList()
 		this.getSex()
         this.token = getCookie("token") || "";
+		
     },
     methods:{
 
@@ -723,8 +736,6 @@ export default defineComponent({
 
 
         customRequest(event:any){
-			console.log(222);
-			
 			if(this.selectCode == "Models"){
 				return
 			}
@@ -951,27 +962,67 @@ export default defineComponent({
 					return
 				}
 			}
-			// this.isShowMark = true
+			this.isShowMark = true
-			// Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
+			Https.axiosPost(Https.httpUrls.sketchAndPrintGenerate, data).then(
-            //     (rv) => {
+                (rv) => {
-			// 		if(rv){
+					if(rv){
-			// 			let arr
+						let arr
-			// 			rv.generatedCollectionItems.forEach((v:any,index:number)=>{
+						rv.generatedCollectionItems.forEach((v:any,index:number)=>{
-			// 				arr = {
+							arr = {
-			// 					id:v.generateItemId,
+								id:v.generateItemId,
-			// 					imgUrl:v.generateItemUrl,
+								imgUrl:v.generateItemUrl,
-			// 				}
+							}
-			// 			this.generateList.push(arr)
+						this.generateList.push(arr)
-			// 			console.log(this.generateList);
+						})
-						
+						this.isShowMark = false
-			// 			})
+					}
-			// 			this.isShowMark = false
+                }
-			// 		}
+            ).catch(res=>{
-            //     }
+				this.isShowMark = false
-            // ).catch(res=>{
+            });
-			// 	this.isShowMark = false
-            // });
 		},
+		
+		dropdownVisibleChange(){
+			this.labelOpen = true
+			document.addEventListener('click',this.setClick)
+			nextTick().then(()=>{
+				let cascader = document.getElementsByClassName('libraryPageCascader')[0]
+				let cascaderChild = cascader.children[0].children[0]
+				console.log(cascader.children,cascaderChild);
+				cascader.addEventListener('click',(event)=>{
+					event.stopPropagation()
+				})
+				if(cascader.children[0].children[0].children.length > 1){
+				}else{
+					
+					let button1:any = document.createElement("span")
+					button1.classList.add('started_btn','cascader_btn1')
+					let button2:any = document.createElement("span")
+					button2.classList.add('started_btn','cascader_btn2')
+					let divMax:any = document.createElement("div")
+					divMax.classList.add('cascader_btn_max')
+					button1.textContent = '新增'
+					button2.textContent = '删除'
+					button1.addEventListener('click',this.addLabel,false)
+					button2.addEventListener('click',this.removeLabel,false)
+					divMax.appendChild(button1)
+					divMax.appendChild(button2)
+					cascaderChild?.insertAdjacentElement("afterbegin", divMax);
+				}
+			})
+		},
+		setClick(){
+			this.labelOpen = false
+			document.removeEventListener('click',this.setClick)
+		},
+		removeClick(){
+		},
+		addLabel(){
+			this.labelOpen = false
+		},
+		removeLabel(){
+			this.labelOpen = false
+		}
     }
 })
 </script>
@@ -981,7 +1032,7 @@ export default defineComponent({
 	overflow: hidden;
     height: 100%;
 	padding: 0 9rem;
-	min-width: 1024px;
+	min-width: 1440px;
 	position: relative;
     .page_content {
         position: relative;
@@ -1109,7 +1160,7 @@ export default defineComponent({
 					.content_search_block{
 						display: flex;
 						align-items: center;
-						width: 75rem;
+						width: 75rem; 
 						.search_input{
 							// width: 20.8rem;
 							// padding-left: 1.5rem;
@@ -1148,6 +1199,7 @@ export default defineComponent({
 								color: #FFFFFF;
 							}
 						}
+						
 					}
 
                     .library_right_header{