@aplus-frontend/ui 0.2.1 → 0.2.3

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

@@ -1,23 +1,23 @@
-import { defineComponent as Ce, useSlots as ve, ref as z, computed as s, unref as t, createVNode as f, Fragment as U, watchEffect as Te, watch as G, openBlock as m, createElementBlock as F, normalizeClass as c, normalizeStyle as M, mergeProps as h, createSlots as J, withCtx as w, renderList as Q, createBlock as X, resolveDynamicComponent as Fe, renderSlot as S, createCommentVNode as Y, createElementVNode as I, h as xe, normalizeProps as Be, guardReactiveProps as Pe } from "vue";
-import { Typography as ke, Divider as ze, Button as Ie, Table as Ne } from "@aplus-frontend/antdv";
-import { useToken as Ee } from "@aplus-frontend/antdv/es/theme/internal";
-import { ApForm as Ke } from "../ap-form/index.mjs";
+import { defineComponent as ve, useSlots as Te, ref as z, computed as s, unref as t, createVNode as f, Fragment as U, watchEffect as Fe, watch as G, openBlock as m, createElementBlock as F, normalizeClass as c, normalizeStyle as M, mergeProps as h, createSlots as J, withCtx as w, renderList as Q, createBlock as X, resolveDynamicComponent as Be, renderSlot as S, createCommentVNode as Y, createElementVNode as I, h as xe, normalizeProps as ke, guardReactiveProps as Pe } from "vue";
+import { Typography as ze, Divider as Ie, Button as Ne, Table as Ee } from "@aplus-frontend/antdv";
+import { useToken as Ke } from "@aplus-frontend/antdv/es/theme/internal";
+import { ApForm as Le } from "../ap-form/index.mjs";
 import { noRenderAsFormItemValueList as Z } from "./constants.mjs";
 import "../config-provider/index.mjs";
-import { useTablePaging as Le } from "./hooks/use-table-paging.mjs";
-import { omit as _, isUndefined as g, isBoolean as Oe } from "lodash-unified";
-import { apColumnToColumn as Ve, getTableTitle as De, getTableRenderType as je, getTableRenderProps as Ae, getTableCellRenderNode as We, getColumnOrder as ee, updateFormProps as $e, getFieldProps as He, getSearchFormItemRenderNode as qe, objectToString as Ue } from "./utils.mjs";
-import Ge from "./hooks/use-table-content-height.mjs";
-import { getRawDisplayValue as Me } from "../editable-table/utils.mjs";
-import Je from "./hooks/use-table-row-selection.mjs";
-import { isDef as Qe } from "../utils/index.mjs";
-import { SettingOutlined as Xe } from "@ant-design/icons-vue";
+import { useTablePaging as Oe } from "./hooks/use-table-paging.mjs";
+import { omit as _, isUndefined as g, isBoolean as Ve } from "lodash-unified";
+import { apColumnToColumn as De, getTableTitle as Ae, getTableRenderType as je, getTableRenderProps as We, getTableCellRenderNode as $e, getColumnOrder as ee, updateFormProps as He, getFieldProps as qe, getSearchFormItemRenderNode as Ue, recursionApColumns as ae, objectToString as Ge } from "./utils.mjs";
+import Me from "./hooks/use-table-content-height.mjs";
+import { getRawDisplayValue as Je } from "../editable-table/utils.mjs";
+import Qe from "./hooks/use-table-row-selection.mjs";
+import { isDef as Xe } from "../utils/index.mjs";
+import { SettingOutlined as Ye } from "@ant-design/icons-vue";
 import "./components/setting/modal/index.vue.mjs";
-import { useProvideApTable as Ye } from "./context.mjs";
-import { useNamespace as Ze } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as _e } from "../config-provider/hooks/use-global-config.mjs";
-import ea from "./components/setting/modal/index.vue2.mjs";
-const ba = /* @__PURE__ */ Ce({
+import { useProvideApTable as Ze } from "./context.mjs";
+import { useNamespace as _e } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as ea } from "../config-provider/hooks/use-global-config.mjs";
+import aa from "./components/setting/modal/index.vue2.mjs";
+const Ra = /* @__PURE__ */ ve({
   name: "ApTable",
   __name: "ap-table",
   props: {
@@ -141,73 +141,73 @@ const ba = /* @__PURE__ */ Ce({
       default: void 0
     }
   },
-  setup(ae, {
-    expose: oe
+  setup(oe, {
+    expose: te
   }) {
-    const a = ae;
+    const a = oe;
     let N = 0;
-    const b = ve(), [, te] = Ee(), {
-      e: x,
+    const b = Te(), [, re] = Ke(), {
+      e: B,
       b: i,
       be: E
-    } = Ze("ap-table"), K = _e("valueTypeMap"), {
-      height: re,
-      contentRef: le
-    } = Ge(), B = z(a.size), d = z([]), L = z([]);
-    Ye({
+    } = _e("ap-table"), K = ea("valueTypeMap"), {
+      height: le,
+      contentRef: ne
+    } = Me(), x = z(a.size), d = z([]), L = z([]);
+    Ze({
       columns: s(() => d.value),
       columnsBackup: s(() => L.value),
-      size: s(() => B.value),
+      size: s(() => x.value),
       updateColumns(e) {
         d.value = e;
       },
       updateSize(e) {
-        B.value = e;
+        x.value = e;
       }
     });
-    const ne = () => {
+    const se = () => {
       var r;
       let e = ((r = a.columns) == null ? void 0 : r.filter((l) => !l.hideInTable)) || [];
       function o(l, u) {
         return l.map((n) => ({
-          resizable: Qe(n.resizable) ? n.resizable : a.columnResizable,
-          ..._(Ve(n), ["ellipsis"]),
+          resizable: Xe(n.resizable) ? n.resizable : a.columnResizable,
+          ..._(De(n), ["ellipsis"]),
           fixed: u ? u.fixed : n.fixed,
-          title: De(n, E("table-header", "title"), b.headerCell, t(te).colorPrimary),
+          title: Ae(n, E("table-header", "title"), b.headerCell, t(re).colorPrimary),
           customRender({
             value: p,
             ...y
           }) {
             var H, q;
-            const W = je(n), Se = Ae({
+            const W = je(n), be = We({
               ...n,
               valueType: W
             }, {
               value: p,
               ...y
-            }), be = We(W, Se, y.record, t(K)), $ = ((H = n.renderText) == null ? void 0 : H.call(n, {
+            }), Re = $e(W, be, y.record, t(K)), $ = ((H = n.renderText) == null ? void 0 : H.call(n, {
               value: p,
               ...y
-            })) || p, Re = n.renderText ? f(U, null, [(q = n.renderText) == null ? void 0 : q.call(n, {
+            })) || p, Ce = n.renderText ? f(U, null, [(q = n.renderText) == null ? void 0 : q.call(n, {
               value: p,
               ...y
-            })]) : be;
-            let k = ge(n, $, Re);
-            return n.customRender && (k = n.customRender({
+            })]) : Re;
+            let P = ye(n, $, Ce);
+            return n.customRender && (P = n.customRender({
               value: p,
               ...y,
               column: n,
-              originalNode: k,
+              originalNode: P,
               originalText: $
-            })), k;
+            })), P;
           },
           children: o(n.children || [], u || n)
         }));
       }
       return o(e);
     };
-    Te(() => {
-      const e = ne();
+    Fe(() => {
+      const e = se();
       d.value = e, L.value = e;
     });
     const O = s(() => {
@@ -216,7 +216,7 @@ const ba = /* @__PURE__ */ Ce({
         let n = ee(l.order);
         return ee(u.order) - n;
       })) == null ? void 0 : r.map((l) => {
-        const u = $e(l, He(l.fieldProps, {})), n = {
+        const u = He(l, qe(l.fieldProps, {})), n = {
           ...l,
           fieldProps: {
             label: l.title,
@@ -226,25 +226,31 @@ const ba = /* @__PURE__ */ Ce({
           },
           renderNode: void 0
         };
-        return n.renderNode = qe(n, t(K)), n;
+        return n.renderNode = Ue(n, t(K)), n;
       })) || [];
-    }), se = s(() => t(d).filter((e) => e.sorter === !0).map((e) => e.dataIndex).filter(Boolean)), de = s(() => t(d).filter((e) => e.filters && !e.onFilter).map((e) => e.dataIndex).filter(Boolean)), ue = s(() => g(a.dataSource) ? T.value.records : a.dataSource), {
+    }), de = s(() => ae(t(d), (e) => {
+      if (e.sorter === !0)
+        return e.key;
+    }).filter(Boolean)), ue = s(() => ae(t(d), (e) => {
+      if (e.filters && !e.onFilter)
+        return e.key;
+    }).filter(Boolean)), ie = s(() => g(a.dataSource) ? T.value.records : a.dataSource), {
       rowSelection: R,
       selectedRows: C,
       ...v
-    } = Je({
+    } = Qe({
       ...a.rowSelection === !0 ? {} : a.rowSelection,
       rowKey: a.rowKey,
-      dataSource: ue
+      dataSource: ie
     }), {
-      formRef: P,
+      formRef: k,
       submit: V,
       reset: D,
-      tableProps: j,
-      refresh: ie,
+      tableProps: A,
+      refresh: ce,
       data: T,
-      setDataSource: ce
-    } = Le({
+      setDataSource: pe
+    } = Oe({
       async request(e) {
         var r, l;
         if (!R.value.preserveSelectedRowKeys && g(a.dataSource) && v.clearAll(), !g(a.dataSource))
@@ -258,8 +264,8 @@ const ba = /* @__PURE__ */ Ce({
           total: (o == null ? void 0 : o.total) || 0
         };
       },
-      filterFields: de,
-      sortFields: se,
+      filterFields: ue,
+      sortFields: de,
       defaultParams: a.params,
       defaultData: a.defaultData,
       manual: a.manual,
@@ -268,24 +274,24 @@ const ba = /* @__PURE__ */ Ce({
       formatParams: a.beforeSearchSubmit,
       showLessItems: a.pagination ? a.pagination.showLessItems : void 0,
       showTotal: a.pagination ? a.pagination.showTotal : void 0
-    }), pe = s(() => {
+    }), fe = s(() => {
       var o, r;
       if (a.adaptive && (T.value.total > 0 || ((o = a.dataSource) == null ? void 0 : o.length)))
         return {
-          y: t(re),
+          y: t(le),
           x: ((r = a.scroll) == null ? void 0 : r.x) || "100%"
         };
       if (a.scroll)
         return a.scroll;
-    }), fe = s(() => {
+    }), me = s(() => {
       var e;
       if (a.tableLayout)
         return a.tableLayout;
       if ((e = a.columns) != null && e.some((o) => o.ellipsis))
         return "fixed";
-    }), A = s(() => {
+    }), j = s(() => {
       var r;
-      const e = t(j), o = t(R);
+      const e = t(A), o = t(R);
       return {
         ...a,
         ...e,
@@ -296,73 +302,73 @@ const ba = /* @__PURE__ */ Ce({
         } : a.rowSelection,
         loading: g(a.loading) ? e.loading : a.loading,
         pagination: a.pagination === !1 ? !1 : e.pagination,
-        scroll: t(pe)
+        scroll: t(fe)
       };
-    }), me = s(() => [i(), a.card ? null : i("wrapper"), a.adaptive ? i("adaptive") : null].filter(Boolean));
-    function ge(e, o, r) {
+    }), ge = s(() => [i(), a.card ? null : i("wrapper"), a.adaptive ? i("adaptive") : null].filter(Boolean));
+    function ye(e, o, r) {
       if (Z.includes(e.valueType))
         return r;
-      const l = Ue(o);
-      return e.copyable || e.ellipsis ? f(ke.Paragraph, {
+      const l = Ge(o);
+      return e.copyable || e.ellipsis ? f(ze.Paragraph, {
         copyable: e.copyable ? {
           text: l,
           tooltip: !1
         } : !1,
-        ellipsis: e.ellipsis ? Oe(e.ellipsis) ? {
+        ellipsis: e.ellipsis ? Ve(e.ellipsis) ? {
           tooltip: l
         } : {
           ...e.ellipsis,
           tooltip: l
         } : !1,
-        content: e.ellipsis ? Me(e, o) : r
+        content: e.ellipsis ? Je(e, o) : r
       }, null) : r;
     }
     G(() => t(T).loading, (e) => {
       var o;
       (o = a.onLoadingChange) == null || o.call(a, e);
     }), G(() => a.dataSource, (e) => {
-      ce(e);
+      pe(e);
     }, {
       immediate: !0
     });
-    function ye(e) {
+    function he(e) {
       var o, r, l;
-      (l = (r = (o = P.value) == null ? void 0 : o.apForm) == null ? void 0 : r.setFieldsValue) == null || l.call(r, e);
+      (l = (r = (o = k.value) == null ? void 0 : o.apForm) == null ? void 0 : r.setFieldsValue) == null || l.call(r, e);
     }
-    function he() {
+    function we() {
       var e, o, r;
-      return (r = (o = (e = P.value) == null ? void 0 : e.apForm) == null ? void 0 : o.getFieldsValue) == null ? void 0 : r.call(o, !0);
+      return (r = (o = (e = k.value) == null ? void 0 : e.apForm) == null ? void 0 : o.getFieldsValue) == null ? void 0 : r.call(o, !0);
     }
-    function we() {
+    function Se() {
       return t(d);
     }
-    return oe({
+    return te({
       submit: () => V(),
       reset: () => D(),
-      refresh: () => ie(),
-      setSearchFormValues: ye,
-      getSearchFormValues: he,
-      getShownColumns: we,
+      refresh: () => ce(),
+      setSearchFormValues: he,
+      getSearchFormValues: we,
+      getShownColumns: Se,
       dataSource: s(() => t(T).records),
       rowSelection: {
         selectedRows: s(() => t(C)),
         ...v
       }
     }), (e, o) => (m(), F("div", {
-      class: c(me.value)
+      class: c(ge.value)
     }, [t(g)(e.dataSource) && e.searchForm !== !1 && O.value.length > 0 ? (m(), F("div", {
       key: 0,
-      class: c(e.card ? t(x)("search-wrapper") : null),
+      class: c(e.card ? t(B)("search-wrapper") : null),
       style: M(e.searchFormWrapperStyle)
-    }, [f(t(Ke).SearchForm, h(e.searchForm || {}, {
+    }, [f(t(Le).SearchForm, h(e.searchForm || {}, {
       ref_key: "formRef",
-      ref: P,
+      ref: k,
       "custom-reset": "",
       onSubmit: t(V),
       onReset: t(D),
-      "submit-loading": t(j).loading
+      "submit-loading": t(A).loading
     }), J({
-      default: w(() => [(m(!0), F(U, null, Q(O.value, (r) => (m(), X(Fe(r.renderNode), h({
+      default: w(() => [(m(!0), F(U, null, Q(O.value, (r) => (m(), X(Be(r.renderNode), h({
         key: r.dataIndex,
         ref_for: !0
       }, r.fieldProps || {}, {
@@ -375,8 +381,8 @@ const ba = /* @__PURE__ */ Ce({
       key: "0"
     } : void 0]), 1040, ["onSubmit", "onReset", "submit-loading"])], 6)) : Y("", !0), I("div", {
       ref_key: "contentRef",
-      ref: le,
-      class: c([t(x)("table-wrapper"), e.card ? t(x)("table-wrapper-card") : null]),
+      ref: ne,
+      class: c([t(B)("table-wrapper"), e.card ? t(B)("table-wrapper-card") : null]),
       style: M(e.tableWrapperStyle)
     }, [I("div", {
       class: c(t(i)("header-wrapper"))
@@ -389,15 +395,15 @@ const ba = /* @__PURE__ */ Ce({
       selectedRows: t(C),
       selectedRowKeys: t(R).selectedRowKeys,
       shownColumns: d.value
-    }, v))], 2), b.title ? (m(), X(t(ze), {
+    }, v))], 2), b.title ? (m(), X(t(Ie), {
       key: 0,
       type: "vertical"
-    })) : Y("", !0), f(ea, {
+    })) : Y("", !0), f(aa, {
       config: e.settings === !0 ? {} : e.settings
     }, {
-      trigger: w(() => [f(t(Ie), {
+      trigger: w(() => [f(t(Ne), {
         class: c(t(i)("setting-trigger-button")),
-        icon: xe(t(Xe))
+        icon: xe(t(Ye))
       }, null, 8, ["class", "icon"])]),
       _: 1
     }, 8, ["config"])], 2)) : S(e.$slots, "title", h({
@@ -405,26 +411,26 @@ const ba = /* @__PURE__ */ Ce({
       selectedRows: t(C),
       selectedRowKeys: t(R).selectedRowKeys,
       shownColumns: d.value
-    }, v))], 2), f(t(Ne), h({
+    }, v))], 2), f(t(Ee), h({
       class: t(i)("table")
-    }, A.value, {
-      size: B.value,
-      "table-layout": fe.value,
+    }, j.value, {
+      size: x.value,
+      "table-layout": me.value,
       columns: d.value,
       onResizeColumn: o[0] || (o[0] = (r, l) => l.width = r)
     }), J({
       summary: w(() => [S(e.$slots, "summary", {
         columns: d.value,
-        records: A.value.dataSource,
+        records: j.value.dataSource,
         selectedRows: t(C)
       })]),
       _: 2
     }, [Q(t(_)(b, ["title", "searchFormExtra", "headerCell", "summary"]), (r, l) => ({
       name: l,
-      fn: w((u) => [S(e.$slots, l, Be(Pe(u || {})))])
+      fn: w((u) => [S(e.$slots, l, ke(Pe(u || {})))])
     }))]), 1040, ["class", "size", "table-layout", "columns"])], 6)], 2));
   }
 });
 export {
-  ba as default
+  Ra as default
 };

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

@@ -3,6 +3,7 @@ import { ValueTypeRenderConfig } from '../config-provider';
 import { apTableRenderItemMap } from './constants';
 import { VNode, CreateComponentPublicInstance, ExtractPropTypes, PropType, HTMLAttributes, ComponentOptionsMixin, VNodeProps, AllowedComponentProps, ComponentCustomProps, ComponentOptionsBase, VNodeArrayChildren, RendererNode, RendererElement } from 'vue';
 import { EditableColumnType } from '../editable-table/interface';
+import { ColumnType, ColumnGroupType } from '@aplus-frontend/antdv/es/table';
 import { ApFormItemTransformType, ApFieldTextPasswordProps, ApFormItemSlots, ApFieldTextProps, ApFormItemTextPassword, ApFieldTextAreaProps, ApFieldNumberProps, ApFieldDateProps, ApFieldDateRangeProps, ApFieldRadioProps, ApFieldSelectProps, ApFieldSwitchProps, ApFieldCheckboxProps } from '..';
 import { ColSize } from '@aplus-frontend/antdv/es/grid';
 import { FormLabelAlign } from '@aplus-frontend/antdv/es/form/interface';
@@ -8544,4 +8545,5 @@ export declare function getTableTitle(column: ApColumnType<any>, titleNodeClassN
 }) => any, tooltipColor?: string): number | boolean | void | VNodeArrayChildren | VNode< RendererNode, RendererElement, {
     [key: string]: any;
 }> | ((props: ColumnTitleProps<any>) => VNodeArrayChildren | VueNode) | null;
+export declare function recursionApColumns<ReturnType = any>(columns: (ColumnType | ColumnGroupType<any>)[], handler: (column: ColumnType) => ReturnType): ReturnType[];
 export {};

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

@@ -1,18 +1,18 @@
-import { isVNode as b, createVNode as s, mergeProps as a, cloneVNode as T, Fragment as g } from "vue";
-import { isObject as f, isArray as p, isUndefined as h, isFunction as d, omit as j, isBoolean as O, isString as E } from "lodash-unified";
+import { isVNode as b, createVNode as u, mergeProps as a, cloneVNode as T, Fragment as h } from "vue";
+import { isObject as f, isArray as p, isUndefined as g, isFunction as d, omit as j, isBoolean as O, isString as E } from "lodash-unified";
 import { apTableRenderItemMap as F, apTableFormItemMap as N } from "./constants.mjs";
 import { isType as S } from "@fruits-chain/utils";
 import "../ap-form/index.mjs";
 import { Tooltip as v } from "@aplus-frontend/antdv";
 import { QuestionCircleOutlined as I } from "@ant-design/icons-vue";
-import V from "../ap-form/item/index.vue.mjs";
-function w(t) {
+import C from "../ap-form/item/index.vue.mjs";
+function V(t) {
   return typeof t == "function" || Object.prototype.toString.call(t) === "[object Object]" && !b(t);
 }
-const C = (t, e, n) => {
+const w = (t, e, n) => {
   let i = {};
   return f(t) ? Object.keys(t).forEach((o) => {
-    f(t[o]) ? i[o] = C(t[o], e[o], n) : i[o] = n(t[o], e);
+    f(t[o]) ? i[o] = w(t[o], e[o], n) : i[o] = n(t[o], e);
   }) : i = n(t, e), i;
 }, Q = (t, e) => {
   switch (t) {
@@ -38,12 +38,12 @@ const C = (t, e, n) => {
 function U(t) {
   return p(t) ? t.join(".") : t;
 }
-function P(t) {
+function A(t) {
   const e = Object.prototype.toString.call(t).match(/^\[object (.*)\]$/)[1].toLowerCase();
   return e === "string" && typeof t == "object" ? "object" : t === null ? "null" : t === void 0 ? "undefined" : e;
 }
-const x = (t) => P(t) === "map" ? t : new Map(Object.entries(t || {})), m = (t) => {
-  const e = [], n = x(t);
+const P = (t) => A(t) === "map" ? t : new Map(Object.entries(t || {})), m = (t) => {
+  const e = [], n = P(t);
   return n.forEach((i, o) => {
     const r = n.get(o) || n.get(`${o}`);
     if (r) {
@@ -63,8 +63,8 @@ const x = (t) => P(t) === "map" ? t : new Map(Object.entries(t || {})), m = (t)
       });
     }
   }), e;
-}, z = (t) => h(t) || t < 0 ? 0 : t;
-function A(t, e) {
+}, z = (t) => g(t) || t < 0 ? 0 : t;
+function x(t, e) {
   return !t || !d(t) ? t : t(e);
 }
 function G(t) {
@@ -72,14 +72,14 @@ function G(t) {
   return t.valueEnum && (e = "status"), e;
 }
 function K(t, e, n, i) {
-  var u;
+  var s;
   const o = F[t];
   if (o)
-    return s(o, a(e, {
+    return u(o, a(e, {
       mode: "read"
     }), null);
   const r = i == null ? void 0 : i[t];
-  return ((u = r == null ? void 0 : r.render) == null ? void 0 : u.call(r, e.value, n, e)) || e.value;
+  return ((s = r == null ? void 0 : r.render) == null ? void 0 : s.call(r, e.value, n, e)) || e.value;
 }
 function X(t, e) {
   if (t.customRenderFormItem)
@@ -98,22 +98,22 @@ function X(t, e) {
   return () => {
     var r;
     const o = (r = i == null ? void 0 : i.renderFormItem) == null ? void 0 : r.call(i, t.fieldProps.field);
-    return o ? s(V, a(t.fieldProps, {
+    return o ? u(C, a(t.fieldProps, {
       span: t.span
-    }), w(o) ? o : {
+    }), V(o) ? o : {
       default: () => [o]
     }) : null;
   };
 }
 function Y(t, e) {
-  const n = A(t.fieldProps, e), i = (n == null ? void 0 : n.field) || n || {}, o = t.valueType === "switch", r = t.valueType === "index", u = o ? {
+  const n = x(t.fieldProps, e), i = (n == null ? void 0 : n.field) || n || {}, o = t.valueType === "switch", r = t.valueType === "index", s = o ? {
     checked: e.value
   } : {
     value: r ? e.index + 1 : e.value
   };
   return t.valueEnum && (i.valueEnum = t.valueEnum), {
     ...j(i, ["request"]),
-    ...u
+    ...s
   };
 }
 function Z(t) {
@@ -146,21 +146,21 @@ function M(t, e, n, i) {
   }), r = (o == null ? void 0 : o.filter((y) => y.type !== Symbol.for("v-cmt"))) || [];
   if (o && r.length > 0)
     return o;
-  const l = E(t.title) ? s("span", {
+  const l = E(t.title) ? u("span", {
     class: e,
     title: t.title
-  }, [t.title]) : t.title, c = t.tooltip ? d(t.tooltip) ? t.tooltip(t) : s(g, null, [t.tooltip]) : null;
-  return c ? s("span", {
+  }, [t.title]) : t.title, c = t.tooltip ? d(t.tooltip) ? t.tooltip(t) : u(h, null, [t.tooltip]) : null;
+  return c ? u("span", {
     style: {
       display: "inline-flex",
       alignItems: "center",
       maxWidth: "100%"
     }
-  }, [l, s(v, {
+  }, [l, u(v, {
     title: c,
     placement: "bottom"
   }, {
-    default: () => [s(I, {
+    default: () => [u(I, {
       style: {
         padding: "4px",
         color: i,
@@ -169,20 +169,30 @@ function M(t, e, n, i) {
     }, null)]
   })]) : l;
 }
+function tt(t, e) {
+  const n = [];
+  function i(o) {
+    var r;
+    for (const s of o)
+      (r = s.children) != null && r.length ? i(s.children) : n.push(e(s));
+  }
+  return i(t), n;
+}
 export {
   Z as apColumnToColumn,
   U as dataIndexToStr,
-  C as formatParamsValueType,
+  w as formatParamsValueType,
   z as getColumnOrder,
-  A as getFieldProps,
+  x as getFieldProps,
   X as getSearchFormItemRenderNode,
   K as getTableCellRenderNode,
   Y as getTableRenderProps,
   G as getTableRenderType,
   M as getTableTitle,
-  x as objectToMap,
+  P as objectToMap,
   H as objectToString,
   Q as parseFieldValue,
+  tt as recursionApColumns,
   k as updateFormProps,
   m as valueEnumToArray
 };

package/es/src/ap-upload/apUpload.vue.d.ts

@@ -20,7 +20,7 @@ declare const __VLS_component: DefineComponent<{
         default: string;
     };
     value: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ObjectConstructor | ArrayConstructor | StringConstructor)[];
         default: undefined;
     };
     needName: {
@@ -68,7 +68,7 @@ declare const __VLS_component: DefineComponent<{
         default: string;
     };
     value: {
-        type: (ObjectConstructor | StringConstructor | ArrayConstructor)[];
+        type: (ObjectConstructor | ArrayConstructor | StringConstructor)[];
         default: undefined;
     };
     needName: {

package/es/src/ap-upload/components/Picture.vue2.mjs

@@ -14,7 +14,7 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
 }, ye = { class: "picture-title" }, we = { key: 0 }, ke = { key: 1 }, Te = /* @__PURE__ */ K({
   __name: "Picture",
   setup(Ce, { expose: E }) {
-    const { t: r } = pe(), { b: U } = de("ap-upload-picture"), { put: O } = ie(), B = u("theme"), L = u("dirName"), y = u("accept") || "image/*", w = u("maxSize") ?? 5, A = u("title"), l = u("maxCount") ?? 10, v = u("uploadingCount"), N = u("beforeUpload"), P = u("customRequest"), S = u("getOssAccess"), x = R(null), c = u("value"), _ = u("needName");
+    const { t: r } = pe(), { b: U } = de("ap-upload-picture"), { put: O } = ie(), B = u("theme"), L = u("dirName"), y = u("accept") || "image/*", w = u("maxSize") ?? 5, S = u("title"), l = u("maxCount") ?? 10, v = u("uploadingCount"), A = u("beforeUpload"), N = u("customRequest"), P = u("getOssAccess"), x = R(null), c = u("value"), _ = u("needName");
     let s = R([]);
     const f = [];
     Q(
@@ -33,7 +33,7 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
       W(async () => {
         const a = [];
         for (let t of e) {
-          const n = ne(_, t), o = ae(_, t), p = await D(S), H = await p.getSignatureUrl(n), J = {
+          const n = ne(_, t), o = ae(_, t), p = await D(P), H = await p.getSignatureUrl(n), J = {
             ...typeof t == "string" ? {} : t,
             ...new File([t], o, {}),
             uid: `${(/* @__PURE__ */ new Date()).getTime()}-${Math.random()}`,
@@ -83,8 +83,8 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
             r("ap.apUpload.maxUploadPicture", { maxCount: l })
           );
         }), !1;
-      if (typeof N == "function") {
-        if (N(e) === !1)
+      if (typeof A == "function") {
+        if (A(e) === !1)
           return !1;
       } else {
         if (e.size > w * 1024 * 1024)
@@ -109,8 +109,8 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
       };
     }
     async function G(e, a) {
-      if (v.value++, typeof P == "function") {
-        P({
+      if (v.value++, typeof N == "function") {
+        N({
           onProgress: (t) => {
             const n = s.value.find((o) => o.uid === e.uid);
             n && (n.percent = t);
@@ -137,7 +137,7 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
         return;
       }
       try {
-        const t = await D(S);
+        const t = await D(P);
         e.oss = t, s.value.push(e), O({
           file: a,
           dirName: L,
@@ -174,12 +174,12 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
     }
     function I(e) {
       var t;
-      if (e.path) {
+      if (e.path && c) {
         if (Array.isArray(c.value)) {
           const n = f.findIndex(
             (o) => o.uid === e.uid
           );
-          n >= 0 && (c == null || c.value.splice(n, 1), f.splice(n, 1)), c.value.length === 0 && (c.value = void 0);
+          n >= 0 && (c.value = c == null ? void 0 : c.value.toSpliced(n, 1), f.splice(n, 1)), c.value.length === 0 && (c.value = void 0);
         }
       } else
         (t = e == null ? void 0 : e.oss) == null || t.pauseUpload();
@@ -256,7 +256,7 @@ const me = ["accept"], fe = { class: "picture-context" }, he = { class: "picture
         ])) : $("", !0)
       ]),
       d("div", ye, [
-        i(A) ? (h(), g("div", we, C(i(A)), 1)) : (h(), g("div", ke, C(`${i(r)("ap.apUpload.supportExtension")}：${i(ue)(i(y))}，${i(r)(
+        i(S) ? (h(), g("div", we, C(i(S)), 1)) : (h(), g("div", ke, C(`${i(r)("ap.apUpload.supportExtension")}：${i(ue)(i(y))}，${i(r)(
           "ap.apUpload.maxUploadPictureSize",
           { maxSize: i(w) }
         )}`), 1))