@aplus-frontend/ui 6.29.2 → 6.30.0

package/es/src/ap-grid/utils/table.d.ts

@@ -1,7 +1,7 @@
 import { VxeTableEventProps, VxeTableProps } from 'vxe-table';
 import { ApGridColumnType, ApGridProps, ApGridRowSelection } from '../interface';
 import { RowSelectionType } from '@aplus-frontend/antdv/es/table/interface';
-export declare function toVxeProps<RecordType>(props: ApGridProps): VxeTableProps<RecordType> & VxeTableEventProps<RecordType>;
+export declare function toVxeProps<RecordType>(props: ApGridProps, rowSelection: ApGridRowSelection<RecordType> | undefined): VxeTableProps<RecordType> & VxeTableEventProps<RecordType>;
 export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true, columns: ApGridColumnType[], size: 'mini' | 'medium'): {
     type: RowSelectionType;
     width: string | number;

package/es/src/ap-grid/utils/table.mjs

@@ -1,9 +1,9 @@
-import { omit as a, isUndefined as d, isFunction as g, isNumber as m } from "lodash-unified";
+import { omit as d, isUndefined as s, isFunction as g, isNumber as m } from "lodash-unified";
 import { isDef as C } from "../../utils/index.mjs";
-const y = 20, b = 50, v = (e) => e.some((t) => !!t.html);
-function K(e) {
+const b = 20, y = 50, v = (e) => e.some((i) => !!i.html);
+function k(e, i) {
   const t = {
-    ...a(e, [
+    ...d(e, [
       "columns",
       "request",
       "searchForm",
@@ -13,35 +13,32 @@ function K(e) {
       "round"
     ])
   };
-  if (t.rowConfig = {
+  return t.rowConfig = {
     isHover: !0,
     keyField: e.rowKey,
     isCurrent: !!e.rowHighlightable
-  }, t.columnConfig = {}, v(e.columns || []) && (t.rowConfig.useKey = !0, t.columnConfig.useKey = !0), e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig.resizable = !0), e.rowSelection) {
-    const i = e.rowSelection === !0 ? {} : e.rowSelection;
-    i.type === "radio" ? t.radioConfig = {
-      highlight: !0,
-      checkMethod({ row: r }) {
-        return i.disabled ? !i.disabled(r) : !0;
-      },
-      visibleMethod({ row: r }) {
-        return i.shown ? i.shown(r) : !0;
-      },
-      checkRowKey: i.defaultSelectedRowKeys?.[0],
-      reserve: d(i.preserveSelectedRowKeys) ? !0 : i.preserveSelectedRowKeys
-    } : t.checkboxConfig = {
-      highlight: !0,
-      checkMethod({ row: r }) {
-        return i.disabled ? !i.disabled(r) : !0;
-      },
-      visibleMethod({ row: r }) {
-        return i.shown ? i.shown(r) : !0;
-      },
-      reserve: d(i.preserveSelectedRowKeys) ? !0 : i.preserveSelectedRowKeys,
-      range: i.range || !1
-    };
-  }
-  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = a(e.expandable, [
+  }, t.columnConfig = {}, v(e.columns || []) && (t.rowConfig.useKey = !0, t.columnConfig.useKey = !0), e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig.resizable = !0), i && (i.type === "radio" ? t.radioConfig = {
+    highlight: !0,
+    checkMethod({ row: r }) {
+      return i.disabled ? !i.disabled(r) : !0;
+    },
+    visibleMethod({ row: r }) {
+      return i.shown ? i.shown(r) : !0;
+    },
+    checkRowKey: i.defaultSelectedRowKeys?.[0],
+    reserve: i.preserveSelectedRowKeys || s(e.dataSource)
+  } : t.checkboxConfig = {
+    highlight: !0,
+    checkMethod({ row: r }) {
+      return i.disabled ? !i.disabled(r) : !0;
+    },
+    visibleMethod({ row: r }) {
+      return i.shown ? i.shown(r) : !0;
+    },
+    // tips: 离线表格或者手动设置了缓存都会将此字段设置为true
+    reserve: i.preserveSelectedRowKeys || s(e.dataSource),
+    range: i.range || !1
+  }), t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = d(e.expandable, [
     "renderContent",
     "width",
     "title"
@@ -49,7 +46,7 @@ function K(e) {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (s(t, "X", e.virtual), s(t, "Y", e.virtual)), t.round = C(e.round) ? e.round : !e.card, t.headerCellConfig = {
+  }) : (l(t, "X", e.virtual), l(t, "Y", e.virtual)), t.round = C(e.round) ? e.round : !e.card, t.headerCellConfig = {
     height: 36,
     ...t.headerCellConfig || {}
   }, t.treeConfig && (t.treeConfig = {
@@ -59,57 +56,57 @@ function K(e) {
      */
     transform: !0
   }), t.resizableConfig = {
-    minWidth({ cell: i }) {
-      return x(i, e.size);
+    minWidth({ cell: r }) {
+      return R(r, e.size);
     }
   }, t;
 }
-function s(e, t, n) {
-  const i = t === "X", r = i ? "x" : "y", l = i ? "virtualXConfig" : "virtualYConfig", o = n?.[r], u = o !== !1, f = i ? y : b, h = m(o) && o >= 0 ? o : f;
-  e[l] = {
-    enabled: u,
-    gt: h,
-    oSize: n?.oSize || 0
+function l(e, i, t) {
+  const n = i === "X", r = n ? "x" : "y", a = n ? "virtualXConfig" : "virtualYConfig", u = t?.[r], o = u !== !1, f = n ? b : y, c = m(u) && u >= 0 ? u : f;
+  e[a] = {
+    enabled: o,
+    gt: c,
+    oSize: t?.oSize || 0
   };
 }
-function w(e) {
+function x(e) {
   return e === !0 ? "left" : e;
 }
-function M(e, t, n) {
-  const i = e === !0 || !e.type ? "checkbox" : e.type, r = (n === "mini" ? 9 * 2 : 12 * 2) + 16, l = e === !0 ? r : e.columnWidth || r;
-  let o = e === !0 ? void 0 : w(e.fixed);
-  return o || (o === !1 ? o = void 0 : o = t.some(
-    (u) => u.fixed === "left" || u.fixed === !0
+function z(e, i, t) {
+  const n = e === !0 || !e.type ? "checkbox" : e.type, r = (t === "mini" ? 9 * 2 : 12 * 2) + 16, a = e === !0 ? r : e.columnWidth || r;
+  let u = e === !0 ? void 0 : x(e.fixed);
+  return u || (u === !1 ? u = void 0 : u = i.some(
+    (o) => o.fixed === "left" || o.fixed === !0
   ) ? "left" : void 0), {
-    type: i,
-    width: l,
-    fixed: o
+    type: n,
+    width: a,
+    fixed: u
   };
 }
-function W(e) {
-  const t = e?.width || "auto";
+function F(e) {
+  const i = e?.width || "auto";
   return {
     type: "expand",
     title: e?.title,
-    width: t
+    width: i
   };
 }
-function c(e) {
+function h(e) {
   if (!e)
     return 0;
-  const t = getComputedStyle(e);
-  return e.offsetWidth + (Number.parseFloat(t.marginLeft) || 0) + Number.parseFloat(t.marginRight) || 0;
+  const i = getComputedStyle(e);
+  return e.offsetWidth + (Number.parseFloat(i.marginLeft) || 0) + Number.parseFloat(i.marginRight) || 0;
 }
-function x(e, t) {
+function R(e, i) {
   if (!e)
     return "auto";
-  const n = getComputedStyle(e);
-  let i = t === "medium" ? 12 * 2 : 9 * 2;
-  const r = (Number.parseFloat(n.fontSize) || 14) * 1.6;
-  return i += r, e.querySelector("span.anticon-question-circle") && (i += 20), i += c(e.querySelector(".vxe-cell--sort")) + c(e.querySelector(".vxe-cell--filter")), Math.ceil(i);
+  const t = getComputedStyle(e);
+  let n = i === "medium" ? 12 * 2 : 9 * 2;
+  const r = (Number.parseFloat(t.fontSize) || 14) * 1.6;
+  return n += r, e.querySelector("span.anticon-question-circle") && (n += 20), n += h(e.querySelector(".vxe-cell--sort")) + h(e.querySelector(".vxe-cell--filter")), Math.ceil(n);
 }
 export {
-  W as getRowExpandProps,
-  M as getRowSelectionProps,
-  K as toVxeProps
+  F as getRowExpandProps,
+  z as getRowSelectionProps,
+  k as toVxeProps
 };