diff --git a/src/components/Discover/Filter/Funnel.vue b/src/components/Discover/Filter/Funnel.vue
index e57c9cb..deb924e 100644
--- a/src/components/Discover/Filter/Funnel.vue
+++ b/src/components/Discover/Filter/Funnel.vue
@@ -26,6 +26,7 @@
+ this.postRuleData:{{this.postRuleData}}
@@ -86,7 +87,7 @@ export default {
async submitAll() {
this.postRuleData = this.temporaryData.filter(item => item !== 0); // 取得 submit 的資料,有 toggle button 的話,找出並刪除陣列中為 0 的項目
if(!this.postRuleData?.length) return this.$toast.error('Not selected');
- await this.allMapDataStore.checkHasResult();
+ await this.allMapDataStore.checkHasResult(); // 後端快速檢查有沒有結果
if(this.hasResultRule === null) return;
else if(this.hasResultRule) {
diff --git a/src/components/Discover/Filter/Trace.vue b/src/components/Discover/Filter/Trace.vue
index 839a6b3..f5bc21c 100644
--- a/src/components/Discover/Filter/Trace.vue
+++ b/src/components/Discover/Filter/Trace.vue
@@ -67,6 +67,7 @@ import AllMapDataStore from '@/stores/allMapData.js';
import cytoscapeMapTrace from '@/module/cytoscapeMapTrace.js';
export default {
+ expose: ['selectArea'],
setup() {
const allMapDataStore = AllMapDataStore();
const { traces, traceTaskSeq, cases } = storeToRefs(allMapDataStore);
diff --git a/src/components/Discover/SidebarFilter.vue b/src/components/Discover/SidebarFilter.vue
index 586e4ce..83f3e45 100644
--- a/src/components/Discover/SidebarFilter.vue
+++ b/src/components/Discover/SidebarFilter.vue
@@ -85,7 +85,7 @@
-
+
@@ -347,7 +347,7 @@ export default {
type = "Timeframe"
break
case "trace-freq":
- label = `from ${e.lower} to ${e.upper} ${includeStr}`
+ label = `from #${e.lower} to #${e.upper} ${includeStr}`
type = "Trace"
break
};
@@ -433,6 +433,13 @@ export default {
}
};
}
+ } else if(sele[0] === 'Trace'){ // Filter Type 選 Trace 的行為
+ data = {
+ type: 'trace-freq',
+ lower: this.$refs.filterTraceView.selectArea[0]+1,
+ upper: this.$refs.filterTraceView.selectArea[1],
+ is_exclude: isExclude,
+ }
}
// 將資料指向 Vue data 雙向綁定
const postData = Array.isArray(data) ? data : [data];