chitanda 发布系统代码

app_CRM/src/app-register.ts

@@ -16,7 +16,6 @@ import InputBox from './components/input-box/input-box.vue'
 import AppKeepAlive from './components/app-keep-alive/app-keep-alive.vue'
 import TabPageExp from './components/tab-page-exp/tab-page-exp.vue'
 import AppLang from './components/app-lang/app-lang.vue'
-import AppTheme from './components/app-theme/app-theme.vue'
 import AppUser from './components/app-user/app-user.vue'
 import AppForm from './components/app-form/app-form.vue'
 import APPAutocomplete from './components/app-autocomplete/app-autocomplete.vue'
@@ -100,7 +99,6 @@ export const AppComponents = {
         v.component('app-keep-alive',AppKeepAlive);
         v.component('tab-page-exp',TabPageExp);
         v.component('app-lang',AppLang);
-        v.component('app-theme',AppTheme);
         v.component('app-user',AppUser);
         v.component('app-form', AppForm);
         v.component('app-autocomplete', APPAutocomplete);

app_CRM/src/components/tab-page-exp/tab-page-exp.vue

 <template>
-    <div class="ibiz-page-tag" v-if="$store.state.pageMetas.length > 0">
+    <div class="ibiz-page-tag" v-if="$appService.navHistory.historyPathList > 0">
         <div class="move-btn move-left" @click="leftMove">
             <icon type="ios-arrow-back" />
         </div>
         <div ref="scrollBody" class="tags-body">
             <div ref="scrollChild" class="tags-container" :style="{left: styleLeft + 'px'}">
                 <transition-group name="tags-transition">
-                    <template v-for="(meta, index) of $store.state.pageMetas">
-                        <Tag ref="tagElement" :key="index" :class="isActive(index) ? 'tag-is-active' : ''" :name="index" closable @click.native="changePage(index)" @on-close="onClose(index)">
+                    <template v-for="(page, index) of $appService.navHistory.historyPathList">
+                        <Tag ref="tagElement" :key="index" :class="isActive(page) ? 'tag-is-active' : ''" :name="index" closable @click.native="changePage(page)" @on-close="onClose(page)">
                             <div class="tag-text">
-                                <div :title="getCaption(meta.caption, meta.info)" style="max-width: 300px;">
-                                    <i v-if="meta.iconCls && !Object.is(meta.iconCls, '')" :class="meta.iconCls"></i>
-                                    <img v-else :src="meta.imgPath" class="text-icon" />
-                                    &nbsp;{{getCaption(meta.caption, meta.info)}}
+                                <div :title="getCaption(page.meta.caption, page.meta.info)" style="max-width: 300px;">
+                                    <i v-if="page.meta.iconCls && !Object.is(page.meta.iconCls, '')" :class="page.meta.iconCls"></i>
+                                    <img v-else :src="page.meta.imgPath" class="text-icon" />
+                                    &nbsp;{{getCaption(page.meta.caption, page.meta.info)}}
                                 </div>
                             </div>
                         </Tag>
@@ -42,6 +42,7 @@ import { Environment } from '../../environments/environment';
 
 @Component({})
 export default class TabPageExp extends Vue {
+
     @Provide()
     public styleLeft: number = 0;
 
@@ -97,12 +98,11 @@ export default class TabPageExp extends Vue {
     /**
      * 是否选中
      *
-     * @param {(string | number)} index
-     * @returns
+     * @param {*} page
+     * @returns {boolean}
      * @memberof TabPageExp
      */
-    public isActive(index: string | number) {
-        const page = this.$store.state.pageTagList[index];
+    public isActive(page: any): boolean {
         if (Object.is(page.fullPath, this.$route.fullPath)) {
             return true;
         }
@@ -112,14 +112,12 @@ export default class TabPageExp extends Vue {
     /**
      * 关闭
      *
-     * @param {*} event
-     * @param {*} name
+     * @param {*} page
      * @memberof TabPageExp
      */
-    public onClose(name: any) {
-        const page = this.$store.getters.getPage(name);
+    public onClose(page: any) {
         if (!page) {
-            this.$store.commit("deletePage", name);
+            this.$appService.navHistory.remove(page);
             this.gotoPage();
         }
         const appview = this.$store.getters['viewaction/getAppView'](page.viewtag);
@@ -130,14 +128,14 @@ export default class TabPageExp extends Vue {
                 title: title,
                 content: content,
                 onOk: () => {
-                    this.$store.commit("deletePage", name);
+                    this.$appService.navHistory.remove(page);
                     this.gotoPage();
                 },
                 onCancel: () => {
                 }
             });
         } else {
-            this.$store.commit("deletePage", name);
+            this.$appService.navHistory.remove(page);
             this.gotoPage();
         }
     }
@@ -149,8 +147,7 @@ export default class TabPageExp extends Vue {
      * @memberof TabPageExp
      */
     public isClose() {
-        const pageTagList = this.$store.state.pageTagList;
-        if (pageTagList.length > 1) {
+        if (this.$appService.navHistory.historyList.length > 1) {
             return true;
         }
         return false;
@@ -159,12 +156,11 @@ export default class TabPageExp extends Vue {
     /**
      * 切换分页
      *
-     * @param {*} index
+     * @param {*} page
      * @memberof TabPageExp
      */
-    public changePage(index: any) {
-        this.$store.commit("setCurPage", index);
-        this.gotoPage();
+    public changePage(page: any) {
+        this.gotoPage(page);
     }
 
     /**
@@ -173,20 +169,14 @@ export default class TabPageExp extends Vue {
      * @returns
      * @memberof TabPageExp
      */
-    public gotoPage() {
-        const length = this.$store.state.historyPathList.length;
-        if (length > 0) {
-            const path = this.$store.state.historyPathList[length - 1];
-            if (Object.is(path, this.$route.fullPath)) {
+    public gotoPage(page?: any) {
+        if (page) {
+            if (Object.is(page.fullPath, this.$route.fullPath)) {
                 return;
             }
-            const index = this.$store.state.pageTagList.findIndex((page: any) => Object.is(page.fullPath, path));
-            if (index >= 0) {
-                const page = this.$store.state.pageTagList[index];
-                this.$router.push({ path: page.path, params: page.params, query: page.query });
-            }
+            this.$router.push({ path: page.path, params: page.params, query: page.query });
         } else {
-            let path: string | null = window.sessionStorage.getItem(Environment.AppName);
+            const path: string | null = window.sessionStorage.getItem(Environment.AppName);
             if(path) {
                 this.$router.push({path: path});
             } else {
@@ -214,11 +204,11 @@ export default class TabPageExp extends Vue {
     /**
      * 移动至指定页面标签
      *
-     * @param {*} to
+     * @param {*} page
      * @memberof TabPageExp
      */
-    public moveToView(to: any) {
-        const pages: any[] = this.$store.state.pageTagList;
+    public moveToView(page: any) {
+        const pages: any[] = this.$appService.navHistory.historyList;
         let leftWidth: number = 0;
         this.$nextTick(() => {
             pages.forEach((page, index) => {
@@ -227,7 +217,7 @@ export default class TabPageExp extends Vue {
                     return ;
                 }
                 const el = tag[index].$el;
-                if (Object.is(page.fullPath, to.fullPath)) {
+                if (Object.is(page.fullPath, page.fullPath)) {
                     this.setLeft(el, leftWidth);
                 } else {
                     leftWidth += el.offsetWidth;
@@ -262,10 +252,10 @@ export default class TabPageExp extends Vue {
      */
     public doTagAction(name: string) {
         if (Object.is(name, 'closeAll')) {
-            this.$store.commit("removeAllPage");
+            this.$appService.navHistory.reset();
             this.gotoPage();
         } else if (Object.is(name, 'closeOther')) {
-            this.$store.commit("removeOtherPage");
+            this.$appService.navHistory.removeOther(this.$route);
             this.moveToView(this.$route);
         }
     }  

app_CRM/src/pages/base/account-edit-account-info/account-edit-account-info.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/edit-account-info-form/edit-account-info
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-edit-address/account-edit-address.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/edit-address-form/edit-address-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-edit-introduction/account-edit-introduction.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/edit-introduction-form/edit-introduction
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-edit-view/account-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-gradation/account-gradation.vue

@@ -18,7 +18,7 @@ import view_treeexpbar from '@widgets/account/gradationtreeexpbar-treeexpbar/gra
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-grid-view/account-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/account/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-info-all/account-info-all.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/info-all-form/info-all-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-info-major-contact/account-info-major-contact.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/info-major-contact-form/info-major-conta
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-info/account-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/account/infotabexppanel-tabexppanel/infot
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-inner-pickup-grid-view/account-inner-pickup-grid-view.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/account/inner-pickip-grid/inner-pickip-grid.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-inner-pickup-view/account-inner-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/account/inner-pickup-viewpickupviewpa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-pickup-grid-view/account-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/account/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-pickup-view/account-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/account/pickup-viewpickupviewpanel-pi
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-quick-create/account-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/account/quick-create-form/quick-create-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/account-summary/account-summary.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/account/summary-dashboard/summary-dashboard
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/activity-pointer-by-parent-key/activity-pointer-by-parent-key.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/activity-pointer/default-searchform/defaul
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/activity-pointer-edit-view/activity-pointer-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/activity-pointer/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/activity-pointer-grid-view/activity-pointer-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/activity-pointer/default-searchform/defaul
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/activity-pointer-redirect-view/activity-pointer-redirect-view.vue

@@ -16,7 +16,7 @@ import { ActivityPointerRedirectViewBase } from './activity-pointer-redirect-vie
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/appointment-edit-view/appointment-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/appointment/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/appointment-quick-create/appointment-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/appointment/quick-create-form/quick-create-form.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-by-account/contact-by-account.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/contact/by-account-grid/by-account-grid.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-edit-address/contact-edit-address.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/address-edit-form/address-edit-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-edit-book/contact-edit-book.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/book-edit-form/book-edit-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-edit-market/contact-edit-market.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/market-edit-form/market-edit-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-edit-person/contact-edit-person.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/person-edit-form/person-edit-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-grid-view/contact-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/contact/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-info-abstract/contact-info-abstract.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/abstract-info-form/abstract-info-form.vu
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-info/contact-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/contact/infotabexppanel-tabexppanel/infot
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-pickup-grid-view/contact-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/contact/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-pickup-view/contact-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/contact/pickup-viewpickupviewpanel-pi
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-quick-create/contact-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/contact/quick-create-form/quick-create-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/contact-summary-view/contact-summary-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/contact/con-abs-dashboard/con-abs-dashboard
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/email-edit-view/email-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/email/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/fax-edit-view/fax-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/fax/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/letter-edit-view/letter-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/letter/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/metric-edit-view/metric-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/metric/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/metric-grid-view/metric-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/metric/default-searchform/default-searchfo
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/metric-pickup-grid-view/metric-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/metric/default-searchform/default-searchfo
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/metric-pickup-view/metric-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/metric/pickup-viewpickupviewpanel-pic
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/phone-call-edit-view/phone-call-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/phone-call/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/subject-pickup-grid-view/subject-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/subject/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/subject-pickup-view/subject-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/subject/pickup-viewpickupviewpanel-pi
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/task-edit-view/task-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/task/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/task-quick-create/task-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/task/quick-create-form/quick-create-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/transaction-currency-pickup-grid-view/transaction-currency-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/transaction-currency/default-searchform/de
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/transaction-currency-pickup-view/transaction-currency-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/transaction-currency/pickup-viewpicku
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/uom-pickup-grid-view/uom-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/uom/default-searchform/default-searchform.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/base/uom-pickup-view/uom-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/uom/pickup-viewpickupviewpanel-pickup
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-detail-edit-view/invoice-detail-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/invoice-detail/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-detail-invoice-pro-grid-view/invoice-detail-invoice-pro-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/invoice-detail/default-searchform/default-
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-grid-view/invoice-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/invoice/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-info-invoice-view/invoice-info-invoice-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/invoice/info-form/info-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-info-view/invoice-info-view.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/invoice/info-viewtabexppanel-tabexppanel/
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-quick-create-view/invoice-quick-create-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/invoice/quick-create-form/quick-create-form.vue'
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/finance/invoice-summary-view/invoice-summary-view.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/invoice/board-dashboard/board-dashboard.vue
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-activity-by-parent-key/campaign-activity-by-parent-key.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/campaign-activity/default-searchform/defau
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-activity-edit-view/campaign-activity-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-activity/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-activity-quick-create/campaign-activity-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-activity/quick-create-form/quick-create
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-edit-head/campaign-edit-head.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/edit-head-form/edit-head-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-grid-view/campaign-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/campaign/default-searchform/default-search
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info-campagin/campaign-info-campagin.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/info-campagin-form/info-campagin-form.v
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info-head/campaign-info-head.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/info-head-form/info-head-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info-manager/campaign-info-manager.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/info-manager-form/info-manager-form.vue
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info-schedule/campaign-info-schedule.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/info-schedule-form/info-schedule-form.v
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-info/campaign-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/campaign/infotabexppanel-tabexppanel/info
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-list-edit-view/campaign-list-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-list/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-list-grid-view/campaign-list-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/campaign-list/default-searchform/default-s
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-quick-create-view/campaign-quick-create-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign/quick-create-form/quick-create-form.vue
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-response-by-parent-key/campaign-response-by-parent-key.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/campaign-response/default-searchform/defau
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-response-edit-view/campaign-response-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-response/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-response-quick-create/campaign-response-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/campaign-response/quick-create-form/quick-create
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-summary-head/campaign-summary-head.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/campaign/head-summary-dashboard/head-summar
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/campaign-summary/campaign-summary.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/campaign/summary-dashboard/summary-dashboar
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-grid-view/ibiz-list-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/ibiz-list/default-searchform/default-searc
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-info-abstract/ibiz-list-info-abstract.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/ibiz-list/abstract-info-form/abstract-info-form.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-info/ibiz-list-info.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/ibiz-list/infotabexppanel-tabexppanel/inf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-option-view/ibiz-list-option-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/ibiz-list/abstract-edit-form/abstract-edit-form.
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-quick-create/ibiz-list-quick-create.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/ibiz-list/quick-create-form/quick-create-form.vu
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/ibiz-list-summary/ibiz-list-summary.vue

@@ -18,7 +18,7 @@ import view_dashboard from '@widgets/ibiz-list/summary-dashboard/summary-dashboa
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-account-by-list/list-account-by-list.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/list-account/default-searchform/default-se
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-account-edit-view/list-account-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/list-account/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-account-inner/list-account-inner.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/list-account/main-grid/main-grid.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-account-quick-create-by-list/list-account-quick-create-by-list.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/list-account/quick-create-by-list-form/quick-cre
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-contact-edit-view/list-contact-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/list-contact/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-contact-grid-view/list-contact-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/list-contact/default-searchform/default-se
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-contact-inner/list-contact-inner.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/list-contact/inner-grid/inner-grid.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-lead-by-list/list-lead-by-list.vue

@@ -18,7 +18,7 @@ import view_grid from '@widgets/list-lead/main-grid/main-grid.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/marketing/list-lead-quick-create-by-list/list-lead-quick-create-by-list.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/list-lead/quick-create-by-list-form/quick-create
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/price-level-pickup-grid-view/price-level-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/price-level/default-searchform/default-sea
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/price-level-pickup-view/price-level-pickup-view.vue

@@ -18,7 +18,7 @@ import view_pickupviewpanel from '@widgets/price-level/pickup-viewpickupviewpane
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-association-edit-view/product-association-edit-view.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/product-association/main-form/main-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-association-grid-view/product-association-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/product-association/default-searchform/def
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-grid-view/product-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/product/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-info-pro-info/product-info-pro-info.vue

@@ -18,7 +18,7 @@ import view_form from '@widgets/product/pro-info-form/pro-info-form.vue';
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-info-view/product-info-view.vue

@@ -18,7 +18,7 @@ import view_tabexppanel from '@widgets/product/info-viewtabexppanel-tabexppanel/
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })

app_CRM/src/pages/product/product-pickup-grid-view/product-pickup-grid-view.vue

@@ -20,7 +20,7 @@ import view_searchform from '@widgets/product/default-searchform/default-searchf
     },
     beforeRouteEnter: (to: any, from: any, next: any) => {
         next((vm: any) => {
-            vm.$store.commit('addCurPageViewtag', { route: to, viewtag: vm.viewtag });
+            vm.$appService.navHistory.setViewTag(vm.viewtag, to);
         });
     }
 })