@ditari/bsui 1.0.28 → 1.0.30

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

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 { defineComponent as X, ref as f, computed as C, watchEffect as k, nextTick as _, watch as G, createVNode as m, withDirectives as M, vShow as Y, Fragment as z } from "vue";
+import { Table as Z, Space as ee, Pagination as te } from "ant-design-vue";
+import { useEleHeight as K } from "../../utils/html.esm.js";
 import { prefixName as ne } from "../theme/index.esm.js";
-const te = () => ({
+const ae = () => ({
   data: {
     type: Object,
     required: !0
@@ -39,134 +39,134 @@ const te = () => ({
   responsive: !0,
   showQuickJumper: !0,
   showLessItems: !0,
-  showTotal: (n) => `总共 ${n} 条`
-}, K = `${ne}-pagination`, ue = /* @__PURE__ */ W({
+  showTotal: (t) => `总共 ${t} 条`
+}, O = `${ne}-pagination`, ce = /* @__PURE__ */ X({
   name: "DTable",
-  props: te(),
+  props: ae(),
   // emits: {  "update:keys": (keys: []) => void }
   // TODO 需要做调整
   emits: ["update:keys"],
-  setup: function(n, {
+  setup: function(t, {
     emit: S,
-    slots: h
+    slots: s
   }) {
-    const t = f(n.keys || []), O = R(() => n.data), E = R(() => {
+    const n = f(t.keys || []), B = C(() => t.data), E = C(() => {
       var e;
-      return ((e = n.config) == null ? void 0 : e.columns) ?? [];
-    }), y = R(() => {
+      return ((e = t.config) == null ? void 0 : e.columns) ?? [];
+    }), y = C(() => {
       var e;
-      return ((e = n.config) == null ? void 0 : e.pagination) ?? {};
-    }), C = f(n.expandedRowKeys);
+      return ((e = t.config) == null ? void 0 : e.pagination) ?? {};
+    }), R = f(t.expandedRowKeys);
     k(() => {
       const {
         expandedRowKeys: e
-      } = n;
-      C.value = e;
+      } = t;
+      R.value = e;
     });
     const {
-      tableRef: B,
-      tableRootRef: H,
-      tableHeight: j,
-      onPageChange: D,
-      onRowClassName: U
-    } = $();
-    function $() {
+      tableRef: H,
+      tableRootRef: j,
+      tableHeight: D,
+      onPageChange: U,
+      onRowClassName: $
+    } = q();
+    function q() {
       const {
         rowClassName: e,
-        keepSelected: a,
+        keepSelected: o,
         onPageChange: l
-      } = n.config, s = n.config.selection ?? "N", d = f(), u = f(null), o = f(), i = f(null), r = (w) => {
-        var v, N;
+      } = t.config, v = t.config.selection ?? "N", d = f(), u = f(null), a = f(), i = f(null), r = (w) => {
+        var h, P;
         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) {
-            const V = (N = d.value) == null ? void 0 : N.getElementsByClassName(K)[0];
-            P = z(V) ?? 0;
+          const p = (h = u == null ? void 0 : u.value) == null ? void 0 : h.$el, V = K(p.getElementsByClassName("ant-table-header")[0]);
+          let T = 0;
+          if (t.config.pagination) {
+            const W = (P = d.value) == null ? void 0 : P.getElementsByClassName(O)[0];
+            T = K(W) ?? 0;
           }
-          o.value = w - (L + P), p.getElementsByClassName("ant-table-body")[0].style.height = o.value - 10 + "px", i.value = p.getElementsByClassName("ant-table-body")[0];
+          a.value = w - (V + T), p.getElementsByClassName("ant-table-body")[0].style.height = a.value - 10 + "px", i.value = p.getElementsByClassName("ant-table-body")[0];
         } catch (p) {
           console.warn(p);
         }
       };
       return k(() => {
-        n.height !== 0 && X(() => {
-          r(n.height);
+        t.height !== 0 && _(() => {
+          r(t.height);
         });
       }), {
         tableRef: u,
         tableRootRef: d,
-        tableHeight: o,
-        onPageChange: (w, v) => {
+        tableHeight: a,
+        onPageChange: (w, h) => {
           l && l({
             page: w,
-            size: v
-          }), i.value.scrollTop = 0, (s === "S" || !a) && (t.value = [], S("update:keys", t.value));
+            size: h
+          }), i.value.scrollTop = 0, (v === "S" || !o) && (n.value = [], S("update:keys", n.value));
         },
-        onRowClassName: (w, v) => e ? e(w, v) : void 0
+        onRowClassName: (w, h) => e ? e(w, h) : void 0
       };
     }
-    const q = A();
-    function A() {
+    const A = F();
+    function F() {
       const {
         rowKey: e,
         config: {
-          getCheckboxProps: a
+          getCheckboxProps: o
         }
-      } = 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);
-      }, d = (o, i, r) => {
+      } = t;
+      let l = t.config.selection ?? "N";
+      const v = (a, i) => {
+        l === "S" ? (n.value = [], n.value = i ? [a[e]] : []) : n.value = i ? n.value.concat(a[e]) : n.value.filter((r) => r !== a[e]), S("update:keys", n.value);
+      }, d = (a, 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);
+        n.value = a ? n.value.concat(g) : n.value.filter((c) => !g.includes(c)), S("update:keys", n.value);
       };
-      _(() => n.keys, (o) => {
-        t.value = o;
+      G(() => t.keys, (a) => {
+        n.value = a;
       });
       const u = f(void 0);
       return k(() => {
         const {
-          selection: o
-        } = n.config;
-        l = o, l !== "N" ? u.value = {
-          selectedRowKeys: t,
-          onSelect: s,
+          selection: a
+        } = t.config;
+        l = a, l !== "N" ? u.value = {
+          selectedRowKeys: n,
+          onSelect: v,
           onSelectAll: d,
           fixed: !0,
           columnTitle: l === "S" ? "选择" : null,
           columnWidth: l === "S" ? 60 : 40,
-          getCheckboxProps: a
+          getCheckboxProps: o
         } : u.value = void 0;
       }), u;
     }
-    const F = J();
-    function J() {
+    const J = Q();
+    function Q() {
       return (e) => {
-        let a;
+        let o;
         const {
           rowKey: l,
           config: {
-            click: s,
+            click: v,
             dbClick: d,
             selection: u,
-            getCheckboxProps: o
+            getCheckboxProps: a
           }
-        } = 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((c) => c === i) ? n.value = n.value.filter((c) => c !== 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);
+            const g = a ? a(e) : null;
+            g && g.value === i || (clearTimeout(o), o = setTimeout(() => {
+              r(), v && v(e);
             }, 200));
           },
           // 点击行
           onDblclick: () => {
-            clearTimeout(a), d && d(e);
+            clearTimeout(o), d && d(e);
           }
           // onContextmenu: (event) => {
           //   //TODO
@@ -182,55 +182,61 @@ 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()]);
+    }, I = C(() => {
+      const {
+        selection: e
+      } = t.config;
+      return e === "N";
+    }), N = {};
+    s.expandedRowRender && (N.expandedRowRender = (e) => m(z, null, [s.expandedRowRender && s.expandedRowRender(e)]));
+    const L = () => m(z, null, [s.summary && s.summary()]);
     return () => {
       var e;
       return m("div", {
-        ref: H
-      }, [m(Y, {
-        ref: B,
-        "row-key": n.rowKey,
-        bordered: n.config.bordered,
+        ref: j
+      }, [m(Z, {
+        ref: H,
+        "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",
+        dataSource: B.value,
+        loading: t.loading,
+        size: ((e = t.config) == null ? void 0 : e.size) ?? "small",
         scroll: {
           scrollToFirstRowOnChange: !0,
           x: "100%",
-          y: j.value + "px"
+          y: D.value + "px"
         },
-        expandedRowKeys: C.value,
-        "onUpdate:expandedRowKeys": (a) => C.value = a,
-        expandRowByClick: !0,
+        expandedRowKeys: R.value,
+        "onUpdate:expandedRowKeys": (o) => R.value = o,
+        expandRowByClick: I.value,
         pagination: !1,
-        customRow: F,
-        rowSelection: q.value,
-        rowClassName: U
+        customRow: J,
+        rowSelection: A.value,
+        rowClassName: $
       }, {
         bodyCell: ({
-          column: a,
+          column: o,
           record: l
         }) => {
-          if (a.slot === "action")
+          if (o.slot === "action")
             return m("div", {
               onClick: x,
               onDblclick: x
-            }, [m(Z, null, {
-              default: () => [h.action && h.action(l)]
+            }, [m(ee, null, {
+              default: () => [s.action && s.action(l)]
             })]);
         },
-        // 展开插槽
-        expandedRowRender: Q,
+        ...N,
         // 总结栏插槽
-        summary: I
-      }), G(m(ee, {
-        class: [K],
+        summary: L
+      }), M(m(te, {
+        class: [O],
         current: y.value.current,
-        "onUpdate:current": (a) => y.value.current = a,
+        "onUpdate:current": (o) => y.value.current = o,
         pageSize: y.value.pageSize,
-        "onUpdate:pageSize": (a) => y.value.pageSize = a,
-        disabled: n.loading,
+        "onUpdate:pageSize": (o) => y.value.pageSize = o,
+        disabled: t.loading,
         "show-size-changer": !0,
         size: "default",
         "hide-on-single-page": b.hideOnSinglePage,
@@ -239,11 +245,11 @@ const te = () => ({
         "page-size-options": b.pageSizeOptions,
         "show-total": b.showTotal,
         total: y.value.total,
-        onChange: D
-      }, null), [[M, n.config.pagination]])]);
+        onChange: U
+      }, null), [[Y, t.config.pagination]])]);
     };
   }
 });
 export {
-  ue as default
+  ce as default
 };

package/package.json

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

package/src/components/table/Table.tsx

@@ -1,5 +1,6 @@
 import {
   computed,
+  createVNode,
   defineComponent,
   nextTick,
   PropType,
@@ -8,7 +9,7 @@ import {
   watch,
   watchEffect
 } from "vue";
-import { Pagination, Space, Table } from "ant-design-vue";
+import { Pagination, Space, Table, Card } from "ant-design-vue";
 import { useEleHeight } from "../../utils/html";
 import { prefixName } from "../theme";
 
@@ -352,15 +353,18 @@ const DXTable = defineComponent({
       event.stopPropagation();
     };
 
-    const expandedRowRender = (
-      record: any,
-      index: number,
-      indent: number,
-      expanded: any
-    ) => {
-      return <>{slots.expandedRowRender && slots.expandedRowRender()}</>;
-    };
-
+    const expandRowByClick = computed(() => {
+      const { selection } = props.config;
+      return selection === "N";
+    });
+    const tableSlots: any = {};
+    if (slots.expandedRowRender) {
+      tableSlots.expandedRowRender = (record: any) => {
+        return (
+          <>{slots.expandedRowRender && slots.expandedRowRender(record)}</>
+        );
+      };
+    }
     const summary = () => {
       return <>{slots.summary && slots.summary()}</>;
     };
@@ -380,7 +384,7 @@ const DXTable = defineComponent({
             y: tableHeight.value + "px"
           }}
           v-model:expandedRowKeys={expandedKeys.value}
-          expandRowByClick={true}
+          expandRowByClick={expandRowByClick.value}
           pagination={false}
           customRow={customRow}
           rowSelection={rowSelection.value}
@@ -396,8 +400,7 @@ const DXTable = defineComponent({
                 );
               }
             },
-            // 展开插槽
-            expandedRowRender: expandedRowRender,
+            ...tableSlots,
             // 总结栏插槽
             summary: summary
           }}