feat: Conformance Save Logout done.

src/components/Discover/Conformance/ConformanceSidebar.vue

@@ -1268,6 +1268,10 @@ export default {
       };
     });
   },
+  beforeUnmount() {
+    this.isSubmitReset();
+    this.selectTimeReset();
+  },
 }
 </script>
 <style>

src/components/Header.vue

@@ -24,6 +24,8 @@ import loginStore from '@/stores/login.js';
 import DspLogo from '@/components/icons/DspLogo.vue';
 import IconMember from '@/components/icons/IconMember.vue';
 import AllMapDataStore from '@/stores/allMapData.js';
+import ConformanceStore from '@/stores/conformance.js';
+import { leaveFilter, leaveConformance } from '@/module/alertModal.js';
 
 export default {
   data() {
@@ -35,9 +37,11 @@ export default {
     const store = loginStore();
     const { logOut } = store;
     const allMapDataStore = AllMapDataStore();
+    const conformanceStore = ConformanceStore();
     const { tempFilterId, temporaryData, postRuleData, ruleData } = storeToRefs(allMapDataStore);
+    const { conformanceLogTempCheckId, conformanceFilterTempCheckId, conformanceFileName } = storeToRefs(conformanceStore);
 
-    return { logOut, temporaryData, tempFilterId, postRuleData, ruleData, allMapDataStore}
+    return { logOut, temporaryData, tempFilterId, postRuleData, ruleData, conformanceLogTempCheckId, conformanceFilterTempCheckId, allMapDataStore, conformanceStore, conformanceFileName }
   },
   components: {
     DspLogo,
@@ -45,13 +49,13 @@ export default {
   },
   methods: {
     logOutButton() {
-      if (this.$route.name === 'Map' && this.$route.params.type === 'log') {
-        this.tempFilterId = null;
-        this.temporaryData = [];
-        this.postRuleData = [];
-        this.ruleData = [];
-      };
-      this.logOut();
+      if ((this.$route.name === 'Map' || this.$route.name === 'CheckMap') && this.tempFilterId) {
+        // 傳給 Map，通知 Sidebar 要關閉。
+        this.$emitter.emit('leaveFilter', false);
+        leaveFilter(false, this.allMapDataStore.addFilterId, false, this.logOut)
+      } else if((this.$route.name === 'Conformance' || this.$route.name === 'CheckConformance') && (this.conformanceLogTempCheckId || this.conformanceFilterTempCheckId)) {
+        leaveConformance(false, this.conformanceStore.addConformanceCreateCheckId, false, this.logOut)
+      } else this.logOut();
     },
   },
   mounted() {

src/components/Navbar.vue

@@ -1,6 +1,15 @@
 <template>
   <nav class="bg-neutral-700">
     <div class="mx-auto px-4" :class="[showNavbarBreadcrumb? 'min-h-12': 'h-12']">
+      <p class="text-neutral-10">logId: {{ logId }}</p>
+      <p class="text-neutral-10">tempFilterId: {{ tempFilterId }}</p>
+      <p class="text-neutral-10">createFilterId: {{ createFilterId }}</p>
+      <p class="text-neutral-10">conformanceLogId: {{ conformanceLogId }}</p>
+      <p class="text-neutral-10">conformanceFilterId: {{ conformanceFilterId }}</p>
+      <p class="text-neutral-10">conformanceLogTempCheckId: {{ conformanceLogTempCheckId }}</p>
+      <p class="text-neutral-10">conformanceFilterTempCheckId: {{ conformanceFilterTempCheckId }}</p>
+      <p class="text-neutral-10">conformanceLogCreateCheckId: {{ conformanceLogCreateCheckId }}</p>
+      <p class="text-neutral-10">conformanceFilterCreateCheckId: {{ conformanceFilterCreateCheckId }}</p>
       <div class="flex justify-between items-center flex-wrap" v-show="showNavbarBreadcrumb">
         <div class="flex flex-1 items-center">
           <!-- 回 Files 頁 -->
@@ -148,15 +157,18 @@ export default {
           if(this.createFilterId) {
             await this.allMapDataStore.updataFilter();
             if(this.isUpdataFilter) await savedSuccessfully(this.filterName);
-            this.tempFilterId = null;
           }else if(this.logId){
             await saveFilter(this.allMapDataStore.addFilterId);
             // 存檔後為 filterID，換網址不跳頁，使用 push 記錄歷史路由
             await this.$router.push(`/discover/map/filter/${this.createFilterId}`);
           };
           break;
-        case 'Conformance':
         case 'CheckMap':
+          // 無論 parentLog, parentFilter，做新 filter 皆另存新檔
+          await saveFilter(this.allMapDataStore.addFilterId);
+          // 存檔後為 filterID，換網址不跳頁，使用 push 記錄歷史路由
+          await this.$router.push(`/discover/map/filter/${this.createFilterId}`);
+        case 'Conformance':
         case 'CheckConformance':
           // 先判斷有沒有 check Id，有就儲存 return，沒有就往下走
           // 沒有 check Id, 有暫存 temp Id 可以另存新檔