@aplus-frontend/ui 0.4.27 → 0.4.28

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

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

package/es/src/ap-table/components/dynamic-component/index.vue2.mjs

@@ -1,5 +1,5 @@
-import { defineComponent as n, openBlock as o, createBlock as t, resolveDynamicComponent as r } from "vue";
-const s = /* @__PURE__ */ n({
+import { defineComponent as t, openBlock as n, createElementBlock as o, Fragment as r, createBlock as a, resolveDynamicComponent as s, createTextVNode as c, toDisplayString as m } from "vue";
+const u = /* @__PURE__ */ t({
   name: "ApTableDynamicComponent",
   inheritAttrs: !1,
   __name: "index",
@@ -7,9 +7,12 @@ const s = /* @__PURE__ */ n({
     customRender: { type: Function }
   },
   setup(p) {
-    return (e, a) => (o(), t(r(e.customRender(e.$attrs))));
+    return (e, l) => (n(), o(r, null, [
+      (n(), a(s(e.customRender(e.$attrs)))),
+      c(" " + m(console.log(e.$attrs)), 1)
+    ], 64));
   }
 });
 export {
-  s as default
+  u as default
 };

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

@@ -1010,7 +1010,10 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                         };
                         parser: {
                             type: PropType<(displayValue: string) => ValueType>;
-                            default: (displayValue: string) => ValueType;
+                            default: (displayValue: string) => **
+                             * 通常情况下，表格渲染是不需要请求网络数据的，因此这里删掉request，
+                             * 如果需要做映射，可以在外部发起一次网络请求，然后使用valueEnum设置匹配枚举。
+                             */).ValueType;
                         };
                         formatter: {
                             type: PropType<(value: ValueType, info: {

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

@@ -1,6 +1,6 @@
 import { isVNode as E, createVNode as l, mergeProps as y, cloneVNode as j, Fragment as O } from "vue";
 import { isObject as a, isArray as c, isUndefined as g, isFunction as T, omit as C, isBoolean as F, isString as N, isEqual as S, sortBy as p, isPlainObject as m, every as I, isEmpty as v } from "lodash-unified";
-import { apTableRenderItemMap as P, apTableFormItemMap as V } from "./constants.mjs";
+import { apTableRenderItemMap as V, apTableFormItemMap as P } from "./constants.mjs";
 import { isType as _ } from "@fruits-chain/utils";
 import "../ap-form/index.mjs";
 import { Tooltip as w } from "@aplus-frontend/antdv";
@@ -12,10 +12,10 @@ function R(t) {
   return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !E(t);
 }
 const q = (t, e, n) => {
-  let o = {};
+  let r = {};
   return a(t) ? Object.keys(t).forEach((i) => {
-    a(t[i]) ? o[i] = q(t[i], e[i], n) : o[i] = n(t[i], e);
-  }) : o = n(t, e), o;
+    a(t[i]) ? r[i] = q(t[i], e[i], n) : r[i] = n(t[i], e);
+  }) : r = n(t, e), r;
 }, k = (t, e) => {
   switch (t) {
     case "dayjs":
@@ -23,8 +23,8 @@ const q = (t, e, n) => {
     case "dayjsRange":
       return e.map((n) => n.valueOf());
     case "dayjsDayRange": {
-      const [n, o] = e;
-      return [n.startOf("day").valueOf(), o.endOf("day").valueOf()];
+      const [n, r] = e;
+      return [n.startOf("day").valueOf(), r.endOf("day").valueOf()];
     }
     case "multiple":
     case "multipleNumber":
@@ -46,21 +46,21 @@ function W(t) {
 }
 const $ = (t) => W(t) === "map" ? t : new Map(Object.entries(t || {})), b = (t) => {
   const e = [], n = $(t);
-  return n.forEach((o, i) => {
-    const r = n.get(i) || n.get(`${i}`);
-    if (r) {
-      if (typeof r == "object" && (r != null && r.text)) {
+  return n.forEach((r, i) => {
+    const o = n.get(i) || n.get(`${i}`);
+    if (o) {
+      if (typeof o == "object" && (o != null && o.text)) {
         e.push({
-          text: r == null ? void 0 : r.text,
+          text: o == null ? void 0 : o.text,
           value: i,
-          label: r == null ? void 0 : r.text,
-          disabled: r.disabled
+          label: o == null ? void 0 : o.text,
+          disabled: o.disabled
         });
         return;
       }
       e.push({
-        text: r,
-        label: r,
+        text: o,
+        label: o,
         value: i
       });
     }
@@ -73,42 +73,45 @@ function tt(t) {
   let e = t.valueType || "text";
   return t.valueEnum && (e = "status"), e;
 }
-function et(t, e, n, o) {
-  var u;
-  const i = P[t];
+function et(t, e, n, r) {
+  var s;
+  const i = V[t];
   if (i)
     return l(i, y(e, {
       mode: "read"
     }), null);
-  const r = o == null ? void 0 : o[t];
-  return ((u = r == null ? void 0 : r.render) == null ? void 0 : u.call(r, e.value, n, e)) || e.value;
+  const o = r == null ? void 0 : r[t];
+  return ((s = o == null ? void 0 : o.render) == null ? void 0 : s.call(o, e.value, n, e)) || e.value;
 }
 function nt(t, e) {
   if (t.customRenderFormItem)
     return {
       Comp: d,
-      render: function(u) {
-        const s = u.item.customRenderFormItem(u.item);
-        return j(s, {
-          ...u.item.fieldProps,
-          span: u.item.span,
-          ...s.props || {}
+      render: function(s) {
+        const u = s.item.customRenderFormItem(s.item);
+        return j(u, {
+          ...s.item.fieldProps,
+          span: s.item.span,
+          ...u.props || {},
+          // 需要额外设置的属性（用于显示和隐藏节点）
+          hidden: s.hidden,
+          class: s.class
         });
       }
     };
-  const n = V[t.valueType];
+  const n = P[t.valueType];
   if (n)
     return {
       Comp: n
     };
-  const o = e == null ? void 0 : e[t.valueType];
-  function i(r) {
-    var s;
-    const u = (s = o == null ? void 0 : o.renderFormItem) == null ? void 0 : s.call(o, r.item.fieldProps.field);
-    return u ? l(A, y(r.item.fieldProps, {
-      span: r.item.fieldProps
-    }), R(u) ? u : {
-      default: () => [u]
+  const r = e == null ? void 0 : e[t.valueType];
+  function i(o) {
+    var u;
+    const s = (u = r == null ? void 0 : r.renderFormItem) == null ? void 0 : u.call(r, o.item.fieldProps.field);
+    return s ? l(A, y(o.item.fieldProps, {
+      span: t.span
+    }), R(s) ? s : {
+      default: () => [s]
     }) : null;
   }
   return {
@@ -117,14 +120,14 @@ function nt(t, e) {
   };
 }
 function rt(t, e) {
-  const n = B(t.fieldProps, e), o = (n == null ? void 0 : n.field) || n || {}, i = t.valueType === "switch", r = t.valueType === "index", u = i ? {
+  const n = B(t.fieldProps, e), r = (n == null ? void 0 : n.field) || n || {}, i = t.valueType === "switch", o = t.valueType === "index", s = i ? {
     checked: e.value
   } : {
-    value: r ? e.index + 1 : e.value
+    value: o ? e.index + 1 : e.value
   };
-  return t.valueEnum && (o.valueEnum = t.valueEnum), {
-    ...C(o, ["request"]),
-    ...u
+  return t.valueEnum && (r.valueEnum = t.valueEnum), {
+    ...C(r, ["request"]),
+    ...s
   };
 }
 function ot(t) {
@@ -134,14 +137,14 @@ function ot(t) {
   return F(t.filters) && t.filters && t.valueEnum && (e.filters = b(t.valueEnum)), e;
 }
 function it(t, e) {
-  var o;
+  var r;
   const n = e || {};
-  return t.valueEnum && !((o = n.field) != null && o.options) && (n.field = {
+  return t.valueEnum && !((r = n.field) != null && r.options) && (n.field = {
     ...n.field,
     options: b(t.valueEnum)
   }), n;
 }
-function ut(t) {
+function st(t) {
   if (!_("Object")(t))
     return t;
   try {
@@ -150,14 +153,14 @@ function ut(t) {
     return t;
   }
 }
-function st(t, e, n, o) {
+function ut(t, e, n, r) {
   const i = n == null ? void 0 : n({
     title: t.title,
     column: t
-  }), r = (i == null ? void 0 : i.filter((h) => h.type !== Symbol.for("v-cmt"))) || [];
-  if (i && r.length > 0)
+  }), o = (i == null ? void 0 : i.filter((h) => h.type !== Symbol.for("v-cmt"))) || [];
+  if (i && o.length > 0)
     return i;
-  const s = N(t.title) ? l("span", {
+  const u = N(t.title) ? l("span", {
     class: e,
     title: t.title
   }, [t.title]) : t.title, f = t.tooltip ? T(t.tooltip) ? t.tooltip(t) : l(O, null, [t.tooltip]) : null;
@@ -167,33 +170,33 @@ function st(t, e, n, o) {
       alignItems: "center",
       maxWidth: "100%"
     }
-  }, [s, l(w, {
+  }, [u, l(w, {
     title: f,
     placement: "bottom"
   }, {
     default: () => [l(x, {
       style: {
         padding: "4px",
-        color: o,
+        color: r,
         verticalAlign: "middle"
       }
     }, null)]
-  })]) : s;
+  })]) : u;
 }
 function lt(t, e) {
   const n = [];
-  function o(i) {
-    var r;
-    for (const u of i)
-      (r = u.children) != null && r.length ? o(u.children) : n.push(e(u));
+  function r(i) {
+    var o;
+    for (const s of i)
+      (o = s.children) != null && o.length ? r(s.children) : n.push(e(s));
   }
-  return o(t), n;
+  return r(t), n;
 }
 function ct(t, e) {
   if (c(t) && c(e))
     return S(p(t), p(e));
   if (m(t) && m(e)) {
-    const n = (o) => I(o, (i) => i == null) || v(o);
+    const n = (r) => I(r, (i) => i == null) || v(r);
     if (n(t) && n(e))
       return !0;
   }
@@ -213,10 +216,10 @@ export {
   et as getTableCellRenderNode,
   rt as getTableRenderProps,
   tt as getTableRenderType,
-  st as getTableTitle,
+  ut as getTableTitle,
   ct as isEqualCustom,
   $ as objectToMap,
-  ut as objectToString,
+  st as objectToString,
   k as parseFieldValue,
   lt as recursionApColumns,
   it as updateFormProps,

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

package/lib/src/ap-table/components/dynamic-component/index.vue2.js

@@ -1 +1 @@
-"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),t=e.defineComponent({name:"ApTableDynamicComponent",inheritAttrs:!1,__name:"index",props:{customRender:{type:Function}},setup(o){return(n,r)=>(e.openBlock(),e.createBlock(e.resolveDynamicComponent(n.customRender(n.$attrs))))}});exports.default=t;
+"use strict";Object.defineProperties(exports,{__esModule:{value:!0},[Symbol.toStringTag]:{value:"Module"}});const e=require("vue"),n=e.defineComponent({name:"ApTableDynamicComponent",inheritAttrs:!1,__name:"index",props:{customRender:{type:Function}},setup(o){return(t,r)=>(e.openBlock(),e.createElementBlock(e.Fragment,null,[(e.openBlock(),e.createBlock(e.resolveDynamicComponent(t.customRender(t.$attrs)))),e.createTextVNode(" "+e.toDisplayString(console.log(t.$attrs)),1)],64))}});exports.default=n;

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

@@ -1010,7 +1010,10 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                         };
                         parser: {
                             type: PropType<(displayValue: string) => ValueType>;
-                            default: (displayValue: string) => ValueType;
+                            default: (displayValue: string) => **
+                             * 通常情况下，表格渲染是不需要请求网络数据的，因此这里删掉request，
+                             * 如果需要做映射，可以在外部发起一次网络请求，然后使用valueEnum设置匹配枚举。
+                             */).ValueType;
                         };
                         formatter: {
                             type: PropType<(value: ValueType, info: {

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("vue"),s=require("lodash-unified"),p=require("./constants.js"),g=require("@fruits-chain/utils");require("../ap-form/index.js");const j=require("@aplus-frontend/antdv"),O=require("@ant-design/icons-vue");require("./components/dynamic-component/index.vue.js");const f=require("./components/dynamic-component/index.vue2.js"),h=require("../ap-form/item/index.vue.js");function E(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!l.isVNode(e)}const m=(e,t,n)=>{let o={};return s.isObject(e)?Object.keys(e).forEach(i=>{s.isObject(e[i])?o[i]=m(e[i],t[i],n):o[i]=n(e[i],t)}):o=n(e,t),o},N=(e,t)=>{switch(e){case"dayjs":return t.valueOf();case"dayjsRange":return t.map(n=>n.valueOf());case"dayjsDayRange":{const[n,o]=t;return[n.startOf("day").valueOf(),o.endOf("day").valueOf()]}case"multiple":case"multipleNumber":return s.isArray(t)?t:[t];case"boolean":return t;case"object":return t;default:return t}};function C(e){return s.isArray(e)?e.join("."):e}function F(e){const t=Object.prototype.toString.call(e).match(/^\[object (.*)\]$/)[1].toLowerCase();return t==="string"&&typeof e=="object"?"object":e===null?"null":e===void 0?"undefined":t}const y=e=>F(e)==="map"?e:new Map(Object.entries(e||{})),a=e=>{const t=[],n=y(e);return n.forEach((o,i)=>{const r=n.get(i)||n.get(`${i}`);if(r){if(typeof r=="object"&&(r!=null&&r.text)){t.push({text:r==null?void 0:r.text,value:i,label:r==null?void 0:r.text,disabled:r.disabled});return}t.push({text:r,label:r,value:i})}}),t},_=e=>s.isUndefined(e)||e<0?0:e;function T(e,t){return!e||!s.isFunction(e)?e:e(t)}function v(e){let t=e.valueType||"text";return e.valueEnum&&(t="status"),t}function S(e,t,n,o){var u;const i=p.apTableRenderItemMap[e];if(i)return l.createVNode(i,l.mergeProps(t,{mode:"read"}),null);const r=o==null?void 0:o[e];return((u=r==null?void 0:r.render)==null?void 0:u.call(r,t.value,n,t))||t.value}function V(e,t){if(e.customRenderFormItem){let r=function(u){const c=u.item.customRenderFormItem(u.item);return l.cloneVNode(c,{...u.item.fieldProps,span:u.item.span,...c.props||{}})};return{Comp:f.default,render:r}}const n=p.apTableFormItemMap[e.valueType];if(n)return{Comp:n};const o=t==null?void 0:t[e.valueType];function i(r){var c;const u=(c=o==null?void 0:o.renderFormItem)==null?void 0:c.call(o,r.item.fieldProps.field);return u?l.createVNode(h.default,l.mergeProps(r.item.fieldProps,{span:r.item.fieldProps}),E(u)?u:{default:()=>[u]}):null}return{Comp:f.default,render:i}}function q(e,t){const n=T(e.fieldProps,t),o=(n==null?void 0:n.field)||n||{},i=e.valueType==="switch",r=e.valueType==="index",u=i?{checked:t.value}:{value:r?t.index+1:t.value};return e.valueEnum&&(o.valueEnum=e.valueEnum),{...s.omit(o,["request"]),...u}}function P(e){const t={...e};return s.isBoolean(e.filters)&&e.filters&&e.valueEnum&&(t.filters=a(e.valueEnum)),t}function I(e,t){var o;const n=t||{};return e.valueEnum&&!((o=n.field)!=null&&o.options)&&(n.field={...n.field,options:a(e.valueEnum)}),n}function A(e){if(!g.isType("Object")(e))return e;try{return JSON.stringify(e)}catch{return e}}function x(e,t,n,o){const i=n==null?void 0:n({title:e.title,column:e}),r=(i==null?void 0:i.filter(b=>b.type!==Symbol.for("v-cmt")))||[];if(i&&r.length>0)return i;const c=s.isString(e.title)?l.createVNode("span",{class:t,title:e.title},[e.title]):e.title,d=e.tooltip?s.isFunction(e.tooltip)?e.tooltip(e):l.createVNode(l.Fragment,null,[e.tooltip]):null;return d?l.createVNode("span",{style:{display:"inline-flex",alignItems:"center",maxWidth:"100%"}},[c,l.createVNode(j.Tooltip,{title:d,placement:"bottom"},{default:()=>[l.createVNode(O.QuestionCircleOutlined,{style:{padding:"4px",color:o,verticalAlign:"middle"}},null)]})]):c}function R(e,t){const n=[];function o(i){var r;for(const u of i)(r=u.children)!=null&&r.length?o(u.children):n.push(t(u))}return o(e),n}function w(e,t){if(s.isArray(e)&&s.isArray(t))return s.isEqual(s.sortBy(e),s.sortBy(t));if(s.isPlainObject(e)&&s.isPlainObject(t)){const n=o=>s.every(o,i=>i==null)||s.isEmpty(o);if(n(e)&&n(t))return!0}}function U(e){if(e!==!1)return e}exports.apColumnToColumn=P;exports.dataIndexToStr=C;exports.falseToUndefined=U;exports.formatParamsValueType=m;exports.getColumnOrder=_;exports.getFieldProps=T;exports.getSearchFormItemRenderNode=V;exports.getTableCellRenderNode=S;exports.getTableRenderProps=q;exports.getTableRenderType=v;exports.getTableTitle=x;exports.isEqualCustom=w;exports.objectToMap=y;exports.objectToString=A;exports.parseFieldValue=N;exports.recursionApColumns=R;exports.updateFormProps=I;exports.valueEnumToArray=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("vue"),s=require("lodash-unified"),p=require("./constants.js"),g=require("@fruits-chain/utils");require("../ap-form/index.js");const h=require("@aplus-frontend/antdv"),j=require("@ant-design/icons-vue");require("./components/dynamic-component/index.vue.js");const f=require("./components/dynamic-component/index.vue2.js"),O=require("../ap-form/item/index.vue.js");function E(e){return typeof e=="function"||Object.prototype.toString.call(e)==="[object Object]"&&!l.isVNode(e)}const m=(e,t,n)=>{let o={};return s.isObject(e)?Object.keys(e).forEach(i=>{s.isObject(e[i])?o[i]=m(e[i],t[i],n):o[i]=n(e[i],t)}):o=n(e,t),o},N=(e,t)=>{switch(e){case"dayjs":return t.valueOf();case"dayjsRange":return t.map(n=>n.valueOf());case"dayjsDayRange":{const[n,o]=t;return[n.startOf("day").valueOf(),o.endOf("day").valueOf()]}case"multiple":case"multipleNumber":return s.isArray(t)?t:[t];case"boolean":return t;case"object":return t;default:return t}};function C(e){return s.isArray(e)?e.join("."):e}function F(e){const t=Object.prototype.toString.call(e).match(/^\[object (.*)\]$/)[1].toLowerCase();return t==="string"&&typeof e=="object"?"object":e===null?"null":e===void 0?"undefined":t}const y=e=>F(e)==="map"?e:new Map(Object.entries(e||{})),a=e=>{const t=[],n=y(e);return n.forEach((o,i)=>{const r=n.get(i)||n.get(`${i}`);if(r){if(typeof r=="object"&&(r!=null&&r.text)){t.push({text:r==null?void 0:r.text,value:i,label:r==null?void 0:r.text,disabled:r.disabled});return}t.push({text:r,label:r,value:i})}}),t},_=e=>s.isUndefined(e)||e<0?0:e;function T(e,t){return!e||!s.isFunction(e)?e:e(t)}function v(e){let t=e.valueType||"text";return e.valueEnum&&(t="status"),t}function S(e,t,n,o){var u;const i=p.apTableRenderItemMap[e];if(i)return l.createVNode(i,l.mergeProps(t,{mode:"read"}),null);const r=o==null?void 0:o[e];return((u=r==null?void 0:r.render)==null?void 0:u.call(r,t.value,n,t))||t.value}function V(e,t){if(e.customRenderFormItem){let r=function(u){const c=u.item.customRenderFormItem(u.item);return l.cloneVNode(c,{...u.item.fieldProps,span:u.item.span,...c.props||{},hidden:u.hidden,class:u.class})};return{Comp:f.default,render:r}}const n=p.apTableFormItemMap[e.valueType];if(n)return{Comp:n};const o=t==null?void 0:t[e.valueType];function i(r){var c;const u=(c=o==null?void 0:o.renderFormItem)==null?void 0:c.call(o,r.item.fieldProps.field);return u?l.createVNode(O.default,l.mergeProps(r.item.fieldProps,{span:e.span}),E(u)?u:{default:()=>[u]}):null}return{Comp:f.default,render:i}}function q(e,t){const n=T(e.fieldProps,t),o=(n==null?void 0:n.field)||n||{},i=e.valueType==="switch",r=e.valueType==="index",u=i?{checked:t.value}:{value:r?t.index+1:t.value};return e.valueEnum&&(o.valueEnum=e.valueEnum),{...s.omit(o,["request"]),...u}}function P(e){const t={...e};return s.isBoolean(e.filters)&&e.filters&&e.valueEnum&&(t.filters=a(e.valueEnum)),t}function I(e,t){var o;const n=t||{};return e.valueEnum&&!((o=n.field)!=null&&o.options)&&(n.field={...n.field,options:a(e.valueEnum)}),n}function A(e){if(!g.isType("Object")(e))return e;try{return JSON.stringify(e)}catch{return e}}function x(e,t,n,o){const i=n==null?void 0:n({title:e.title,column:e}),r=(i==null?void 0:i.filter(b=>b.type!==Symbol.for("v-cmt")))||[];if(i&&r.length>0)return i;const c=s.isString(e.title)?l.createVNode("span",{class:t,title:e.title},[e.title]):e.title,d=e.tooltip?s.isFunction(e.tooltip)?e.tooltip(e):l.createVNode(l.Fragment,null,[e.tooltip]):null;return d?l.createVNode("span",{style:{display:"inline-flex",alignItems:"center",maxWidth:"100%"}},[c,l.createVNode(h.Tooltip,{title:d,placement:"bottom"},{default:()=>[l.createVNode(j.QuestionCircleOutlined,{style:{padding:"4px",color:o,verticalAlign:"middle"}},null)]})]):c}function R(e,t){const n=[];function o(i){var r;for(const u of i)(r=u.children)!=null&&r.length?o(u.children):n.push(t(u))}return o(e),n}function w(e,t){if(s.isArray(e)&&s.isArray(t))return s.isEqual(s.sortBy(e),s.sortBy(t));if(s.isPlainObject(e)&&s.isPlainObject(t)){const n=o=>s.every(o,i=>i==null)||s.isEmpty(o);if(n(e)&&n(t))return!0}}function U(e){if(e!==!1)return e}exports.apColumnToColumn=P;exports.dataIndexToStr=C;exports.falseToUndefined=U;exports.formatParamsValueType=m;exports.getColumnOrder=_;exports.getFieldProps=T;exports.getSearchFormItemRenderNode=V;exports.getTableCellRenderNode=S;exports.getTableRenderProps=q;exports.getTableRenderType=v;exports.getTableTitle=x;exports.isEqualCustom=w;exports.objectToMap=y;exports.objectToString=A;exports.parseFieldValue=N;exports.recursionApColumns=R;exports.updateFormProps=I;exports.valueEnumToArray=a;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aplus-frontend/ui",
-  "version": "0.4.27",
+  "version": "0.4.28",
   "main": "./lib/index.js",
   "type": "module",
   "files": [
@@ -65,8 +65,8 @@
     "sortablejs": "^1.15.2",
     "vue-virtual-scroller": "2.0.0-beta.8",
     "vuedraggable": "^4.1.0",
-    "@aplus-frontend/hooks": "1.0.7",
-    "@aplus-frontend/utils": "1.0.51"
+    "@aplus-frontend/utils": "1.0.51",
+    "@aplus-frontend/hooks": "1.0.7"
   },
   "peerDependencies": {
     "@aplus-frontend/antdv": "^1.0.12",

package/theme/antd-global-overwrite/aplus/index.css

@@ -798,7 +798,7 @@ div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-f
 [class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container .'aplus'-scroll-bar {
   position: sticky;
   bottom: -1px;
-  z-index: 99;
+  z-index: 90;
 }
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(ul.ant-pagination) .'aplus'-scroll-bar,
 [class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(ul.ant-pagination) .'aplus'-scroll-bar,
@@ -845,3 +845,23 @@ div[class$='-basic-table-form-container ap-table--sticky'] form[class$='-basic-f
   padding: 16px 0;
   background-color: #ffffff;
 }
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination {
+  padding-top: 8px;
+}

package/theme/antd-global-overwrite/aplus/table.css

@@ -234,7 +234,7 @@
 [class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container .'aplus'-scroll-bar {
   position: sticky;
   bottom: -1px;
-  z-index: 99;
+  z-index: 90;
 }
 [class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(ul.ant-pagination) .'aplus'-scroll-bar,
 [class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(ul.ant-pagination) .'aplus'-scroll-bar,
@@ -281,3 +281,23 @@
   padding: 16px 0;
   background-color: #ffffff;
 }
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .aplus-ap-table__table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-basic-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-ap-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination,
+[class*='-pro-table'].ap-table--sticky .ant-table-wrapper .ant-spin-container:has(.'aplus'-scroll-bar) ul.ant-pagination {
+  padding-top: 8px;
+}

package/theme/antd-global-overwrite/aplus/table.less

@@ -162,7 +162,7 @@
       .@{ns}-scroll-bar {
         position: sticky;
         bottom: -1px;
-        z-index: 99;
+        z-index: 90;
       }
 
       &:has(ul.ant-pagination) {
@@ -179,6 +179,12 @@
         padding: 16px 0;
         background-color: #ffffff;
       }
+
+      &:has(.@{ns}-scroll-bar) {
+        ul.ant-pagination {
+          padding-top: 8px;
+        }
+      }
     }
   }
 }