@ditari/bsui 1.0.24 → 1.0.26

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

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

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

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

package/package.json

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

package/src/components/table/Table.tsx

@@ -306,6 +306,9 @@ const DXTable = defineComponent({
       };
     }
 
+    const actionStop = (event: MouseEvent) => {
+      event.stopPropagation();
+    };
     return () => (
       <div ref={tableRootRef}>
         <Table
@@ -327,9 +330,13 @@ const DXTable = defineComponent({
           rowClassName={onRowClassName}
         >
           {{
-            bodyCell: ({ column }: any) => {
+            bodyCell: ({ column, record }: any) => {
               if (column.slot === "action") {
-                return <Space>{slots.action && slots.action()}</Space>;
+                return (
+                  <div onClick={actionStop} onDblclick={actionStop}>
+                    <Space>{slots.action && slots.action(record)}</Space>
+                  </div>
+                );
               }
             }
           }}