@aplus-frontend/ui 0.2.15 → 0.2.16

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

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

package/es/src/ap-table/hooks/use-sorted-filtered.d.ts

@@ -0,0 +1,9 @@
+import { ApColumnType } from '../interface';
+import { Recordable } from '../../type';
+export declare const useTableSortedAndFiltered: () => {
+    getColumnSFConfig: (column: ApColumnType) => Recordable;
+    setSF: (filters: any, sorter: any) => void;
+    clearSorter: () => void;
+    clearFilters: () => void;
+    clearAll: () => void;
+};

package/es/src/ap-table/hooks/use-sorted-filtered.mjs

@@ -0,0 +1,30 @@
+import { ref as i, unref as s } from "vue";
+const F = () => {
+  const r = i(), t = i();
+  function c(e) {
+    const n = s(t) || {}, u = s(r) || {}, l = {};
+    return e.filters && (l.filteredValue = n[e.key] || null), e.sorter && (l.sortOrder = u.columnKey === e.key ? u.order : null), l;
+  }
+  function d(e, n) {
+    t.value = e, r.value = n;
+  }
+  function o() {
+    r.value = null;
+  }
+  function f() {
+    t.value = null;
+  }
+  function a() {
+    o(), f();
+  }
+  return {
+    getColumnSFConfig: c,
+    setSF: d,
+    clearSorter: o,
+    clearFilters: f,
+    clearAll: a
+  };
+};
+export {
+  F as useTableSortedAndFiltered
+};

package/es/src/ap-table/hooks/use-table-paging.d.ts

@@ -4,6 +4,8 @@ import { ApFormSearchFormExpose } from '../../ap-form';
 import { DataIndex } from '@aplus-frontend/antdv/es/vc-table/interface';
 import { TablePaginationConfig } from '@aplus-frontend/antdv';
 import { FilterValue, SorterResult, TableCurrentDataSource } from '@aplus-frontend/antdv/es/table/interface';
+import { ApColumnType } from '..';
+import { Recordable } from '../../type';
 export type UseTablePagingParams<DataType, ParamsType> = {
     request: (params: any) => Promise<RequestData<DataType>>;
     /**
@@ -92,4 +94,5 @@ export declare const useTablePaging: <DataType = any, ParamsType = Record<string
     }>;
     dataSource: ComputedRef<DataType[]>;
     setDataSource: (dataSource?: DataType[]) => void;
+    getColumnSFConfig: (column: ApColumnType) => Recordable;
 };