@aplus-frontend/ui 0.0.38 → 0.0.39

package/es/src/ap-form/ap-form-item-group/index.vue.mjs

@@ -1,15 +1,16 @@
-import { isVNode as k, defineComponent as w, useSlots as _, watch as S, shallowRef as b, computed as x, unref as n, createVNode as N, mergeProps as c, openBlock as a, createBlock as u, withCtx as R, createElementBlock as h, Fragment as j, renderList as B, resolveDynamicComponent as P } from "vue";
+import { isVNode as h, defineComponent as k, useSlots as w, watch as _, shallowRef as P, computed as S, unref as n, createVNode as b, mergeProps as m, openBlock as s, createBlock as c, withCtx as x, createElementBlock as B, Fragment as N, renderList as R, resolveDynamicComponent as j } from "vue";
 import { Col as v, Row as F } from "ant-design-vue";
-import { pick as I } from "lodash-unified";
+import { pick as D, isBoolean as I } from "lodash-unified";
 import { apFormItemColPropKeys as O } from "../constant.mjs";
-import { genRealChildren as i, buildColSpan as V, getStringName as $ } from "./helper.mjs";
+import { genRealChildren as u, buildColSpan as V, getStringName as $ } from "./helper.mjs";
 import "../../config-provider/index.mjs";
 import "../style/ap-form-item-group.css";
-import { useNamespace as A } from "../../config-provider/hooks/use-namespace.mjs";
-function D(o) {
-  return typeof o == "function" || Object.prototype.toString.call(o) === "[object Object]" && !k(o);
+import { isDef as A } from "../../utils/index.mjs";
+import { useNamespace as E } from "../../config-provider/hooks/use-namespace.mjs";
+function G(t) {
+  return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !h(t);
 }
-const M = /* @__PURE__ */ w({
+const U = /* @__PURE__ */ k({
   name: "ApFormItemGroup",
   __name: "index",
   props: {
@@ -27,31 +28,31 @@ const M = /* @__PURE__ */ w({
       default: 3
     }
   },
-  setup(o) {
+  setup(t) {
     const {
-      b: s
-    } = A("ap-form-item-group"), {
-      countPerRow: f,
-      ...d
-    } = o, p = _();
-    S(() => p.default(), (t) => {
-      l.value = i(t);
+      b: a
+    } = E("ap-form-item-group"), {
+      countPerRow: d,
+      ...f
+    } = t, p = w();
+    _(() => p.default(), (o) => {
+      l.value = u(o);
     });
-    const l = b(i(p.default())), g = x(() => n(l).map((t, m) => {
-      const e = t.props, r = I(e, O), y = r != null && r.span ? {} : V(f), C = !!(e != null && e.hidden);
+    const l = P(u(p.default())), g = S(() => n(l).map((o, i) => {
+      const e = o.props, r = D(e, O), y = r != null && r.span ? {} : V(d), C = I(e.hidden) ? !!e.hidden : A(e.hidden);
       return {
-        key: `${m}-${$(e.name)}`,
-        node: N(v, c(y, r, {
-          class: C ? s("col-hidden") : ""
-        }), D(t) ? t : {
-          default: () => [t]
+        key: `${i}-${$(e.name)}`,
+        node: b(v, m(y, r, {
+          class: C ? a("col-hidden") : ""
+        }), G(o) ? o : {
+          default: () => [o]
         })
       };
     }));
-    return (t, m) => (a(), u(n(F), c({
-      class: n(s)()
-    }, d), {
-      default: R(() => [(a(!0), h(j, null, B(g.value, (e) => (a(), u(P(e.node), {
+    return (o, i) => (s(), c(n(F), m({
+      class: n(a)()
+    }, f), {
+      default: x(() => [(s(!0), B(N, null, R(g.value, (e) => (s(), c(j(e.node), {
         key: e.key
       }))), 128))]),
       _: 1
@@ -59,5 +60,5 @@ const M = /* @__PURE__ */ w({
   }
 });
 export {
-  M as default
+  U as default
 };

package/es/src/ap-form/search-form/index.vue.mjs

@@ -1,25 +1,25 @@
-import { isVNode as oe, defineComponent as ae, useSlots as le, ref as ne, unref as t, shallowRef as j, computed as g, watch as M, cloneVNode as re, createVNode as l, Fragment as S, openBlock as c, createBlock as h, mergeProps as se, withCtx as B, resolveDynamicComponent as R, createElementBlock as ue, renderList as ie } from "vue";
-import { Col as b, Flex as D, Space as pe, Button as v, Row as ce } from "ant-design-vue";
+import { isVNode as ne, defineComponent as le, useSlots as re, ref as se, unref as o, shallowRef as V, computed as g, watch as j, cloneVNode as ie, createVNode as n, Fragment as _, openBlock as m, createBlock as y, mergeProps as ue, withCtx as B, resolveDynamicComponent as A, createElementBlock as ce, renderList as pe } from "vue";
+import { Col as R, Flex as M, Space as de, Button as E, Row as fe } from "ant-design-vue";
 import "../ap-form.vue.mjs";
 import "../ap-form-item.vue2.mjs";
 import "../../hooks/index.mjs";
-import { genRealChildren as O } from "../ap-form-item-group/helper.mjs";
-import { DoubleRightOutlined as de } from "@ant-design/icons-vue";
+import { genRealChildren as D } from "../ap-form-item-group/helper.mjs";
+import { DoubleRightOutlined as me } from "@ant-design/icons-vue";
 import "../../config-provider/index.mjs";
 import "../style/search-form.css";
-import { isArray as fe, omit as me } from "lodash-unified";
-import { isDef as he } from "../../utils/index.mjs";
-import { diffFormItem as xe } from "./utils.mjs";
-import { useControllableValue as Ce } from "../../hooks/useControllableValue.mjs";
-import { useNamespace as ge } from "../../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as ye } from "../../config-provider/hooks/use-global-config.mjs";
-import { useLocale as _e } from "../../config-provider/hooks/use-locale.mjs";
-import $ from "../ap-form-item.vue.mjs";
+import { isArray as he, isBoolean as xe, omit as ye } from "lodash-unified";
+import { isDef as $ } from "../../utils/index.mjs";
+import { diffFormItem as Ce } from "./utils.mjs";
+import { useControllableValue as ge } from "../../hooks/useControllableValue.mjs";
+import { useNamespace as _e } from "../../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as Re } from "../../config-provider/hooks/use-global-config.mjs";
+import { useLocale as Se } from "../../config-provider/hooks/use-locale.mjs";
+import L from "../ap-form-item.vue.mjs";
 import Fe from "../ap-form.vue2.mjs";
-function Se(d) {
-  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !oe(d);
+function Be(h) {
+  return typeof h == "function" || Object.prototype.toString.call(h) === "[object Object]" && !ne(h);
 }
-const i = 24, qe = /* @__PURE__ */ ae({
+const i = 24, ze = /* @__PURE__ */ le({
   name: "ApFormSearchForm",
   __name: "index",
   props: {
@@ -98,134 +98,139 @@ const i = 24, qe = /* @__PURE__ */ ae({
     }
   },
   emits: ["update:collapse"],
-  setup(d, {
-    expose: L,
+  setup(h, {
+    expose: W,
     emit: q
   }) {
-    var k;
-    const r = le(), o = d, z = q, {
-      value: f,
-      updateValue: U
-    } = Ce(o, z, {
+    var N;
+    const s = re(), a = h, z = q, {
+      value: u,
+      updateValue: H
+    } = ge(a, z, {
       valuePropName: "collapse",
       defaultValuePropName: "defaultCollapse"
     }), {
-      b: W
-    } = ge("ap-form-search-form"), G = ye("uiMode"), {
-      t: w
-    } = _e(), x = ne();
-    function H() {
-      U(!t(f));
-    }
+      b: U
+    } = _e("ap-form-search-form"), G = Re("uiMode"), {
+      t: b
+    } = Se(), C = se();
     function J() {
-      var e, a;
-      (a = (e = x.value) == null ? void 0 : e.validateFields()) == null || a.then(o.onSubmit);
+      H(!o(u));
     }
     function K() {
-      var e, a, n;
-      o.customReset || (a = (e = x.value) == null ? void 0 : e.resetFields) == null || a.call(e), (n = o.onReset) == null || n.call(o);
+      var e, t;
+      (t = (e = C.value) == null ? void 0 : e.validateFields()) == null || t.then(a.onSubmit);
+    }
+    function Q() {
+      var e, t, l;
+      a.customReset || (t = (e = C.value) == null ? void 0 : e.resetFields) == null || t.call(e), (l = a.onReset) == null || l.call(a);
     }
-    let E = [];
-    const y = j(O(r.default())), m = j((k = r.extra) == null ? void 0 : k.call(r)), N = g(() => Math.floor(i / o.countPerRow));
-    M(() => r.default(), (e) => {
-      E = y.value, y.value = O(e);
-    }), M(() => {
+    let v = [];
+    const S = V(D(s.default())), p = V((N = s.extra) == null ? void 0 : N.call(s)), w = g(() => Math.floor(i / a.countPerRow));
+    j(() => s.default(), (e) => {
+      v = S.value, S.value = D(e);
+    }), j(() => {
       var e;
-      return (e = r.extra) == null ? void 0 : e.call(r);
+      return (e = s.extra) == null ? void 0 : e.call(s);
     }, (e) => {
-      m.value = e;
+      p.value = e;
     });
-    const Q = (e) => he(e) ? (fe(e) ? e : [e]).join("") : Date.now(), _ = g(() => {
-      const e = xe(E, y.value), a = [], n = [], s = t(N);
-      let F = 0;
-      e.forEach((u) => {
-        const p = u.props;
-        p != null && p.hidden ? a.push(u) : (F += p.span || s, n.push(u));
+    const X = (e) => $(e) ? (he(e) ? e : [e]).join("") : Date.now(), F = g(() => {
+      const e = Ce(v, S.value), t = [], l = [], r = o(w);
+      let d = 0;
+      e.forEach((c) => {
+        const f = c.props;
+        (xe(f.hidden) ? !!f.hidden : $(f.hidden)) ? t.push(c) : (d += f.span || r, l.push(c));
       });
-      const A = i - (F + s) % i, Y = A < s ? i : A, P = i - s * (t(m) && !o.extraInAction ? 2 : 1), Z = !o.forceExpand && F > P;
-      let T = 0, V = 0;
-      const ee = n.map((u, p) => {
-        const C = u.props, I = C.span || s;
-        if (T += I, !o.forceExpand && t(f) && T > P) {
-          a.push(re(u, {
+      const k = i - (d + r) % i, Z = d % i < r, ee = k < r ? i : k, I = i - r * (o(p) && !a.extraInAction ? 2 : 1), te = !a.forceExpand && d > I;
+      let P = 0, T = 0;
+      const oe = l.map((c, f) => {
+        const x = c.props, O = x.span || r;
+        if (P += O, !a.forceExpand && o(u) && P > I) {
+          t.push(ie(c, {
             hidden: !0
           }));
           return;
         }
-        return V += I, {
-          node: u,
-          span: C.span || s,
-          key: `ApFormSearchFormItem-${p}-${Q(C.name)}-${C._signal}`
+        return T += O, {
+          node: c,
+          span: x.span || r,
+          key: `ApFormSearchFormItem-${f}-${X(x.name)}-${x._signal}`
         };
-      }).filter(Boolean), te = i - V - s;
+      }).filter(Boolean), ae = i - T - r;
       return {
-        hideNode: l(S, null, [a]),
-        nodes: ee,
-        defaultExtraSpan: Y,
-        actualExtraSpan: te,
-        showCollapse: Z
+        hideNode: n(_, null, [t]),
+        nodes: oe,
+        defaultExtraSpan: ee,
+        actualExtraSpan: ae,
+        showCollapse: te,
+        lastRowOnlyIncludeActionAndExtra: Z
       };
-    }), X = g(() => {
+    }), Y = g(() => {
       let e;
-      const a = t(_);
-      return l(S, null, [l(b, {
-        span: t(t(N))
+      const t = o(F), l = n(R, {
+        span: o(w),
+        key: "actionWrapper"
       }, {
-        default: () => [l($, null, {
-          default: () => [l(D, {
-            justify: "space-between"
+        default: () => [n(L, null, {
+          default: () => [n(M, {
+            justify: !o(u) && t.lastRowOnlyIncludeActionAndExtra && !(o(p) && a.extraInAction) ? "flex-end" : "space-between"
           }, {
-            default: () => [l(pe, null, {
-              default: () => [l(v, {
+            default: () => [n(de, null, {
+              default: () => [n(E, {
                 type: "primary",
-                onClick: J,
-                loading: o.submitLoading,
+                onClick: K,
+                loading: a.submitLoading,
                 htmlType: "submit"
               }, {
-                default: () => [o.searchText || w("ap.apForm.search.search")]
-              }), l(v, {
-                onClick: K
+                default: () => [a.searchText || b("ap.apForm.search.search")]
+              }), n(E, {
+                onClick: Q
               }, {
-                default: () => [o.resetText || w("ap.apForm.search.reset")]
-              }), a.showCollapse ? l(v, {
-                onClick: H,
-                icon: l(de, {
+                default: () => [a.resetText || b("ap.apForm.search.reset")]
+              }), t.showCollapse ? n(E, {
+                onClick: J,
+                icon: n(me, {
                   style: G.value === "aplus" ? "color:#B8C3D1" : "color:#BFBFBF",
-                  rotate: t(f) ? 90 : -90
+                  rotate: o(u) ? 90 : -90
                 }, null)
               }, null) : null]
-            }), o.extraInAction ? t(m) : null]
+            }), a.extraInAction ? o(p) : null]
           })]
         })]
-      }), !o.extraInAction && t(m) ? l(b, {
-        span: t(f) ? a.actualExtraSpan : a.defaultExtraSpan
+      }), r = !a.extraInAction && o(p) ? n(R, {
+        span: o(u) ? t.actualExtraSpan : t.defaultExtraSpan,
+        key: "extraNode"
       }, {
-        default: () => [l($, null, {
-          default: () => [l(D, {
-            justify: !t(f) && a.defaultExtraSpan === i ? "start" : "end"
-          }, Se(e = t(m)) ? e : {
+        default: () => [n(L, null, {
+          default: () => [n(M, {
+            justify: !o(u) && (t.defaultExtraSpan === i || t.lastRowOnlyIncludeActionAndExtra) ? "start" : "flex-end"
+          }, Be(e = o(p)) ? e : {
             default: () => [e]
           })]
         })]
-      }) : null]);
+      }) : null, d = n(R, {
+        span: t.defaultExtraSpan
+      }, null);
+      return !o(u) && t.lastRowOnlyIncludeActionAndExtra ? n(_, null, [r || d, l]) : n(_, null, [l, r]);
     });
-    return L({
-      apForm: g(() => t(x))
-    }), (e, a) => (c(), h(Fe, se({
-      class: t(W)(),
+    return W({
+      apForm: g(() => o(C))
+    }), (e, t) => (m(), y(Fe, ue({
+      class: o(U)(),
       ref_key: "apForm",
-      ref: x
-    }, t(me)(o, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
-      default: B(() => [(c(), h(R(_.value.hideNode))), l(t(ce), {
+      ref: C
+    }, o(ye)(a, ["collapse", "defaultCollapse", "onUpdate:collapse", "searchText", "resetText", "onSubmit", "onReset", "extraInAction", "forceExpand", "countPerRow"])), {
+      default: B(() => [(m(), y(A(F.value.hideNode))), n(o(fe), {
         gutter: 16
       }, {
-        default: B(() => [(c(!0), ue(S, null, ie(_.value.nodes, (n) => (c(), h(t(b), {
-          key: n.key,
-          span: n.span
+        default: B(() => [(m(!0), ce(_, null, pe(F.value.nodes, (l) => (m(), y(o(R), {
+          key: l.key,
+          span: l.span
         }, {
-          default: B(() => [(c(), h(R(n.node)))]),
+          default: B(() => [(m(), y(A(l.node)))]),
           _: 2
-        }, 1032, ["span"]))), 128)), (c(), h(R(X.value)))]),
+        }, 1032, ["span"]))), 128)), (m(), y(A(Y.value)))]),
         _: 1
       })]),
       _: 1
@@ -233,5 +238,5 @@ const i = 24, qe = /* @__PURE__ */ ae({
   }
 });
 export {
-  qe as default
+  ze as default
 };

package/es/src/ap-table/ap-table.vue.d.ts

@@ -4,7 +4,7 @@ import { ColumnType } from 'ant-design-vue/es/table';
 import { RowSelectionReturnType } from './hooks/use-table-row-selection';
 import { SpinSize } from 'ant-design-vue/es/spin/Spin';
 import { VueTypeValidableDef } from '../../node_modules/vue-types';
-import { GetPopupContainer, FilterValue, SorterResult, TableCurrentDataSource, TableLocale, CompareFn, ColumnFilterItem, SortOrder } from 'ant-design-vue/es/table/interface';
+import { GetPopupContainer, FilterValue, SorterResult, TableCurrentDataSource, TableLocale, CompareFn, ColumnFilterItem, SortOrder, TableRowSelection } from 'ant-design-vue/es/table/interface';
 import { RenderExpandIcon, PanelRender, TableComponents, TransformCellText, TableLayout, GetRowKey, TableSticky, RowClassName, GetComponentProps, ColumnType, Key, ExpandedRowRender } from 'ant-design-vue/es/vc-table/interface';
 import { TablePaginationConfig } from 'ant-design-vue';
 import { EllipsisConfig } from 'ant-design-vue/es/typography/Base';
@@ -672,7 +672,9 @@ declare const _default: <RecordType>(__VLS_props: {
         onOpenChange: PropType<(vis: boolean) => void>;
         'onUpdate:open': PropType<(vis: boolean) => void>;
     }>> | undefined;
-    rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
+    rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
+        mode?: "base" | undefined;
+    }) | undefined;
     rowClassName?: string | RowClassName<RecordType> | undefined;
     showHeader?: boolean | undefined;
     customRow?: GetComponentProps<RecordType> | undefined;
@@ -1417,7 +1419,9 @@ declare const _default: <RecordType>(__VLS_props: {
             onOpenChange: PropType<(vis: boolean) => void>;
             'onUpdate:open': PropType<(vis: boolean) => void>;
         }>> | undefined;
-        rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
+        rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
+            mode?: "base" | undefined;
+        }) | undefined;
         rowClassName?: string | RowClassName<RecordType> | undefined;
         showHeader?: boolean | undefined;
         customRow?: GetComponentProps<RecordType> | undefined;
@@ -2166,7 +2170,9 @@ declare const _default: <RecordType>(__VLS_props: {
                 onOpenChange: PropType<(vis: boolean) => void>;
                 'onUpdate:open': PropType<(vis: boolean) => void>;
             }>> | undefined;
-            rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
+            rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
+                mode?: "base" | undefined;
+            }) | undefined;
             rowClassName?: string | RowClassName<RecordType> | undefined;
             showHeader?: boolean | undefined;
             customRow?: GetComponentProps<RecordType> | undefined;

package/es/src/ap-table/ap-table.vue.mjs

@@ -1,14 +1,14 @@
-import { defineComponent as ne, useSlots as se, computed as s, createVNode as d, mergeProps as p, unref as r, watch as de, openBlock as c, createElementBlock as y, normalizeClass as F, normalizeStyle as T, createSlots as V, withCtx as f, Fragment as ue, renderList as z, createBlock as ie, resolveDynamicComponent as pe, renderSlot as x, createCommentVNode as D, createElementVNode as K, toDisplayString as ce, normalizeProps as fe, guardReactiveProps as me } from "vue";
+import { defineComponent as ne, useSlots as se, computed as s, createVNode as d, mergeProps as p, unref as l, watch as de, openBlock as c, createElementBlock as y, normalizeClass as F, normalizeStyle as T, createSlots as V, withCtx as f, Fragment as ue, renderList as z, createBlock as ie, resolveDynamicComponent as pe, renderSlot as x, createCommentVNode as D, createElementVNode as K, toDisplayString as ce, normalizeProps as fe, guardReactiveProps as me } from "vue";
 import { Typography as ge, Table as ye, Tooltip as be } from "ant-design-vue";
 import { useToken as Se } from "ant-design-vue/es/theme/internal";
 import { ApForm as he } from "../ap-form/index.mjs";
 import { apTableRenderItemMap as we, noRenderAsFormItemValueList as N, apTableFormItemMap as Ce } from "./constants.mjs";
 import "../config-provider/index.mjs";
 import { useTablePaging as Re } from "./hooks/use-table-paging.mjs";
-import { omit as W, isUndefined as u, isBoolean as Fe } from "lodash-unified";
+import { omit as j, isUndefined as u, isBoolean as Fe } from "lodash-unified";
 import "./style/ap-table.css";
 import { QuestionCircleOutlined as Te } from "@ant-design/icons-vue";
-import { apColumnToColumn as xe, getTableRenderType as ve, getTableRenderProps as Be, getColumnOrder as _, updateFormProps as Pe, getFieldProps as Ie, getPlaceholder as ke } from "./utils.mjs";
+import { apColumnToColumn as xe, getTableRenderType as ve, getTableRenderProps as Be, getColumnOrder as W, updateFormProps as Pe, getFieldProps as Ie, getPlaceholder as ke } from "./utils.mjs";
 import Le from "./hooks/use-table-content-height.mjs";
 import { getRawDisplayValue as Ee } from "../editable-table/utils.mjs";
 import Oe from "./hooks/use-table-row-selection.mjs";
@@ -97,7 +97,7 @@ const Ke = {
     transformCellText: {},
     columns: {},
     rowSelection: {
-      type: Boolean
+      type: [Boolean, Object]
     },
     card: {
       type: Boolean,
@@ -133,10 +133,10 @@ const Ke = {
       default: !1
     }
   },
-  setup(j, {
+  setup(_, {
     expose: A
   }) {
-    const a = j;
+    const a = _;
     let v = 0;
     const B = se(), [, M] = Se(), {
       t: q
@@ -150,20 +150,20 @@ const Ke = {
       var t;
       let e = ((t = a.columns) == null ? void 0 : t.filter((o) => !o.hideInTable)) || [];
       return e = e.map((o) => ({
-        ...W(xe(o), ["ellipsis"]),
+        ...j(xe(o), ["ellipsis"]),
         customRender({
-          value: l,
+          value: r,
           ...n
         }) {
           const C = ve(o), O = we[C], le = Be(o, {
-            value: l,
+            value: r,
             ...n
           });
-          let R = oe(o, l, d(O, p(le, {
+          let R = oe(o, r, d(O, p(le, {
             mode: "read"
           }), null));
           return o.customRender && (R = o.customRender({
-            value: l,
+            value: r,
             ...n,
             column: o,
             originalNode: R
@@ -172,24 +172,24 @@ const Ke = {
       })), e;
     }), P = s(() => {
       var e, t, o;
-      return v++, ((o = (t = (e = a.columns) == null ? void 0 : e.filter((l) => !l.hideInSearch && l.dataIndex && (l.valueType || l.customRenderFormItem) && !N.includes(l.valueType))) == null ? void 0 : t.sort((l, n) => {
-        let C = _(l.order);
-        return _(n.order) - C;
-      })) == null ? void 0 : o.map((l) => {
-        const n = Pe(l, Ie(l.fieldProps, {}));
+      return v++, ((o = (t = (e = a.columns) == null ? void 0 : e.filter((r) => !r.hideInSearch && r.dataIndex && (r.valueType || r.customRenderFormItem) && !N.includes(r.valueType))) == null ? void 0 : t.sort((r, n) => {
+        let C = W(r.order);
+        return W(n.order) - C;
+      })) == null ? void 0 : o.map((r) => {
+        const n = Pe(r, Ie(r.fieldProps, {}));
         return {
-          ...l,
+          ...r,
           fieldProps: {
-            label: l.title,
-            name: l.dataIndex,
+            label: r.title,
+            name: r.dataIndex,
             ...n || {},
             // 格式化placeholder
-            placeholder: ke(q, l.valueType, n == null ? void 0 : n.placeholder),
+            placeholder: ke(q, r.valueType, n == null ? void 0 : n.placeholder),
             _signal: v
           }
         };
       })) || [];
-    }), Q = s(() => r(S).filter((e) => e.sorter === !0).map((e) => e.dataIndex)), U = s(() => r(S).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex)), J = s(() => u(a.dataSource) ? g.value.records : a.dataSource), {
+    }), Q = s(() => l(S).filter((e) => e.sorter === !0).map((e) => e.dataIndex)), U = s(() => l(S).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex)), J = s(() => u(a.dataSource) ? g.value.records : a.dataSource), {
       rowSelection: I,
       selectedRows: k,
       ...h
@@ -206,16 +206,16 @@ const Ke = {
       data: g
     } = Re({
       async request(e) {
-        var o, l;
+        var o, r;
         !I.value.preserveSelectedRowKeys && u(a.dataSource) && h.clearAll();
         const t = await ((o = a.request) == null ? void 0 : o.call(a, e));
-        return (l = a.onLoad) == null || l.call(a, (t == null ? void 0 : t.data) || []), {
+        return (r = a.onLoad) == null || r.call(a, (t == null ? void 0 : t.data) || []), {
           data: (t == null ? void 0 : t.data) || [],
           total: (t == null ? void 0 : t.total) || 0
         };
       },
-      filterFields: r(U),
-      sortFields: r(Q),
+      filterFields: l(U),
+      sortFields: l(Q),
       defaultParams: a.params,
       defaultData: a.defaultData,
       manual: a.manual,
@@ -225,7 +225,7 @@ const Ke = {
     }), Y = s(() => {
       var e;
       return a.scroll ? a.scroll : a.adaptive && (g.value.total > 0 || (e = a.dataSource) != null && e.length) ? {
-        y: r($),
+        y: l($),
         x: "100%"
       } : {
         x: !0
@@ -237,22 +237,23 @@ const Ke = {
       if ((e = a.columns) != null && e.some((t) => t.ellipsis))
         return "fixed";
     }), ee = s(() => {
-      const e = r(m), t = u(a.dataSource) ? e : {
+      var r;
+      const e = l(m), t = u(a.dataSource) ? e : {
         ...e,
         dataSource: a.dataSource,
         onChange: a.onChange
-      }, o = r(I);
+      }, o = l(I);
       return {
         ...a,
         ...t,
-        rowSelection: a.rowSelection ? {
+        rowSelection: a.rowSelection === !0 || ((r = a.rowSelection) == null ? void 0 : r.mode) === "internal" ? {
           ...o,
           // tips 如果是前端分页，则默认会走缓存
           preserveSelectedRowKeys: u(a.dataSource) ? o.preserveSelectedRowKeys : !0
-        } : void 0,
-        loading: u(a.loading) ? r(m).loading : a.loading,
-        pagination: a.pagination === !1 ? !1 : r(m).pagination,
-        scroll: r(Y)
+        } : a.rowSelection,
+        loading: u(a.loading) ? l(m).loading : a.loading,
+        pagination: a.pagination === !1 ? !1 : l(m).pagination,
+        scroll: l(Y)
       };
     }), ae = s(() => [i(), a.card ? null : i("wrapper"), a.adaptive ? i("adaptive") : null].filter(Boolean));
     function oe(e, t, o) {
@@ -270,13 +271,13 @@ const Ke = {
         content: e.ellipsis ? Ee(e, t) : o
       }, null) : o;
     }
-    de(() => r(g).loading, (e) => {
+    de(() => l(g).loading, (e) => {
       var t;
       (t = a.onLoadingChange) == null || t.call(a, e);
     });
     function te(e) {
-      var t, o, l;
-      (l = (o = (t = w.value) == null ? void 0 : t.apForm) == null ? void 0 : o.setFieldsValue) == null || l.call(o, e);
+      var t, o, r;
+      (r = (o = (t = w.value) == null ? void 0 : t.apForm) == null ? void 0 : o.setFieldsValue) == null || r.call(o, e);
     }
     function re() {
       var e, t, o;
@@ -287,26 +288,26 @@ const Ke = {
       reset: () => E(),
       setSearchFormValues: te,
       getSearchFormValues: re,
-      dataSource: s(() => r(g).records),
+      dataSource: s(() => l(g).records),
       rowSelection: {
-        selectedRows: s(() => r(k)),
+        selectedRows: s(() => l(k)),
         ...h
       }
     }), (e, t) => (c(), y("div", {
       class: F(ae.value)
-    }, [r(u)(e.dataSource) && e.searchForm !== !1 && P.value.length > 0 ? (c(), y("div", {
+    }, [l(u)(e.dataSource) && e.searchForm !== !1 && P.value.length > 0 ? (c(), y("div", {
       key: 0,
-      class: F(e.card ? r(b)("search-wrapper") : null),
+      class: F(e.card ? l(b)("search-wrapper") : null),
       style: T(e.searchFormWrapperStyle)
-    }, [d(r(he).SearchForm, p(e.searchForm || {}, {
+    }, [d(l(he).SearchForm, p(e.searchForm || {}, {
       ref_key: "formRef",
       ref: w,
       "custom-reset": "",
-      onSubmit: r(L),
-      onReset: r(E),
-      "submit-loading": r(m).loading
+      onSubmit: l(L),
+      onReset: l(E),
+      "submit-loading": l(m).loading
     }), V({
-      default: f(() => [(c(!0), y(ue, null, z(P.value, (o) => (c(), ie(pe(o.customRenderFormItem ? o.customRenderFormItem(o) : r(Ce)[o.valueType || "text"]), p({
+      default: f(() => [(c(!0), y(ue, null, z(P.value, (o) => (c(), ie(pe(o.customRenderFormItem ? o.customRenderFormItem(o) : l(Ce)[o.valueType || "text"]), p({
         key: o.dataIndex,
         ref_for: !0
       }, o.fieldProps || {}, {
@@ -320,36 +321,36 @@ const Ke = {
     } : void 0]), 1040, ["onSubmit", "onReset", "submit-loading"])], 6)) : D("", !0), K("div", {
       ref_key: "contentRef",
       ref: G,
-      class: F([r(b)("table-wrapper"), e.card ? r(b)("table-wrapper-card") : null]),
+      class: F([l(b)("table-wrapper"), e.card ? l(b)("table-wrapper-card") : null]),
       style: T(e.tableWrapperStyle)
     }, [x(e.$slots, "title", p({
-      selectedRows: r(k)
-    }, h)), d(r(ye), p({
-      class: r(H) === "admin" ? r(i)("table-admin") : r(i)("table")
+      selectedRows: l(k)
+    }, h)), d(l(ye), p({
+      class: l(H) === "admin" ? l(i)("table-admin") : l(i)("table")
     }, ee.value, {
       "table-layout": Z.value,
-      onChange: r(X),
+      onChange: l(X),
       columns: S.value
     }), V({
       headerCell: f(({
         column: o,
-        title: l
-      }) => [o.tooltip ? (c(), y("span", Ke, [K("span", null, ce(l), 1), d(r(be), {
+        title: r
+      }) => [o.tooltip ? (c(), y("span", Ke, [K("span", null, ce(r), 1), d(l(be), {
         title: o.tooltip,
         placement: "bottom"
       }, {
-        default: f(() => [d(r(Te), {
+        default: f(() => [d(l(Te), {
           style: T({
             paddingLeft: "4px",
-            color: r(M).colorPrimary
+            color: l(M).colorPrimary
           })
         }, null, 8, ["style"])]),
         _: 2
       }, 1032, ["title"])])) : D("", !0)]),
       _: 2
-    }, [z(r(W)(B, ["title", "searchFormExtra"]), (o, l) => ({
-      name: l,
-      fn: f((n) => [x(e.$slots, l, fe(me(n || {})))])
+    }, [z(l(j)(B, ["title", "searchFormExtra"]), (o, r) => ({
+      name: r,
+      fn: f((n) => [x(e.$slots, r, fe(me(n || {})))])
     }))]), 1040, ["class", "table-layout", "onChange", "columns"])], 6)], 2));
   }
 });

package/es/src/ap-table/constants.d.ts

@@ -9419,7 +9419,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -9624,7 +9624,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -9861,7 +9861,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -10095,7 +10095,7 @@ export declare const apTableRenderItemMap: {
             default: string;
         };
         timezone: {
-            type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+            type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
         };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -10363,7 +10363,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -10576,7 +10576,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -10826,7 +10826,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -11073,7 +11073,7 @@ export declare const apTableRenderItemMap: {
             default: string;
         };
         timezone: {
-            type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+            type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
         };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;

package/es/src/ap-table/hooks/use-table-row-selection.d.ts

@@ -46,7 +46,7 @@ export interface RowSelectionReturnType<RecordType = any> {
      */
     toggleSelect: (item: RecordType) => void;
 }
-type RowSelectionParams<T> = ApTableRowSelection<T> & {
+type RowSelectionParams<T> = Omit<ApTableRowSelection<T>, 'mode'> & {
     /**
      * 数据源（如果是后端分页，则表示当页数据，否则是全量数据）
      */

package/es/src/ap-table/interface.d.ts

@@ -65,7 +65,9 @@ export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters' |
         multiple?: number;
     };
 };
-export type ApTableRowSelection<RecordType = any> = Omit<TableRowSelection<RecordType>, 'selectedRowKeys' | 'onChange' | 'onSelect' | 'onSelectAll' | 'onSelectInvert' | 'onSelectNone'>;
+export type ApTableRowSelection<RecordType = any> = Omit<TableRowSelection<RecordType>, 'selectedRowKeys' | 'onChange' | 'onSelect' | 'onSelectAll' | 'onSelectInvert' | 'onSelectNone'> & {
+    mode: 'internal';
+};
 export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? ExtraProColumnType<RecordType> & {
     children?: ApColumnType<RecordType, ValueType>[];
     /**
@@ -151,7 +153,9 @@ export type ApTableProps<RecordType = any, ParamsType = any> = Omit<TableProps<R
     /**
      * 行选中配置
      */
-    rowSelection?: true | ApTableRowSelection<RecordType>;
+    rowSelection?: true | ApTableRowSelection<RecordType> | (TableRowSelection<RecordType> & {
+        mode?: 'base';
+    });
     /**
      * 是否启用卡片样式
      */

package/es/src/business/expandAlert/ApExpandAlert.vue2.mjs

@@ -15,7 +15,7 @@ const K = { key: 0 }, P = ["onClick"], le = /* @__PURE__ */ z({
     tipTitle: { default: "查看详情" },
     mapLabel: {},
     separator: { default: "|" },
-    rows: { default: 1 }
+    rows: { default: 2 }
   },
   emits: ["choose", "expand"],
   setup(g, { expose: b, emit: C }) {

package/es/src/business/expandAlert/interface.d.ts

@@ -24,7 +24,7 @@ export interface ApExpandAlertProps {
      */
     separator: string;
     /**
-     * 内容达到几行显示展开收起,默认是一行
+     * 内容达到几行显示展开收起,默认是两行
      */
     rows: string | number;
 }

package/lib/src/ap-form/ap-form-item-group/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("ant-design-vue"),k=require("lodash-unified"),y=require("../constant.js"),s=require("./helper.js");require("../../config-provider/index.js");require("../style/ap-form-item-group.css");const C=require("../../config-provider/hooks/use-namespace.js");function _(o){return typeof o=="function"||Object.prototype.toString.call(o)==="[object Object]"&&!e.isVNode(o)}const q=e.defineComponent({name:"ApFormItemGroup",__name:"index",props:{align:{},justify:{},prefixCls:{},gutter:{default:16},wrap:{type:Boolean,default:void 0},countPerRow:{default:3}},setup(o){const{b:u}=C.useNamespace("ap-form-item-group"),{countPerRow:p,...d}=o,a=e.useSlots();e.watch(()=>a.default(),n=>{c.value=s.genRealChildren(n)});const c=e.shallowRef(s.genRealChildren(a.default())),f=e.computed(()=>e.unref(c).map((n,l)=>{const t=n.props,r=k.pick(t,y.apFormItemColPropKeys),m=r!=null&&r.span?{}:s.buildColSpan(p),g=!!(t!=null&&t.hidden);return{key:`${l}-${s.getStringName(t.name)}`,node:e.createVNode(i.Col,e.mergeProps(m,r,{class:g?u("col-hidden"):""}),_(n)?n:{default:()=>[n]})}}));return(n,l)=>(e.openBlock(),e.createBlock(e.unref(i.Row),e.mergeProps({class:e.unref(u)()},d),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(f.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.node),{key:t.key}))),128))]),_:1},16,["class"]))}});exports.default=q;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),i=require("ant-design-vue"),d=require("lodash-unified"),k=require("../constant.js"),s=require("./helper.js");require("../../config-provider/index.js");require("../style/ap-form-item-group.css");const y=require("../../utils/index.js"),C=require("../../config-provider/hooks/use-namespace.js");function q(o){return typeof o=="function"||Object.prototype.toString.call(o)==="[object Object]"&&!e.isVNode(o)}const _=e.defineComponent({name:"ApFormItemGroup",__name:"index",props:{align:{},justify:{},prefixCls:{},gutter:{default:16},wrap:{type:Boolean,default:void 0},countPerRow:{default:3}},setup(o){const{b:u}=C.useNamespace("ap-form-item-group"),{countPerRow:p,...f}=o,a=e.useSlots();e.watch(()=>a.default(),n=>{c.value=s.genRealChildren(n)});const c=e.shallowRef(s.genRealChildren(a.default())),m=e.computed(()=>e.unref(c).map((n,l)=>{const t=n.props,r=d.pick(t,k.apFormItemColPropKeys),g=r!=null&&r.span?{}:s.buildColSpan(p),h=d.isBoolean(t.hidden)?!!t.hidden:y.isDef(t.hidden);return{key:`${l}-${s.getStringName(t.name)}`,node:e.createVNode(i.Col,e.mergeProps(g,r,{class:h?u("col-hidden"):""}),q(n)?n:{default:()=>[n]})}}));return(n,l)=>(e.openBlock(),e.createBlock(e.unref(i.Row),e.mergeProps({class:e.unref(u)()},f),{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(m.value,t=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.node),{key:t.key}))),128))]),_:1},16,["class"]))}});exports.default=_;

package/lib/src/ap-form/search-form/index.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),n=require("ant-design-vue");require("../ap-form.vue.js");require("../ap-form-item.vue2.js");require("../../hooks/index.js");const k=require("../ap-form-item-group/helper.js"),W=require("@ant-design/icons-vue");require("../../config-provider/index.js");require("../style/search-form.css");const R=require("lodash-unified"),H=require("../../utils/index.js"),J=require("./utils.js"),K=require("../../hooks/useControllableValue.js"),Q=require("../../config-provider/hooks/use-namespace.js"),X=require("../../config-provider/hooks/use-global-config.js"),Y=require("../../config-provider/hooks/use-locale.js"),q=require("../ap-form-item.vue.js"),Z=require("../ap-form.vue2.js");function ee(d){return typeof d=="function"||Object.prototype.toString.call(d)==="[object Object]"&&!e.isVNode(d)}const c=24,te=e.defineComponent({name:"ApFormSearchForm",__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},initialValues:{},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!1},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},customReset:{type:Boolean,default:!1},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:4},submitLoading:{type:Boolean}},emits:["update:collapse"],setup(d,{expose:w,emit:E}){var N;const r=e.useSlots(),a=d,A=E,{value:p,updateValue:P}=K.useControllableValue(a,A,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:T}=Q.useNamespace("ap-form-search-form"),I=X.useGlobalConfig("uiMode"),{t:x}=Y.useLocale(),m=e.ref();function D(){P(!e.unref(p))}function M(){var t,o;(o=(t=m.value)==null?void 0:t.validateFields())==null||o.then(a.onSubmit)}function j(){var t,o,l;a.customReset||(o=(t=m.value)==null?void 0:t.resetFields)==null||o.call(t),(l=a.onReset)==null||l.call(a)}let y=[];const C=e.shallowRef(k.genRealChildren(r.default())),f=e.shallowRef((N=r.extra)==null?void 0:N.call(r)),B=e.computed(()=>Math.floor(c/a.countPerRow));e.watch(()=>r.default(),t=>{y=C.value,C.value=k.genRealChildren(t)}),e.watch(()=>{var t;return(t=r.extra)==null?void 0:t.call(r)},t=>{f.value=t});const O=t=>H.isDef(t)?(R.isArray(t)?t:[t]).join(""):Date.now(),_=e.computed(()=>{const t=J.diffFormItem(y,C.value),o=[],l=[],u=e.unref(B);let g=0;t.forEach(s=>{const i=s.props;i!=null&&i.hidden?o.push(s):(g+=i.span||u,l.push(s))});const v=c-(g+u)%c,U=v<u?c:v,F=c-u*(e.unref(f)&&!a.extraInAction?2:1),$=!a.forceExpand&&g>F;let S=0,V=0;const z=l.map((s,i)=>{const h=s.props,b=h.span||u;if(S+=b,!a.forceExpand&&e.unref(p)&&S>F){o.push(e.cloneVNode(s,{hidden:!0}));return}return V+=b,{node:s,span:h.span||u,key:`ApFormSearchFormItem-${i}-${O(h.name)}-${h._signal}`}}).filter(Boolean),G=c-V-u;return{hideNode:e.createVNode(e.Fragment,null,[o]),nodes:z,defaultExtraSpan:U,actualExtraSpan:G,showCollapse:$}}),L=e.computed(()=>{let t;const o=e.unref(_);return e.createVNode(e.Fragment,null,[e.createVNode(n.Col,{span:e.unref(e.unref(B))},{default:()=>[e.createVNode(q.default,null,{default:()=>[e.createVNode(n.Flex,{justify:"space-between"},{default:()=>[e.createVNode(n.Space,null,{default:()=>[e.createVNode(n.Button,{type:"primary",onClick:M,loading:a.submitLoading,htmlType:"submit"},{default:()=>[a.searchText||x("ap.apForm.search.search")]}),e.createVNode(n.Button,{onClick:j},{default:()=>[a.resetText||x("ap.apForm.search.reset")]}),o.showCollapse?e.createVNode(n.Button,{onClick:D,icon:e.createVNode(W.DoubleRightOutlined,{style:I.value==="aplus"?"color:#B8C3D1":"color:#BFBFBF",rotate:e.unref(p)?90:-90},null)},null):null]}),a.extraInAction?e.unref(f):null]})]})]}),!a.extraInAction&&e.unref(f)?e.createVNode(n.Col,{span:e.unref(p)?o.actualExtraSpan:o.defaultExtraSpan},{default:()=>[e.createVNode(q.default,null,{default:()=>[e.createVNode(n.Flex,{justify:!e.unref(p)&&o.defaultExtraSpan===c?"start":"end"},ee(t=e.unref(f))?t:{default:()=>[t]})]})]}):null])});return w({apForm:e.computed(()=>e.unref(m))}),(t,o)=>(e.openBlock(),e.createBlock(Z.default,e.mergeProps({class:e.unref(T)(),ref_key:"apForm",ref:m},e.unref(R.omit)(a,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(_.value.hideNode))),e.createVNode(e.unref(n.Row),{gutter:16},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(_.value.nodes,l=>(e.openBlock(),e.createBlock(e.unref(n.Col),{key:l.key,span:l.span},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(l.node)))]),_:2},1032,["span"]))),128)),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(L.value)))]),_:1})]),_:1},16,["class"]))}});exports.default=te;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),r=require("ant-design-vue");require("../ap-form.vue.js");require("../ap-form-item.vue2.js");require("../../hooks/index.js");const b=require("../ap-form-item-group/helper.js"),J=require("@ant-design/icons-vue");require("../../config-provider/index.js");require("../style/search-form.css");const g=require("lodash-unified"),w=require("../../utils/index.js"),K=require("./utils.js"),Q=require("../../hooks/useControllableValue.js"),X=require("../../config-provider/hooks/use-namespace.js"),Y=require("../../config-provider/hooks/use-global-config.js"),Z=require("../../config-provider/hooks/use-locale.js"),q=require("../ap-form-item.vue.js"),ee=require("../ap-form.vue2.js");function te(m){return typeof m=="function"||Object.prototype.toString.call(m)==="[object Object]"&&!e.isVNode(m)}const s=24,ne=e.defineComponent({name:"ApFormSearchForm",__name:"index",props:{layout:{default:"horizontal"},labelCol:{},wrapperCol:{},colon:{type:Boolean,default:!0},labelAlign:{default:"right"},labelWrap:{type:Boolean},prefixCls:{},requiredMark:{},hideRequiredMark:{type:Boolean,default:!1},rules:{},validateMessages:{},validateOnRuleChange:{type:Boolean,default:!0},scrollToFirstError:{},onSubmit:{},name:{},validateTrigger:{default:"change"},size:{},disabled:{type:Boolean},onValuesChange:{},onFieldsChange:{},onFinish:{},onFinishFailed:{},onValidate:{},initialValues:{},collapse:{type:Boolean,default:void 0},defaultCollapse:{type:Boolean,default:!1},"onUpdate:collapse":{},searchText:{},resetText:{},onReset:{},customReset:{type:Boolean,default:!1},extraInAction:{type:Boolean,default:!1},forceExpand:{type:Boolean,default:!1},countPerRow:{default:4},submitLoading:{type:Boolean}},emits:["update:collapse"],setup(m,{expose:A,emit:E}){var F;const u=e.useSlots(),a=m,I=E,{value:c,updateValue:P}=Q.useControllableValue(a,I,{valuePropName:"collapse",defaultValuePropName:"defaultCollapse"}),{b:T}=X.useNamespace("ap-form-search-form"),O=Y.useGlobalConfig("uiMode"),{t:y}=Z.useLocale(),x=e.ref();function D(){P(!e.unref(c))}function M(){var t,n;(n=(t=x.value)==null?void 0:t.validateFields())==null||n.then(a.onSubmit)}function j(){var t,n,o;a.customReset||(n=(t=x.value)==null?void 0:t.resetFields)==null||n.call(t),(o=a.onReset)==null||o.call(a)}let N=[];const C=e.shallowRef(b.genRealChildren(u.default())),d=e.shallowRef((F=u.extra)==null?void 0:F.call(u)),B=e.computed(()=>Math.floor(s/a.countPerRow));e.watch(()=>u.default(),t=>{N=C.value,C.value=b.genRealChildren(t)}),e.watch(()=>{var t;return(t=u.extra)==null?void 0:t.call(u)},t=>{d.value=t});const L=t=>w.isDef(t)?(g.isArray(t)?t:[t]).join(""):Date.now(),_=e.computed(()=>{const t=K.diffFormItem(N,C.value),n=[],o=[],l=e.unref(B);let p=0;t.forEach(i=>{const f=i.props;(g.isBoolean(f.hidden)?!!f.hidden:w.isDef(f.hidden))?n.push(i):(p+=f.span||l,o.push(i))});const v=s-(p+l)%s,U=p%s<l,$=v<l?s:v,V=s-l*(e.unref(d)&&!a.extraInAction?2:1),z=!a.forceExpand&&p>V;let R=0,S=0;const G=o.map((i,f)=>{const h=i.props,k=h.span||l;if(R+=k,!a.forceExpand&&e.unref(c)&&R>V){n.push(e.cloneVNode(i,{hidden:!0}));return}return S+=k,{node:i,span:h.span||l,key:`ApFormSearchFormItem-${f}-${L(h.name)}-${h._signal}`}}).filter(Boolean),H=s-S-l;return{hideNode:e.createVNode(e.Fragment,null,[n]),nodes:G,defaultExtraSpan:$,actualExtraSpan:H,showCollapse:z,lastRowOnlyIncludeActionAndExtra:U}}),W=e.computed(()=>{let t;const n=e.unref(_),o=e.createVNode(r.Col,{span:e.unref(B),key:"actionWrapper"},{default:()=>[e.createVNode(q.default,null,{default:()=>[e.createVNode(r.Flex,{justify:!e.unref(c)&&n.lastRowOnlyIncludeActionAndExtra&&!(e.unref(d)&&a.extraInAction)?"flex-end":"space-between"},{default:()=>[e.createVNode(r.Space,null,{default:()=>[e.createVNode(r.Button,{type:"primary",onClick:M,loading:a.submitLoading,htmlType:"submit"},{default:()=>[a.searchText||y("ap.apForm.search.search")]}),e.createVNode(r.Button,{onClick:j},{default:()=>[a.resetText||y("ap.apForm.search.reset")]}),n.showCollapse?e.createVNode(r.Button,{onClick:D,icon:e.createVNode(J.DoubleRightOutlined,{style:O.value==="aplus"?"color:#B8C3D1":"color:#BFBFBF",rotate:e.unref(c)?90:-90},null)},null):null]}),a.extraInAction?e.unref(d):null]})]})]}),l=!a.extraInAction&&e.unref(d)?e.createVNode(r.Col,{span:e.unref(c)?n.actualExtraSpan:n.defaultExtraSpan,key:"extraNode"},{default:()=>[e.createVNode(q.default,null,{default:()=>[e.createVNode(r.Flex,{justify:!e.unref(c)&&(n.defaultExtraSpan===s||n.lastRowOnlyIncludeActionAndExtra)?"start":"flex-end"},te(t=e.unref(d))?t:{default:()=>[t]})]})]}):null,p=e.createVNode(r.Col,{span:n.defaultExtraSpan},null);return!e.unref(c)&&n.lastRowOnlyIncludeActionAndExtra?e.createVNode(e.Fragment,null,[l||p,o]):e.createVNode(e.Fragment,null,[o,l])});return A({apForm:e.computed(()=>e.unref(x))}),(t,n)=>(e.openBlock(),e.createBlock(ee.default,e.mergeProps({class:e.unref(T)(),ref_key:"apForm",ref:x},e.unref(g.omit)(a,["collapse","defaultCollapse","onUpdate:collapse","searchText","resetText","onSubmit","onReset","extraInAction","forceExpand","countPerRow"])),{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(_.value.hideNode))),e.createVNode(e.unref(r.Row),{gutter:16},{default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(_.value.nodes,o=>(e.openBlock(),e.createBlock(e.unref(r.Col),{key:o.key,span:o.span},{default:e.withCtx(()=>[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(o.node)))]),_:2},1032,["span"]))),128)),(e.openBlock(),e.createBlock(e.resolveDynamicComponent(W.value)))]),_:1})]),_:1},16,["class"]))}});exports.default=ne;

package/lib/src/ap-table/ap-table.vue.d.ts

@@ -4,7 +4,7 @@ import { ColumnType } from 'ant-design-vue/es/table';
 import { RowSelectionReturnType } from './hooks/use-table-row-selection';
 import { SpinSize } from 'ant-design-vue/es/spin/Spin';
 import { VueTypeValidableDef } from '../../node_modules/vue-types';
-import { GetPopupContainer, FilterValue, SorterResult, TableCurrentDataSource, TableLocale, CompareFn, ColumnFilterItem, SortOrder } from 'ant-design-vue/es/table/interface';
+import { GetPopupContainer, FilterValue, SorterResult, TableCurrentDataSource, TableLocale, CompareFn, ColumnFilterItem, SortOrder, TableRowSelection } from 'ant-design-vue/es/table/interface';
 import { RenderExpandIcon, PanelRender, TableComponents, TransformCellText, TableLayout, GetRowKey, TableSticky, RowClassName, GetComponentProps, ColumnType, Key, ExpandedRowRender } from 'ant-design-vue/es/vc-table/interface';
 import { TablePaginationConfig } from 'ant-design-vue';
 import { EllipsisConfig } from 'ant-design-vue/es/typography/Base';
@@ -672,7 +672,9 @@ declare const _default: <RecordType>(__VLS_props: {
         onOpenChange: PropType<(vis: boolean) => void>;
         'onUpdate:open': PropType<(vis: boolean) => void>;
     }>> | undefined;
-    rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
+    rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
+        mode?: "base" | undefined;
+    }) | undefined;
     rowClassName?: string | RowClassName<RecordType> | undefined;
     showHeader?: boolean | undefined;
     customRow?: GetComponentProps<RecordType> | undefined;
@@ -1417,7 +1419,9 @@ declare const _default: <RecordType>(__VLS_props: {
             onOpenChange: PropType<(vis: boolean) => void>;
             'onUpdate:open': PropType<(vis: boolean) => void>;
         }>> | undefined;
-        rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
+        rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
+            mode?: "base" | undefined;
+        }) | undefined;
         rowClassName?: string | RowClassName<RecordType> | undefined;
         showHeader?: boolean | undefined;
         customRow?: GetComponentProps<RecordType> | undefined;
@@ -2166,7 +2170,9 @@ declare const _default: <RecordType>(__VLS_props: {
                 onOpenChange: PropType<(vis: boolean) => void>;
                 'onUpdate:open': PropType<(vis: boolean) => void>;
             }>> | undefined;
-            rowSelection?: true | ApTableRowSelection<RecordType> | undefined;
+            rowSelection?: true | ApTableRowSelection<RecordType> | ( TableRowSelection<RecordType> & {
+                mode?: "base" | undefined;
+            }) | undefined;
             rowClassName?: string | RowClassName<RecordType> | undefined;
             showHeader?: boolean | undefined;
             customRow?: GetComponentProps<RecordType> | undefined;

package/lib/src/ap-table/ap-table.vue.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),h=require("ant-design-vue"),H=require("ant-design-vue/es/theme/internal"),G=require("../ap-form/index.js"),p=require("./constants.js");require("../config-provider/index.js");const Q=require("./hooks/use-table-paging.js"),s=require("lodash-unified");require("./style/ap-table.css");const J=require("@ant-design/icons-vue"),u=require("./utils.js"),X=require("./hooks/use-table-content-height.js"),Y=require("../editable-table/utils.js"),Z=require("./hooks/use-table-row-selection.js"),ee=require("../config-provider/hooks/use-locale.js"),te=require("../config-provider/hooks/use-namespace.js"),ae=require("../config-provider/hooks/use-global-config.js"),re={key:0},oe=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!0},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},rowSelection:{type:Boolean},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1}},setup(v,{expose:k}){const a=v;let w=0;const C=e.useSlots(),[,q]=H.useToken(),{t:I}=ee.useLocale(),{e:f,b:d}=te.useNamespace("ap-table"),V=ae.useGlobalConfig("uiMode","aplus"),{height:N,contentRef:E}=X.default(),m=e.computed(()=>{var o;let t=((o=a.columns)==null?void 0:o.filter(r=>!r.hideInTable))||[];return t=t.map(r=>({...s.omit(u.apColumnToColumn(r),["ellipsis"]),customRender({value:n,...l}){const S=u.getTableRenderType(r),P=p.apTableRenderItemMap[S],$=u.getTableRenderProps(r,{value:n,...l});let b=A(r,n,e.createVNode(P,e.mergeProps($,{mode:"read"}),null));return r.customRender&&(b=r.customRender({value:n,...l,column:r,originalNode:b})),b}})),t}),R=e.computed(()=>{var t,o,r;return w++,((r=(o=(t=a.columns)==null?void 0:t.filter(n=>!n.hideInSearch&&n.dataIndex&&(n.valueType||n.customRenderFormItem)&&!p.noRenderAsFormItemValueList.includes(n.valueType)))==null?void 0:o.sort((n,l)=>{let S=u.getColumnOrder(n.order);return u.getColumnOrder(l.order)-S}))==null?void 0:r.map(n=>{const l=u.updateFormProps(n,u.getFieldProps(n.fieldProps,{}));return{...n,fieldProps:{label:n.title,name:n.dataIndex,...l||{},placeholder:u.getPlaceholder(I,n.valueType,l==null?void 0:l.placeholder),_signal:w}}}))||[]}),L=e.computed(()=>e.unref(m).filter(t=>t.sorter===!0).map(t=>t.dataIndex)),z=e.computed(()=>e.unref(m).filter(t=>t.filters&&!t.onFilter).map(t=>t.dataIndex)),O=e.computed(()=>s.isUndefined(a.dataSource)?c.value.records:a.dataSource),{rowSelection:F,selectedRows:x,...g}=Z.default({...a.rowSelection===!0?{}:a.rowSelection,rowKey:a.rowKey,dataSource:O}),{formRef:y,submit:T,reset:B,tableProps:i,handleTableChange:D,data:c}=Q.useTablePaging({async request(t){var r,n;!F.value.preserveSelectedRowKeys&&s.isUndefined(a.dataSource)&&g.clearAll();const o=await((r=a.request)==null?void 0:r.call(a,t));return(n=a.onLoad)==null||n.call(a,(o==null?void 0:o.data)||[]),{data:(o==null?void 0:o.data)||[],total:(o==null?void 0:o.total)||0}},filterFields:e.unref(z),sortFields:e.unref(L),defaultParams:a.params,defaultData:a.defaultData,manual:a.manual,defaultCurrent:a.pagination?a.pagination.defaultCurrent:void 0,defaultPageSize:a.pagination?a.pagination.defaultPageSize:void 0,formatParams:a.beforeSearchSubmit}),K=e.computed(()=>{var t;return a.scroll?a.scroll:a.adaptive&&(c.value.total>0||(t=a.dataSource)!=null&&t.length)?{y:e.unref(N),x:"100%"}:{x:!0}}),_=e.computed(()=>{var t;if(a.tableLayout)return a.tableLayout;if((t=a.columns)!=null&&t.some(o=>o.ellipsis))return"fixed"}),U=e.computed(()=>{const t=e.unref(i),o=s.isUndefined(a.dataSource)?t:{...t,dataSource:a.dataSource,onChange:a.onChange},r=e.unref(F);return{...a,...o,rowSelection:a.rowSelection?{...r,preserveSelectedRowKeys:s.isUndefined(a.dataSource)?r.preserveSelectedRowKeys:!0}:void 0,loading:s.isUndefined(a.loading)?e.unref(i).loading:a.loading,pagination:a.pagination===!1?!1:e.unref(i).pagination,scroll:e.unref(K)}}),j=e.computed(()=>[d(),a.card?null:d("wrapper"),a.adaptive?d("adaptive"):null].filter(Boolean));function A(t,o,r){return p.noRenderAsFormItemValueList.includes(t.valueType)?r:t.copyable||t.ellipsis?e.createVNode(h.Typography.Paragraph,{copyable:t.copyable?{text:o,tooltip:!1}:!1,ellipsis:t.ellipsis?s.isBoolean(t.ellipsis)?{tooltip:o}:{...t.ellipsis,tooltip:o}:!1,content:t.ellipsis?Y.getRawDisplayValue(t,o):r},null):r}e.watch(()=>e.unref(c).loading,t=>{var o;(o=a.onLoadingChange)==null||o.call(a,t)});function M(t){var o,r,n;(n=(r=(o=y.value)==null?void 0:o.apForm)==null?void 0:r.setFieldsValue)==null||n.call(r,t)}function W(){var t,o,r;return(r=(o=(t=y.value)==null?void 0:t.apForm)==null?void 0:o.getFieldsValue)==null?void 0:r.call(o,!0)}return k({submit:()=>T(),reset:()=>B(),setSearchFormValues:M,getSearchFormValues:W,dataSource:e.computed(()=>e.unref(c).records),rowSelection:{selectedRows:e.computed(()=>e.unref(x)),...g}}),(t,o)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(j.value)},[e.unref(s.isUndefined)(t.dataSource)&&t.searchForm!==!1&&R.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(t.card?e.unref(f)("search-wrapper"):null),style:e.normalizeStyle(t.searchFormWrapperStyle)},[e.createVNode(e.unref(G.ApForm).SearchForm,e.mergeProps(t.searchForm||{},{ref_key:"formRef",ref:y,"custom-reset":"",onSubmit:e.unref(T),onReset:e.unref(B),"submit-loading":e.unref(i).loading}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(R.value,r=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(r.customRenderFormItem?r.customRenderFormItem(r):e.unref(p.apTableFormItemMap)[r.valueType||"text"]),e.mergeProps({key:r.dataIndex,ref_for:!0},r.fieldProps||{},{span:r.span}),null,16,["span"]))),128))]),_:2},[C.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(t.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["onSubmit","onReset","submit-loading"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:E,class:e.normalizeClass([e.unref(f)("table-wrapper"),t.card?e.unref(f)("table-wrapper-card"):null]),style:e.normalizeStyle(t.tableWrapperStyle)},[e.renderSlot(t.$slots,"title",e.mergeProps({selectedRows:e.unref(x)},g)),e.createVNode(e.unref(h.Table),e.mergeProps({class:e.unref(V)==="admin"?e.unref(d)("table-admin"):e.unref(d)("table")},U.value,{"table-layout":_.value,onChange:e.unref(D),columns:m.value}),e.createSlots({headerCell:e.withCtx(({column:r,title:n})=>[r.tooltip?(e.openBlock(),e.createElementBlock("span",re,[e.createElementVNode("span",null,e.toDisplayString(n),1),e.createVNode(e.unref(h.Tooltip),{title:r.tooltip,placement:"bottom"},{default:e.withCtx(()=>[e.createVNode(e.unref(J.QuestionCircleOutlined),{style:e.normalizeStyle({paddingLeft:"4px",color:e.unref(q).colorPrimary})},null,8,["style"])]),_:2},1032,["title"])])):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(s.omit)(C,["title","searchFormExtra"]),(r,n)=>({name:n,fn:e.withCtx(l=>[e.renderSlot(t.$slots,n,e.normalizeProps(e.guardReactiveProps(l||{})))])}))]),1040,["class","table-layout","onChange","columns"])],6)],2))}});exports.default=oe;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),h=require("ant-design-vue"),H=require("ant-design-vue/es/theme/internal"),G=require("../ap-form/index.js"),p=require("./constants.js");require("../config-provider/index.js");const Q=require("./hooks/use-table-paging.js"),s=require("lodash-unified");require("./style/ap-table.css");const J=require("@ant-design/icons-vue"),u=require("./utils.js"),X=require("./hooks/use-table-content-height.js"),Y=require("../editable-table/utils.js"),Z=require("./hooks/use-table-row-selection.js"),ee=require("../config-provider/hooks/use-locale.js"),te=require("../config-provider/hooks/use-namespace.js"),ae=require("../config-provider/hooks/use-global-config.js"),re={key:0},oe=e.defineComponent({name:"ApTable",__name:"ap-table",props:{dropdownPrefixCls:{},loading:{type:[Boolean,Object],default:void 0},bordered:{type:Boolean,default:!1},locale:{},onChange:{},onResizeColumn:{},getPopupContainer:{},scroll:{},sortDirections:{default:()=>["ascend","descend"]},showSorterTooltip:{type:[Boolean,Object],default:!0},prefixCls:{},rowKey:{default:"key"},tableLayout:{},rowClassName:{},title:{},footer:{},id:{},showHeader:{type:Boolean,default:!0},components:{},customRow:{},customHeaderRow:{},direction:{},expandFixed:{type:[String,Boolean],default:!1},expandColumnWidth:{},expandedRowKeys:{},defaultExpandedRowKeys:{},expandedRowRender:{},expandRowByClick:{type:Boolean,default:!1},expandIcon:{},onExpand:{},onExpandedRowsChange:{},defaultExpandAllRows:{type:Boolean,default:!1},indentSize:{default:15},expandIconColumnIndex:{},showExpandColumn:{type:Boolean,default:!0},expandedRowClassName:{},childrenColumnName:{default:"children"},rowExpandable:{},sticky:{type:[Boolean,Object]},transformCellText:{},columns:{},rowSelection:{type:[Boolean,Object]},card:{type:Boolean,default:!1},params:{},searchFormRender:{},request:{},onLoad:{},defaultData:{},dataSource:{},onLoadingChange:{},searchForm:{type:[Boolean,Object],default:void 0},beforeSearchSubmit:{},pagination:{type:[Boolean,Object],default:void 0},searchFormWrapperStyle:{},tableWrapperStyle:{},manual:{type:Boolean,default:!1},size:{default:"middle"},adaptive:{type:Boolean,default:!1}},setup(v,{expose:k}){const a=v;let w=0;const C=e.useSlots(),[,q]=H.useToken(),{t:I}=ee.useLocale(),{e:f,b:d}=te.useNamespace("ap-table"),V=ae.useGlobalConfig("uiMode","aplus"),{height:N,contentRef:E}=X.default(),m=e.computed(()=>{var o;let t=((o=a.columns)==null?void 0:o.filter(r=>!r.hideInTable))||[];return t=t.map(r=>({...s.omit(u.apColumnToColumn(r),["ellipsis"]),customRender({value:n,...l}){const S=u.getTableRenderType(r),P=p.apTableRenderItemMap[S],$=u.getTableRenderProps(r,{value:n,...l});let b=A(r,n,e.createVNode(P,e.mergeProps($,{mode:"read"}),null));return r.customRender&&(b=r.customRender({value:n,...l,column:r,originalNode:b})),b}})),t}),R=e.computed(()=>{var t,o,r;return w++,((r=(o=(t=a.columns)==null?void 0:t.filter(n=>!n.hideInSearch&&n.dataIndex&&(n.valueType||n.customRenderFormItem)&&!p.noRenderAsFormItemValueList.includes(n.valueType)))==null?void 0:o.sort((n,l)=>{let S=u.getColumnOrder(n.order);return u.getColumnOrder(l.order)-S}))==null?void 0:r.map(n=>{const l=u.updateFormProps(n,u.getFieldProps(n.fieldProps,{}));return{...n,fieldProps:{label:n.title,name:n.dataIndex,...l||{},placeholder:u.getPlaceholder(I,n.valueType,l==null?void 0:l.placeholder),_signal:w}}}))||[]}),L=e.computed(()=>e.unref(m).filter(t=>t.sorter===!0).map(t=>t.dataIndex)),O=e.computed(()=>e.unref(m).filter(t=>t.filters&&!t.onFilter).map(t=>t.dataIndex)),z=e.computed(()=>s.isUndefined(a.dataSource)?c.value.records:a.dataSource),{rowSelection:F,selectedRows:x,...g}=Z.default({...a.rowSelection===!0?{}:a.rowSelection,rowKey:a.rowKey,dataSource:z}),{formRef:y,submit:T,reset:B,tableProps:i,handleTableChange:D,data:c}=Q.useTablePaging({async request(t){var r,n;!F.value.preserveSelectedRowKeys&&s.isUndefined(a.dataSource)&&g.clearAll();const o=await((r=a.request)==null?void 0:r.call(a,t));return(n=a.onLoad)==null||n.call(a,(o==null?void 0:o.data)||[]),{data:(o==null?void 0:o.data)||[],total:(o==null?void 0:o.total)||0}},filterFields:e.unref(O),sortFields:e.unref(L),defaultParams:a.params,defaultData:a.defaultData,manual:a.manual,defaultCurrent:a.pagination?a.pagination.defaultCurrent:void 0,defaultPageSize:a.pagination?a.pagination.defaultPageSize:void 0,formatParams:a.beforeSearchSubmit}),K=e.computed(()=>{var t;return a.scroll?a.scroll:a.adaptive&&(c.value.total>0||(t=a.dataSource)!=null&&t.length)?{y:e.unref(N),x:"100%"}:{x:!0}}),_=e.computed(()=>{var t;if(a.tableLayout)return a.tableLayout;if((t=a.columns)!=null&&t.some(o=>o.ellipsis))return"fixed"}),j=e.computed(()=>{var n;const t=e.unref(i),o=s.isUndefined(a.dataSource)?t:{...t,dataSource:a.dataSource,onChange:a.onChange},r=e.unref(F);return{...a,...o,rowSelection:a.rowSelection===!0||((n=a.rowSelection)==null?void 0:n.mode)==="internal"?{...r,preserveSelectedRowKeys:s.isUndefined(a.dataSource)?r.preserveSelectedRowKeys:!0}:a.rowSelection,loading:s.isUndefined(a.loading)?e.unref(i).loading:a.loading,pagination:a.pagination===!1?!1:e.unref(i).pagination,scroll:e.unref(K)}}),U=e.computed(()=>[d(),a.card?null:d("wrapper"),a.adaptive?d("adaptive"):null].filter(Boolean));function A(t,o,r){return p.noRenderAsFormItemValueList.includes(t.valueType)?r:t.copyable||t.ellipsis?e.createVNode(h.Typography.Paragraph,{copyable:t.copyable?{text:o,tooltip:!1}:!1,ellipsis:t.ellipsis?s.isBoolean(t.ellipsis)?{tooltip:o}:{...t.ellipsis,tooltip:o}:!1,content:t.ellipsis?Y.getRawDisplayValue(t,o):r},null):r}e.watch(()=>e.unref(c).loading,t=>{var o;(o=a.onLoadingChange)==null||o.call(a,t)});function M(t){var o,r,n;(n=(r=(o=y.value)==null?void 0:o.apForm)==null?void 0:r.setFieldsValue)==null||n.call(r,t)}function W(){var t,o,r;return(r=(o=(t=y.value)==null?void 0:t.apForm)==null?void 0:o.getFieldsValue)==null?void 0:r.call(o,!0)}return k({submit:()=>T(),reset:()=>B(),setSearchFormValues:M,getSearchFormValues:W,dataSource:e.computed(()=>e.unref(c).records),rowSelection:{selectedRows:e.computed(()=>e.unref(x)),...g}}),(t,o)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass(U.value)},[e.unref(s.isUndefined)(t.dataSource)&&t.searchForm!==!1&&R.value.length>0?(e.openBlock(),e.createElementBlock("div",{key:0,class:e.normalizeClass(t.card?e.unref(f)("search-wrapper"):null),style:e.normalizeStyle(t.searchFormWrapperStyle)},[e.createVNode(e.unref(G.ApForm).SearchForm,e.mergeProps(t.searchForm||{},{ref_key:"formRef",ref:y,"custom-reset":"",onSubmit:e.unref(T),onReset:e.unref(B),"submit-loading":e.unref(i).loading}),e.createSlots({default:e.withCtx(()=>[(e.openBlock(!0),e.createElementBlock(e.Fragment,null,e.renderList(R.value,r=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(r.customRenderFormItem?r.customRenderFormItem(r):e.unref(p.apTableFormItemMap)[r.valueType||"text"]),e.mergeProps({key:r.dataIndex,ref_for:!0},r.fieldProps||{},{span:r.span}),null,16,["span"]))),128))]),_:2},[C.searchFormExtra?{name:"extra",fn:e.withCtx(()=>[e.renderSlot(t.$slots,"searchFormExtra")]),key:"0"}:void 0]),1040,["onSubmit","onReset","submit-loading"])],6)):e.createCommentVNode("",!0),e.createElementVNode("div",{ref_key:"contentRef",ref:E,class:e.normalizeClass([e.unref(f)("table-wrapper"),t.card?e.unref(f)("table-wrapper-card"):null]),style:e.normalizeStyle(t.tableWrapperStyle)},[e.renderSlot(t.$slots,"title",e.mergeProps({selectedRows:e.unref(x)},g)),e.createVNode(e.unref(h.Table),e.mergeProps({class:e.unref(V)==="admin"?e.unref(d)("table-admin"):e.unref(d)("table")},j.value,{"table-layout":_.value,onChange:e.unref(D),columns:m.value}),e.createSlots({headerCell:e.withCtx(({column:r,title:n})=>[r.tooltip?(e.openBlock(),e.createElementBlock("span",re,[e.createElementVNode("span",null,e.toDisplayString(n),1),e.createVNode(e.unref(h.Tooltip),{title:r.tooltip,placement:"bottom"},{default:e.withCtx(()=>[e.createVNode(e.unref(J.QuestionCircleOutlined),{style:e.normalizeStyle({paddingLeft:"4px",color:e.unref(q).colorPrimary})},null,8,["style"])]),_:2},1032,["title"])])):e.createCommentVNode("",!0)]),_:2},[e.renderList(e.unref(s.omit)(C,["title","searchFormExtra"]),(r,n)=>({name:n,fn:e.withCtx(l=>[e.renderSlot(t.$slots,n,e.normalizeProps(e.guardReactiveProps(l||{})))])}))]),1040,["class","table-layout","onChange","columns"])],6)],2))}});exports.default=oe;

package/lib/src/ap-table/constants.d.ts

@@ -9419,7 +9419,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -9624,7 +9624,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -9861,7 +9861,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -10095,7 +10095,7 @@ export declare const apTableRenderItemMap: {
             default: string;
         };
         timezone: {
-            type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+            type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
         };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -10363,7 +10363,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -10576,7 +10576,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -10826,7 +10826,7 @@ export declare const apTableRenderItemMap: {
                 default: string;
             };
             timezone: {
-                type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+                type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
             };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
@@ -11073,7 +11073,7 @@ export declare const apTableRenderItemMap: {
             default: string;
         };
         timezone: {
-            type: PropType<"LD" | "PR" | "MS" | "DB" | "SH" | "SU" | "LA" | "NY">;
+            type: PropType<"RJ" | "PR" | "VD" | "CP" | "BS" | "MS" | "SP" | "DB" | "NY" | "KR" | "CG" | "TM" | "DV" | "SU" | "LA" | "SH" | "ALS">;
         };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;

package/lib/src/ap-table/hooks/use-table-row-selection.d.ts

@@ -46,7 +46,7 @@ export interface RowSelectionReturnType<RecordType = any> {
      */
     toggleSelect: (item: RecordType) => void;
 }
-type RowSelectionParams<T> = ApTableRowSelection<T> & {
+type RowSelectionParams<T> = Omit<ApTableRowSelection<T>, 'mode'> & {
     /**
      * 数据源（如果是后端分页，则表示当页数据，否则是全量数据）
      */

package/lib/src/ap-table/interface.d.ts

@@ -65,7 +65,9 @@ export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters' |
         multiple?: number;
     };
 };
-export type ApTableRowSelection<RecordType = any> = Omit<TableRowSelection<RecordType>, 'selectedRowKeys' | 'onChange' | 'onSelect' | 'onSelectAll' | 'onSelectInvert' | 'onSelectNone'>;
+export type ApTableRowSelection<RecordType = any> = Omit<TableRowSelection<RecordType>, 'selectedRowKeys' | 'onChange' | 'onSelect' | 'onSelectAll' | 'onSelectInvert' | 'onSelectNone'> & {
+    mode: 'internal';
+};
 export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? ExtraProColumnType<RecordType> & {
     children?: ApColumnType<RecordType, ValueType>[];
     /**
@@ -151,7 +153,9 @@ export type ApTableProps<RecordType = any, ParamsType = any> = Omit<TableProps<R
     /**
      * 行选中配置
      */
-    rowSelection?: true | ApTableRowSelection<RecordType>;
+    rowSelection?: true | ApTableRowSelection<RecordType> | (TableRowSelection<RecordType> & {
+        mode?: 'base';
+    });
     /**
      * 是否启用卡片样式
      */

package/lib/src/business/expandAlert/ApExpandAlert.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),b=require("@ant-design/icons-vue"),c=require("ant-design-vue"),B=require("../../ap-action/index.js");require("../../config-provider/index.js");require("./style.css");const E=require("../../config-provider/hooks/use-namespace.js"),N=require("../../config-provider/hooks/use-global-config.js"),z={key:0},V=["onClick"],S=e.defineComponent({__name:"ApExpandAlert",props:{type:{default:"warning"},data:{default:()=>[]},prefix:{default:""},tipTitle:{default:"查看详情"},mapLabel:{},separator:{default:"|"},rows:{default:1}},emits:["choose","expand"],setup(p,{expose:d,emit:f}){const m=f,i=p,a=e.ref(""),o=e.ref(null),v=e.computed(()=>({fontWeight:"400",wordBreak:"break-all",overflow:"hidden",display:"-webkit-box",webkitLineClamp:a.value,webkitBoxOrient:"vertical",lineHeight:"22px"}));function k(){a.value==="1"?a.value="":a.value="1",m("expand")}const g=e.computed(()=>a.value==="1"?"展开":"收起"),r=e.ref(!0),u=e.computed(()=>a.value!=="1");function y(t){t?a.value="":a.value="1"}e.watch(()=>i.data,()=>{a.value="",e.nextTick(()=>{if(o.value){const t=Number(o.value.clientHeight),s=Number(parseInt(o.value.style.lineHeight));t<s*Number(i.rows)&&u.value?r.value=!1:r.value=!0}})},{immediate:!0});const{b:C,e:l,m:h}=E.useNamespace("ap-expand-alert"),w=N.useGlobalConfig("uiMode","aplus");return d({setExpand:y}),(t,s)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass([e.unref(C)(),`${e.unref(h)(e.unref(w))}`])},[e.createVNode(e.unref(c.Alert),{type:t.type,"show-icon":"",class:e.normalizeClass(e.unref(l)("antAlert"))},{action:e.withCtx(()=>[r.value?(e.openBlock(),e.createBlock(e.unref(B.ApActionItem),{key:0,size:"small",onClick:s[0]||(s[0]=n=>k()),style:{"font-size":"12px","padding-left":"16px"}},{default:e.withCtx(()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(l)("expandText"))},e.toDisplayString(g.value),3),e.createVNode(e.unref(b.DownOutlined),{class:e.normalizeClass(u.value?e.unref(l)("expandIcon"):e.unref(l)("collapseIcon"))},null,8,["class"])]),_:1})):e.createCommentVNode("",!0)]),message:e.withCtx(()=>[e.createElementVNode("div",{style:e.normalizeStyle(v.value),class:e.normalizeClass(e.unref(l)("alertContent")),ref_key:"ellipsisBoxRef",ref:o},[e.renderSlot(t.$slots,"default",{},()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(l)("prefix"))},e.toDisplayString(t.prefix),3),typeof t.data=="string"?(e.openBlock(),e.createElementBlock("span",z,e.toDisplayString(t.data),1)):(e.openBlock(!0),e.createElementBlock(e.Fragment,{key:1},e.renderList(t.data,(n,x)=>(e.openBlock(),e.createElementBlock(e.Fragment,{key:n},[e.createVNode(e.unref(c.Tooltip),{title:t.tipTitle},{default:e.withCtx(()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(l)("showItem")),onClick:q=>t.$emit("choose",n)},e.toDisplayString(t.mapLabel?n[t.mapLabel]:n),11,V)]),_:2},1032,["title"]),x!==t.data.length-1?(e.openBlock(),e.createElementBlock("span",{key:0,class:e.normalizeClass(e.unref(l)("spliter"))},e.toDisplayString(t.separator),3)):e.createCommentVNode("",!0)],64))),128))])],6)]),_:3},8,["type","class"])],2))}});exports.default=S;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),b=require("@ant-design/icons-vue"),c=require("ant-design-vue"),B=require("../../ap-action/index.js");require("../../config-provider/index.js");require("./style.css");const E=require("../../config-provider/hooks/use-namespace.js"),N=require("../../config-provider/hooks/use-global-config.js"),z={key:0},V=["onClick"],S=e.defineComponent({__name:"ApExpandAlert",props:{type:{default:"warning"},data:{default:()=>[]},prefix:{default:""},tipTitle:{default:"查看详情"},mapLabel:{},separator:{default:"|"},rows:{default:2}},emits:["choose","expand"],setup(p,{expose:d,emit:f}){const m=f,i=p,a=e.ref(""),o=e.ref(null),v=e.computed(()=>({fontWeight:"400",wordBreak:"break-all",overflow:"hidden",display:"-webkit-box",webkitLineClamp:a.value,webkitBoxOrient:"vertical",lineHeight:"22px"}));function k(){a.value==="1"?a.value="":a.value="1",m("expand")}const g=e.computed(()=>a.value==="1"?"展开":"收起"),r=e.ref(!0),u=e.computed(()=>a.value!=="1");function y(t){t?a.value="":a.value="1"}e.watch(()=>i.data,()=>{a.value="",e.nextTick(()=>{if(o.value){const t=Number(o.value.clientHeight),s=Number(parseInt(o.value.style.lineHeight));t<s*Number(i.rows)&&u.value?r.value=!1:r.value=!0}})},{immediate:!0});const{b:C,e:l,m:h}=E.useNamespace("ap-expand-alert"),w=N.useGlobalConfig("uiMode","aplus");return d({setExpand:y}),(t,s)=>(e.openBlock(),e.createElementBlock("div",{class:e.normalizeClass([e.unref(C)(),`${e.unref(h)(e.unref(w))}`])},[e.createVNode(e.unref(c.Alert),{type:t.type,"show-icon":"",class:e.normalizeClass(e.unref(l)("antAlert"))},{action:e.withCtx(()=>[r.value?(e.openBlock(),e.createBlock(e.unref(B.ApActionItem),{key:0,size:"small",onClick:s[0]||(s[0]=n=>k()),style:{"font-size":"12px","padding-left":"16px"}},{default:e.withCtx(()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(l)("expandText"))},e.toDisplayString(g.value),3),e.createVNode(e.unref(b.DownOutlined),{class:e.normalizeClass(u.value?e.unref(l)("expandIcon"):e.unref(l)("collapseIcon"))},null,8,["class"])]),_:1})):e.createCommentVNode("",!0)]),message:e.withCtx(()=>[e.createElementVNode("div",{style:e.normalizeStyle(v.value),class:e.normalizeClass(e.unref(l)("alertContent")),ref_key:"ellipsisBoxRef",ref:o},[e.renderSlot(t.$slots,"default",{},()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(l)("prefix"))},e.toDisplayString(t.prefix),3),typeof t.data=="string"?(e.openBlock(),e.createElementBlock("span",z,e.toDisplayString(t.data),1)):(e.openBlock(!0),e.createElementBlock(e.Fragment,{key:1},e.renderList(t.data,(n,x)=>(e.openBlock(),e.createElementBlock(e.Fragment,{key:n},[e.createVNode(e.unref(c.Tooltip),{title:t.tipTitle},{default:e.withCtx(()=>[e.createElementVNode("span",{class:e.normalizeClass(e.unref(l)("showItem")),onClick:q=>t.$emit("choose",n)},e.toDisplayString(t.mapLabel?n[t.mapLabel]:n),11,V)]),_:2},1032,["title"]),x!==t.data.length-1?(e.openBlock(),e.createElementBlock("span",{key:0,class:e.normalizeClass(e.unref(l)("spliter"))},e.toDisplayString(t.separator),3)):e.createCommentVNode("",!0)],64))),128))])],6)]),_:3},8,["type","class"])],2))}});exports.default=S;

package/lib/src/business/expandAlert/interface.d.ts

@@ -24,7 +24,7 @@ export interface ApExpandAlertProps {
      */
     separator: string;
     /**
-     * 内容达到几行显示展开收起,默认是一行
+     * 内容达到几行显示展开收起,默认是两行
      */
     rows: string | number;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.0.38",
+  "version": "0.0.39",
   "main": "lib/index.js",
   "module": "es/index.mjs",
   "files": [
@@ -59,8 +59,8 @@
     "lodash-unified": "^1.0.3",
     "sortablejs": "^1.15.2",
     "mime": "^4.0.3",
-    "@aplus-frontend/utils": "1.0.25",
-    "@aplus-frontend/hooks": "1.0.7"
+    "@aplus-frontend/hooks": "1.0.7",
+    "@aplus-frontend/utils": "1.0.26"
   },
   "peerDependencies": {
     "ant-design-vue": "^4.2.1",