@ditari/bsui 1.0.72 → 1.0.74

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

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

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

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

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

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

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

package/package.json

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

package/src/components/layout/List.vue

@@ -1,10 +1,7 @@
 <script setup lang="ts">
-import { useElementSize } from "@vueuse/core";
-
 import {
   useSlots,
   ref,
-  nextTick,
   onActivated,
   watch,
   onDeactivated,
@@ -12,6 +9,7 @@ import {
   WatchStopHandle,
   inject
 } from "vue";
+import { useElementSize, useResizeObserver } from "@vueuse/core";
 import { useSettingsStore } from "../../store/modules/Settings";
 import { storeToRefs } from "pinia";
 import { useRoute } from "vue-router";
@@ -37,21 +35,10 @@ const height = ref(0);
 
 let stopHandleWatch: WatchStopHandle;
 
-// nextTick(() => {
-//   setTimeout(() => {
-//     height.value = tableRef?.value?.offsetHeight;
-//     show.value = true;
-//   }, 1);
-// });
-
 watch(
   () => configProvider?.componentSize,
   (val) => {
-    show.value = false;
-    setTimeout(() => {
-      height.value = tableRef?.value?.offsetHeight;
-      show.value = true;
-    }, 100);
+    calcHeight();
   }
 );
 
@@ -101,13 +88,22 @@ const { height: formHeight } = useElementSize(formRef);
 watch(
   () => formHeight.value,
   (val) => {
-    show.value = false;
-    setTimeout(() => {
-      height.value = tableRef?.value?.offsetHeight;
-      show.value = true;
-    }, 10);
+    calcHeight();
   }
 );
+
+useResizeObserver(document.body, () => {
+  calcHeight();
+});
+
+// 动态计算高度
+function calcHeight() {
+  show.value = false;
+  setTimeout(() => {
+    height.value = tableRef?.value?.offsetHeight;
+    show.value = true;
+  }, 300);
+}
 </script>
 <script lang="ts">
 export default {

package/src/hooks/http/index.ts

@@ -107,6 +107,7 @@ const useRequestList = (service: any, options: Options = {}) => {
     data,
     pagination,
     loading,
+    total,
     run,
     onPageChange,
     onQuery