@aplus-frontend/ui 0.1.15 → 0.1.17

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

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

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

@@ -1,6 +1,6 @@
 import { ColumnType, TableProps } from 'ant-design-vue/es/table';
 import { CompareFn, SortOrder, TableRowSelection } from 'ant-design-vue/es/table/interface';
-import { ApFormSearchFormProps } from '../ap-form';
+import { ApFormItemProps, ApFormSearchFormProps } from '../ap-form';
 import { ApFormItemCheckboxProps, ApFormItemDateProps, ApFormItemDateRangeProps, ApFormItemNumberProps, ApFormItemRadioProps, ApFormItemSelectProps, ApFormItemSwitchProps, ApFormItemTextAreaProps, ApFormItemTextPasswordProps, ApFormItemTextProps } from '../ap-form/items/interface';
 import { Recordable } from '../type';
 import { ComputedRef, CSSProperties, VNode } from 'vue';
@@ -67,8 +67,21 @@ export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters' |
 export type ApTableRowSelection<RecordType = any> = Omit<TableRowSelection<RecordType>, 'selectedRowKeys' | 'onChange' | 'onSelect' | 'onSelectAll' | 'onSelectInvert' | 'onSelectNone'> & {
     mode: 'internal';
 };
-export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes = ApTableValueTypes> = ValueType extends ApTableValueTypes ? ExtraProColumnType<RecordType> & {
-    children?: ApColumnType<RecordType, ValueType>[];
+export type CommonFieldReturnType = ApFormItemProps & {
+    field: Recordable;
+    placeholder?: string;
+    disabled?: boolean;
+};
+export type FieldPropsType<ReturnType, RecordType, ExtraValueType, ValueType extends ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType> = ReturnType | ((opt: Partial<{
+    value: any;
+    text: any;
+    record: RecordType;
+    index: number;
+    renderIndex: number;
+    column: ApColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>;
+}>) => ReturnType);
+export type ApColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? ExtraProColumnType<RecordType> & {
+    children?: ApColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
     /**
      * 表单项所占据的格子数（1-24格）
      */
@@ -100,7 +113,7 @@ export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes =
     /**
      * 自定义查询表单渲染
      */
-    customRenderFormItem?: (config: ApColumnType<RecordType, ValueType>) => any;
+    customRenderFormItem?: (config: ApColumnType<RecordType>) => any;
     /**
      * 自定义渲染文本，和customRender相比，其必须返回字符串，并且后续的渲染（例如copy/ellipsis）都将使用这个值
      */
@@ -115,18 +128,11 @@ export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes =
     /**
      * 指定值类型（将会用于默认渲染和查询表单生成）
      */
-    valueType?: ValueType;
+    valueType?: MergedValueType;
     /**
      * 值类型额外配置的参数（用于查询表单渲染）
      */
-    fieldProps?: ApTableValueFields[ValueType] | ((opt: Partial<{
-        value: any;
-        text: any;
-        record: RecordType;
-        index: number;
-        renderIndex: number;
-        column: ApColumnType<RecordType, ValueType>;
-    }>) => ApTableValueFields[ValueType]);
+    fieldProps?: FieldPropsType<Extract<MergedValueType, ValueType> extends never ? CommonFieldReturnType : ApTableValueFields[Extract<MergedValueType, ValueType>], RecordType, ExtraValueType, ValueType, MergedValueType>;
     /**
      * 用于表单项排序的字段
      * @description 值越大，越排在前面，请设置正整数，设置为0或负数将会无效