@aplus-frontend/ui 6.13.2 → 6.13.3

package/es/src/ap-grid/index.vue.mjs

@@ -1,29 +1,29 @@
-import { defineComponent as Oe, useSlots as $e, getCurrentInstance as Me, ref as E, computed as n, unref as a, toRef as We, nextTick as je, watch as B, createElementBlock as P, openBlock as d, normalizeStyle as V, normalizeClass as g, createCommentVNode as w, createElementVNode as b, createVNode as _, mergeProps as R, createSlots as ee, withCtx as h, Fragment as te, renderList as K, createBlock as f, resolveDynamicComponent as L, renderSlot as D, normalizeProps as He, guardReactiveProps as qe } from "vue";
-import { VxeUI as oe, VxeTable as Ue, VxeColumn as ae } from "vxe-table";
+import { defineComponent as $e, useSlots as We, getCurrentInstance as Me, ref as E, computed as n, unref as a, toRef as je, nextTick as He, watch as B, createElementBlock as P, openBlock as d, normalizeStyle as V, normalizeClass as g, createCommentVNode as w, createElementVNode as b, createVNode as _, mergeProps as R, createSlots as te, withCtx as h, Fragment as oe, renderList as K, createBlock as f, resolveDynamicComponent as L, renderSlot as D, normalizeProps as qe, guardReactiveProps as Ue } from "vue";
+import { VxeUI as ae, VxeTable as Ge, VxeColumn as re } from "vxe-table";
 import "vxe-table/es/style.css";
-import { isUndefined as x, isFunction as re, omit as Ge } from "lodash-unified";
-import { ApForm as Xe } from "../ap-form/index.mjs";
+import { isUndefined as x, isFunction as le, omit as Xe } from "lodash-unified";
+import { ApForm as Je } from "../ap-form/index.mjs";
 import "../config-provider/index.mjs";
-import { noRenderAsFormItemValueList as Je } from "../ap-table/constants.mjs";
-import { getColumnOrder as le, updateFormProps as Qe, getFieldProps as Ye, getSearchFormItemRenderNode as Ze, recursionApColumns as ne } from "../ap-table/utils.mjs";
-import { useTablePaging as et } from "../ap-table/hooks/use-table-paging-ng.mjs";
-import { Spin as tt, Empty as se, Pagination as ot } from "@aplus-frontend/antdv";
-import { useInnerParams as at } from "./hooks/use-inner-params.mjs";
-import { toVxeProps as rt, getRowExpandProps as lt, getRowSelectionProps as nt } from "./utils/table.mjs";
-import st from "./hooks/use-row-selection.mjs";
-import { useProvideApTable as it } from "../ap-table/context.mjs";
-import { sizeReverseMap as dt, sizeMap as ut, ROW_SELECTION_FIELD as ct } from "./constants.mjs";
-import { useRenderColumns as ft } from "./hooks/use-render-columns.mjs";
-import { useToken as pt } from "@aplus-frontend/antdv/es/theme/internal";
+import { noRenderAsFormItemValueList as Qe } from "../ap-table/constants.mjs";
+import { getColumnOrder as ne, updateFormProps as Ye, getFieldProps as Ze, getSearchFormItemRenderNode as et, recursionApColumns as se } from "../ap-table/utils.mjs";
+import { useTablePaging as tt } from "../ap-table/hooks/use-table-paging-ng.mjs";
+import { Spin as ot, Empty as ie, Pagination as at } from "@aplus-frontend/antdv";
+import { useInnerParams as rt } from "./hooks/use-inner-params.mjs";
+import { toVxeProps as lt, getRowExpandProps as nt, getRowSelectionProps as st } from "./utils/table.mjs";
+import it from "./hooks/use-row-selection.mjs";
+import { useProvideApTable as dt } from "../ap-table/context.mjs";
+import { sizeReverseMap as ut, sizeMap as ct, ROW_SELECTION_FIELD as ft } from "./constants.mjs";
+import { useRenderColumns as pt } from "./hooks/use-render-columns.mjs";
+import { useToken as mt } from "@aplus-frontend/antdv/es/theme/internal";
 import "../scroll-bar/index.mjs";
-import { isDef as mt } from "../utils/index.mjs";
-import { getValidVNodeList as gt } from "../utils/slot.mjs";
-import { useTableStyle as ht } from "./hooks/use-table-style.mjs";
-import { useNamespace as Ct } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as vt } from "../config-provider/hooks/use-global-config.mjs";
-import { useLocale as yt } from "../config-provider/hooks/use-locale.mjs";
-import St from "../scroll-bar/index.vue.mjs";
-const Ut = /* @__PURE__ */ Oe({
+import { isDef as gt } from "../utils/index.mjs";
+import { getValidVNodeList as ht } from "../utils/slot.mjs";
+import { useTableStyle as Ct } from "./hooks/use-table-style.mjs";
+import { useNamespace as vt } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as yt } from "../config-provider/hooks/use-global-config.mjs";
+import { useLocale as St } from "../config-provider/hooks/use-locale.mjs";
+import wt from "../scroll-bar/index.vue.mjs";
+const Gt = /* @__PURE__ */ $e({
   name: "ApGrid",
   __name: "index",
   props: {
@@ -114,32 +114,32 @@ const Ut = /* @__PURE__ */ Oe({
     rowHighlightable: { type: [Boolean, Function], default: !1 },
     treeConfig: {}
   },
-  setup(ie, { expose: de }) {
-    var Z;
-    const v = $e(), o = ie, k = (Z = Me()) == null ? void 0 : Z.appContext.app;
-    k && !k.__VXE_PC_UI_INSTALLED__ && (k.use(oe), k.__VXE_PC_UI_INSTALLED__ = !0);
-    const { e: F, b: u, be: ue } = Ct("ap-grid"), ce = vt("valueTypeMap"), i = E([]), O = E([]), s = E(), I = E(o.size), fe = ht(), [, pe] = pt(), { t: me } = yt();
-    oe.setConfig({
-      i18n: (e, t) => me(`ap.${e}`, t)
+  setup(de, { expose: ue }) {
+    var ee;
+    const v = We(), o = de, k = (ee = Me()) == null ? void 0 : ee.appContext.app;
+    k && !k.__VXE_PC_UI_INSTALLED__ && (k.use(ae), k.__VXE_PC_UI_INSTALLED__ = !0);
+    const { e: F, b: u, be: ce } = vt("ap-grid"), fe = yt("valueTypeMap"), i = E([]), O = E([]), s = E(), I = E(o.size), pe = Ct(), [, me] = mt(), { t: ge } = St();
+    ae.setConfig({
+      i18n: (e, t) => ge(`ap.${e}`, t)
     });
-    const { renderConfig: ge, updateSignal: he } = ft(i);
+    const { renderConfig: he, updateSignal: Ce } = pt(i);
     let $ = 0;
-    const Ce = n(() => {
+    const ve = n(() => {
       if (s.value)
         return s.value.$el.querySelector(
           ".vxe-table--header-inner-wrapper"
         );
-    }), M = n(() => {
+    }), W = n(() => {
       var e, t, l;
       return $++, ((l = (t = (e = o.columns) == null ? void 0 : e.filter(
-        (r) => !r.hideInSearch && r.dataIndex && (r.valueType || r.customRenderFormItem) && !Je.includes(r.valueType)
+        (r) => !r.hideInSearch && r.dataIndex && (r.valueType || r.customRenderFormItem) && !Qe.includes(r.valueType)
       )) == null ? void 0 : t.sort((r, c) => {
-        let S = le(r.order);
-        return le(c.order) - S;
+        let S = ne(r.order);
+        return ne(c.order) - S;
       })) == null ? void 0 : l.map((r) => {
-        const c = Qe(
+        const c = Ye(
           r,
-          Ye(r.fieldProps, {})
+          Ze(r.fieldProps, {})
         ), S = {
           ...r,
           fieldProps: {
@@ -152,26 +152,26 @@ const Ut = /* @__PURE__ */ Oe({
           },
           renderNode: void 0
         };
-        return S.renderNode = Ze(
+        return S.renderNode = et(
           S,
-          a(ce)
+          a(fe)
         ), S;
       })) || [];
-    }), ve = n(() => {
+    }), ye = n(() => {
       var t;
-      return mt(o.manual) ? o.manual : gt(((t = v.searchFormExtra) == null ? void 0 : t.call(v)) || []).some((l) => {
+      return gt(o.manual) ? o.manual : ht(((t = v.searchFormExtra) == null ? void 0 : t.call(v)) || []).some((l) => {
         var r;
         return ((r = l.type) == null ? void 0 : r.name) === "ApView";
       });
-    }), ye = n(() => [
+    }), Se = n(() => [
       u(),
       o.card ? null : u("wrapper"),
       o.adaptive ? u("adaptive") : null,
       o.sticky ? u("sticky") : null
-    ].filter(Boolean)), W = n(() => ne(a(i), (e) => {
+    ].filter(Boolean)), M = n(() => se(a(i), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), j = n(() => ne(a(i), (e) => {
+    }).filter(Boolean)), j = n(() => se(a(i), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
@@ -181,11 +181,12 @@ const Ut = /* @__PURE__ */ Oe({
       refresh: H,
       data: p,
       tableProps: q,
-      setDataSource: Se,
-      handleTableChangeOptional: we,
-      getPaging: be,
-      setPaging: Re
-    } = et({
+      setDataSource: we,
+      handleTableChangeOptional: be,
+      getPaging: Re,
+      setPaging: xe,
+      submitWith: U
+    } = tt({
       async request(e) {
         var l;
         if (!m.value.preserveSelectedRowKeys && x(o.dataSource) && A(), !x(o.dataSource)) {
@@ -203,53 +204,54 @@ const Ut = /* @__PURE__ */ Oe({
       },
       namespace: "ap-grid",
       filterFields: j,
-      sortFields: W,
-      params: We(o, "params"),
+      sortFields: M,
+      params: je(o, "params"),
       defaultData: o.defaultData,
-      manual: a(ve),
+      manual: a(ye),
       formatParams: o.beforeSearchSubmit,
       pagination: o.pagination,
-      onClickReset: Le,
-      onAfterRequest: Y
-    }), { sortChangeEvent: xe, filterChangeEvent: ke, paginationChangeEvent: Fe } = at(we);
-    it({
+      onClickReset: De,
+      onAfterRequest: Z
+    }), { sortChangeEvent: ke, filterChangeEvent: Fe, paginationChangeEvent: Ie } = rt(be);
+    dt({
       columns: n(() => i.value),
       columnsBackup: n(() => O.value),
-      size: n(() => ut[I.value]),
+      size: n(() => ct[I.value]),
       updateColumns(e) {
         var t;
         i.value = e, (t = o.onShownColumnsChange) == null || t.call(o, e);
       },
       updateSize(e) {
-        I.value = dt[e];
+        I.value = ut[e];
       },
       renderConfig: n(() => ({
-        className: ue("table-header", "title"),
-        color: pe.value.colorTextTertiary
+        className: ce("table-header", "title"),
+        color: me.value.colorTextTertiary
       })),
       dataSource: n(() => a(p).records),
-      getSearchFormValues: G,
-      setSearchFormValues: U,
+      getSearchFormValues: X,
+      setSearchFormValues: G,
       submit: T,
+      submitWith: U,
       reset: N,
       refresh: H,
-      getSearchFormSorterItems: X,
-      setSearchFormSorterItems: J,
-      resetSearchFormSorterItems: Q
+      getSearchFormSorterItems: J,
+      setSearchFormSorterItems: Q,
+      resetSearchFormSorterItems: Y
     });
-    const Ie = n(
+    const Ee = n(
       () => i.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
-    ), Ee = n(
-      () => x(o.loading) ? p.loading : o.loading
     ), Be = n(
+      () => x(o.loading) ? p.loading : o.loading
+    ), Pe = n(
       () => x(o.dataSource) ? p.records : o.dataSource
-    ), { selectedRows: z, rowSelection: m, ...y } = st({
+    ), { selectedRows: z, rowSelection: m, ...y } = it({
       ...o.rowSelection === !0 ? {} : o.rowSelection,
-      dataSource: Be,
+      dataSource: Pe,
       rowKey: o.rowKey
-    }), Pe = ({
+    }), Te = ({
       checked: e,
       row: t
     }) => {
@@ -261,7 +263,7 @@ const Ut = /* @__PURE__ */ Oe({
         ];
         y.selectChange(t, e, r);
       }
-    }, Te = ({
+    }, Ne = ({
       checked: e
     }) => {
       const t = s.value;
@@ -269,43 +271,43 @@ const Ut = /* @__PURE__ */ Oe({
         ...t.getCheckboxReserveRecords(),
         ...t.getCheckboxRecords()
       ]);
-    }, Ne = () => {
+    }, ze = () => {
       const e = s.value;
       e && y.selectRangeChange(e.getCheckboxRecords(), [
         ...e.getCheckboxReserveRecords(),
         ...e.getCheckboxRecords()
       ]);
-    }, ze = () => {
+    }, Ae = () => {
       const e = s.value;
       e && (z.value = [e.getRadioRecord()]);
-    }, Ae = ({
+    }, Ve = ({
       row: e
     }) => {
       const t = o.rowHighlightable;
-      re(t) && t(e);
+      le(t) && t(e);
     };
-    function Ve() {
+    function _e() {
       var e;
       return ((e = o.columns) == null ? void 0 : e.filter((t) => !t.hideInTable)) || [];
     }
-    function U(e) {
+    function G(e) {
       var t, l, r;
       (r = (l = (t = C.value) == null ? void 0 : t.apForm) == null ? void 0 : l.setFieldsValue) == null || r.call(l, e);
     }
-    function G(e = !1) {
+    function X(e = !1) {
       var l, r, c;
       const t = e ? "getFieldsValueTransformed" : "getFieldsValue";
       return (c = (r = (l = C.value) == null ? void 0 : l.apForm) == null ? void 0 : r[t]) == null ? void 0 : c.call(r, !0);
     }
-    function X() {
+    function J() {
       var e;
       return ((e = C.value) == null ? void 0 : e.getSorterItems()) || [];
     }
-    function J(e) {
+    function Q(e) {
       var t;
       (t = C.value) == null || t.setSorterItems(e);
     }
-    function Q() {
+    function Y() {
       var e;
       (e = C.value) == null || e.resetSorterItems();
     }
@@ -314,22 +316,22 @@ const Ut = /* @__PURE__ */ Oe({
       const e = s.value;
       e && (m.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
     }
-    function _e(e) {
-      re(o.rowKey) || (y.selectMultiByKeys(e), Y());
-    }
     function Ke(e) {
+      le(o.rowKey) || (y.selectMultiByKeys(e), Z());
+    }
+    function Le(e) {
       const t = s.value;
       if (!t)
         return;
       const l = String(e[o.rowKey]), r = t.getRowById(l);
       t.setCurrentRow(r);
     }
-    function Le() {
+    function De() {
       const e = s.value;
       e && (e.clearSort(), e.clearFilter());
     }
-    function Y() {
-      je(() => {
+    function Z() {
+      He(() => {
         var e, t;
         m.value.type === "radio" ? (e = s.value) == null || e.setRadioRowKey(m.value.selectedRowKeys[0]) : (t = s.value) == null || t.setCheckboxRowKey(
           m.value.selectedRowKeys,
@@ -337,7 +339,7 @@ const Ut = /* @__PURE__ */ Oe({
         );
       });
     }
-    async function De(e, t) {
+    async function Oe(e, t) {
       var r;
       const l = p.records[e];
       if (l)
@@ -347,7 +349,7 @@ const Ut = /* @__PURE__ */ Oe({
       () => [o.columnResizable, o.columns],
       () => {
         var t;
-        const e = Ve();
+        const e = _e();
         i.value = e, (t = o.onShownColumnsChange) == null || t.call(o, e), O.value = e;
       },
       {
@@ -357,7 +359,7 @@ const Ut = /* @__PURE__ */ Oe({
     ), B(
       () => o.dataSource,
       (e) => {
-        Se(e);
+        we(e);
       },
       { immediate: !0, deep: !0 }
     ), B(
@@ -371,45 +373,46 @@ const Ut = /* @__PURE__ */ Oe({
       (e) => {
         I.value = e;
       }
-    ), de({
+    ), ue({
       submit: T,
       reset: N,
       refresh: H,
-      setSearchFormValues: U,
-      getSearchFormValues: G,
+      submitWith: U,
+      setSearchFormValues: G,
+      getSearchFormValues: X,
       getShowColumns: () => a(i),
       rowSelection: {
         selectedRows: n(() => z.value),
-        setSelectedRowKeys: _e,
+        setSelectedRowKeys: Ke,
         clearAll: A
       },
-      scrollToRow: De,
+      scrollToRow: Oe,
       getDataSource: () => a(p.records),
-      setCurrentRow: Ke,
-      getPaging: be,
-      setPaging: Re,
-      getSearchFormSorterItems: X,
-      setSearchFormSorterItems: J,
-      resetSearchFormSorterItems: Q
+      setCurrentRow: Le,
+      getPaging: Re,
+      setPaging: xe,
+      getSearchFormSorterItems: J,
+      setSearchFormSorterItems: Q,
+      resetSearchFormSorterItems: Y
     }), (e, t) => (d(), P("div", {
-      class: g(ye.value),
+      class: g(Se.value),
       style: V(e.wrapperStyle)
     }, [
-      a(x)(e.dataSource) && e.searchForm !== !1 && M.value.length > 0 ? (d(), P("div", {
+      a(x)(e.dataSource) && e.searchForm !== !1 && W.value.length > 0 ? (d(), P("div", {
         key: 0,
         class: g(e.card ? a(F)("search-wrapper") : null),
         style: V(e.searchFormWrapperStyle)
       }, [
-        _(a(Xe).SearchForm, R(e.searchForm || {}, {
+        _(a(Je).SearchForm, R(e.searchForm || {}, {
           ref_key: "formRef",
           ref: C,
           "custom-reset": "",
           "submit-loading": a(q).loading,
           onSubmit: a(T),
           onReset: a(N)
-        }), ee({
+        }), te({
           default: h(() => [
-            (d(!0), P(te, null, K(M.value, (l) => (d(), f(L(l.renderNode), {
+            (d(!0), P(oe, null, K(W.value, (l) => (d(), f(L(l.renderNode), {
               key: l.dataIndex
             }))), 128))
           ]),
@@ -441,59 +444,59 @@ const Ut = /* @__PURE__ */ Oe({
         b("div", {
           class: g(a(u)("vxe-wrapper"))
         }, [
-          (d(), f(a(Ue), R(a(rt)(o), {
+          (d(), f(a(Ge), R(a(lt)(o), {
             ref_key: "tableRef",
             ref: s,
-            key: a(he),
+            key: a(Ce),
             data: a(p).records,
             "sort-config": {
-              remote: W.value.length > 0,
+              remote: M.value.length > 0,
               trigger: "cell"
             },
             "filter-config": {
               remote: j.value.length > 0
             },
-            loading: Ee.value,
-            style: a(fe),
+            loading: Be.value,
+            style: a(pe),
             size: I.value,
-            onSortChange: a(xe),
-            onFilterChange: a(ke),
-            onCheckboxChange: Pe,
-            onCheckboxRangeChange: Ne,
-            onCheckboxAll: Te,
-            onRadioChange: ze,
-            onCurrentChange: Ae
-          }), ee({
+            onSortChange: a(ke),
+            onFilterChange: a(Fe),
+            onCheckboxChange: Te,
+            onCheckboxRangeChange: ze,
+            onCheckboxAll: Ne,
+            onRadioChange: Ae,
+            onCurrentChange: Ve
+          }), te({
             empty: h(() => [
-              _(a(se), {
-                image: a(se).PRESENTED_IMAGE_SIMPLE
+              _(a(ie), {
+                image: a(ie).PRESENTED_IMAGE_SIMPLE
               }, null, 8, ["image"])
             ]),
             loading: h(() => [
               b("div", {
                 class: g(a(F)("table-loading-wrapper"))
               }, [
-                _(a(tt))
+                _(a(ot))
               ], 2)
             ]),
             default: h(() => [
-              o.expandable && i.value.length ? (d(), f(a(ae), R({ key: 0 }, a(lt)(e.expandable), { fixed: Ie.value }), {
+              o.expandable && i.value.length ? (d(), f(a(re), R({ key: 0 }, a(nt)(e.expandable), { fixed: Ee.value }), {
                 content: h((l) => [
                   (d(), f(L(o.expandable.renderContent(l))))
                 ]),
                 _: 1
               }, 16, ["fixed"])) : w("", !0),
-              o.rowSelection && i.value.length ? (d(), f(a(ae), R({ key: 1 }, a(nt)(a(m), i.value), { field: a(ct) }), null, 16, ["field"])) : w("", !0),
-              (d(!0), P(te, null, K(a(ge), (l) => (d(), f(L(l), {
+              o.rowSelection && i.value.length ? (d(), f(a(re), R({ key: 1 }, a(st)(a(m), i.value), { field: a(ft) }), null, 16, ["field"])) : w("", !0),
+              (d(!0), P(oe, null, K(a(he), (l) => (d(), f(L(l), {
                 key: l.props.colId
               }))), 128))
             ]),
             _: 2
           }, [
-            K(a(Ge)(v, ["searchFormExtra"]), (l, r) => ({
+            K(a(Xe)(v, ["searchFormExtra"]), (l, r) => ({
               name: r,
               fn: h((c) => [
-                D(e.$slots, r, He(qe(c || {})))
+                D(e.$slots, r, qe(Ue(c || {})))
               ])
             }))
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "style", "size", "onSortChange", "onFilterChange"]))
@@ -501,23 +504,23 @@ const Ut = /* @__PURE__ */ Oe({
         b("div", {
           class: g(a(u)("pagination-wrapper"))
         }, [
-          e.sticky ? (d(), f(a(St), {
+          e.sticky ? (d(), f(a(wt), {
             key: 0,
             direction: "horizontal",
-            "scroll-container": Ce.value,
+            "scroll-container": ve.value,
             "extra-size": -4.2,
             "bar-color": "var(--ap-scrollbar-thumb-color-base)",
             "track-color": "var(--ap-table-header-bg, #f2f6f9)"
           }, null, 8, ["scroll-container"])) : w("", !0),
-          e.pagination !== !1 ? (d(), f(a(ot), R({
+          e.pagination !== !1 ? (d(), f(a(at), R({
             key: 1,
             class: a(u)("pagination")
-          }, a(q).pagination, { onChange: a(Fe) }), null, 16, ["class", "onChange"])) : w("", !0)
+          }, a(q).pagination, { onChange: a(Ie) }), null, 16, ["class", "onChange"])) : w("", !0)
         ], 2)
       ], 6)
     ], 6));
   }
 });
 export {
-  Ut as default
+  Gt as default
 };

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

@@ -284,6 +284,12 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     refresh: () => void;
+    /**
+     * 表格查询提交（重制页码但查询参数不会重置）
+     * @param resetCurrent 是否重置当前页码，默认为`false`
+     * @returns
+     */
+    submitWith: (resetCurrent?: boolean) => void;
     /**
      * 设置查询表单数据
      * @param values

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

@@ -9,6 +9,7 @@ declare const _default: <RecordType>(__VLS_props: NonNullable<Awaited<typeof __V
         submit: () => void;
         reset: () => void;
         refresh: () => void;
+        submitWith: () => void;
         setSearchFormValues: (fields: any) => void;
         getSearchFormValues: (transform?: boolean) => Partial<any> | undefined;
         setPaging: (nextPaging: Partial<{