Merge branch 'dev_vite' of ssh://18.167.251.121:10002/aidlab/aida_front into dev_vite

src/component/LibraryPage/brandDetail.vue

@@ -175,7 +175,7 @@ export default defineComponent({
 			isNoData:false,//如果数据为空就不加载
 			isNull:true,
 			finishTime:'',
-			upLoadList:0,
+			uploadCount:0,//上传的图片数量
 		})
 		const dataDom = reactive({
 			Cropper:null as any,
@@ -184,6 +184,7 @@ export default defineComponent({
 			loadingDom:null as any,
 		})
 		const customRequest = (event:any)=>{
+			data.uploadCount++;
             let new_data = {
                 file:event.file,
 				brandId:data.detail.id,
@@ -191,16 +192,19 @@ export default defineComponent({
             data.isShowMark = true
             Https.axiosPost(Https.httpUrls.brandDNAUpload, new_data,{headers:{'Content-Type': 'multipart/form-data'}}).then(
                 (rv: any) => {
+					data.uploadCount --;
 					dataDom.fall.clearData()
+					if(data.uploadCount) return;
+					data.isShowMark = false
+					data.isNoData = false
 					data.currentPage = 1
 					getLibraryList()
 					// rv.canvasUrl = rv.minIOPath
 					// dataDom.fall.push([rv]); 
-					data.isNull = false
-					data.isShowMark = false
                 }
             ).catch((res)=>{
                 // getLibraryList()
+				data.uploadCount --;
 				data.isShowMark = false
             });
         }

src/component/LibraryPage/setLabel.vue

@@ -12,7 +12,7 @@
 		<div class="setLabel_centent">
 			<ul class="optionsItem">
 				<li class="optionsItem_title" @click="clearOpenType" v-for="optionsItem,optionsIndex in options" :key="optionsItem.id">
-					<div class="setLabel_text" @click.stop="" :class="{active:optionsItem.checkAll}">
+					<div class="setLabel_text" @click.stop :class="{active:optionsItem.checkAll}">
 						<a-checkbox v-model:checked="optionsItem.checkAll" @change="onCheckAllChange(optionsItem)"></a-checkbox>
 						<span v-show="!optionsItem.openType" :title="optionsItem.classificationName">{{ optionsItem.classificationName }}</span>
 						<input v-show="optionsItem.openType" type="text" class="inputName" v-model="itemName" @keydown.enter="putName(optionsIndex,'affirm',optionsItem)">
@@ -20,7 +20,7 @@
 						<i v-show="!optionsItem.openType" @click.stop="putName(optionsIndex,'put',optionsItem)" class="fi fi-rr-edit"></i>
 					</div>
 					
-					<ul class="childrenItem active" v-mousewheel  @click.stop="">
+					<ul class="childrenItem active" v-mousewheel  @click.stop>
 						<li class="childrenItem_title setLabel_text" v-for="childrenItem,childrenIndex in optionsItem.childList" :class="{active:childrenItem.checkAll}" :key="childrenItem.id">
 							<a-checkbox v-model:checked="childrenItem.checkAll" @change="onCheckAllchildrenItem(optionsItem)"></a-checkbox>
 							<span v-show="!childrenItem.openType" :title="childrenItem.classificationName">{{ childrenItem.classificationName }}</span>
@@ -36,7 +36,7 @@
 					</ul>
 				</li>
 				<li class="newLabel setLabel_text optionsItem_title" @click="clearOpenType">
-					<div @click.stop="">
+					<div @click.stop>
 						<input v-show="openType" type="text" class="inputName" v-model="itemName"  @keydown.enter="putName(-1,'affirm','')">
 						<i @click.stop="putName(-1,'affirm','')" v-show="openType" class="fi fi-br-check"></i>
 						<div class="addLabel" v-show="!openType" @click.stop="newLabel('','')"><i class="fi fi-rr-plus-small"></i></div>
@@ -138,9 +138,11 @@ export default defineComponent({
 			this.multiple = true
 		}
 		this.options = data
+		this.labelBor = false
 		this.clearOpenType()
 	  },
 	  clearSetLabel(){
+		this.labelBor = false
 		this.clearOpenType()
 		let parent:any = this.$parent
 		parent.getClass()
@@ -233,7 +235,7 @@ export default defineComponent({
 				this.openType = true
 			}
 			nextTick().then(()=>{
-				input.focus()
+				input?.focus()
 			})
 		},
 		removeLabel(val:any){
@@ -257,7 +259,8 @@ export default defineComponent({
 				}
 			});
 			data.classificationIdList = classificationIdList
-			this.deleteClass(data)
+			if(classificationIdList.length > 0) this.deleteClass(data)
+			this.labelBor = false
 		},
 		addLabel(val:any){
 			let data = this.setLabelData()