diff --git a/src/components/Discover/Map/Filter/Attributes.vue b/src/components/Discover/Map/Filter/Attributes.vue new file mode 100644 index 0000000..0e5bb04 --- /dev/null +++ b/src/components/Discover/Map/Filter/Attributes.vue @@ -0,0 +1,136 @@ + + diff --git a/src/components/Discover/Map/SidebarFilter.vue b/src/components/Discover/Map/SidebarFilter.vue index 791ce63..d76638b 100644 --- a/src/components/Discover/Map/SidebarFilter.vue +++ b/src/components/Discover/Map/SidebarFilter.vue @@ -38,13 +38,14 @@ -
+ +

Refine

@@ -63,10 +64,10 @@
-
+
-
-

Activity Select

+
+

Activity Select

@@ -83,6 +84,8 @@
+ + @@ -109,6 +112,7 @@ import AllMapDataStore from '@/stores/allMapData.js'; import ActOccCase from '@/components/Discover/Map/Filter/ActOccCase.vue'; import ActOcc from '@/components/Discover/Map/Filter/ActOcc.vue'; import ActAndSeq from '@/components/Discover/Map/Filter/ActAndSeq.vue'; +import Attributes from '@/components/Discover/Map/Filter/Attributes.vue'; import Funnel from '@/components/Discover/Map/Filter/Funnel.vue'; import Trace from '@/components/Discover/Map/Filter/Trace.vue'; import Timeframes from '@/components/Discover/Map/Filter/Timeframes.vue'; @@ -127,8 +131,8 @@ export default { data() { return { selectFilter: { - // 'Filter Type': ['Sequence', 'Attributes', 'Trace', 'Timeframes'], - 'Filter Type': ['Sequence', 'Trace', 'Timeframes'], + 'Filter Type': ['Sequence', 'Attributes', 'Trace', 'Timeframes'], + // 'Filter Type': ['Sequence', 'Trace', 'Timeframes'], 'Activity Sequence':['Have activity(s)', 'Start & End', 'Sequence'], 'Start & End': ['Start', 'End', 'Start & End'], 'Mode': ['Directly follows', 'Eventually follows'], @@ -164,6 +168,7 @@ export default { ActOccCase, ActOcc, ActAndSeq, + Attributes, Funnel, Trace, Timeframes, diff --git a/src/stores/allMapData.js b/src/stores/allMapData.js index 4322199..5b10aff 100644 --- a/src/stores/allMapData.js +++ b/src/stores/allMapData.js @@ -26,6 +26,7 @@ export default defineStore('allMapDataStore', { allFilterEndToStart: [], allFilterTimeframe: {}, allFilterTrace: [], + allFilterAttrs: [], hasResultRule: null, // click Apply 後檢查是否有 Data temporaryData: [], // 沒被 apply all 的 Data postRuleData: [], // has-result API & temp-filters API 的 Data @@ -93,6 +94,9 @@ export default defineStore('allMapDataStore', { filterTrace: state => { return state.allFilterTrace; }, + filterAttrs: state => { + return state.allFilterAttrs; + }, allFunnels: state => { return state.allFunnelData; }, @@ -217,6 +221,7 @@ export default defineStore('allMapDataStore', { this.allFilterEndToStart = response.data.sinks; this.allFilterTimeframe = response.data.timeframe; this.allFilterTrace = response.data.trace; + this.allFilterAttrs = response.data.attrs; } catch(error) { apiError(error, 'Failed to load the Filter Parameters.'); }; diff --git a/src/views/Discover/Map/index.vue b/src/views/Discover/Map/index.vue index bd7bf54..a1a2047 100644 --- a/src/views/Discover/Map/index.vue +++ b/src/views/Discover/Map/index.vue @@ -68,9 +68,9 @@ export default { const loadingStore = LoadingStore(); const allMapDataStore = AllMapDataStore(); const { isLoading } = storeToRefs(loadingStore); - const { processMap, bpmn, stats, insights, traceId, traces, baseTraces, baseTraceId, filterTasks, filterStartToEnd, filterEndToStart, filterTimeframe, filterTrace, temporaryData, isRuleData, ruleData, logId, createFilterId } = storeToRefs(allMapDataStore); + const { processMap, bpmn, stats, insights, traceId, traces, baseTraces, baseTraceId, filterTasks, filterStartToEnd, filterEndToStart, filterTimeframe, filterTrace, temporaryData, isRuleData, ruleData, logId, baseLogId, createFilterId } = storeToRefs(allMapDataStore); - return { isLoading, processMap, bpmn, stats, insights, traceId, traces, baseTraces, baseTraceId, filterTasks, filterStartToEnd, filterEndToStart, filterTimeframe, filterTrace, logId, createFilterId, temporaryData, isRuleData, ruleData, allMapDataStore} + return { isLoading, processMap, bpmn, stats, insights, traceId, traces, baseTraces, baseTraceId, filterTasks, filterStartToEnd, filterEndToStart, filterTimeframe, filterTrace, logId, baseLogId, createFilterId, temporaryData, isRuleData, ruleData, allMapDataStore} }, components: { SidebarView, @@ -299,6 +299,7 @@ export default { // 先 loading 再執行以下程式 this.isLoading = true; // Log 檔前往 Map Log 頁, Filter 檔前往 Map Filter 頁 + this.baseLogId = this.$route.params.fileId; if(this.$route.params.type === 'log'){ this.logId = this.$route.params.fileId; }else if(this.$route.params.type === 'filter') {