@ditari/bsui 1.0.28 → 1.0.29

package/dist/cjs/components/table/Table.cjs.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),C=require("ant-design-vue"),N=require("../../utils/html.cjs.js"),J=require("../theme/index.cjs.js"),M=()=>({data:{type:Object,required:!0},height:{type:Number,default:300},keys:Array,rowKey:{type:String,default:"id"},loading:{type:Boolean,default:!1},pagination:{type:Object,default:()=>({})},config:{type:Object,default:()=>({})},expandedRowKeys:{type:Object,default:()=>[]}}),p={defaultPageSize:20,hideOnSinglePage:!1,pageSizeOptions:["10","20","30","40"],responsive:!0,showQuickJumper:!0,showLessItems:!0,showTotal:n=>`总共 ${n} 条`},P=`${J.prefixName}-pagination`,Q=e.defineComponent({name:"DTable",props:M(),emits:["update:keys"],setup:function(n,{emit:b,slots:h}){const a=e.ref(n.keys||[]),T=e.computed(()=>n.data),z=e.computed(()=>{var t;return((t=n.config)==null?void 0:t.columns)??[]}),m=e.computed(()=>{var t;return((t=n.config)==null?void 0:t.pagination)??{}}),S=e.ref(n.expandedRowKeys);e.watchEffect(()=>{const{expandedRowKeys:t}=n;S.value=t});const{tableRef:E,tableRootRef:K,tableHeight:O,onPageChange:V,onRowClassName:B}=H();function H(){const{rowClassName:t,keepSelected:o,onPageChange:i}=n.config,d=n.config.selection??"N",r=e.ref(),c=e.ref(null),l=e.ref(),u=e.ref(null),g=y=>{var v,k;try{const w=(v=c==null?void 0:c.value)==null?void 0:v.$el,$=N.useEleHeight(w.getElementsByClassName("ant-table-header")[0]);let x=0;if(n.config.pagination){const A=(k=r.value)==null?void 0:k.getElementsByClassName(P)[0];x=N.useEleHeight(A)??0}l.value=y-($+x),w.getElementsByClassName("ant-table-body")[0].style.height=l.value-10+"px",u.value=w.getElementsByClassName("ant-table-body")[0]}catch(w){console.warn(w)}};return e.watchEffect(()=>{n.height!==0&&e.nextTick(()=>{g(n.height)})}),{tableRef:c,tableRootRef:r,tableHeight:l,onPageChange:(y,v)=>{i&&i({page:y,size:v}),u.value.scrollTop=0,(d==="S"||!o)&&(a.value=[],b("update:keys",a.value))},onRowClassName:(y,v)=>t?t(y,v):void 0}}const j=q();function q(){const{rowKey:t,config:{getCheckboxProps:o}}=n;let i=n.config.selection??"N";const d=(l,u)=>{i==="S"?(a.value=[],a.value=u?[l[t]]:[]):a.value=u?a.value.concat(l[t]):a.value.filter(g=>g!==l[t]),b("update:keys",a.value)},r=(l,u,g)=>{const f=g.map(s=>s[t]);a.value=l?a.value.concat(f):a.value.filter(s=>!f.includes(s)),b("update:keys",a.value)};e.watch(()=>n.keys,l=>{a.value=l});const c=e.ref(void 0);return e.watchEffect(()=>{const{selection:l}=n.config;i=l,i!=="N"?c.value={selectedRowKeys:a,onSelect:d,onSelectAll:r,fixed:!0,columnTitle:i==="S"?"选择":null,columnWidth:i==="S"?60:40,getCheckboxProps:o}:c.value=void 0}),c}const D=F();function F(){return t=>{let o;const{rowKey:i,config:{click:d,dbClick:r,selection:c,getCheckboxProps:l}}=n,u=t[i],g=()=>{if(c==="N")return;a.value.some(s=>s===u)?a.value=a.value.filter(s=>s!==u):(c==="S"&&(a.value=[]),a.value.push(u)),b("update:keys",a.value)};return{onClick:()=>{const f=l?l(t):null;f&&f.value===u||(clearTimeout(o),o=setTimeout(()=>{g(),d&&d(t)},200))},onDblclick:()=>{clearTimeout(o),r&&r(t)}}}}const R=t=>{t.stopPropagation()},U=(t,o,i,d)=>e.createVNode(e.Fragment,null,[h.expandedRowRender&&h.expandedRowRender()]),_=()=>e.createVNode(e.Fragment,null,[h.summary&&h.summary()]);return()=>{var t;return e.createVNode("div",{ref:K},[e.createVNode(C.Table,{ref:E,"row-key":n.rowKey,bordered:n.config.bordered,columns:z.value,dataSource:T.value,loading:n.loading,size:((t=n.config)==null?void 0:t.size)??"small",scroll:{scrollToFirstRowOnChange:!0,x:"100%",y:O.value+"px"},expandedRowKeys:S.value,"onUpdate:expandedRowKeys":o=>S.value=o,expandRowByClick:!0,pagination:!1,customRow:D,rowSelection:j.value,rowClassName:B},{bodyCell:({column:o,record:i})=>{if(o.slot==="action")return e.createVNode("div",{onClick:R,onDblclick:R},[e.createVNode(C.Space,null,{default:()=>[h.action&&h.action(i)]})])},expandedRowRender:U,summary:_}),e.withDirectives(e.createVNode(C.Pagination,{class:[P],current:m.value.current,"onUpdate:current":o=>m.value.current=o,pageSize:m.value.pageSize,"onUpdate:pageSize":o=>m.value.pageSize=o,disabled:n.loading,"show-size-changer":!0,size:"default","hide-on-single-page":p.hideOnSinglePage,"show-quick-jumper":p.showQuickJumper,"default-page-size":p.defaultPageSize,"page-size-options":p.pageSizeOptions,"show-total":p.showTotal,total:m.value.total,onChange:V},null),[[e.vShow,n.config.pagination]])])}}});exports.default=Q;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const t=require("vue"),C=require("ant-design-vue"),x=require("../../utils/html.cjs.js"),J=require("../theme/index.cjs.js"),M=()=>({data:{type:Object,required:!0},height:{type:Number,default:300},keys:Array,rowKey:{type:String,default:"id"},loading:{type:Boolean,default:!1},pagination:{type:Object,default:()=>({})},config:{type:Object,default:()=>({})},expandedRowKeys:{type:Object,default:()=>[]}}),p={defaultPageSize:20,hideOnSinglePage:!1,pageSizeOptions:["10","20","30","40"],responsive:!0,showQuickJumper:!0,showLessItems:!0,showTotal:a=>`总共 ${a} 条`},P=`${J.prefixName}-pagination`,Q=t.defineComponent({name:"DTable",props:M(),emits:["update:keys"],setup:function(a,{emit:b,slots:h}){const n=t.ref(a.keys||[]),T=t.computed(()=>a.data),z=t.computed(()=>{var e;return((e=a.config)==null?void 0:e.columns)??[]}),m=t.computed(()=>{var e;return((e=a.config)==null?void 0:e.pagination)??{}}),S=t.ref(a.expandedRowKeys);t.watchEffect(()=>{const{expandedRowKeys:e}=a;S.value=e});const{tableRef:E,tableRootRef:K,tableHeight:O,onPageChange:V,onRowClassName:B}=H();function H(){const{rowClassName:e,keepSelected:o,onPageChange:i}=a.config,s=a.config.selection??"N",r=t.ref(),c=t.ref(null),l=t.ref(),u=t.ref(null),g=y=>{var v,k;try{const w=(v=c==null?void 0:c.value)==null?void 0:v.$el,$=x.useEleHeight(w.getElementsByClassName("ant-table-header")[0]);let N=0;if(a.config.pagination){const A=(k=r.value)==null?void 0:k.getElementsByClassName(P)[0];N=x.useEleHeight(A)??0}l.value=y-($+N),w.getElementsByClassName("ant-table-body")[0].style.height=l.value-10+"px",u.value=w.getElementsByClassName("ant-table-body")[0]}catch(w){console.warn(w)}};return t.watchEffect(()=>{a.height!==0&&t.nextTick(()=>{g(a.height)})}),{tableRef:c,tableRootRef:r,tableHeight:l,onPageChange:(y,v)=>{i&&i({page:y,size:v}),u.value.scrollTop=0,(s==="S"||!o)&&(n.value=[],b("update:keys",n.value))},onRowClassName:(y,v)=>e?e(y,v):void 0}}const j=q();function q(){const{rowKey:e,config:{getCheckboxProps:o}}=a;let i=a.config.selection??"N";const s=(l,u)=>{i==="S"?(n.value=[],n.value=u?[l[e]]:[]):n.value=u?n.value.concat(l[e]):n.value.filter(g=>g!==l[e]),b("update:keys",n.value)},r=(l,u,g)=>{const f=g.map(d=>d[e]);n.value=l?n.value.concat(f):n.value.filter(d=>!f.includes(d)),b("update:keys",n.value)};t.watch(()=>a.keys,l=>{n.value=l});const c=t.ref(void 0);return t.watchEffect(()=>{const{selection:l}=a.config;i=l,i!=="N"?c.value={selectedRowKeys:n,onSelect:s,onSelectAll:r,fixed:!0,columnTitle:i==="S"?"选择":null,columnWidth:i==="S"?60:40,getCheckboxProps:o}:c.value=void 0}),c}const D=F();function F(){return e=>{let o;const{rowKey:i,config:{click:s,dbClick:r,selection:c,getCheckboxProps:l}}=a,u=e[i],g=()=>{if(c==="N")return;n.value.some(d=>d===u)?n.value=n.value.filter(d=>d!==u):(c==="S"&&(n.value=[]),n.value.push(u)),b("update:keys",n.value)};return{onClick:()=>{const f=l?l(e):null;f&&f.value===u||(clearTimeout(o),o=setTimeout(()=>{g(),s&&s(e)},200))},onDblclick:()=>{clearTimeout(o),r&&r(e)}}}}const R=e=>{e.stopPropagation()},U=(e,o,i,s)=>t.createVNode(t.Fragment,null,[h.expandedRowRender&&h.expandedRowRender({record:e,index:o,indent:i,expanded:s})]),_=()=>t.createVNode(t.Fragment,null,[h.summary&&h.summary()]);return()=>{var e;return t.createVNode("div",{ref:K},[t.createVNode(C.Table,{ref:E,"row-key":a.rowKey,bordered:a.config.bordered,columns:z.value,dataSource:T.value,loading:a.loading,size:((e=a.config)==null?void 0:e.size)??"small",scroll:{scrollToFirstRowOnChange:!0,x:"100%",y:O.value+"px"},expandedRowKeys:S.value,"onUpdate:expandedRowKeys":o=>S.value=o,expandRowByClick:!0,pagination:!1,customRow:D,rowSelection:j.value,rowClassName:B},{bodyCell:({column:o,record:i})=>{if(o.slot==="action")return t.createVNode("div",{onClick:R,onDblclick:R},[t.createVNode(C.Space,null,{default:()=>[h.action&&h.action(i)]})])},expandedRowRender:U,summary:_}),t.withDirectives(t.createVNode(C.Pagination,{class:[P],current:m.value.current,"onUpdate:current":o=>m.value.current=o,pageSize:m.value.pageSize,"onUpdate:pageSize":o=>m.value.pageSize=o,disabled:a.loading,"show-size-changer":!0,size:"default","hide-on-single-page":p.hideOnSinglePage,"show-quick-jumper":p.showQuickJumper,"default-page-size":p.defaultPageSize,"page-size-options":p.pageSizeOptions,"show-total":p.showTotal,total:m.value.total,onChange:V},null),[[t.vShow,a.config.pagination]])])}}});exports.default=Q;

package/dist/esm/components/table/Table.esm.js

@@ -1,8 +1,8 @@
 import { defineComponent as W, ref as f, computed as R, watchEffect as k, nextTick as X, watch as _, createVNode as m, withDirectives as G, vShow as M, Fragment as T } from "vue";
 import { Table as Y, Space as Z, Pagination as ee } from "ant-design-vue";
 import { useEleHeight as z } from "../../utils/html.esm.js";
-import { prefixName as ne } from "../theme/index.esm.js";
-const te = () => ({
+import { prefixName as te } from "../theme/index.esm.js";
+const ne = () => ({
   data: {
     type: Object,
     required: !0
@@ -39,28 +39,28 @@ const te = () => ({
   responsive: !0,
   showQuickJumper: !0,
   showLessItems: !0,
-  showTotal: (n) => `总共 ${n} 条`
-}, K = `${ne}-pagination`, ue = /* @__PURE__ */ W({
+  showTotal: (t) => `总共 ${t} 条`
+}, K = `${te}-pagination`, ue = /* @__PURE__ */ W({
   name: "DTable",
-  props: te(),
+  props: ne(),
   // emits: {  "update:keys": (keys: []) => void }
   // TODO 需要做调整
   emits: ["update:keys"],
-  setup: function(n, {
+  setup: function(t, {
     emit: S,
     slots: h
   }) {
-    const t = f(n.keys || []), O = R(() => n.data), E = R(() => {
+    const n = f(t.keys || []), O = R(() => t.data), E = R(() => {
       var e;
-      return ((e = n.config) == null ? void 0 : e.columns) ?? [];
+      return ((e = t.config) == null ? void 0 : e.columns) ?? [];
     }), y = R(() => {
       var e;
-      return ((e = n.config) == null ? void 0 : e.pagination) ?? {};
-    }), C = f(n.expandedRowKeys);
+      return ((e = t.config) == null ? void 0 : e.pagination) ?? {};
+    }), C = f(t.expandedRowKeys);
     k(() => {
       const {
         expandedRowKeys: e
-      } = n;
+      } = t;
       C.value = e;
     });
     const {
@@ -75,12 +75,12 @@ const te = () => ({
         rowClassName: e,
         keepSelected: a,
         onPageChange: l
-      } = n.config, s = n.config.selection ?? "N", d = f(), u = f(null), o = f(), i = f(null), r = (w) => {
+      } = t.config, c = t.config.selection ?? "N", d = f(), u = f(null), o = f(), i = f(null), r = (w) => {
         var v, N;
         try {
           const p = (v = u == null ? void 0 : u.value) == null ? void 0 : v.$el, L = z(p.getElementsByClassName("ant-table-header")[0]);
           let P = 0;
-          if (n.config.pagination) {
+          if (t.config.pagination) {
             const V = (N = d.value) == null ? void 0 : N.getElementsByClassName(K)[0];
             P = z(V) ?? 0;
           }
@@ -90,8 +90,8 @@ const te = () => ({
         }
       };
       return k(() => {
-        n.height !== 0 && X(() => {
-          r(n.height);
+        t.height !== 0 && X(() => {
+          r(t.height);
         });
       }), {
         tableRef: u,
@@ -101,7 +101,7 @@ const te = () => ({
           l && l({
             page: w,
             size: v
-          }), i.value.scrollTop = 0, (s === "S" || !a) && (t.value = [], S("update:keys", t.value));
+          }), i.value.scrollTop = 0, (c === "S" || !a) && (n.value = [], S("update:keys", n.value));
         },
         onRowClassName: (w, v) => e ? e(w, v) : void 0
       };
@@ -113,25 +113,25 @@ const te = () => ({
         config: {
           getCheckboxProps: a
         }
-      } = n;
-      let l = n.config.selection ?? "N";
-      const s = (o, i) => {
-        l === "S" ? (t.value = [], t.value = i ? [o[e]] : []) : t.value = i ? t.value.concat(o[e]) : t.value.filter((r) => r !== o[e]), S("update:keys", t.value);
+      } = t;
+      let l = t.config.selection ?? "N";
+      const c = (o, i) => {
+        l === "S" ? (n.value = [], n.value = i ? [o[e]] : []) : n.value = i ? n.value.concat(o[e]) : n.value.filter((r) => r !== o[e]), S("update:keys", n.value);
       }, d = (o, i, r) => {
-        const g = r.map((c) => c[e]);
-        t.value = o ? t.value.concat(g) : t.value.filter((c) => !g.includes(c)), S("update:keys", t.value);
+        const g = r.map((s) => s[e]);
+        n.value = o ? n.value.concat(g) : n.value.filter((s) => !g.includes(s)), S("update:keys", n.value);
       };
-      _(() => n.keys, (o) => {
-        t.value = o;
+      _(() => t.keys, (o) => {
+        n.value = o;
       });
       const u = f(void 0);
       return k(() => {
         const {
           selection: o
-        } = n.config;
+        } = t.config;
         l = o, l !== "N" ? u.value = {
-          selectedRowKeys: t,
-          onSelect: s,
+          selectedRowKeys: n,
+          onSelect: c,
           onSelectAll: d,
           fixed: !0,
           columnTitle: l === "S" ? "选择" : null,
@@ -147,21 +147,21 @@ const te = () => ({
         const {
           rowKey: l,
           config: {
-            click: s,
+            click: c,
             dbClick: d,
             selection: u,
             getCheckboxProps: o
           }
-        } = n, i = e[l], r = () => {
+        } = t, i = e[l], r = () => {
           if (u === "N")
             return;
-          t.value.some((c) => c === i) ? t.value = t.value.filter((c) => c !== i) : (u === "S" && (t.value = []), t.value.push(i)), S("update:keys", t.value);
+          n.value.some((s) => s === i) ? n.value = n.value.filter((s) => s !== i) : (u === "S" && (n.value = []), n.value.push(i)), S("update:keys", n.value);
         };
         return {
           onClick: () => {
             const g = o ? o(e) : null;
             g && g.value === i || (clearTimeout(a), a = setTimeout(() => {
-              r(), s && s(e);
+              r(), c && c(e);
             }, 200));
           },
           // 点击行
@@ -182,19 +182,24 @@ const te = () => ({
     }
     const x = (e) => {
       e.stopPropagation();
-    }, Q = (e, a, l, s) => m(T, null, [h.expandedRowRender && h.expandedRowRender()]), I = () => m(T, null, [h.summary && h.summary()]);
+    }, Q = (e, a, l, c) => m(T, null, [h.expandedRowRender && h.expandedRowRender({
+      record: e,
+      index: a,
+      indent: l,
+      expanded: c
+    })]), I = () => m(T, null, [h.summary && h.summary()]);
     return () => {
       var e;
       return m("div", {
         ref: H
       }, [m(Y, {
         ref: B,
-        "row-key": n.rowKey,
-        bordered: n.config.bordered,
+        "row-key": t.rowKey,
+        bordered: t.config.bordered,
         columns: E.value,
         dataSource: O.value,
-        loading: n.loading,
-        size: ((e = n.config) == null ? void 0 : e.size) ?? "small",
+        loading: t.loading,
+        size: ((e = t.config) == null ? void 0 : e.size) ?? "small",
         scroll: {
           scrollToFirstRowOnChange: !0,
           x: "100%",
@@ -230,7 +235,7 @@ const te = () => ({
         "onUpdate:current": (a) => y.value.current = a,
         pageSize: y.value.pageSize,
         "onUpdate:pageSize": (a) => y.value.pageSize = a,
-        disabled: n.loading,
+        disabled: t.loading,
         "show-size-changer": !0,
         size: "default",
         "hide-on-single-page": b.hideOnSinglePage,
@@ -240,7 +245,7 @@ const te = () => ({
         "show-total": b.showTotal,
         total: y.value.total,
         onChange: D
-      }, null), [[M, n.config.pagination]])]);
+      }, null), [[M, t.config.pagination]])]);
     };
   }
 });

package/package.json

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

package/src/components/table/Table.tsx

@@ -358,7 +358,12 @@ const DXTable = defineComponent({
       indent: number,
       expanded: any
     ) => {
-      return <>{slots.expandedRowRender && slots.expandedRowRender()}</>;
+      return (
+        <>
+          {slots.expandedRowRender &&
+            slots.expandedRowRender({ record, index, indent, expanded })}
+        </>
+      );
     };
 
     const summary = () => {