@aplus-frontend/ui 0.0.17 → 0.0.18

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

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

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

@@ -7913,6 +7913,9 @@ export declare const apTableRenderItemMap: {
                 type: PropType<string>;
                 default: string;
             };
+            timezone: {
+                type: PropType<"LA" | "NY" | "SH">;
+            };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
         }, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -8115,6 +8118,9 @@ export declare const apTableRenderItemMap: {
                 type: PropType<string>;
                 default: string;
             };
+            timezone: {
+                type: PropType<"LA" | "NY" | "SH">;
+            };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
         }, {
@@ -8349,6 +8355,9 @@ export declare const apTableRenderItemMap: {
                 type: PropType<string>;
                 default: string;
             };
+            timezone: {
+                type: PropType<"LA" | "NY" | "SH">;
+            };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
         }, {}, {}, {}, {}, {
@@ -8580,6 +8589,9 @@ export declare const apTableRenderItemMap: {
             type: PropType<string>;
             default: string;
         };
+        timezone: {
+            type: PropType<"LA" | "NY" | "SH">;
+        };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -8845,6 +8857,9 @@ export declare const apTableRenderItemMap: {
                 type: PropType<string>;
                 default: string;
             };
+            timezone: {
+                type: PropType<"LA" | "NY" | "SH">;
+            };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
         }, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
@@ -9055,6 +9070,9 @@ export declare const apTableRenderItemMap: {
                 type: PropType<string>;
                 default: string;
             };
+            timezone: {
+                type: PropType<"LA" | "NY" | "SH">;
+            };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
         }, {
@@ -9302,6 +9320,9 @@ export declare const apTableRenderItemMap: {
                 type: PropType<string>;
                 default: string;
             };
+            timezone: {
+                type: PropType<"LA" | "NY" | "SH">;
+            };
         }>> & {
             "onUpdate:value"?: ((...args: any[]) => any) | undefined;
         }, {}, {}, {}, {}, {
@@ -9546,6 +9567,9 @@ export declare const apTableRenderItemMap: {
             type: PropType<string>;
             default: string;
         };
+        timezone: {
+            type: PropType<"LA" | "NY" | "SH">;
+        };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }, {}, unknown, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {

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

@@ -3,7 +3,7 @@ import { CompareFn, SortOrder } from 'ant-design-vue/es/table/interface';
 import { 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 } from 'vue';
+import { ComputedRef, CSSProperties, VNode } from 'vue';
 import { ApActionGroupProps } from '../ap-action';
 import { ApTableIndexProps } from './components/interface';
 
@@ -56,7 +56,7 @@ export type ApTableValueFields = {
 };
 export type ApTableValueTypes = keyof ApTableValueFields;
 export type ValueEnum = Record<string, ValueEnumType>;
-export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters'> & {
+export type ExtraProColumnType<T> = Omit<ColumnType<T>, 'children' | 'filters' | 'customRender'> & {
     sorter?: string | boolean | CompareFn<T> | {
         compare?: CompareFn<T>;
         /** Config multiple sorter order priority */
@@ -100,14 +100,14 @@ export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes =
     /**
      * 值类型额外配置的参数（用于查询表单渲染）
      */
-    fieldProps?: ApTableValueFields[ValueType] | ((opt?: {
+    fieldProps?: ApTableValueFields[ValueType] | ((opt: Partial<{
         value: any;
         text: any;
         record: RecordType;
         index: number;
         renderIndex: number;
         column: ApColumnType<RecordType, ValueType>;
-    }) => ApTableValueFields[ValueType]);
+    }>) => ApTableValueFields[ValueType]);
     /**
      * 用于表单项排序的字段
      * @description 值越大，越排在前面，请设置正整数，设置为0或负数将会无效
@@ -117,6 +117,20 @@ export type ApColumnType<RecordType = any, ValueType extends ApTableValueTypes =
      * 表头的菜单筛选项，设置为true后会尝试使用valueEnum生成filters
      */
     filters?: ColumnType<RecordType>['filters'] | true;
+    /**
+     * 自定义渲染，添加了`editable`以及`originalNode`
+     * @param opt
+     * @returns
+     */
+    customRender?: (opt: {
+        value: any;
+        text: any;
+        record: RecordType;
+        index: number;
+        renderIndex: number;
+        column: ApColumnType<RecordType>;
+        originalNode?: VNode;
+    }) => any;
 } : never;
 export type RequestData<T> = {
     data: T[] | undefined;