@ditari/bsui 1.0.40 → 1.0.41

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

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

@@ -1,4 +1,4 @@
-import { defineComponent as T, computed as N, ref as w, watchEffect as x, watch as A, resolveComponent as f, openBlock as l, createElementBlock as p, createVNode as _, withCtx as h, Fragment as B, renderList as E, unref as b, createBlock as P, createElementVNode as C, normalizeClass as R, toDisplayString as V, createCommentVNode as q } from "vue";
+import { defineComponent as T, computed as N, ref as P, watchEffect as w, watch as x, resolveComponent as f, openBlock as l, createElementBlock as p, createVNode as _, withCtx as h, Fragment as A, renderList as B, unref as b, createBlock as E, createElementVNode as C, normalizeClass as R, toDisplayString as V, createCommentVNode as q } from "vue";
 import { useRoute as D, useRouter as L } from "vue-router";
 import { CloseOutlined as M } from "@ant-design/icons-vue";
 import { storeToRefs as O } from "pinia";
@@ -13,10 +13,10 @@ const j = { class: "ditari-nav" }, G = /* @__PURE__ */ C("div", { class: "tab-di
 }, te = /* @__PURE__ */ T({
   ...I,
   setup(J) {
-    const n = D(), v = L(), c = z(), m = F(), k = U(), o = N(() => c.getList), { selectedMenuKeys: u } = O(k), r = w("");
-    x(() => {
+    const n = D(), v = L(), c = z(), m = F(), k = U(), o = N(() => c.getList), { selectedMenuKeys: u } = O(k), r = P("");
+    w(() => {
       r.value = u.value.length > 0 ? u.value[0] : "";
-    }), d(), A(
+    }), d(), x(
       () => n.path,
       () => {
         d();
@@ -35,11 +35,11 @@ const j = { class: "ditari-nav" }, G = /* @__PURE__ */ C("div", { class: "tab-di
         });
       }
     }, S = (t, e) => {
-      const s = o.value.filter((i) => i.path === e)[0];
+      const s = o.value.filter((i) => i.fullPath === e)[0];
       t.stopPropagation(), c.deleteTabs(e), v.push(o.value[o.value.length - 1].fullPath), s.name && m.deleteKeepAlive(s.name);
     }, g = (t) => {
       var e;
-      return !((e = t.meta) != null && e.keepOpen) || o.value.length === 0;
+      return !((e = t.meta) != null && e.keepOpen) || o.value.length === 1;
     };
     return (t, e) => {
       const s = f("a-tab-pane"), i = f("a-tabs");
@@ -51,7 +51,7 @@ const j = { class: "ditari-nav" }, G = /* @__PURE__ */ C("div", { class: "tab-di
           onTabClick: y
         }, {
           default: h(() => [
-            (l(!0), p(B, null, E(b(o), (a) => (l(), P(s, {
+            (l(!0), p(A, null, B(b(o), (a) => (l(), E(s, {
               key: a.path
             }, {
               tab: h(() => [

package/package.json

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

package/src/components/layout/NavTabs.vue

@@ -72,7 +72,7 @@ const onClick = (key: string) => {
  * @param targetKey
  */
 const onClose = ($event: any, key: string) => {
-  const rs = navTabs.value.filter((item) => item.path === key)[0];
+  const rs = navTabs.value.filter((item) => item.fullPath === key)[0];
   //阻止冒泡
   $event.stopPropagation();
   // 删除标签
@@ -92,7 +92,8 @@ const onClose = ($event: any, key: string) => {
  * 根据item和当前 navTabs 长度来判断是否要隐藏关闭标签按钮
  */
 const closeStatus = (item: INavTab) => {
-  return !item.meta?.keepOpen || navTabs.value.length === 0;
+  // 如果meta有设置keepOpen或者当前打开的标签只有一个的话不显示关闭按钮
+  return !item.meta?.keepOpen || navTabs.value.length === 1;
 };
 </script>
 <script lang="ts">