From 4089b1c7b86d8d32a4a39321245d2dd8a14a6b8d Mon Sep 17 00:00:00 2001 From: chiayin Date: Wed, 1 Nov 2023 11:17:45 +0800 Subject: [PATCH] Issues #170: done. --- src/components/Discover/Map/SidebarFilter.vue | 7 +-- src/views/Files/index.vue | 47 +++++++++---------- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue index e5f4cd4..d109825 100644 --- a/src/components/Discover/Map/SidebarFilter.vue +++ b/src/components/Discover/Map/SidebarFilter.vue @@ -511,6 +511,7 @@ export default { }, // header:Filter 發送選取的資料 async submit(){ + this.isLoading = true; let data; let sele = this.selectValue; let isExclude = sele[5] === 'Exclude' ? true : false; @@ -644,7 +645,7 @@ export default { await this.allMapDataStore.checkHasResult(); // 有 Data 就加進 Funnel，沒有 Data 不加進 Funnel 和跳錯誤訊息 - if(this.hasResultRule === null) return; + if(this.hasResultRule === null) return this.isLoading = false; else if(this.hasResultRule) { if(!this.temporaryData?.length){ this.temporaryData.push(...postData); @@ -656,13 +657,13 @@ export default { this.ruleData.push(...postData.map(e => this.setRule(e))) } this.reset(false); - this.isLoading = true; + // this.isLoading = true; await new Promise(resolve => setTimeout(resolve, 1000)); this.isLoading = false; this.$toast.success('Filter applied. Go to Funnel to verify.'); }else { this.reset(false); - this.isLoading = true; + // this.isLoading = true; await new Promise(resolve => setTimeout(resolve, 1000)); this.isLoading = false; this.$toast.warning('No Data.'); diff --git a/src/views/Files/index.vue b/src/views/Files/index.vue index 5cd8a8f..76b814b 100644 --- a/src/views/Files/index.vue +++ b/src/views/Files/index.vue @@ -4,15 +4,14 @@

Recently Used

-