@aplus-frontend/ui 0.0.10 → 0.0.12

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

@@ -1,20 +1,21 @@
-import { isVNode as E, defineComponent as L, useSlots as A, ref as F, watch as W, cloneVNode as G, computed as H, createVNode as n, mergeProps as p, unref as r, openBlock as g, createElementBlock as J, Fragment as K, withCtx as V, renderSlot as x, createTextVNode as Q, toDisplayString as X, createBlock as N, resolveDynamicComponent as P } from "vue";
-import { Button as y, Flex as S, Space as Y, Modal as Z } from "ant-design-vue";
+import { isVNode as U, defineComponent as $, useSlots as q, ref as F, watch as D, cloneVNode as L, computed as A, createVNode as u, mergeProps as p, unref as i, openBlock as g, createElementBlock as G, Fragment as W, withCtx as y, renderSlot as w, createTextVNode as H, toDisplayString as J, createElementVNode as K, normalizeClass as Q, createBlock as x, resolveDynamicComponent as T } from "vue";
+import { Button as V, Flex as X, Modal as Y } from "ant-design-vue";
 import "../ap-form.vue.mjs";
 import "../../hooks/index.mjs";
-import { getSingleVNode as I } from "../../utils/slot.mjs";
+import { getSingleVNode as Z } from "../../utils/slot.mjs";
 import "../../config-provider/index.mjs";
-import { omit as ee } from "lodash-unified";
+import { omit as I } from "lodash-unified";
 import "../style/modal-form.css";
-import { convertReactiveToRaw as te } from "../../utils/index.mjs";
-import { useControllableValue as le } from "../../hooks/useControllableValue.mjs";
-import { useLocale as ae } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as oe } from "../../config-provider/hooks/use-namespace.mjs";
-import se from "../ap-form.vue2.mjs";
-function C(d) {
-  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !E(d);
+import { convertReactiveToRaw as ee } from "../../utils/index.mjs";
+import { useControllableValue as te } from "../../hooks/useControllableValue.mjs";
+import { useLocale as le } from "../../config-provider/hooks/use-locale.mjs";
+import { useGlobalConfig as oe } from "../../config-provider/hooks/use-global-config.mjs";
+import { useNamespace as ae } from "../../config-provider/hooks/use-namespace.mjs";
+import ie from "../ap-form.vue2.mjs";
+function se(d) {
+  return typeof d == "function" || Object.prototype.toString.call(d) === "[object Object]" && !U(d);
 }
-const xe = /* @__PURE__ */ L({
+const Pe = /* @__PURE__ */ $({
   __name: "index",
   props: {
     layout: {
@@ -85,155 +86,154 @@ const xe = /* @__PURE__ */ L({
   },
   emits: ["update:open"],
   setup(d, {
-    expose: _,
-    emit: R
+    expose: N,
+    emit: P
   }) {
-    const a = d, b = A(), j = R, o = F(), c = F(), u = F(!1), {
-      value: M,
-      updateValue: f
-    } = le(a, j, {
+    const o = d, b = q(), S = P, a = F(), c = F(), r = F(!1), {
+      value: _,
+      updateValue: m
+    } = te(o, S, {
       valuePropName: "open",
       defaultValue: !1
     }), {
       t: v
-    } = ae(), {
-      b: O,
-      e: B
-    } = oe("ap-form-modal-form");
-    W(() => o.value, (t) => {
-      var e;
-      t && c.value && ((e = t.setFieldsValue) == null || e.call(t, c.value), c.value = void 0);
+    } = le(), h = oe("uiMode"), {
+      b: R,
+      e: C
+    } = ae("ap-form-modal-form");
+    D(() => a.value, (e) => {
+      var t;
+      e && c.value && ((t = e.setFieldsValue) == null || t.call(e, c.value), c.value = void 0);
     });
-    const k = I(b.trigger), U = k ? G(k, {
+    const B = Z(b.trigger), M = B ? L(B, {
       onClick: () => {
-        f(!0);
+        m(!0);
       }
-    }) : null, $ = H(() => {
-      var i, m, h, T;
-      let t;
+    }) : null, j = A(() => {
+      var t, l, n, f;
       const e = [];
-      if (a.submitter === !1)
+      if (o.submitter === !1)
         return null;
-      if (a.showCancel) {
+      if (o.showCancel) {
         let s;
-        e.push(n(y, {
-          onClick: w,
-          disabled: u.value
-        }, C(s = v("ap.common.cancelText")) ? s : {
+        e.push(u(V, {
+          onClick: k,
+          disabled: r.value
+        }, se(s = v("ap.common.cancelText")) ? s : {
           default: () => [s]
         }));
       }
-      return ((i = a.submitter) == null ? void 0 : i.resetButtonProps) !== !1 && e.push(n(y, p(((m = a.submitter) == null ? void 0 : m.resetButtonProps) || {}, {
+      return ((t = o.submitter) == null ? void 0 : t.resetButtonProps) !== !1 && e.push(u(V, p(((l = o.submitter) == null ? void 0 : l.resetButtonProps) || {}, {
         key: "submit",
-        disabled: u.value,
-        onClick: q
+        disabled: r.value,
+        onClick: O
       }), {
         default: () => {
           var s;
-          return [((s = a.submitter) == null ? void 0 : s.resetText) || v("ap.common.resetText")];
+          return [((s = o.submitter) == null ? void 0 : s.resetText) || v("ap.common.resetText")];
         }
-      })), ((h = a.submitter) == null ? void 0 : h.submitButtonProps) !== !1 && e.push(n(y, p({
+      })), ((n = o.submitter) == null ? void 0 : n.submitButtonProps) !== !1 && e.push(u(V, p({
         type: "primary",
         key: "submit"
-      }, ((T = a.submitter) == null ? void 0 : T.submitButtonProps) || {}, {
-        loading: u.value,
+      }, ((f = o.submitter) == null ? void 0 : f.submitButtonProps) || {}, {
+        loading: r.value,
         onClick: z
       }), {
         default: () => {
           var s;
-          return [((s = a.submitter) == null ? void 0 : s.submitText) || v("ap.common.okText")];
+          return [((s = o.submitter) == null ? void 0 : s.submitText) || v("ap.common.okText")];
         }
-      })), b.submitter ? n(S, {
+      })), u(X, {
         justify: "flex-end",
-        class: B("footer")
-      }, C(t = b.submitter(e)) ? t : {
-        default: () => [t]
-      }) : n(S, {
-        justify: "flex-end",
-        class: B("footer")
+        class: C(i(h) === "admin" ? "footer-admin" : "footer")
       }, {
-        default: () => [n(Y, null, C(e) ? e : {
-          default: () => [e]
-        })]
+        default: () => [b.submitter ? b.submitter(e) : e]
       });
     });
-    function q() {
-      var t, e, l;
-      a.submitter !== !1 && ((t = o.value) == null || t.resetFields(), (l = (e = a.submitter) == null ? void 0 : e.onReset) == null || l.call(e));
+    function O() {
+      var e, t, l;
+      o.submitter !== !1 && ((e = a.value) == null || e.resetFields(), (l = (t = o.submitter) == null ? void 0 : t.onReset) == null || l.call(t));
     }
     async function z() {
-      var t, e, l, i;
-      if (a.submitter !== !1)
+      var e, t, l, n;
+      if (o.submitter !== !1)
         try {
-          const m = await ((t = o.value) == null ? void 0 : t.validateFields());
-          (l = (e = a.submitter) == null ? void 0 : e.onSubmit) == null || l.call(e), u.value = !0, await ((i = a.onFinish) == null ? void 0 : i.call(a, te(m))) && f(!1);
+          const f = await ((e = a.value) == null ? void 0 : e.validateFields());
+          (l = (t = o.submitter) == null ? void 0 : t.onSubmit) == null || l.call(t), r.value = !0, await ((n = o.onFinish) == null ? void 0 : n.call(o, ee(f))) && m(!1);
         } finally {
-          u.value = !1;
+          r.value = !1;
         }
     }
-    function w() {
-      r(u) || f(!1);
+    function k() {
+      i(r) || m(!1);
     }
-    function D(t) {
-      !t && r(u) || f(t);
+    function E(e) {
+      !e && i(r) || m(e);
     }
-    return _({
-      resetFields: (t) => {
-        var e;
-        (e = o.value) == null || e.resetFields(t);
+    return N({
+      resetFields: (e) => {
+        var t;
+        (t = a.value) == null || t.resetFields(e);
       },
-      clearValidate: (t) => {
-        var e;
-        (e = o.value) == null || e.clearValidate(t);
+      clearValidate: (e) => {
+        var t;
+        (t = a.value) == null || t.clearValidate(e);
       },
-      validateFields: (t, e) => {
+      validateFields: (e, t) => {
         var l;
-        return (l = o.value) == null ? void 0 : l.validateFields(t, e);
+        return (l = a.value) == null ? void 0 : l.validateFields(e, t);
       },
-      getFieldsValue: (t) => {
-        var e;
-        return (e = o.value) == null ? void 0 : e.getFieldsValue(t);
+      getFieldsValue: (e) => {
+        var t;
+        return (t = a.value) == null ? void 0 : t.getFieldsValue(e);
       },
-      validate: (t, e) => {
+      validate: (e, t) => {
         var l;
-        return (l = o.value) == null ? void 0 : l.validate(t, e);
+        return (l = a.value) == null ? void 0 : l.validate(e, t);
       },
-      scrollToField: (t, e = {}) => {
+      scrollToField: (e, t = {}) => {
         var l;
-        (l = o.value) == null || l.scrollToField(t, e);
+        (l = a.value) == null || l.scrollToField(e, t);
       },
-      setFieldValue: (t, e) => {
-        var l, i;
-        (i = (l = o.value) == null ? void 0 : l.setFieldValue) == null || i.call(l, t, e);
+      setFieldValue: (e, t) => {
+        var l, n;
+        (n = (l = a.value) == null ? void 0 : l.setFieldValue) == null || n.call(l, e, t);
       },
-      setFieldsValue: (t) => {
-        var e, l;
-        if (!o.value) {
-          c.value = t;
+      setFieldsValue: (e) => {
+        var t, l;
+        if (!a.value) {
+          c.value = e;
           return;
         }
-        (l = (e = o.value) == null ? void 0 : e.setFieldsValue) == null || l.call(e, t);
+        (l = (t = a.value) == null ? void 0 : t.setFieldsValue) == null || l.call(t, e);
       }
-    }), (t, e) => (g(), J(K, null, [n(r(Z), p(t.modalProps, {
-      open: r(M),
-      "onUpdate:open": D,
-      onCancel: w,
+    }), (e, t) => (g(), G(W, null, [u(i(Y), p(e.modalProps, {
+      open: i(_),
+      "onUpdate:open": E,
+      onCancel: k,
       footer: null,
-      width: t.width,
-      class: r(O)()
+      width: e.width,
+      class: i(R)(),
+      "body-style": {
+        padding: i(h) === "admin" ? "0px !important" : "20px !important"
+        // 这里使用内联样式目的是为了使用最高优先级覆盖设置的全局样式
+        // 使用ModalForm你可能无法再自定义body的样式
+      }
     }), {
-      title: V(() => [x(t.$slots, "title", {}, () => [Q(X(a.title), 1)])]),
-      default: V(() => [n(se, p({
+      title: y(() => [w(e.$slots, "title", {}, () => [H(J(o.title), 1)])]),
+      default: y(() => [K("div", {
+        class: Q(i(C)(i(h) === "admin" ? "content-admin" : "content"))
+      }, [u(ie, p({
         ref_key: "formRef",
-        ref: o
-      }, r(ee)(a, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"])), {
-        default: V(() => [x(t.$slots, "default")]),
+        ref: a
+      }, i(I)(o, ["modalProps", "open", "onUpdate:open", "title", "width", "onFinish", "submitter"])), {
+        default: y(() => [w(e.$slots, "default")]),
         _: 3
-      }, 16), (g(), N(P($.value)))]),
+      }, 16)], 2), (g(), x(T(j.value)))]),
       _: 3
-    }, 16, ["open", "width", "class"]), (g(), N(P(r(U))))], 64));
+    }, 16, ["open", "width", "class", "body-style"]), (g(), x(T(i(M))))], 64));
   }
 });
 export {
-  xe as default
+  Pe as default
 };

package/es/src/ap-form/style/modal-form.css

@@ -6,12 +6,16 @@
   border-bottom: 1px solid #E9EDF3;
   margin-bottom: 0;
 }
-.aplus-ap-form-modal-form .ant-modal-body {
+.aplus-ap-form-modal-form__content-admin {
   padding: 20px;
 }
 .aplus-ap-form-modal-form__footer {
   padding-top: 20px;
 }
+.aplus-ap-form-modal-form__footer-admin {
+  border-top: 1px solid #E9EDF3;
+  padding: 12px 20px;
+}
 .aplus-ap-form-modal-form .ant-modal-close {
   top: 16px;
 }

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

@@ -22,6 +22,7 @@ type ApTableSlots = {
     expandColumnTitle?: any;
     customFilterIcon?: any;
     customFilterDropdown?: any;
+    searchFormExtra?: any;
 };
 /**
  * 设置查询表单值
@@ -167,9 +168,7 @@ declare const _default: __VLS_WithTemplateSlots< DefineComponent<__VLS_WithDefau
     card: boolean;
     searchForm: false | ApFormSearchFormProps;
     adaptive: boolean;
-}, {}>, Partial<Record<NonNullable<keyof ApTableSlots>, (_: any) => any>> & {
-    title?(_: {}): any;
-}>;
+}, {}>, Readonly<ApTableSlots> & ApTableSlots>;
 export default _default;
 type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
 type __VLS_TypePropsToRuntimeProps<T> = {

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

@@ -1,20 +1,20 @@
-import { defineComponent as U, computed as d, createVNode as s, mergeProps as f, unref as l, watch as J, openBlock as i, createElementBlock as m, normalizeClass as F, normalizeStyle as x, withCtx as g, Fragment as X, renderList as B, createBlock as Y, resolveDynamicComponent as Z, createCommentVNode as v, createElementVNode as P, renderSlot as I, createSlots as ee, toDisplayString as ae, normalizeProps as te, guardReactiveProps as oe } from "vue";
-import { Typography as re, Table as le, Tooltip as ne } from "ant-design-vue";
-import { ApForm as de } from "../ap-form/index.mjs";
-import { apTableRenderItemMap as se, noRenderAsFormItemValueList as k, apTableFormItemMap as ue } from "./constants.mjs";
+import { defineComponent as X, useSlots as Y, computed as d, createVNode as s, mergeProps as m, unref as l, watch as Z, openBlock as i, createElementBlock as g, normalizeClass as F, normalizeStyle as v, createSlots as P, withCtx as p, Fragment as ee, renderList as I, createBlock as ae, resolveDynamicComponent as te, renderSlot as S, createCommentVNode as k, createElementVNode as E, toDisplayString as oe, normalizeProps as re, guardReactiveProps as le } from "vue";
+import { Typography as ne, Table as de, Tooltip as se } from "ant-design-vue";
+import { ApForm as ue } from "../ap-form/index.mjs";
+import { apTableRenderItemMap as ie, noRenderAsFormItemValueList as O, apTableFormItemMap as pe } from "./constants.mjs";
 import "../config-provider/index.mjs";
-import { useTablePaging as ie } from "./hooks/use-table-paging.mjs";
-import { isUndefined as pe, omit as ce } from "lodash-unified";
+import { useTablePaging as ce } from "./hooks/use-table-paging.mjs";
+import { isUndefined as fe, omit as me } from "lodash-unified";
 import "./style/ap-table.css";
-import { QuestionCircleOutlined as fe } from "@ant-design/icons-vue";
-import { apColumnToColumn as me, getTableRenderType as ge, getTableRenderProps as ye, getColumnOrder as O, updateFormProps as be, getFieldProps as he, getPlaceholder as Ce } from "./utils.mjs";
-import Fe from "./hooks/use-table-content-height.mjs";
-import { useLocale as Se } from "../config-provider/hooks/use-locale.mjs";
-import { useNamespace as Re } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as we } from "../config-provider/hooks/use-global-config.mjs";
-const Te = {
+import { QuestionCircleOutlined as ge } from "@ant-design/icons-vue";
+import { apColumnToColumn as ye, getTableRenderType as he, getTableRenderProps as be, getColumnOrder as z, updateFormProps as Ce, getFieldProps as Fe, getPlaceholder as Se } from "./utils.mjs";
+import Re from "./hooks/use-table-content-height.mjs";
+import { useLocale as xe } from "../config-provider/hooks/use-locale.mjs";
+import { useNamespace as we } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as Te } from "../config-provider/hooks/use-global-config.mjs";
+const Be = {
   key: 0
-}, _e = /* @__PURE__ */ U({
+}, Ae = /* @__PURE__ */ X({
   name: "ApTable",
   __name: "ap-table",
   props: {
@@ -127,22 +127,22 @@ const Te = {
       default: !1
     }
   },
-  setup(z, {
-    expose: E
+  setup(L, {
+    expose: V
   }) {
-    const r = z, {
-      t: L
-    } = Se(), {
+    const r = L, R = Y(), {
+      t: N
+    } = xe(), {
       e: y,
-      b: p
-    } = Re("ap-table"), V = we("uiMode"), {
-      height: N,
-      contentRef: D
-    } = Fe(), b = d(() => {
+      b: c
+    } = we("ap-table"), D = Te("uiMode"), {
+      height: W,
+      contentRef: _
+    } = Re(), h = d(() => {
       var t;
       let e = ((t = r.columns) == null ? void 0 : t.filter((a) => !a.hideInTable)) || [];
       return e = e.map((a) => ({
-        ...me(a),
+        ...ye(a),
         customRender({
           value: o,
           ...n
@@ -155,24 +155,24 @@ const Te = {
               column: a
             });
           else {
-            const T = ge(a), G = se[T], Q = ye(a, {
+            const B = he(a), U = ie[B], J = be(a, {
               value: o,
               ...n
             });
-            u = s(G, f(Q, {
+            u = s(U, m(J, {
               mode: "read"
             }), null);
           }
-          return H(a, o, u);
+          return $(a, o, u);
         }
       })), e;
-    }), S = d(() => {
+    }), x = d(() => {
       var e, t, a;
-      return ((a = (t = (e = r.columns) == null ? void 0 : e.filter((o) => !o.hideInSearch && o.dataIndex && (o.valueType || o.customRenderFormItem) && !k.includes(o.valueType))) == null ? void 0 : t.sort((o, n) => {
-        let u = O(o.order);
-        return O(n.order) - u;
+      return ((a = (t = (e = r.columns) == null ? void 0 : e.filter((o) => !o.hideInSearch && o.dataIndex && (o.valueType || o.customRenderFormItem) && !O.includes(o.valueType))) == null ? void 0 : t.sort((o, n) => {
+        let u = z(o.order);
+        return z(n.order) - u;
       })) == null ? void 0 : a.map((o) => {
-        const n = be(o, he(o.fieldProps));
+        const n = Ce(o, Fe(o.fieldProps));
         return {
           ...o,
           fieldProps: {
@@ -180,18 +180,18 @@ const Te = {
             name: o.dataIndex,
             ...n || {},
             // 格式化placeholder
-            placeholder: Ce(L, o.valueType, n == null ? void 0 : n.placeholder)
+            placeholder: Se(N, o.valueType, n == null ? void 0 : n.placeholder)
           }
         };
       })) || [];
-    }), W = d(() => l(b).filter((e) => e.sorter === !0).map((e) => e.dataIndex)), _ = d(() => l(b).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex)), {
-      formRef: h,
-      submit: R,
-      reset: w,
-      tableProps: c,
-      handleTableChange: j,
+    }), j = d(() => l(h).filter((e) => e.sorter === !0).map((e) => e.dataIndex)), A = d(() => l(h).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex)), {
+      formRef: b,
+      submit: w,
+      reset: T,
+      tableProps: f,
+      handleTableChange: M,
       data: C
-    } = ie({
+    } = ce({
       async request(e) {
         var a, o;
         const t = await ((a = r.request) == null ? void 0 : a.call(r, e));
@@ -200,30 +200,30 @@ const Te = {
           total: (t == null ? void 0 : t.total) || 0
         };
       },
-      filterFields: l(_),
-      sortFields: l(W),
+      filterFields: l(A),
+      sortFields: l(j),
       defaultParams: r.params,
       defaultData: r.defaultData,
       manual: r.manual,
       defaultCurrent: r.pagination ? r.pagination.defaultCurrent : void 0,
       defaultPageSize: r.pagination ? r.pagination.defaultPageSize : void 0,
       formatParams: r.beforeSearchSubmit
-    }), A = d(() => {
+    }), q = d(() => {
       if (r.scroll)
         return r.scroll;
       if (r.adaptive && C.value.total > 0)
         return {
-          y: l(N)
+          y: l(W)
         };
-    }), M = d(() => ({
+    }), H = d(() => ({
       ...r,
-      ...l(c),
-      loading: pe(r.loading) ? l(c).loading : r.loading,
-      pagination: r.pagination === !1 ? !1 : l(c).pagination,
-      scroll: l(A)
-    })), q = d(() => [r.card ? null : p("wrapper"), r.adaptive ? p("adaptive") : null].filter(Boolean));
-    function H(e, t, a) {
-      return k.includes(e.valueType) ? a : e.copyable || e.ellipsis ? s(re.Text, {
+      ...l(f),
+      loading: fe(r.loading) ? l(f).loading : r.loading,
+      pagination: r.pagination === !1 ? !1 : l(f).pagination,
+      scroll: l(q)
+    })), K = d(() => [r.card ? null : c("wrapper"), r.adaptive ? c("adaptive") : null].filter(Boolean));
+    function $(e, t, a) {
+      return O.includes(e.valueType) ? a : e.copyable || e.ellipsis ? s(ne.Text, {
         copyable: e.copyable ? {
           text: t,
           tooltip: !1
@@ -234,78 +234,82 @@ const Te = {
         content: a
       }, null) : a;
     }
-    J(() => l(C).loading, (e) => {
+    Z(() => l(C).loading, (e) => {
       var t;
       (t = r.onLoadingChange) == null || t.call(r, e);
     });
-    function K(e) {
+    function G(e) {
       var t, a, o;
-      (o = (a = (t = h.value) == null ? void 0 : t.apForm) == null ? void 0 : a.setFieldsValue) == null || o.call(a, e);
+      (o = (a = (t = b.value) == null ? void 0 : t.apForm) == null ? void 0 : a.setFieldsValue) == null || o.call(a, e);
     }
-    function $() {
+    function Q() {
       var e, t, a;
-      return (a = (t = (e = h.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValue) == null ? void 0 : a.call(t, !0);
+      return (a = (t = (e = b.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValue) == null ? void 0 : a.call(t, !0);
     }
-    return E({
-      submit: () => R(),
-      reset: () => w(),
-      setSearchFormValues: K,
-      getSearchFormValues: $,
+    return V({
+      submit: () => w(),
+      reset: () => T(),
+      setSearchFormValues: G,
+      getSearchFormValues: Q,
       dataSource: d(() => l(C).records)
-    }), (e, t) => (i(), m("div", {
-      class: F(q.value)
-    }, [e.searchForm !== !1 && S.value.length > 0 ? (i(), m("div", {
+    }), (e, t) => (i(), g("div", {
+      class: F(K.value)
+    }, [e.searchForm !== !1 && x.value.length > 0 ? (i(), g("div", {
       key: 0,
       class: F(e.card ? l(y)("search-wrapper") : null),
-      style: x(e.searchFormWrapperStyle)
-    }, [s(l(de).SearchForm, f(e.searchForm || {}, {
+      style: v(e.searchFormWrapperStyle)
+    }, [s(l(ue).SearchForm, m(e.searchForm || {}, {
       ref_key: "formRef",
-      ref: h,
+      ref: b,
       "custom-reset": "",
-      onSubmit: l(R),
-      onReset: l(w),
-      "submit-loading": l(c).loading
-    }), {
-      default: g(() => [(i(!0), m(X, null, B(S.value, (a) => (i(), Y(Z(a.customRenderFormItem ? a.customRenderFormItem(a) : l(ue)[a.valueType || "text"]), f({
+      onSubmit: l(w),
+      onReset: l(T),
+      "submit-loading": l(f).loading
+    }), P({
+      default: p(() => [(i(!0), g(ee, null, I(x.value, (a) => (i(), ae(te(a.customRenderFormItem ? a.customRenderFormItem(a) : l(pe)[a.valueType || "text"]), m({
         key: a.dataIndex,
         ref_for: !0
       }, a.fieldProps || {}, {
         span: a.span
       }), null, 16, ["span"]))), 128))]),
-      _: 1
-    }, 16, ["onSubmit", "onReset", "submit-loading"])], 6)) : v("", !0), P("div", {
+      _: 2
+    }, [R.searchFormExtra ? {
+      name: "extra",
+      fn: p(() => [S(e.$slots, "searchFormExtra")]),
+      key: "0"
+    } : void 0]), 1040, ["onSubmit", "onReset", "submit-loading"])], 6)) : k("", !0), E("div", {
       ref_key: "contentRef",
-      ref: D,
+      ref: _,
       class: F([l(y)("table-wrapper"), e.card ? l(y)("table-wrapper-card") : null]),
-      style: x(e.tableWrapperStyle)
-    }, [I(e.$slots, "title"), s(l(le), f({
-      class: l(V) === "admin" ? l(p)("table-admin") : l(p)("table")
-    }, M.value, {
-      onChange: l(j),
-      columns: b.value
-    }), ee({
-      headerCell: g(({
+      style: v(e.tableWrapperStyle)
+    }, [S(e.$slots, "title"), s(l(de), m({
+      class: l(D) === "admin" ? l(c)("table-admin") : l(c)("table")
+    }, H.value, {
+      onChange: l(M),
+      columns: h.value
+    }), P({
+      headerCell: p(({
         column: a,
         title: o
-      }) => [a.tooltip ? (i(), m("span", Te, [P("span", null, ae(o), 1), s(l(ne), {
+      }) => [a.tooltip ? (i(), g("span", Be, [E("span", null, oe(o), 1), s(l(se), {
         title: a.tooltip,
         placement: "bottom"
       }, {
-        default: g(() => [s(l(fe), {
+        default: p(() => [s(l(ge), {
           style: {
             color: "#0070ff",
             "padding-left": "4px"
           }
         })]),
         _: 2
-      }, 1032, ["title"])])) : v("", !0)]),
+      }, 1032, ["title"])])) : k("", !0)]),
       _: 2
-    }, [B(l(ce)(e.$slots, "title"), (a, o) => ({
+    }, [I(l(me)(R, ["title", "searchFormExtra"]), (a, o) => ({
       name: o,
-      fn: g((n) => [I(e.$slots, o, te(oe(n || {})))])
+      fn: p((n) => [S(e.$slots, o, re(le(n || {})))])
     }))]), 1040, ["class", "onChange", "columns"])], 6)], 2));
   }
 });
 export {
-  _e as default
+  Ae as default
 };

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

@@ -62,7 +62,7 @@ export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters'>
         multiple?: number;
     };
 };
-export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = ExtraProColumnType<any> & {
+export type ApColumnType<ValueType extends keyof ApTableValueFields = 'text', RecordType = any> = ExtraProColumnType<RecordType> & {
     children?: ApColumnType<any, RecordType>[];
     /**
      * 表单项所占据的格子数（1-24格）