From eca1a39771c0d5fa8bfda788024a09027832fe49 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 2 Feb 2024 17:42:39 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dlibrarybug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/LibraryPage.vue | 65 ++++++++++++++++++++++++++------------- 1 file changed, 44 insertions(+), 21 deletions(-) diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index e807b37b..eab797c2 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -92,7 +92,7 @@
{{ $t('LibraryPage.Rename') }}
- +
-
+ +
@@ -464,6 +464,7 @@ export default defineComponent({ let selectImgList:any = ref([]) let selectCode:any = ref('Moodboard') let searchPictureName = ref('') + let newSearchPictureName = ref('') let designType:any = ref('Outwear') let sex:any = ref('Meal') let sexList:any = [ @@ -550,11 +551,13 @@ export default defineComponent({ let isGenerate:any = ref(false) let remGenerate:any = ref(false) let remGenerateTime:any = ref() + let getLibraryListInputTime:any = ref() return { menuList, selectImgList, selectCode, searchPictureName, + newSearchPictureName, sexList, sex, disignTypeList, @@ -595,6 +598,7 @@ export default defineComponent({ isGenerate, remGenerate, remGenerateTime, + getLibraryListInputTime, } }, data(this_) { @@ -619,6 +623,14 @@ export default defineComponent({ sex(newVal,oldVal){ this.upload.gender = newVal.value }, + searchPictureName(newVal,oldVal){ + clearTimeout(this.getLibraryListInputTime) + this.getLibraryListInputTime = setTimeout(() => { + if(newVal != oldVal){ + this.currentPage = 1 + } + }, 500); + }, }, async mounted(){ let userInfo:any = getCookie("userInfo") @@ -626,7 +638,7 @@ export default defineComponent({ this.isTest =JSON.parse(isTest) this.userInfo = JSON.parse(userInfo); this.uploadUrl = getUploadUrl() - this.getLibraryList() + this.getLibraryList('') this.getClass() this.getSex() this.token = getCookie("token") || ""; @@ -718,7 +730,7 @@ export default defineComponent({ this.selectImgList = [] this.selectSingleImg = {} this.value.labelValue = [] - this.getLibraryList() + this.getLibraryList('') this.getClass() this.uploadGenerate = 'Upload' this.captionGeneration = '' @@ -747,10 +759,12 @@ export default defineComponent({ async sexChange(){ await this.getPosition() - this.getLibraryList() + this.currentPage = 1 + this.getLibraryList('') }, handleChange(){ - this.getLibraryList() + this.currentPage = 1 + this.getLibraryList('') }, fileUploadChange(data:any){ @@ -787,7 +801,7 @@ export default defineComponent({ changePage(current: number, pageSize: number){ this.currentPage = current this.pageSize = pageSize - this.getLibraryList() + this.getLibraryList('page') }, //选择图片 @@ -884,7 +898,7 @@ export default defineComponent({ // } this.value.labelValue = [] - this.getLibraryList() + this.getLibraryList('') this.closeRenameModal() }, @@ -938,7 +952,7 @@ export default defineComponent({ uploadGenerateOpen(str:any){ if(this.uploadGenerate == 'Generate'){ if(str != 'Generate'){ - this.getLibraryList() + this.getLibraryList('') } } this.uploadGenerate = str @@ -991,7 +1005,7 @@ export default defineComponent({ this.imgList.splice(index, 1) }else{ this.selectImgList = [] - this.getLibraryList() + this.getLibraryList('') } } ).catch((res)=>{ @@ -1063,14 +1077,14 @@ export default defineComponent({ }else{ this.currentUploadFileNum -- if(!this.currentUploadFileNum){ - this.getLibraryList() + this.getLibraryList('') } } } ).catch((res)=>{ this.currentUploadFileNum -- if(!this.currentUploadFileNum){ - this.getLibraryList() + this.getLibraryList('') } }); }, @@ -1090,25 +1104,25 @@ export default defineComponent({ (rv: any) => { _this.currentUploadFileNum -- if(!_this.currentUploadFileNum){ - _this.getLibraryList() + _this.getLibraryList('') } } ).catch((res)=>{ _this.currentUploadFileNum -- if(!_this.currentUploadFileNum){ - _this.getLibraryList() + _this.getLibraryList('') } }); }, onCancel(){ _this.currentUploadFileNum -- if(!_this.currentUploadFileNum){ - _this.getLibraryList() + _this.getLibraryList('') } } }); }, - getLibraryList(){ + getLibraryList(str:any){ let labelArr:any = [] this.value.labelValue.forEach((item:any)=>{ labelArr.push(item[item.length-1]) @@ -1118,18 +1132,27 @@ export default defineComponent({ classificationIdList:labelArr, level1Type:this.selectCode, level2Type:designType, - page:this.currentPage, + page:1, modelSex:this.sex.value?this.sex.value:'', pictureName:this.searchPictureName, size:this.pageSize, intersection:this.intersection, } + if(str == 'page'){ + data.page = this.currentPage + } this.isShowMark = true Https.axiosPost(Https.httpUrls.queryLibraryPage,data).then( (rv: any) => { - this.imgList = rv.content - this.total = rv.total - this.isShowMark = false + if(rv.content.length == 0){ + this.currentPage = 1 + this.getLibraryList('') + }else{ + this.imgList = rv.content + this.total = rv.total + this.newSearchPictureName = this.searchPictureName + this.isShowMark = false + } } ).catch((res)=>{ this.isShowMark = false From 058574d1fd0cd78c0627d84675e65c25bbf331dd Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 2 Feb 2024 17:44:47 +0800 Subject: [PATCH 2/5] fix --- src/views/LibraryPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index eab797c2..f02d2efe 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -1144,7 +1144,7 @@ export default defineComponent({ this.isShowMark = true Https.axiosPost(Https.httpUrls.queryLibraryPage,data).then( (rv: any) => { - if(rv.content.length == 0){ + if(rv.content.length == 0 && this.currentPage != 1){ this.currentPage = 1 this.getLibraryList('') }else{ From 62d86519ca93e00b8718b05f3cbe2015e9310c4d Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 2 Feb 2024 17:50:08 +0800 Subject: [PATCH 3/5] fix --- src/views/LibraryPage.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index f02d2efe..dba19228 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -624,12 +624,12 @@ export default defineComponent({ this.upload.gender = newVal.value }, searchPictureName(newVal,oldVal){ - clearTimeout(this.getLibraryListInputTime) - this.getLibraryListInputTime = setTimeout(() => { - if(newVal != oldVal){ - this.currentPage = 1 - } - }, 500); + // clearTimeout(this.getLibraryListInputTime) + // this.getLibraryListInputTime = setTimeout(() => { + // if(newVal != oldVal){ + // this.currentPage = 1 + // } + // }, 500); }, }, async mounted(){ From 15814005981c11c46acee5b2ebff4ca2545bc0c1 Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 2 Feb 2024 17:54:13 +0800 Subject: [PATCH 4/5] fix --- src/views/LibraryPage.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue index dba19228..d060986b 100644 --- a/src/views/LibraryPage.vue +++ b/src/views/LibraryPage.vue @@ -1140,6 +1140,8 @@ export default defineComponent({ } if(str == 'page'){ data.page = this.currentPage + }else{ + this.currentPage = 1 } this.isShowMark = true Https.axiosPost(Https.httpUrls.queryLibraryPage,data).then( From 5d0af2f90e1fa1eb94b0654cccac72a9c14a467a Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Mon, 19 Feb 2024 09:41:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B92024=20CodeCreate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/LoginPage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/LoginPage.vue b/src/views/LoginPage.vue index 20ef3f33..1071310d 100644 --- a/src/views/LoginPage.vue +++ b/src/views/LoginPage.vue @@ -219,7 +219,7 @@
-
+