@ditari/bsui 1.0.70 → 1.0.72

package/dist/cjs/components/layout/NavTabs.vue.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),m=require("vue-router"),N=require("@ant-design/icons-vue"),q=require("pinia"),y=require("../../store/modules/NavTab.cjs.js"),S=require("../../store/modules/KeepAlive.cjs.js"),g=require("../../store/modules/Menu.cjs.js"),T=require("../theme/index.cjs.js"),B=e.createElementVNode("div",{class:"tab-dividers"},null,-1),K={key:0,class:"tab-close"},E={name:"DNavTabs"},V=e.defineComponent({...E,setup(x){const l=m.useRoute(),p=m.useRouter(),c=y.useNavTabsStore(),v=S.useKeepAliveStore(),f=g.useMenuStore(),_=`${T.prefixName}-nav`,n=e.computed(()=>c.getList),{selectedMenuKeys:u}=q.storeToRefs(f),r=e.ref("");e.watchEffect(()=>{r.value=u.value.length>0?u.value[0]:""}),d(),e.watch(()=>l.path,()=>{d()});function d(){c.save(l),u.value=[l.path],v.save(l)}const h=a=>{if(a!==l.path){const t=n.value.filter(s=>s.path===a)[0];p.push({path:t.path,query:t.query,params:t.params})}},b=(a,t)=>{const s=n.value.find(i=>i.fullPath===t);a.stopPropagation(),c.deleteTabs(t),p.push(n.value[n.value.length-1].fullPath),s.name&&v.deleteKeepAlive(s.name)},C=a=>{var t;return(t=a.meta)!=null&&t.keepOpen?!1:n.value.length!==1};return(a,t)=>{const s=e.resolveComponent("a-tab-pane"),i=e.resolveComponent("a-tabs");return e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(_)},[e.createVNode(i,{activeKey:r.value,"onUpdate:activeKey":t[0]||(t[0]=o=>r.value=o),type:"card",onTabClick:h},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(n),o=>(e.openBlock(),e.createBlock(s,{key:o.path},{tab:e.withCtx(()=>[B,e.createElementVNode("div",{class:e.normalizeClass(["tab-item",{active:r.value===o.path}])},e.toDisplayString(o.meta.title),3),C(o)?(e.openBlock(),e.createElementBlock("div",K,[e.createVNode(e.unref(N.CloseOutlined),{onClick:k=>b(k,o.fullPath)},null,8,["onClick"])])):e.createCommentVNode("",!0)]),_:2},1024))),128))]),_:1},8,["activeKey"])])}}});exports.default=V;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),f=require("vue-router"),N=require("@ant-design/icons-vue"),q=require("pinia"),y=require("../../store/modules/NavTab.cjs.js"),S=require("../../store/modules/KeepAlive.cjs.js"),g=require("../../store/modules/Menu.cjs.js"),T=require("../theme/index.cjs.js"),B=e.createElementVNode("div",{class:"tab-dividers"},null,-1),K={key:0,class:"tab-close"},P={name:"DNavTabs"},E=e.defineComponent({...P,setup(V){const l=f.useRoute(),p=f.useRouter(),u=y.useNavTabsStore(),v=S.useKeepAliveStore(),m=g.useMenuStore(),h=`${T.prefixName}-nav`,n=e.computed(()=>u.getList),{selectedMenuKeys:c}=q.storeToRefs(m),r=e.ref("");e.watchEffect(()=>{r.value=c.value.length>0?c.value[0]:""}),d(),e.watch(()=>l.path,()=>{d()});function d(){u.save(l),c.value=[l.path],v.save(l)}const _=a=>{if(a!==l.path){const t=n.value.filter(s=>s.path===a)[0];p.push({path:t.path,query:t.query,params:t.params,fullPath:t.fullPath})}},b=(a,t)=>{const s=n.value.find(i=>i.fullPath===t);a.stopPropagation(),u.deleteTabs(t),p.push(n.value[n.value.length-1].fullPath),s.name&&v.deleteKeepAlive(s.name)},C=a=>{var t;return(t=a.meta)!=null&&t.keepOpen?!1:n.value.length!==1};return(a,t)=>{const s=e.resolveComponent("a-tab-pane"),i=e.resolveComponent("a-tabs");return e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(h)},[e.createVNode(i,{activeKey:r.value,"onUpdate:activeKey":t[0]||(t[0]=o=>r.value=o),type:"card",onTabClick:_},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(e.unref(n),o=>(e.openBlock(),e.createBlock(s,{key:o.path},{tab:e.withCtx(()=>[B,e.createElementVNode("div",{class:e.normalizeClass(["tab-item",{active:r.value===o.path}])},e.toDisplayString(o.meta.title),3),C(o)?(e.openBlock(),e.createElementBlock("div",K,[e.createVNode(e.unref(N.CloseOutlined),{onClick:k=>b(k,o.fullPath)},null,8,["onClick"])])):e.createCommentVNode("",!0)]),_:2},1024))),128))]),_:1},8,["activeKey"])])}}});exports.default=E;

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"),h=require("../types.cjs.js"),n=l.defineStore(h.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.fullPath=t.fullPath,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=n;

package/dist/esm/components/layout/NavTabs.vue.esm.js

@@ -1,4 +1,4 @@
-import { defineComponent as x, computed as P, ref as w, watchEffect as A, watch as B, resolveComponent as d, openBlock as l, createElementBlock as p, normalizeClass as _, createVNode as h, withCtx as b, Fragment as E, renderList as R, unref as C, createBlock as V, createElementVNode as k, toDisplayString as q, createCommentVNode as D } from "vue";
+import { defineComponent as P, computed as x, ref as w, watchEffect as A, watch as B, resolveComponent as d, openBlock as r, createElementBlock as p, normalizeClass as h, createVNode as _, withCtx as b, Fragment as E, renderList as R, unref as C, createBlock as V, createElementVNode as k, toDisplayString as q, createCommentVNode as D } from "vue";
 import { useRoute as L, useRouter as M } from "vue-router";
 import { CloseOutlined as O } from "@ant-design/icons-vue";
 import { storeToRefs as z } from "pinia";
@@ -11,12 +11,12 @@ const G = /* @__PURE__ */ k("div", { class: "tab-dividers" }, null, -1), H = {
   class: "tab-close"
 }, I = {
   name: "DNavTabs"
-}, oe = /* @__PURE__ */ x({
+}, oe = /* @__PURE__ */ P({
   ...I,
   setup(J) {
-    const n = L(), m = M(), c = F(), v = U(), y = $(), N = `${j}-nav`, o = P(() => c.getList), { selectedMenuKeys: u } = z(y), r = w("");
+    const n = L(), m = M(), u = F(), v = U(), y = $(), N = `${j}-nav`, o = x(() => u.getList), { selectedMenuKeys: c } = z(y), l = w("");
     A(() => {
-      r.value = u.value.length > 0 ? u.value[0] : "";
+      l.value = c.value.length > 0 ? c.value[0] : "";
     }), f(), B(
       () => n.path,
       () => {
@@ -24,7 +24,7 @@ const G = /* @__PURE__ */ k("div", { class: "tab-dividers" }, null, -1), H = {
       }
     );
     function f() {
-      c.save(n), u.value = [n.path], v.save(n);
+      u.save(n), c.value = [n.path], v.save(n);
     }
     const S = (t) => {
       if (t !== n.path) {
@@ -32,38 +32,39 @@ const G = /* @__PURE__ */ k("div", { class: "tab-dividers" }, null, -1), H = {
         m.push({
           path: e.path,
           query: e.query,
-          params: e.params
+          params: e.params,
+          fullPath: e.fullPath
         });
       }
     }, g = (t, e) => {
       const s = o.value.find((i) => i.fullPath === e);
-      t.stopPropagation(), c.deleteTabs(e), m.push(o.value[o.value.length - 1].fullPath), s.name && v.deleteKeepAlive(s.name);
+      t.stopPropagation(), u.deleteTabs(e), m.push(o.value[o.value.length - 1].fullPath), s.name && v.deleteKeepAlive(s.name);
     }, K = (t) => {
       var e;
       return (e = t.meta) != null && e.keepOpen ? !1 : o.value.length !== 1;
     };
     return (t, e) => {
       const s = d("a-tab-pane"), i = d("a-tabs");
-      return l(), p("div", {
-        class: _(N)
+      return r(), p("div", {
+        class: h(N)
       }, [
-        h(i, {
-          activeKey: r.value,
-          "onUpdate:activeKey": e[0] || (e[0] = (a) => r.value = a),
+        _(i, {
+          activeKey: l.value,
+          "onUpdate:activeKey": e[0] || (e[0] = (a) => l.value = a),
           type: "card",
           onTabClick: S
         }, {
           default: b(() => [
-            (l(!0), p(E, null, R(C(o), (a) => (l(), V(s, {
+            (r(!0), p(E, null, R(C(o), (a) => (r(), V(s, {
               key: a.path
             }, {
               tab: b(() => [
                 G,
                 k("div", {
-                  class: _(["tab-item", { active: r.value === a.path }])
+                  class: h(["tab-item", { active: l.value === a.path }])
                 }, q(a.meta.title), 3),
-                K(a) ? (l(), p("div", H, [
-                  h(C(O), {
+                K(a) ? (r(), p("div", H, [
+                  _(C(O), {
                     onClick: (T) => g(T, a.fullPath)
                   }, null, 8, ["onClick"])
                 ])) : D("", !0)

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 n = l(h, {
   state: () => ({
     // 多标签列表
     list: [],
@@ -24,9 +24,16 @@ 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;
-      const e = {
+      if (this.list.some((a) => a.path === t.path)) {
+        this.list.forEach((a) => {
+          a.path === t.path && (a.query = t.query, a.fullPath = t.fullPath, a.params = t.params, a.meta = t.meta, a.name = t.name || "");
+        });
+        return;
+      }
+      const s = {
         path: t.path,
         fullPath: t.fullPath,
         query: t.query,
@@ -34,7 +41,7 @@ const f = a(l, {
         meta: t.meta,
         name: t.name || ""
       };
-      this.list.push(e);
+      this.list.push(s);
     },
     /**
      * 删除标签
@@ -42,7 +49,7 @@ const f = a(l, {
      */
     deleteTabs(t) {
       this.list.splice(
-        this.list.findIndex((i) => i.fullPath === t),
+        this.list.findIndex((e) => e.fullPath === t),
         1
       );
     },
@@ -51,10 +58,10 @@ const f = a(l, {
      * @param title 标题
      * @param path url
      */
-    setNavTitle(t, i) {
-      for (let e = 0; e < this.list.length; e++)
-        if (this.list[e].fullPath === i) {
-          this.list[e].meta.title = t;
+    setNavTitle(t, e) {
+      for (let s = 0; s < this.list.length; s++)
+        if (this.list[s].fullPath === e) {
+          this.list[s].meta.title = t;
           break;
         }
     }
@@ -62,5 +69,5 @@ const f = a(l, {
   persist: !0
 });
 export {
-  f as useNavTabsStore
+  n as useNavTabsStore
 };

package/package.json

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

package/src/components/layout/NavTabs.vue

@@ -66,8 +66,9 @@ const onClick = (key: string) => {
     router.push({
       path: rs.path,
       query: rs.query,
-      params: rs.params
-    });
+      params: rs.params,
+      fullPath: rs.fullPath
+    } as any);
   }
 };
 

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,22 @@ 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.fullPath = route.fullPath;
+            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": []