fix #294 by handling navItem string with function mapPageNameToCapitalUnifiedName()

This commit is contained in:
Cindy Chang
2024-06-05 14:42:24 +08:00
parent 5f0e12ef1a
commit 0df045c218
3 changed files with 40 additions and 15 deletions

View File

@@ -8,10 +8,10 @@ import { mapPageNameToCapitalUnifiedName } from "../utils/pageUtils";
// 因此至少要處理這兩種方式所引起的畫面切換
export default defineStore('pageAdminStore', {
state: () => ({
activePage: 'FILES',
previousPage: 'FILES',
activePage: 'MAP',
previousPage: 'MAP',
pendingActivePage: 'FILES',
isPending: false,
isPagePending: false,
shouldKeepPreviousPage: false, // false -- meaning modal is not pressed as "NO"
activePageComputedByRoute: "MAP",
}),
@@ -40,7 +40,8 @@ export default defineStore('pageAdminStore', {
* @param {*} prevPage
*/
setPrevioiusPage(prevPage) {
this.previousPage = prevPage;
// console.log('setPrevioiusPage()', prevPage);
this.previousPage = mapPageNameToCapitalUnifiedName(prevPage);
},
/**
* Set the previous(usually current) pages to the ones we just decide.
@@ -48,6 +49,14 @@ export default defineStore('pageAdminStore', {
setPrevioiusPageUsingActivePage() {
this.previoiusPage = this.activePage;
},
/**
* Set the boolean value of status of pending state of the pate
* For the control of Swal popup
* @param {boolean} boolVal
*/
setIsPagePendingBoolean(boolVal) {
this.isPagePending = boolVal;
},
/**
* Copy(transit) the value of pendingActivePage to activePage
*/
@@ -65,7 +74,6 @@ export default defineStore('pageAdminStore', {
setPendingActivePage(argPendingActivePage) {
// console.log('pinia setting this.pendingActivePage', this.pendingActivePage);
this.pendingActivePage = mapPageNameToCapitalUnifiedName(argPendingActivePage);
this.isPending = true;
},
/**
* Set Pending active Page to empty string; we call this right after we just decide an active page.
@@ -73,7 +81,6 @@ export default defineStore('pageAdminStore', {
*/
clearPendingActivePage(){
this.pendingActivePage = '';
this.isPending = false;
},
/**
* When user dismiss the popup modal, we don't apply the new page,
@@ -82,13 +89,13 @@ export default defineStore('pageAdminStore', {
keepPreviousPage() {
// console.log('pinia keeping this.previousPage', this.previousPage);
this.activePage = this.previousPage;
this.isPending = false;
this.shouldKeepPreviousPage = true;
},
/**
* Clean up the state of the boolean related to modal showing phase
*/
clearShouldKeepPreviousPageBoolean(){
// console.log('clearShouldKeepPreviousPageBoolean()');
this.shouldKeepPreviousPage = false;
},
},