@ditari/bsui 1.0.67 → 1.0.69

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

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),g=require("../../store/modules/Settings.cjs.js"),y=require("pinia"),w=require("vue-router"),N={class:"ditari-list-layout"},V={ref:"contentRef",class:"wrapper"},C={style:{height:"100%"}},b={class:"ditari-content-extra"},x={name:"DListLayout"},E=e.defineComponent({...x,emits:["refresh"],setup(R,{emit:u}){const l=e.useSlots(),v=g.useSettingsStore(),h=w.useRoute(),n=e.inject("configProvider"),{refresh:a}=y.storeToRefs(v),_=e.ref(),o=e.ref(),f=16,s=e.ref(!1),i=e.ref(0);let r;e.nextTick(()=>{setTimeout(()=>{var t;i.value=(t=o==null?void 0:o.value)==null?void 0:t.offsetHeight,s.value=!0},1)}),e.watch(()=>n==null?void 0:n.componentSize,t=>{s.value=!1,setTimeout(()=>{var c;i.value=(c=o==null?void 0:o.value)==null?void 0:c.offsetHeight,s.value=!0},100)}),p();function p(){h.name?(e.onActivated(()=>{a.value&&(a.value=!1,u("refresh")),r=d()}),e.onDeactivated(()=>{r()})):(r=d(),e.onUnmounted(()=>{r()}))}function d(){return e.watch(()=>a.value,t=>{t&&u("refresh")})}return(t,c)=>{const m=e.resolveComponent("a-card"),S=e.resolveComponent("a-space");return e.openBlock(),e.createElementBlock("div",N,[e.createElementVNode("div",V,[e.createVNode(m,{ref:"formRef",bordered:!1,class:e.normalizeClass({"ditari-list-form":e.unref(l).form}),style:e.normalizeStyle({"margin-bottom":e.unref(l).form?f+"px":0})},{default:e.withCtx(()=>[e.renderSlot(t.$slots,"form")]),_:3},8,["class","style"]),e.createVNode(m,{class:"ditari-list-table",bordered:!1},{default:e.withCtx(()=>[e.createElementVNode("div",{ref_key:"toolsRef",ref:_,class:"xi-tools",style:e.normalizeStyle({"margin-bottom":e.unref(l).tools?f+"px":0})},[e.createVNode(S,null,{default:e.withCtx(()=>[e.renderSlot(t.$slots,"tools")]),_:3})],4),e.createElementVNode("div",{ref_key:"tableRef",ref:o,style:{flex:"1"}},[e.withDirectives(e.createElementVNode("div",C,[e.renderSlot(t.$slots,"table",{height:i.value})],512),[[e.vShow,s.value]])],512)]),_:3})],512),e.createElementVNode("div",b,[e.renderSlot(t.$slots,"default")])])}}});exports.default=E;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),w=require("@vueuse/core"),N=require("../../store/modules/Settings.cjs.js"),V=require("pinia"),C=require("vue-router"),E={class:"ditari-list-layout"},R={ref:"contentRef",class:"wrapper"},b={style:{height:"100%"}},k={class:"ditari-content-extra"},q={name:"DListLayout"},x=e.defineComponent({...q,emits:["refresh"],setup(z,{emit:u}){const n=e.useSlots(),h=N.useSettingsStore(),_=C.useRoute(),a=e.inject("configProvider"),{refresh:i}=V.storeToRefs(h),p=e.ref(),o=e.ref(),f=16,r=e.ref(!1),c=e.ref(0);let l;e.watch(()=>a==null?void 0:a.componentSize,t=>{r.value=!1,setTimeout(()=>{var s;c.value=(s=o==null?void 0:o.value)==null?void 0:s.offsetHeight,r.value=!0},100)}),S();function S(){_.name?(e.onActivated(()=>{i.value&&(i.value=!1,u("refresh")),l=d()}),e.onDeactivated(()=>{l()})):(l=d(),e.onUnmounted(()=>{l()}))}function d(){return e.watch(()=>i.value,t=>{t&&u("refresh")})}const m=e.ref(null),{height:g}=w.useElementSize(m);return e.watch(()=>g.value,t=>{r.value=!1,setTimeout(()=>{var s;c.value=(s=o==null?void 0:o.value)==null?void 0:s.offsetHeight,r.value=!0},10)}),(t,s)=>{const v=e.resolveComponent("a-card"),y=e.resolveComponent("a-space");return e.openBlock(),e.createElementBlock("div",E,[e.createElementVNode("div",R,[e.createVNode(v,{ref_key:"formRef",ref:m,bordered:!1,class:e.normalizeClass({"ditari-list-form":e.unref(n).form}),style:e.normalizeStyle({"margin-bottom":e.unref(n).form?f+"px":0})},{default:e.withCtx(()=>[e.renderSlot(t.$slots,"form")]),_:3},8,["class","style"]),e.createVNode(v,{class:"ditari-list-table",bordered:!1},{default:e.withCtx(()=>[e.createElementVNode("div",{ref_key:"toolsRef",ref:p,class:"xi-tools",style:e.normalizeStyle({"margin-bottom":e.unref(n).tools?f+"px":0})},[e.createVNode(y,null,{default:e.withCtx(()=>[e.renderSlot(t.$slots,"tools")]),_:3})],4),e.createElementVNode("div",{ref_key:"tableRef",ref:o,style:{flex:"1"}},[e.withDirectives(e.createElementVNode("div",b,[e.renderSlot(t.$slots,"table",{height:c.value})],512),[[e.vShow,r.value]])],512)]),_:3})],512),e.createElementVNode("div",k,[e.renderSlot(t.$slots,"default")])])}}});exports.default=x;

package/dist/cjs/components/table/Table.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from "vue";
-import type { Key, Config } from "./interface/table";
+import type { Key } from "./interface/table";
 /**
  * 表格组件定义
  */
@@ -26,7 +26,7 @@ declare const DXTable: import("vue").DefineComponent<{
         default: () => {};
     };
     config: {
-        type: PropType<Config>;
+        type: PropType<import("./interface/table").Config>;
         default: () => {};
     };
     expandedRowKeys: {
@@ -58,7 +58,7 @@ declare const DXTable: import("vue").DefineComponent<{
         default: () => {};
     };
     config: {
-        type: PropType<Config>;
+        type: PropType<import("./interface/table").Config>;
         default: () => {};
     };
     expandedRowKeys: {
@@ -74,7 +74,7 @@ declare const DXTable: import("vue").DefineComponent<{
     loading: false | undefined;
     rowKey: string;
     pagination: any;
-    config: Config;
+    config: import("./interface/table").Config;
     expandedRowKeys: string[] | undefined;
 }>;
 export default DXTable;

package/dist/cjs/hooks/http/index.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),q=require("vue-request"),f=require("../../utils/get.cjs.js"),z=(i,e={})=>{e.pagination||(e.pagination={currentKey:"page",pageSizeKey:"limit",totalKey:"data.total"}),e.manual===void 0&&(e.manual=!0);const{dataKey:o,pagination:{currentKey:r,pageSizeKey:c}}=e,a=e.params||n.ref({}),{total:s,pageSize:g,current:v,loading:d,data:m,run:u}=q.usePagination(i,{manual:!0,pagination:e.pagination,loadingDelay:400,loadingKeep:100,onSuccess:(t,l)=>{e.onSuccess&&e.onSuccess(t,l)},onError:(t,l)=>{console.log(l,t)}}),y=n.computed(()=>({total:s.value,current:v.value,pageSize:g.value})),S=n.computed(()=>f.get(m.value,o||"data",[])||[]),p=t=>{a.value[r]=t.page,a.value[c]=t.size,u(a.value||{})},K=t=>{a.value={...a.value,...t},a.value[r]=1,u(a.value||{})};return n.onMounted(()=>{e.manual&&u(a.value)}),{data:S,pagination:y,loading:d,run:u,onPageChange:p,onQuery:K}};exports.useRequestList=z;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("vue"),f=require("vue-request"),q=require("../../utils/get.cjs.js"),z=(c,e={})=>{e.pagination||(e.pagination={currentKey:"page",pageSizeKey:"limit",totalKey:"data.total"}),e.manual===void 0&&(e.manual=!0);const{dataKey:o,pagination:{currentKey:r,pageSizeKey:s}}=e,a=e.params||n.ref({}),{total:g,pageSize:v,current:d,loading:i,data:m,run:u}=f.usePagination(c,{manual:!0,pagination:e.pagination,loadingDelay:400,loadingKeep:100,onSuccess:(t,l)=>{e.onSuccess&&e.onSuccess(t,l)},onError:(t,l)=>{console.warn(l,t),i.value=!1}}),y=n.computed(()=>({total:g.value,current:d.value,pageSize:v.value})),S=n.computed(()=>q.get(m.value,o||"data",[])||[]),p=t=>{a.value[r]=t.page,a.value[s]=t.size,u(a.value||{})},K=t=>{a.value={...a.value,...t},a.value[r]=1,u(a.value||{})};return n.onMounted(()=>{e.manual&&u(a.value)}),{data:S,pagination:y,loading:i,run:u,onPageChange:p,onQuery:K}};exports.useRequestList=z;

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

@@ -1,104 +1,110 @@
-import { defineComponent as T, useSlots as $, inject as z, ref as l, nextTick as B, watch as g, onUnmounted as D, onActivated as H, onDeactivated as E, resolveComponent as S, openBlock as L, createElementBlock as N, createElementVNode as o, createVNode as d, normalizeClass as V, unref as m, normalizeStyle as w, withCtx as _, renderSlot as r, withDirectives as W, vShow as j } from "vue";
-import { useSettingsStore as A } from "../../store/modules/Settings.esm.js";
-import { storeToRefs as U } from "pinia";
-import { useRoute as q } from "vue-router";
-const F = { class: "ditari-list-layout" }, G = {
+import { defineComponent as $, useSlots as B, inject as D, ref as l, watch as m, onUnmounted as E, onActivated as T, onDeactivated as L, resolveComponent as w, openBlock as N, createElementBlock as V, createElementVNode as a, createVNode as d, normalizeClass as W, unref as h, normalizeStyle as R, withCtx as v, renderSlot as n, withDirectives as j, vShow as A } from "vue";
+import { useElementSize as U } from "@vueuse/core";
+import { useSettingsStore as q } from "../../store/modules/Settings.esm.js";
+import { storeToRefs as F } from "pinia";
+import { useRoute as G } from "vue-router";
+const I = { class: "ditari-list-layout" }, J = {
   ref: "contentRef",
   class: "wrapper"
-}, I = { style: { height: "100%" } }, J = { class: "ditari-content-extra" }, K = {
+}, K = { style: { height: "100%" } }, M = { class: "ditari-content-extra" }, O = {
   name: "DListLayout"
-}, Y = /* @__PURE__ */ T({
-  ...K,
+}, te = /* @__PURE__ */ $({
+  ...O,
   emits: ["refresh"],
-  setup(M, { emit: h }) {
-    const n = $(), k = A(), x = q(), i = z("configProvider"), { refresh: c } = U(k), R = l(), t = l(), v = 16, s = l(!1), f = l(0);
-    let a;
-    B(() => {
-      setTimeout(() => {
-        var e;
-        f.value = (e = t == null ? void 0 : t.value) == null ? void 0 : e.offsetHeight, s.value = !0;
-      }, 1);
-    }), g(
-      () => i == null ? void 0 : i.componentSize,
+  setup(P, { emit: _ }) {
+    const i = B(), k = q(), b = G(), f = D("configProvider"), { refresh: c } = F(k), x = l(), t = l(), p = 16, s = l(!1), u = l(0);
+    let r;
+    m(
+      () => f == null ? void 0 : f.componentSize,
       (e) => {
         s.value = !1, setTimeout(() => {
-          var u;
-          f.value = (u = t == null ? void 0 : t.value) == null ? void 0 : u.offsetHeight, s.value = !0;
+          var o;
+          u.value = (o = t == null ? void 0 : t.value) == null ? void 0 : o.offsetHeight, s.value = !0;
         }, 100);
       }
-    ), b();
-    function b() {
-      x.name ? (H(() => {
-        c.value && (c.value = !1, h("refresh")), a = p();
-      }), E(() => {
-        a();
-      })) : (a = p(), D(() => {
-        a();
+    ), z();
+    function z() {
+      b.name ? (T(() => {
+        c.value && (c.value = !1, _("refresh")), r = g();
+      }), L(() => {
+        r();
+      })) : (r = g(), E(() => {
+        r();
       }));
     }
-    function p() {
-      return g(
+    function g() {
+      return m(
         () => c.value,
         (e) => {
-          e && h("refresh");
+          e && _("refresh");
         }
       );
     }
-    return (e, u) => {
-      const y = S("a-card"), C = S("a-space");
-      return L(), N("div", F, [
-        o("div", G, [
-          d(y, {
-            ref: "formRef",
+    const y = l(null), { height: C } = U(y);
+    return m(
+      () => C.value,
+      (e) => {
+        s.value = !1, setTimeout(() => {
+          var o;
+          u.value = (o = t == null ? void 0 : t.value) == null ? void 0 : o.offsetHeight, s.value = !0;
+        }, 10);
+      }
+    ), (e, o) => {
+      const S = w("a-card"), H = w("a-space");
+      return N(), V("div", I, [
+        a("div", J, [
+          d(S, {
+            ref_key: "formRef",
+            ref: y,
             bordered: !1,
-            class: V({ "ditari-list-form": m(n).form }),
-            style: w({ "margin-bottom": m(n).form ? v + "px" : 0 })
+            class: W({ "ditari-list-form": h(i).form }),
+            style: R({ "margin-bottom": h(i).form ? p + "px" : 0 })
           }, {
-            default: _(() => [
-              r(e.$slots, "form")
+            default: v(() => [
+              n(e.$slots, "form")
             ]),
             _: 3
           }, 8, ["class", "style"]),
-          d(y, {
+          d(S, {
             class: "ditari-list-table",
             bordered: !1
           }, {
-            default: _(() => [
-              o("div", {
+            default: v(() => [
+              a("div", {
                 ref_key: "toolsRef",
-                ref: R,
+                ref: x,
                 class: "xi-tools",
-                style: w({ "margin-bottom": m(n).tools ? v + "px" : 0 })
+                style: R({ "margin-bottom": h(i).tools ? p + "px" : 0 })
               }, [
-                d(C, null, {
-                  default: _(() => [
-                    r(e.$slots, "tools")
+                d(H, null, {
+                  default: v(() => [
+                    n(e.$slots, "tools")
                   ]),
                   _: 3
                 })
               ], 4),
-              o("div", {
+              a("div", {
                 ref_key: "tableRef",
                 ref: t,
                 style: { flex: "1" }
               }, [
-                W(o("div", I, [
-                  r(e.$slots, "table", { height: f.value })
+                j(a("div", K, [
+                  n(e.$slots, "table", { height: u.value })
                 ], 512), [
-                  [j, s.value]
+                  [A, s.value]
                 ])
               ], 512)
             ]),
             _: 3
           })
         ], 512),
-        o("div", J, [
-          r(e.$slots, "default")
+        a("div", M, [
+          n(e.$slots, "default")
         ])
       ]);
     };
   }
 });
 export {
-  Y as default
+  te as default
 };

package/dist/esm/components/table/Table.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from "vue";
-import type { Key, Config } from "./interface/table";
+import type { Key } from "./interface/table";
 /**
  * 表格组件定义
  */
@@ -26,7 +26,7 @@ declare const DXTable: import("vue").DefineComponent<{
         default: () => {};
     };
     config: {
-        type: PropType<Config>;
+        type: PropType<import("./interface/table").Config>;
         default: () => {};
     };
     expandedRowKeys: {
@@ -58,7 +58,7 @@ declare const DXTable: import("vue").DefineComponent<{
         default: () => {};
     };
     config: {
-        type: PropType<Config>;
+        type: PropType<import("./interface/table").Config>;
         default: () => {};
     };
     expandedRowKeys: {
@@ -74,7 +74,7 @@ declare const DXTable: import("vue").DefineComponent<{
     loading: false | undefined;
     rowKey: string;
     pagination: any;
-    config: Config;
+    config: import("./interface/table").Config;
     expandedRowKeys: string[] | undefined;
 }>;
 export default DXTable;

package/dist/esm/hooks/http/index.esm.js

@@ -1,23 +1,23 @@
-import { ref as S, computed as r, onMounted as z } from "vue";
+import { ref as S, computed as o, onMounted as z } from "vue";
 import { usePagination as D } from "vue-request";
 import { get as P } from "../../utils/get.esm.js";
-const C = (o, a = {}) => {
+const x = (i, a = {}) => {
   a.pagination || (a.pagination = {
     currentKey: "page",
     pageSizeKey: "limit",
     totalKey: "data.total"
   }), a.manual === void 0 && (a.manual = !0);
   const {
-    dataKey: i,
-    pagination: { currentKey: l, pageSizeKey: c }
+    dataKey: c,
+    pagination: { currentKey: l, pageSizeKey: g }
   } = a, e = a.params || S({}), {
-    total: g,
-    pageSize: m,
-    current: s,
-    loading: v,
+    total: s,
+    pageSize: v,
+    current: m,
+    loading: r,
     data: d,
     run: n
-  } = D(o, {
+  } = D(i, {
     manual: !0,
     pagination: a.pagination,
     loadingDelay: 400,
@@ -26,30 +26,30 @@ const C = (o, a = {}) => {
       a.onSuccess && a.onSuccess(t, u);
     },
     onError: (t, u) => {
-      console.log(u, t);
+      console.warn(u, t), r.value = !1;
     }
-  }), p = r(() => ({
-    total: g.value,
-    current: s.value,
-    pageSize: m.value
-  })), y = r(
-    () => P(d.value, i || "data", []) || []
-  ), f = (t) => {
-    e.value[l] = t.page, e.value[c] = t.size, n(e.value || {});
+  }), p = o(() => ({
+    total: s.value,
+    current: m.value,
+    pageSize: v.value
+  })), f = o(
+    () => P(d.value, c || "data", []) || []
+  ), y = (t) => {
+    e.value[l] = t.page, e.value[g] = t.size, n(e.value || {});
   }, K = (t) => {
     e.value = { ...e.value, ...t }, e.value[l] = 1, n(e.value || {});
   };
   return z(() => {
     a.manual && n(e.value);
   }), {
-    data: y,
+    data: f,
     pagination: p,
-    loading: v,
+    loading: r,
     run: n,
-    onPageChange: f,
+    onPageChange: y,
     onQuery: K
   };
 };
 export {
-  C as useRequestList
+  x as useRequestList
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditari/bsui",
-  "version": "1.0.67",
+  "version": "1.0.69",
   "files": [
     "dist/**",
     "src"
@@ -11,22 +11,22 @@
   },
   "main": "dist/cjs/components/index.cjs.js",
   "module": "dist/esm/components/index.esm.js",
-  "types": "dist/**/*.d.ts",
+  "typings": "dist/**/*.d.ts",
   "exports": {
     ".": {
       "require": "./dist/cjs/components/index.cjs.js",
       "import": "./dist/esm/components/index.esm.js",
-      "types": "./dist/esm/components/index.d.ts"
+      "typings": "./dist/esm/components/index.d.ts"
     },
     "./store": {
       "require": "./dist/cjs/store/index.cjs.js",
       "import": "./dist/esm/store/index.esm.js",
-      "types": "./dist/esm/store/index.d.ts"
+      "typings": "./dist/esm/store/index.d.ts"
     },
     "./hooks": {
       "require": "./dist/cjs/hooks/index.cjs.js",
       "import": "./dist/esm/hooks/index.esm.js",
-      "types": "./dist/esm/hooks/index.d.ts"
+      "typings": "./dist/esm/hooks/index.d.ts"
     },
     "./css/*": "./dist/css/*",
     "./theme/*": "./dist/style/*"

package/src/components/layout/FuckMain.vue

@@ -8,8 +8,6 @@ import { useKeepAliveStore, useSettingsStore } from "../../store";
 
 //标签页组件
 import DNavTabs from "./NavTabs.vue";
-//面包屑组件
-import DBreadcrumb from "./Breadcrumb.vue";
 // 菜单组件
 import Menu from "../menu/Menu";
 

package/src/components/layout/List.vue

@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { useElementSize } from "@vueuse/core";
+
 import {
   useSlots,
   ref,
@@ -35,12 +37,12 @@ const height = ref(0);
 
 let stopHandleWatch: WatchStopHandle;
 
-nextTick(() => {
-  setTimeout(() => {
-    height.value = tableRef?.value?.offsetHeight;
-    show.value = true;
-  }, 1);
-});
+// nextTick(() => {
+//   setTimeout(() => {
+//     height.value = tableRef?.value?.offsetHeight;
+//     show.value = true;
+//   }, 1);
+// });
 
 watch(
   () => configProvider?.componentSize,
@@ -91,6 +93,21 @@ function useWatch() {
     }
   );
 }
+
+// 监听表单高度变化
+// 然后再获取表格高度
+const formRef = ref(null);
+const { height: formHeight } = useElementSize(formRef);
+watch(
+  () => formHeight.value,
+  (val) => {
+    show.value = false;
+    setTimeout(() => {
+      height.value = tableRef?.value?.offsetHeight;
+      show.value = true;
+    }, 10);
+  }
+);
 </script>
 <script lang="ts">
 export default {
@@ -119,7 +136,7 @@ export default {
           </a-space>
         </div>
         <div ref="tableRef" style="flex: 1">
-          <div style="height: 100%" v-show="show">
+          <div v-show="show" style="height: 100%">
             <slot name="table" :height="height" />
           </div>
         </div>

package/src/components/layout/Main.vue

@@ -12,7 +12,6 @@ import DNavTabs from "./NavTabs.vue";
 import DBreadcrumb from "./Breadcrumb.vue";
 // 菜单组件
 import Menu from "../menu/Menu";
-import CollapsedMenu from "../menu/CollapsedMenu.vue";
 
 interface Props {
   showConfig?: ShowConfig;
@@ -59,7 +58,6 @@ export default {
         </div>
         <div class="ditari-menu">
           <Menu  />
-
         </div>
       </div>
     </a-layout-sider>

package/src/components/table/Table.tsx

@@ -1,19 +1,17 @@
 import {
   computed,
-  createVNode,
   defineComponent,
   nextTick,
   PropType,
-  reactive,
   ref,
   watch,
   watchEffect
 } from "vue";
-import { Pagination, Space, Table, Card } from "ant-design-vue";
+import { Pagination, Space, Table } from "ant-design-vue";
 import { useEleHeight } from "../../utils/html";
 import { prefixName } from "../theme";
 
-import type { TableProps, Key, Config } from "./interface/table";
+import type { TableProps, Key } from "./interface/table";
 /**
  * 表格组件 基于TSX封装ATable
  */
@@ -80,11 +78,6 @@ const paginationConfig = {
 //分页class名称
 const basePageClassName = `${prefixName}-pagination`;
 
-const configDefault: Config = {
-  selection: "N",
-  bordered: true
-};
-
 /**
  * 表格组件定义
  */
@@ -383,6 +376,7 @@ const DXTable = defineComponent({
     const summary = () => {
       return <>{slots.summary && slots.summary()}</>;
     };
+
     return () => (
       <div ref={tableRootRef} style={{ height: "100%" }}>
         <Table

package/src/hooks/http/index.ts

@@ -56,7 +56,8 @@ const useRequestList = (service: any, options: Options = {}) => {
     },
     onError: (error: Error, params: any) => {
       //错误处理
-      console.log(params, error);
+      console.warn(params, error);
+      loading.value = false;
     }
   });