@ditari/bsui 1.0.70 → 1.0.71

package/dist/cjs/store/modules/NavTab.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("pinia"),l=require("../types.cjs.js"),r=a.defineStore(l.NAV_TAB_ID,{state:()=>({list:[],activeKey:""}),getters:{getList:t=>t.list,getActiveKey:t=>t.activeKey},actions:{setActiveKey(t){this.activeKey=t},save(t){if(!t.meta.title||this.list.some(i=>i.fullPath===t.fullPath))return;const e={path:t.path,fullPath:t.fullPath,query:t.query,params:t.params,meta:t.meta,name:t.name||""};this.list.push(e)},deleteTabs(t){this.list.splice(this.list.findIndex(s=>s.fullPath===t),1)},setNavTitle(t,s){for(let e=0;e<this.list.length;e++)if(this.list[e].fullPath===s){this.list[e].meta.title=t;break}}},persist:!0});exports.useNavTabsStore=r;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("pinia"),r=require("../types.cjs.js"),h=l.defineStore(r.NAV_TAB_ID,{state:()=>({list:[],activeKey:""}),getters:{getList:t=>t.list,getActiveKey:t=>t.activeKey},actions:{setActiveKey(t){this.activeKey=t},save(t){var i;if(!((i=t.meta)!=null&&i.title))return;if(this.list.some(e=>e.path===t.path)){this.list.forEach(e=>{e.path===t.path&&(e.query=t.query,e.params=t.params,e.meta=t.meta,e.name=t.name||"")});return}const a={path:t.path,fullPath:t.fullPath,query:t.query,params:t.params,meta:t.meta,name:t.name||""};this.list.push(a)},deleteTabs(t){this.list.splice(this.list.findIndex(s=>s.fullPath===t),1)},setNavTitle(t,s){for(let a=0;a<this.list.length;a++)if(this.list[a].fullPath===s){this.list[a].meta.title=t;break}}},persist:!0});exports.useNavTabsStore=h;

package/dist/esm/store/modules/NavTab.esm.js

@@ -1,6 +1,6 @@
-import { defineStore as a } from "pinia";
-import { NAV_TAB_ID as l } from "../types.esm.js";
-const f = a(l, {
+import { defineStore as l } from "pinia";
+import { NAV_TAB_ID as h } from "../types.esm.js";
+const f = l(h, {
   state: () => ({
     // 多标签列表
     list: [],
@@ -24,8 +24,15 @@ const f = a(l, {
      * @param route
      */
     save(t) {
-      if (!t.meta.title || this.list.some((s) => s.fullPath === t.fullPath))
+      var i;
+      if (!((i = t.meta) != null && i.title))
         return;
+      if (this.list.some((a) => a.path === t.path)) {
+        this.list.forEach((a) => {
+          a.path === t.path && (a.query = t.query, a.params = t.params, a.meta = t.meta, a.name = t.name || "");
+        });
+        return;
+      }
       const e = {
         path: t.path,
         fullPath: t.fullPath,
@@ -42,7 +49,7 @@ const f = a(l, {
      */
     deleteTabs(t) {
       this.list.splice(
-        this.list.findIndex((i) => i.fullPath === t),
+        this.list.findIndex((s) => s.fullPath === t),
         1
       );
     },
@@ -51,9 +58,9 @@ const f = a(l, {
      * @param title 标题
      * @param path url
      */
-    setNavTitle(t, i) {
+    setNavTitle(t, s) {
       for (let e = 0; e < this.list.length; e++)
-        if (this.list[e].fullPath === i) {
+        if (this.list[e].fullPath === s) {
           this.list[e].meta.title = t;
           break;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditari/bsui",
-  "version": "1.0.70",
+  "version": "1.0.71",
   "files": [
     "dist/**",
     "src"

package/src/hooks/route/index.ts

@@ -4,7 +4,6 @@ import {
   RouteLocationMatched,
   RouteLocationNormalized,
   RouteRecord,
-  RouteRecordRaw,
   RouterMatcher
 } from "vue-router";
 import { useBreadcrumbStore } from "../../store/modules/Breadcrumb";

package/src/store/modules/NavTab.ts

@@ -50,14 +50,21 @@ export const useNavTabsStore = defineStore(NAV_TAB_ID, {
      * @param route
      */
     save(route: RouteLocationNormalized) {
-      if (!route.meta.title) {
+      if (!route.meta?.title) {
         // 没有设置title，则不进入缓存
         return;
       }
-      const flag = this.list.some(
-        (item: INavTab) => item.fullPath === route.fullPath
-      );
+      const flag = this.list.some((item: INavTab) => item.path === route.path);
       if (flag) {
+        // 如果有相同的路由变化，更新对应的参数信息
+        this.list.forEach((item: INavTab) => {
+          if (item.path === route.path) {
+            item.query = route.query;
+            item.params = route.params;
+            item.meta = route.meta;
+            item.name = <string>route.name || "";
+          }
+        });
         return;
       }
       const data: INavTab = {

package/src/tsconfig.json

@@ -10,7 +10,7 @@
     "moduleResolution": "Node",
     "allowJs": true,
     "lib": ["esnext", "dom"],
-    "types": ["pinia-plugin-persist"],
+    "types": [],
     "paths": {}
   },
   "include": []