@ditari/bsui 1.0.41 → 1.0.42

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(),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;
+"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.find(i=>i.fullPath===t);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/cjs/components/layout/Show.vue.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),l=require("vue-router"),b=require("@ant-design/icons-vue"),i=require("@vueuse/core"),w=require("../../store/modules/NavTab.cjs.js"),T=require("../../store/modules/Settings.cjs.js"),C=require("pinia"),k={class:"ditari-show-layout"},x={key:0,class:"ditari-show-footer"},N={name:"DShowLayout"},q=e.defineComponent({...N,props:{close:{type:Boolean,default:!1},loading:{type:Boolean,default:!1}},setup(s,{expose:c}){const n=s,o=l.useRouter(),r=l.useRoute(),u=e.useSlots(),a=w.useNavTabsStore(),d=T.useSettingsStore(),{refresh:p}=C.storeToRefs(d),f={padding:`10px 10px ${u.footer?"70px":"10px"} 10px`},h=()=>{n.close&&a.deleteTabs(r.path),o.go(-1)},g=()=>{p.value=!0,a.deleteTabs(r.path),o.go(-1)},{y:S}=i.useWindowScroll(),m=i.useScrollLock(document.body);e.watch(()=>n.loading,t=>{m.value=t});const v=200;return c({refresh:g}),(t,B)=>{const _=e.resolveComponent("a-page-header"),y=e.resolveComponent("a-spin");return e.openBlock(),e.createElementBlock("div",k,[e.createVNode(y,{tip:"正在处理...",spinning:s.loading,delay:v,size:"large"},{default:e.withCtx(()=>[e.createVNode(_,{class:e.normalizeClass(["ditari-page-header",{active:e.unref(S)>0}]),ghost:!1,onBack:h},{backIcon:e.withCtx(()=>[e.createVNode(e.unref(b.LeftOutlined))]),title:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(t.$route.meta.title),1)]),subTitle:e.withCtx(()=>[e.renderSlot(t.$slots,"subTitle")]),extra:e.withCtx(()=>[e.renderSlot(t.$slots,"extra")]),_:3},8,["class"]),e.createElementVNode("div",{class:"ditari-show-content",style:f},[e.renderSlot(t.$slots,"default")]),t.$slots.footer?(e.openBlock(),e.createElementBlock("div",x,[e.renderSlot(t.$slots,"footer")])):e.createCommentVNode("",!0)]),_:3},8,["spinning"])])}}});exports.default=q;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),a=require("vue-router"),b=require("@ant-design/icons-vue"),l=require("@vueuse/core"),T=require("../../store/modules/NavTab.cjs.js"),C=require("../../store/modules/Settings.cjs.js"),k=require("pinia"),x={class:"ditari-show-layout"},N={key:0,class:"ditari-show-footer"},q={name:"DShowLayout"},B=e.defineComponent({...q,props:{close:{type:Boolean,default:!1},loading:{type:Boolean,default:!1}},setup(c,{expose:i}){const o=c,s=a.useRouter(),n=a.useRoute(),u=e.useSlots(),r=T.useNavTabsStore(),d=C.useSettingsStore(),{refresh:p}=k.storeToRefs(d),f=e.computed(()=>o.loading),g={padding:`10px 10px ${u.footer?"70px":"10px"} 10px`},h=()=>{o.close&&r.deleteTabs(n.path),s.go(-1)},m=()=>{p.value=!0,r.deleteTabs(n.path),s.go(-1)},{y:S}=l.useWindowScroll(),_=l.useScrollLock(document.body);e.watch(()=>o.loading,t=>{_.value=t});const v=200;return i({closePage:m}),(t,V)=>{const y=e.resolveComponent("a-page-header"),w=e.resolveComponent("a-spin");return e.openBlock(),e.createElementBlock("div",x,[e.createVNode(w,{tip:"正在处理...",spinning:e.unref(f),delay:v,size:"large"},{default:e.withCtx(()=>[e.createVNode(y,{class:e.normalizeClass(["ditari-page-header",{active:e.unref(S)>0}]),ghost:!1,onBack:h},{backIcon:e.withCtx(()=>[e.createVNode(e.unref(b.LeftOutlined))]),title:e.withCtx(()=>[e.createTextVNode(e.toDisplayString(t.$route.meta.title),1)]),subTitle:e.withCtx(()=>[e.renderSlot(t.$slots,"subTitle")]),extra:e.withCtx(()=>[e.renderSlot(t.$slots,"extra")]),_:3},8,["class"]),e.createElementVNode("div",{class:"ditari-show-content",style:g},[e.renderSlot(t.$slots,"default")]),t.$slots.footer?(e.openBlock(),e.createElementBlock("div",N,[e.renderSlot(t.$slots,"footer")])):e.createCommentVNode("",!0)]),_:3},8,["spinning"])])}}});exports.default=B;

package/dist/cjs/components/layout/Show.vue.d.ts

@@ -11,7 +11,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: boolean;
     };
 }, {
-    refresh: () => void;
+    closePage: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     close: {
         type: __PropType<boolean | undefined>;

package/dist/cjs/components/layout/index.d.ts

@@ -15,7 +15,7 @@ export declare const DShow: import("../../utils/install").SFCWithInstall<import(
         default: boolean;
     };
 }, {
-    refresh: () => void;
+    closePage: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     close: {
         type: import("vue").PropType<boolean | undefined>;

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

@@ -35,7 +35,7 @@ const j = { class: "ditari-nav" }, G = /* @__PURE__ */ C("div", { class: "tab-di
         });
       }
     }, S = (t, e) => {
-      const s = o.value.filter((i) => i.fullPath === e)[0];
+      const s = o.value.find((i) => i.fullPath === e);
       t.stopPropagation(), c.deleteTabs(e), v.push(o.value[o.value.length - 1].fullPath), s.name && m.deleteKeepAlive(s.name);
     }, g = (t) => {
       var e;

package/dist/esm/components/layout/Show.vue.d.ts

@@ -11,7 +11,7 @@ declare const _sfc_main: import("vue").DefineComponent<{
         default: boolean;
     };
 }, {
-    refresh: () => void;
+    closePage: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     close: {
         type: __PropType<boolean | undefined>;

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

@@ -1,58 +1,58 @@
-import { defineComponent as $, useSlots as x, watch as B, resolveComponent as c, openBlock as d, createElementBlock as p, createVNode as a, withCtx as o, normalizeClass as C, unref as u, createTextVNode as N, toDisplayString as L, renderSlot as t, createElementVNode as R, createCommentVNode as V } from "vue";
-import { useRouter as z, useRoute as D } from "vue-router";
-import { LeftOutlined as E } from "@ant-design/icons-vue";
-import { useWindowScroll as I, useScrollLock as O } from "@vueuse/core";
-import { useNavTabsStore as W } from "../../store/modules/NavTab.esm.js";
-import { useSettingsStore as j } from "../../store/modules/Settings.esm.js";
-import { storeToRefs as q } from "pinia";
-const A = { class: "ditari-show-layout" }, F = {
+import { defineComponent as x, useSlots as B, computed as C, watch as L, resolveComponent as c, openBlock as d, createElementBlock as p, createVNode as n, unref as r, withCtx as o, normalizeClass as N, createTextVNode as R, toDisplayString as V, renderSlot as t, createElementVNode as z, createCommentVNode as D } from "vue";
+import { useRouter as E, useRoute as I } from "vue-router";
+import { LeftOutlined as O } from "@ant-design/icons-vue";
+import { useWindowScroll as P, useScrollLock as W } from "@vueuse/core";
+import { useNavTabsStore as j } from "../../store/modules/NavTab.esm.js";
+import { useSettingsStore as q } from "../../store/modules/Settings.esm.js";
+import { storeToRefs as A } from "pinia";
+const F = { class: "ditari-show-layout" }, G = {
   key: 0,
   class: "ditari-show-footer"
-}, G = {
+}, H = {
   name: "DShowLayout"
-}, Y = /* @__PURE__ */ $({
-  ...G,
+}, ee = /* @__PURE__ */ x({
+  ...H,
   props: {
     close: { type: Boolean, default: !1 },
     loading: { type: Boolean, default: !1 }
   },
-  setup(n, { expose: f }) {
-    const r = n, s = z(), l = D(), m = x(), i = W(), h = j(), { refresh: g } = q(h), _ = {
-      padding: `10px 10px ${m.footer ? "70px" : "10px"} 10px`
-    }, y = () => {
-      r.close && i.deleteTabs(l.path), s.go(-1);
+  setup(u, { expose: m }) {
+    const s = u, a = E(), l = I(), f = B(), i = j(), g = q(), { refresh: h } = A(g), _ = C(() => s.loading), y = {
+      padding: `10px 10px ${f.footer ? "70px" : "10px"} 10px`
     }, S = () => {
-      g.value = !0, i.deleteTabs(l.path), s.go(-1);
-    }, { y: v } = I(), T = O(document.body);
-    B(
-      () => r.loading,
+      s.close && i.deleteTabs(l.path), a.go(-1);
+    }, v = () => {
+      h.value = !0, i.deleteTabs(l.path), a.go(-1);
+    }, { y: T } = P(), b = W(document.body);
+    L(
+      () => s.loading,
       (e) => {
-        T.value = e;
+        b.value = e;
       }
     );
-    const b = 200;
-    return f({
-      refresh: S
-    }), (e, H) => {
-      const k = c("a-page-header"), w = c("a-spin");
-      return d(), p("div", A, [
-        a(w, {
+    const w = 200;
+    return m({
+      closePage: v
+    }), (e, J) => {
+      const k = c("a-page-header"), $ = c("a-spin");
+      return d(), p("div", F, [
+        n($, {
           tip: "正在处理...",
-          spinning: n.loading,
-          delay: b,
+          spinning: r(_),
+          delay: w,
           size: "large"
         }, {
           default: o(() => [
-            a(k, {
-              class: C(["ditari-page-header", { active: u(v) > 0 }]),
+            n(k, {
+              class: N(["ditari-page-header", { active: r(T) > 0 }]),
               ghost: !1,
-              onBack: y
+              onBack: S
             }, {
               backIcon: o(() => [
-                a(u(E))
+                n(r(O))
               ]),
               title: o(() => [
-                N(L(e.$route.meta.title), 1)
+                R(V(e.$route.meta.title), 1)
               ]),
               subTitle: o(() => [
                 t(e.$slots, "subTitle")
@@ -62,15 +62,15 @@ const A = { class: "ditari-show-layout" }, F = {
               ]),
               _: 3
             }, 8, ["class"]),
-            R("div", {
+            z("div", {
               class: "ditari-show-content",
-              style: _
+              style: y
             }, [
               t(e.$slots, "default")
             ]),
-            e.$slots.footer ? (d(), p("div", F, [
+            e.$slots.footer ? (d(), p("div", G, [
               t(e.$slots, "footer")
-            ])) : V("", !0)
+            ])) : D("", !0)
           ]),
           _: 3
         }, 8, ["spinning"])
@@ -79,5 +79,5 @@ const A = { class: "ditari-show-layout" }, F = {
   }
 });
 export {
-  Y as default
+  ee as default
 };

package/dist/esm/components/layout/index.d.ts

@@ -15,7 +15,7 @@ export declare const DShow: import("../../utils/install").SFCWithInstall<import(
         default: boolean;
     };
 }, {
-    refresh: () => void;
+    closePage: () => void;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     close: {
         type: import("vue").PropType<boolean | undefined>;

package/dist/style/layout/style/show.scss

@@ -15,7 +15,7 @@
   }
   .ditari-page-header {
     position: sticky;
-    top: 84px;
+    top: $show-header-top;
     z-index: 10;
     padding: 4px 24px;
     transition: all 0.3s;

package/dist/style/theme/variable.scss

@@ -17,8 +17,7 @@ $grid-input-border-width: 2px !default;
 $gird-border-width: 1px !default;
 // 网格里的输入框校验结果是否显示
 $gird-error-display: block !default;
-// show头部阴影
-$box-shadow-color: #e0e0e0 !default;
+
 
 /******======左侧菜单======******/
 // 左侧菜单
@@ -37,3 +36,9 @@ $nav-tab-dividers-color: #fff !default;
 $nav-tab-text-color: #fff !default;
 // 悬浮的背景色
 $nav-tab-hover-bg-color: #065de1 !default;
+
+
+/******======详情页，返回导航距离======******/
+$show-header-top: 84px!default;
+// show头部阴影
+$box-shadow-color: #e0e0e0 !default;

package/package.json

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

package/src/components/layout/NavTabs.vue

@@ -21,6 +21,7 @@ const menuStore = useMenuStore();
 
 //标签列表
 const navTabs: Ref<INavTab[]> = computed(() => navStore.getList);
+// 被选中的菜单
 const { selectedMenuKeys } = storeToRefs(menuStore);
 //当前被激活的标签 通过选中的菜单得到
 const activeKey = ref("");
@@ -72,7 +73,7 @@ const onClick = (key: string) => {
  * @param targetKey
  */
 const onClose = ($event: any, key: string) => {
-  const rs = navTabs.value.filter((item) => item.fullPath === key)[0];
+  const rs = navTabs.value.find((item) => item.fullPath === key) as INavTab;
   //阻止冒泡
   $event.stopPropagation();
   // 删除标签
@@ -87,7 +88,7 @@ const onClose = ($event: any, key: string) => {
 };
 
 /**
- * 标签关闭 状态函数
+ * 是否显示标签关闭按钮函数
  * @param item
  * 根据item和当前 navTabs 长度来判断是否要隐藏关闭标签按钮
  */

package/src/components/layout/Show.vue

@@ -2,7 +2,7 @@
 /**
  * 详情/新增/编辑组件
  */
-import { useSlots, watch } from "vue";
+import { computed, useSlots, watch } from "vue";
 import { useRoute, useRouter } from "vue-router";
 import { LeftOutlined } from "@ant-design/icons-vue";
 import { useScrollLock, useWindowScroll } from "@vueuse/core";
@@ -32,6 +32,8 @@ const settingsStore = useSettingsStore();
 
 const { refresh } = storeToRefs(settingsStore);
 
+const showLoading = computed(() => props.loading);
+
 const contentStyle = {
   padding: `10px 10px ${slots.footer ? "70px" : "10px"} 10px`
 };
@@ -74,7 +76,7 @@ watch(
 
 const delayTime = 200;
 defineExpose({
-  refresh: onRefresh
+  closePage: onRefresh
 });
 </script>
 <script lang="ts">
@@ -86,7 +88,7 @@ export default {
   <div class="ditari-show-layout">
     <a-spin
       tip="正在处理..."
-      :spinning="loading"
+      :spinning="showLoading"
       :delay="delayTime"
       size="large"
     >

package/src/components/layout/style/show.scss

@@ -15,7 +15,7 @@
   }
   .ditari-page-header {
     position: sticky;
-    top: 84px;
+    top: $show-header-top;
     z-index: 10;
     padding: 4px 24px;
     transition: all 0.3s;

package/src/components/theme/variable.scss

@@ -17,8 +17,7 @@ $grid-input-border-width: 2px !default;
 $gird-border-width: 1px !default;
 // 网格里的输入框校验结果是否显示
 $gird-error-display: block !default;
-// show头部阴影
-$box-shadow-color: #e0e0e0 !default;
+
 
 /******======左侧菜单======******/
 // 左侧菜单
@@ -37,3 +36,9 @@ $nav-tab-dividers-color: #fff !default;
 $nav-tab-text-color: #fff !default;
 // 悬浮的背景色
 $nav-tab-hover-bg-color: #065de1 !default;
+
+
+/******======详情页，返回导航距离======******/
+$show-header-top: 84px!default;
+// show头部阴影
+$box-shadow-color: #e0e0e0 !default;