2023-11-13-dist

2023-11-13 17:33:41 +08:00
parent 6cad540fbb
commit e3a2f8d25d
35 changed files with 433 additions and 184 deletions
--- a/src/views/LibraryPage.vue
+++ b/src/views/LibraryPage.vue
@@ -86,23 +86,22 @@
 										<div class="content_body_header_right">
 											<div :class="['header_operate_item' , 'fontSize',selectImgList.length>0?'active':'']" @click="deleteBatchPic()">{{ $t('LibraryPage.Delete') }}</div>
 											<div :class="['header_operate_item' , 'fontSize',selectImgList.length>0?'active':'']" @click="showRenameModal('','batch')">{{ $t('LibraryPage.Rename') }}</div>
-											<div :class="['header_operate_item' , 'fontSize',selectImgList.length>0?'active':'']" @click="showRenameModal('','batch')">{{ $t('LibraryPage.Rename') }}</div>
 										</div>
 										<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"
+												v-model:value="value.labelValue"
 												style="width: 60%"
-												:field-names="{ label: 'classificationName', value: 'classificationName', children: 'childList'}"
+												:field-names="{ label: 'classificationName', value: 'id', children: 'childList'}"
 												multiple
 												@change="setLabel1"
 												max-tag-count="responsive"
 												:options="options"
 												placeholder="Please select"
 												:show-search="{ filter }"
-												:open="labelOpen"
+												:open="labelOpen.labelOpen"
 												dropdownClassName="libraryPageCascader"
 											>
 											</a-cascader>
@@ -298,7 +297,23 @@
                <div class="rename_form_content">
                    <input class="rename_form_input" :placeholder="$t('LibraryPage.inputContent3')" v-model="newPicName" @keydown.enter="confrimRename()">
                </div>
-                <div class="rename_button_list">
+				<a-cascader
+					@click.stop="labelSearch"
+					ref="cascader"
+					v-model:value="value.editLabelValue"
+					style="width: 100%"
+					:field-names="{ label: 'classificationName', value: 'id', children: 'childList'}"
+					multiple
+					@change="setLabel1"
+					max-tag-count="responsive"
+					:options="options"
+					placeholder="Please select"
+					:show-search="{ filter }"
+					:open="labelOpen.editLabelOpen"
+					dropdownClassName="editLabel"
+				>
+				</a-cascader>
+				<div class="rename_button_list">
                    <div class="rename_button_item rename_cancel_button"  @click="closeRenameModal()">{{ $t('LibraryPage.Cancel') }}</div>
                    <div class="rename_button_item rename_submit_button"  @click="confrimRename()">{{ $t('LibraryPage.Sure') }}</div>
                </div>
@@ -404,48 +419,23 @@ export default defineComponent({
 		})
 		let {t} = useI18n()
 		const options = ref([
-			{
-				label: 'Light',
-				value: 'light',
-				children: new Array(20)
-				.fill(null)
-				.map((_, index) => ({ label: `Number ${index}`, value: index })),
-			},
-			{
-				label: 'Bamboo',
-				value: 'bamboo',
-				children: [
-				{
-					label: 'Little',
-					value: 'little',
-					children: [
-					{
-						label: `'Toy Fish'`,
-						value: 'fish',
-					},
-					{
-						label: 'Toy Cards',
-						value: 'cards',
-					},
-					{
-						label: 'Toy Bird',
-						value: 'bird',
-					},
-					],
-				},
-				],
-			},
 		]);
 		let type:any = {
 			selectCode:selectCode,
 			designType:designType
 		}
 		provide('type',type)
-
+		let value = ref({
+			labelValue:[],
+			editLabelValue:[],
+		})
 		const filter: ShowSearchType['filter'] = (inputValue, path) => {
 			return path.some(option => option.label.toLowerCase().indexOf(inputValue.toLowerCase()) > -1);
 		};
-		let labelOpen = ref(false)
+		let labelOpen = ref({
+			labelOpen:false,
+			editLabelOpen:false,
+		})
        return {
            menuList,
            selectImgList,
@@ -476,7 +466,7 @@ export default defineComponent({
 			generateList,
 			selectGenerateList,
 			printModel,
-			value: ref<string[]>([]),
+			value,
 			options,
 			filter,
 			t,
@@ -635,6 +625,8 @@ export default defineComponent({
        closeRenameModal(){
            this.renameVisivle= false;
            this.newPicName = ''
+			this.value.editLabelValue = []
+			this.value.labelValue = []
        },

        //确定修改名称
@@ -644,28 +636,58 @@ export default defineComponent({
                libraryName:this.newPicName,
                timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,  
            }
-             Https.axiosPost(Https.httpUrls.batchUpdateLibraryName, data).then(
+            //  Https.axiosPost(Https.httpUrls.batchUpdateLibraryName, data).then(
+            //     (rv: any) => {
+            //         if(this.renameType ==='batch'){
+            //             this.selectImgList = []
+            //         }
+            //         this.getLibraryList()
+            //         this.closeRenameModal() 
+            //     }
+            // ).catch((res)=>{
+            //     this.closeRenameModal()
+            // });
+			let labelArr:any = []
+			this.value.editLabelValue.forEach((item:any)=>{
+				labelArr.push(item[item.length-1])
+			})
+			let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
+			let data2 = {
+				"classificationIdList": labelArr,
+				"classificationName": "",
+				"createTime": "",
+				"id": 0,
+				"libraryId": this.renameType === 'single' ? [this.selectSingleImg.id] : this.selectImgList,
+				"type": this.selectCode,
+				"updateTime": "",
+				"userId": 0
+			}
+			Https.axiosPost(Https.httpUrls.relationLibrary, data2).then(
                (rv: any) => {
-                    if(this.renameType ==='batch'){
-                        this.selectImgList = []
-                    }
+                    console.log(rv);
                    this.getLibraryList()
                    this.closeRenameModal() 
+
                }
            ).catch((res)=>{
-                this.closeRenameModal()
+				this.closeRenameModal() 
            });
        },

        //打开修改名称弹窗
        showRenameModal(data:any,type:any){
+			this.newPicName = ''
            if(type =='batch' && !this.selectImgList.length){ //批量但未选中
+				this.value.labelValue = []
+				this.newPicName = ''
                return
            }
            if(type === 'single'){
                this.selectSingleImg = data
+				this.newPicName = data.name
            }
            this.renameType = type
+			this.labelOpen.labelOpen = false
            this.renameVisivle = true
        },
 		upLoad(){
@@ -680,6 +702,7 @@ export default defineComponent({
 		},
        //删除单个图片
        deleteSinglePic(data:any,index:any){
+			this.labelOpen.labelOpen = false
            let _this = this
            Modal.confirm({
                title: this.t('LibraryPage.jsContent1'),
@@ -817,8 +840,15 @@ export default defineComponent({
            });
 		},
        getLibraryList(){
+			let labelArr:any = []
+			this.value.labelValue.forEach((item:any)=>{
+				labelArr.push(item[item.length-1])
+			})
+			console.log(labelArr);
+			
            let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
            let data = {
+				classificationId:[],
                level1Type:this.selectCode,
                level2Type:designType,
                page:this.currentPage,
@@ -844,6 +874,7 @@ export default defineComponent({
                ...data.libraryModelPoint,
                url:data.url,
            }
+			this.labelOpen.labelOpen = false
            this.placementClick(newData)
        },

@@ -997,12 +1028,11 @@ export default defineComponent({
 		},
 		
 		dropdownVisibleChange(){
-			this.labelOpen = true
+			this.labelOpen.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()
 				})
@@ -1034,14 +1064,15 @@ export default defineComponent({
 			let myCascader:any = this.$refs.cascader
 		},
 		setClick(){
-			this.labelOpen = false
+			this.labelOpen.labelOpen = false
+			this.labelOpen.editLabelOpen = false
 			document.removeEventListener('click',this.setClick)
 		},
 		removeClick(){
 		},
 		addLabel(){
 			let setLabel:any = this.$refs.setLabel
-			this.labelOpen = false
+			this.labelOpen.labelOpen = false
 			setLabel.init('add',this.options)
 		},
 		// removeLabel(){
@@ -1049,7 +1080,20 @@ export default defineComponent({
 		// 	setLabel.init('remove')
 		// 	this.labelOpen = false
 		// }
+		labelSearch(){
+			this.labelOpen.editLabelOpen = true
+			document.addEventListener('click',this.setClick)
+			nextTick().then(()=>{
+				let cascader = document.getElementsByClassName('editLabel')[0]
+				cascader.addEventListener('click',(event)=>{
+					event.stopPropagation()
+				})
+				console.log(this.value.editLabelValue);
+				
+			})
+			

+		},
 		getClass(){
 			let designType = this.selectCode == 'Sketchboard' || this.selectCode == 'MarketingSketch' ? this.designType : ''
 			let data = {
@@ -1603,6 +1647,21 @@ export default defineComponent({
                color: #FFFFFF;
            }
        }
+		.ant-select-allow-clear{
+			height: 4.6rem;
+			margin-top: 2rem;
+			.ant-select-selector{
+				.ant-select-selection-overflow{
+					.ant-select-selection-overflow-item{
+						.ant-select-selection-item{
+							.ant-select-selection-item-content{
+								line-height:  2.7;
+							}
+						}
+					}
+				}
+			}
+		}

        
    }
--- a/src/views/LoginPage.vue
+++ b/src/views/LoginPage.vue
@@ -503,11 +503,13 @@ export default defineComponent({
        },
 		//获取当前语言
 		getLang(){
-			let data = {}
+			let data ={}
 			Https.axiosPost(Https.httpUrls.getUserLanguage, data).then(
                (rv: any) => {
                    if (rv) {
 						this.locale = rv
+						console.log(rv);
+						
                    }
                }
            );