fix: Issues #213 done.
This commit is contained in:
@@ -201,6 +201,9 @@ export default {
|
||||
* Save button' modal
|
||||
*/
|
||||
async saveModal() {
|
||||
// 協助判斷 MAP, CONFORMANCE 儲存有「送出」或「取消」。
|
||||
let isSaved;
|
||||
|
||||
// 傳給 Map,通知 Sidebar 要關閉。
|
||||
this.$emitter.emit('saveModal', false);
|
||||
// 判斷在哪個子頁面
|
||||
@@ -212,16 +215,16 @@ export default {
|
||||
await this.allMapDataStore.updataFilter();
|
||||
if(this.isUpdataFilter) await savedSuccessfully(this.filterName);
|
||||
}else if(this.logId){
|
||||
await saveFilter(this.allMapDataStore.addFilterId);
|
||||
isSaved = await saveFilter(this.allMapDataStore.addFilterId);
|
||||
// 存檔後為 filterID,換網址不跳頁,使用 push 記錄歷史路由
|
||||
await this.$router.push(`/discover/filter/${this.createFilterId}/map`);
|
||||
if(isSaved) await this.$router.push(`/discover/filter/${this.createFilterId}/map`);
|
||||
};
|
||||
break;
|
||||
case 'CheckMap':
|
||||
// 無論 parentLog, parentFilter,做新 filter 皆另存新檔
|
||||
await saveFilter(this.allMapDataStore.addFilterId);
|
||||
isSaved = await saveFilter(this.allMapDataStore.addFilterId);
|
||||
// 存檔後為 filterID,換網址不跳頁,使用 push 記錄歷史路由
|
||||
await this.$router.push(`/discover/filter/${this.createFilterId}/map`);
|
||||
if(isSaved) await this.$router.push(`/discover/filter/${this.createFilterId}/map`);
|
||||
break;
|
||||
case 'Conformance':
|
||||
case 'CheckConformance':
|
||||
@@ -231,10 +234,12 @@ export default {
|
||||
await this.conformanceStore.updataConformance();
|
||||
if(this.isUpdataConformance) await savedSuccessfully(this.conformanceFileName);
|
||||
} else {
|
||||
await saveConformance(this.conformanceStore.addConformanceCreateCheckId);
|
||||
isSaved = await saveConformance(this.conformanceStore.addConformanceCreateCheckId);
|
||||
// 存檔後為 checkID,換網址不跳頁,使用 push 記錄歷史路由
|
||||
if(this.conformanceLogId) await this.$router.push(`/discover/conformance/log/${this.conformanceLogCreateCheckId}/conformance`);
|
||||
else if(this.conformanceFilterId) await this.$router.push(`/discover/conformance/filter/${this.conformanceFilterCreateCheckId}/conformance`);
|
||||
if(isSaved) {
|
||||
if(this.conformanceLogId) await this.$router.push(`/discover/conformance/log/${this.conformanceLogCreateCheckId}/conformance`);
|
||||
else if(this.conformanceFilterId) await this.$router.push(`/discover/conformance/filter/${this.conformanceFilterCreateCheckId}/conformance`);
|
||||
}
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user