@aplus-frontend/ui 0.6.0-beta.16 → 0.6.0-beta.18

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

@@ -1,30 +1,30 @@
-import { defineComponent as ze, useSlots as _e, getCurrentInstance as Ve, ref as F, computed as n, unref as o, nextTick as Ke, watch as B, createElementBlock as I, openBlock as c, normalizeStyle as V, normalizeClass as h, createCommentVNode as S, createElementVNode as E, createVNode as J, mergeProps as v, createSlots as Q, withCtx as C, Fragment as Y, renderList as K, createBlock as f, resolveDynamicComponent as L, renderSlot as D, normalizeProps as Le, guardReactiveProps as De } from "vue";
-import { VxeTable as Oe, VxeColumn as Z } from "vxe-table";
+import { defineComponent as Ve, useSlots as Ke, getCurrentInstance as Le, ref as F, computed as n, unref as o, nextTick as De, watch as B, createElementBlock as I, openBlock as c, normalizeStyle as V, normalizeClass as h, createCommentVNode as S, createElementVNode as E, createVNode as J, mergeProps as v, createSlots as Q, withCtx as C, Fragment as Y, renderList as K, createBlock as f, resolveDynamicComponent as L, renderSlot as D, normalizeProps as Oe, guardReactiveProps as $e } from "vue";
+import { VxeTable as He, VxeColumn as Z } from "vxe-table";
 import "vxe-table/es/style.css";
 import "vxe-pc-ui/es/style.css";
 import { VxeUI as ee } from "vxe-pc-ui";
-import { isUndefined as R, isFunction as oe, omit as $e } from "lodash-unified";
-import { ApForm as He } from "../ap-form/index.mjs";
+import { isUndefined as R, isFunction as oe, omit as Me } from "lodash-unified";
+import { ApForm as We } from "../ap-form/index.mjs";
 import "../config-provider/index.mjs";
-import { noRenderAsFormItemValueList as Me } from "../ap-table/constants.mjs";
-import { getColumnOrder as ae, updateFormProps as We, getFieldProps as je, getSearchFormItemRenderNode as qe, recursionApColumns as te } from "../ap-table/utils.mjs";
-import { useTablePaging as Ue } from "../ap-table/hooks/use-table-paging-ng.mjs";
-import { Empty as re, Pagination as Ge } from "@aplus-frontend/antdv";
-import { useInnerParams as Xe } from "./hooks/use-inner-params.mjs";
-import { toVxeProps as Je, getRowExpandProps as Qe, getRowSelectionProps as Ye } from "./utils/table.mjs";
-import Ze from "./hooks/use-row-selection.mjs";
-import { useProvideApTable as eo } from "../ap-table/context.mjs";
-import { sizeReverseMap as oo, sizeMap as ao, ROW_SELECTION_FIELD as to } from "./constants.mjs";
-import { useRenderColumns as ro } from "./hooks/use-render-columns.mjs";
-import { useToken as lo } from "@aplus-frontend/antdv/es/theme/internal";
+import { noRenderAsFormItemValueList as je } from "../ap-table/constants.mjs";
+import { getColumnOrder as ae, updateFormProps as qe, getFieldProps as Ue, getSearchFormItemRenderNode as Ge, recursionApColumns as te } from "../ap-table/utils.mjs";
+import { useTablePaging as Xe } from "../ap-table/hooks/use-table-paging-ng.mjs";
+import { Empty as re, Pagination as Je } from "@aplus-frontend/antdv";
+import { useInnerParams as Qe } from "./hooks/use-inner-params.mjs";
+import { toVxeProps as Ye, getRowExpandProps as Ze, getRowSelectionProps as eo } from "./utils/table.mjs";
+import oo from "./hooks/use-row-selection.mjs";
+import { useProvideApTable as ao } from "../ap-table/context.mjs";
+import { sizeReverseMap as to, sizeMap as ro, ROW_SELECTION_FIELD as lo } from "./constants.mjs";
+import { useRenderColumns as no } from "./hooks/use-render-columns.mjs";
+import { useToken as so } from "@aplus-frontend/antdv/es/theme/internal";
 import "../scroll-bar/index.mjs";
-import { isDef as no } from "../utils/index.mjs";
-import { getValidVNodeList as so } from "../utils/slot.mjs";
-import { useNamespace as io } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as co } from "../config-provider/hooks/use-global-config.mjs";
-import { useLocale as uo } from "../config-provider/hooks/use-locale.mjs";
-import po from "../scroll-bar/index.vue.mjs";
-const Oo = /* @__PURE__ */ ze({
+import { isDef as io } from "../utils/index.mjs";
+import { getValidVNodeList as co } from "../utils/slot.mjs";
+import { useNamespace as uo } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as po } from "../config-provider/hooks/use-global-config.mjs";
+import { useLocale as fo } from "../config-provider/hooks/use-locale.mjs";
+import mo from "../scroll-bar/index.vue.mjs";
+const Ho = /* @__PURE__ */ Ve({
   name: "ApGrid",
   __name: "index",
   props: {
@@ -116,13 +116,13 @@ const Oo = /* @__PURE__ */ ze({
   },
   setup(le, { expose: ne }) {
     var X;
-    const b = _e(), t = le, x = (X = Ve()) == null ? void 0 : X.appContext.app;
+    const b = Ke(), t = le, x = (X = Le()) == null ? void 0 : X.appContext.app;
     x && !x.__VXE_PC_UI_INSTALLED__ && (x.use(ee), x.__VXE_PC_UI_INSTALLED__ = !0);
-    const { e: P, b: u, be: se } = io("ap-grid"), ie = co("valueTypeMap"), i = F([]), O = F([]), s = F(), k = F(t.size), [, d] = lo(), { t: ce } = uo();
+    const { e: P, b: u, be: se } = uo("ap-grid"), ie = po("valueTypeMap"), i = F([]), O = F([]), s = F(), k = F(t.size), [, d] = so(), { t: ce } = fo();
     ee.setConfig({
       i18n: (e, a) => ce(`ap.${e}`, a)
     });
-    const { renderConfig: de, updateSignal: ue } = ro(i);
+    const { renderConfig: de, updateSignal: ue } = no(i);
     let $ = 0;
     const pe = n(() => {
       if (s.value)
@@ -132,14 +132,14 @@ const Oo = /* @__PURE__ */ ze({
     }), H = n(() => {
       var e, a, r;
       return $++, ((r = (a = (e = t.columns) == null ? void 0 : e.filter(
-        (l) => !l.hideInSearch && l.dataIndex && (l.valueType || l.customRenderFormItem) && !Me.includes(l.valueType)
+        (l) => !l.hideInSearch && l.dataIndex && (l.valueType || l.customRenderFormItem) && !je.includes(l.valueType)
       )) == null ? void 0 : a.sort((l, p) => {
         let w = ae(l.order);
         return ae(p.order) - w;
       })) == null ? void 0 : r.map((l) => {
-        const p = We(
+        const p = qe(
           l,
-          je(l.fieldProps, {})
+          Ue(l.fieldProps, {})
         ), w = {
           ...l,
           fieldProps: {
@@ -152,14 +152,14 @@ const Oo = /* @__PURE__ */ ze({
           },
           renderNode: void 0
         };
-        return w.renderNode = qe(
+        return w.renderNode = Ge(
           w,
           o(ie)
         ), w;
       })) || [];
     }), fe = n(() => {
       var a;
-      return no(t.manual) ? t.manual : so(((a = b.searchFormExtra) == null ? void 0 : a.call(b)) || []).some((r) => {
+      return io(t.manual) ? t.manual : co(((a = b.searchFormExtra) == null ? void 0 : a.call(b)) || []).some((r) => {
         var l;
         return ((l = r.type) == null ? void 0 : l.name) === "ApView";
       });
@@ -182,8 +182,10 @@ const Oo = /* @__PURE__ */ ze({
       data: m,
       tableProps: j,
       setDataSource: he,
-      handleTableChangeOptional: ve
-    } = Ue({
+      handleTableChangeOptional: ve,
+      getPaging: Ce,
+      setPaging: be
+    } = Xe({
       async request(e) {
         var r;
         if (!g.value.preserveSelectedRowKeys && R(t.dataSource) && _(), !R(t.dataSource)) {
@@ -207,19 +209,19 @@ const Oo = /* @__PURE__ */ ze({
       manual: o(fe),
       formatParams: t.beforeSearchSubmit,
       pagination: t.pagination,
-      onClickReset: Ne,
+      onClickReset: ze,
       onAfterRequest: G
-    }), { sortChangeEvent: Ce, filterChangeEvent: be, paginationChangeEvent: ye } = Xe(ve);
-    eo({
+    }), { sortChangeEvent: ye, filterChangeEvent: we, paginationChangeEvent: Se } = Qe(ve);
+    ao({
       columns: n(() => i.value),
       columnsBackup: n(() => O.value),
-      size: n(() => ao[k.value]),
+      size: n(() => ro[k.value]),
       updateColumns(e) {
         var a;
         i.value = e, (a = t.onShownColumnsChange) == null || a.call(t, e);
       },
       updateSize(e) {
-        k.value = oo[e];
+        k.value = to[e];
       },
       renderConfig: n(() => ({
         className: se("table-header", "title"),
@@ -231,19 +233,19 @@ const Oo = /* @__PURE__ */ ze({
       submit: N,
       reset: A
     });
-    const we = n(
+    const Re = n(
       () => i.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
-    ), Se = n(
+    ), xe = n(
       () => R(t.loading) ? m.loading : t.loading
-    ), Re = n(
+    ), ke = n(
       () => R(t.dataSource) ? m.records : t.dataSource
-    ), { selectedRows: z, rowSelection: g, ...y } = Ze({
+    ), { selectedRows: z, rowSelection: g, ...y } = oo({
       ...t.rowSelection === !0 ? {} : t.rowSelection,
-      dataSource: Re,
+      dataSource: ke,
       rowKey: t.rowKey
-    }), xe = ({
+    }), Fe = ({
       checked: e,
       row: a
     }) => {
@@ -255,7 +257,7 @@ const Oo = /* @__PURE__ */ ze({
         ];
         y.selectChange(a, e, l);
       }
-    }, ke = ({
+    }, Be = ({
       checked: e
     }) => {
       const a = s.value;
@@ -263,22 +265,22 @@ const Oo = /* @__PURE__ */ ze({
         ...a.getCheckboxReserveRecords(),
         ...a.getCheckboxRecords()
       ]);
-    }, Fe = () => {
+    }, Ie = () => {
       const e = s.value;
       e && y.selectRangeChange(e.getCheckboxRecords(), [
         ...e.getCheckboxReserveRecords(),
         ...e.getCheckboxRecords()
       ]);
-    }, Be = () => {
+    }, Ee = () => {
       const e = s.value;
       e && (z.value = [e.getRadioRecord()]);
-    }, Ie = ({
+    }, Pe = ({
       row: e
     }) => {
       const a = t.rowHighlightable;
       oe(a) && a(e);
     };
-    function Ee() {
+    function Te() {
       var e;
       return ((e = t.columns) == null ? void 0 : e.filter((a) => !a.hideInTable)) || [];
     }
@@ -296,22 +298,22 @@ const Oo = /* @__PURE__ */ ze({
       const e = s.value;
       e && (g.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
     }
-    function Pe(e) {
+    function Ne(e) {
       oe(t.rowKey) || (y.selectMultiByKeys(e), G());
     }
-    function Te(e) {
+    function Ae(e) {
       const a = s.value;
       if (!a)
         return;
       const r = String(e[t.rowKey]), l = a.getRowById(r);
       a.setCurrentRow(l);
     }
-    function Ne() {
+    function ze() {
       const e = s.value;
       e && (e.clearSort(), e.clearFilter());
     }
     function G() {
-      Ke(() => {
+      De(() => {
         var e, a;
         g.value.type === "radio" ? (e = s.value) == null || e.setRadioRowKey(g.value.selectedRowKeys[0]) : (a = s.value) == null || a.setCheckboxRowKey(
           g.value.selectedRowKeys,
@@ -319,7 +321,7 @@ const Oo = /* @__PURE__ */ ze({
         );
       });
     }
-    async function Ae(e, a) {
+    async function _e(e, a) {
       var l;
       const r = m.records[e];
       if (r)
@@ -329,7 +331,7 @@ const Oo = /* @__PURE__ */ ze({
       () => [t.columnResizable, t.columns],
       () => {
         var a;
-        const e = Ee();
+        const e = Te();
         i.value = e, (a = t.onShownColumnsChange) == null || a.call(t, e), O.value = e;
       },
       {
@@ -362,12 +364,14 @@ const Oo = /* @__PURE__ */ ze({
       getShowColumns: () => o(i),
       rowSelection: {
         selectedRows: n(() => z.value),
-        setSelectedRowKeys: Pe,
+        setSelectedRowKeys: Ne,
         clearAll: _
       },
-      scrollToRow: Ae,
+      scrollToRow: _e,
       getDataSource: () => o(m.records),
-      setCurrentRow: Te
+      setCurrentRow: Ae,
+      getPaging: Ce,
+      setPaging: be
     }), (e, a) => (c(), I("div", {
       class: h(me.value),
       style: V(e.wrapperStyle)
@@ -377,7 +381,7 @@ const Oo = /* @__PURE__ */ ze({
         class: h(e.card ? o(P)("search-wrapper") : null),
         style: V(e.searchFormWrapperStyle)
       }, [
-        J(o(He).SearchForm, v(e.searchForm || {}, {
+        J(o(We).SearchForm, v(e.searchForm || {}, {
           ref_key: "formRef",
           ref: T,
           "custom-reset": "",
@@ -423,7 +427,7 @@ const Oo = /* @__PURE__ */ ze({
         E("div", {
           class: h(o(u)("vxe-wrapper"))
         }, [
-          (c(), f(o(Oe), v(o(Je)(t), {
+          (c(), f(o(He), v(o(Ye)(t), {
             ref_key: "tableRef",
             ref: s,
             key: o(ue),
@@ -435,7 +439,7 @@ const Oo = /* @__PURE__ */ ze({
             "filter-config": {
               remote: W.value.length > 0
             },
-            loading: Se.value,
+            loading: xe.value,
             style: {
               "--vxe-ui-table-row-checkbox-checked-background-color": o(d).controlItemBgActive,
               "--vxe-ui-table-row-hover-checkbox-checked-background-color": o(d).controlItemBgActiveHover,
@@ -450,13 +454,13 @@ const Oo = /* @__PURE__ */ ze({
               "--vxe-ui-table-header-font-color": o(d).colorTextBase
             },
             size: k.value,
-            onSortChange: o(Ce),
-            onFilterChange: o(be),
-            onCheckboxChange: xe,
-            onCheckboxRangeChange: Fe,
-            onCheckboxAll: ke,
-            onRadioChange: Be,
-            onCurrentChange: Ie
+            onSortChange: o(ye),
+            onFilterChange: o(we),
+            onCheckboxChange: Fe,
+            onCheckboxRangeChange: Ie,
+            onCheckboxAll: Be,
+            onRadioChange: Ee,
+            onCurrentChange: Pe
           }), Q({
             empty: C(() => [
               J(o(re), {
@@ -464,23 +468,23 @@ const Oo = /* @__PURE__ */ ze({
               }, null, 8, ["image"])
             ]),
             default: C(() => [
-              t.expandable && i.value.length ? (c(), f(o(Z), v({ key: 0 }, o(Qe)(e.expandable), { fixed: we.value }), {
+              t.expandable && i.value.length ? (c(), f(o(Z), v({ key: 0 }, o(Ze)(e.expandable), { fixed: Re.value }), {
                 content: C((r) => [
                   (c(), f(L(t.expandable.renderContent(r))))
                 ]),
                 _: 1
               }, 16, ["fixed"])) : S("", !0),
-              t.rowSelection && i.value.length ? (c(), f(o(Z), v({ key: 1 }, o(Ye)(o(g), i.value), { field: o(to) }), null, 16, ["field"])) : S("", !0),
+              t.rowSelection && i.value.length ? (c(), f(o(Z), v({ key: 1 }, o(eo)(o(g), i.value), { field: o(lo) }), null, 16, ["field"])) : S("", !0),
               (c(!0), I(Y, null, K(o(de), (r) => (c(), f(L(r), {
                 key: r.props.colId
               }))), 128))
             ]),
             _: 2
           }, [
-            K(o($e)(b, ["searchFormExtra"]), (r, l) => ({
+            K(o(Me)(b, ["searchFormExtra"]), (r, l) => ({
               name: l,
               fn: C((p) => [
-                D(e.$slots, l, Le(De(p || {})))
+                D(e.$slots, l, Oe($e(p || {})))
               ])
             }))
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "style", "size", "onSortChange", "onFilterChange"]))
@@ -488,7 +492,7 @@ const Oo = /* @__PURE__ */ ze({
         E("div", {
           class: h(o(u)("pagination-wrapper"))
         }, [
-          e.sticky ? (c(), f(o(po), {
+          e.sticky ? (c(), f(o(mo), {
             key: 0,
             direction: "horizontal",
             "scroll-container": pe.value,
@@ -496,15 +500,15 @@ const Oo = /* @__PURE__ */ ze({
             "bar-color": "var(--ap-scrollbar-thumb-color-base)",
             "track-color": "var(--ap-table-header-bg, #f2f6f9)"
           }, null, 8, ["scroll-container"])) : S("", !0),
-          e.pagination !== !1 ? (c(), f(o(Ge), v({
+          e.pagination !== !1 ? (c(), f(o(Je), v({
             key: 1,
             class: o(u)("pagination")
-          }, o(j).pagination, { onChange: o(ye) }), null, 16, ["class", "onChange"])) : S("", !0)
+          }, o(j).pagination, { onChange: o(Se) }), null, 16, ["class", "onChange"])) : S("", !0)
         ], 2)
       ], 6)
     ], 6));
   }
 });
 export {
-  Oo as default
+  Ho as default
 };

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

@@ -5,6 +5,7 @@ import { TableProps } from '@aplus-frontend/antdv';
 import { ColumnFilterItem, SortOrder, TableRowSelection } from '@aplus-frontend/antdv/es/table/interface';
 import { ComputedRef, CSSProperties, Ref, VNode } from 'vue';
 import { VxeTablePropTypes, VxeColumnPropTypes, VxeTableProps, VxeTableDefines, VxeColumnSlots, VxeColumnProps } from 'vxe-table';
+import { InternalPagingType } from '../ap-table/hooks/use-table-paging-ng';
 export type ColConfigType = VxeTableDefines.ColumnOptions;
 export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueType extends ApTableValueTypes = ApTableValueTypes, MergedValueType extends ExtraValueType | ValueType = ExtraValueType | ValueType> = MergedValueType extends ExtraValueType | ValueType ? Omit<ExtraProColumnType<RecordType>, 'sorter' | 'rowSpan' | 'customCell' | 'customHeaderCell' | 'minWidth' | 'className' | 'class'> & {
     children?: ApGridColumnType<RecordType, ExtraValueType, ValueType, MergedValueType>[];
@@ -319,4 +320,16 @@ export type ApGridExpose<SearchParamsType = Recordable, RecordType = any> = {
      * @returns
      */
     setCurrentRow: (nextRow: Partial<RecordType>) => void;
+    /**
+     * 获取分页参数
+     * @returns
+     */
+    getPaging: () => InternalPagingType;
+    /**
+     * 设置表格分页参数
+     * @param nextPaging 新的分页参数
+     * @param refreshImmediately 是否立刻刷新数据，默认为`true`
+     * @returns
+     */
+    setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
 };

package/es/src/ap-list/index.vue.d.ts

@@ -1,17 +1,10 @@
-import { ApListProps } from './interface';
+import { ApListExpose, ApListProps } from './interface';
 import { Recordable } from '../type';
 import { VNodeProps, AllowedComponentProps, ComponentCustomProps, PublicProps, ShallowUnwrapRef, Ref, VNode } from 'vue';
 import { ApFormSearchFormExpose } from '..';
 declare const _default: <RecordType extends Recordable>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
     props: __VLS_PrettifyLocal<Pick<Partial<{}> & Omit<{} & VNodeProps & AllowedComponentProps & ComponentCustomProps, never>, never> & ApListProps<RecordType> & Partial<{}>> & PublicProps;
-    expose(exposed: ShallowUnwrapRef<{
-        submit: () => void;
-        reset: () => void;
-        refresh: () => void;
-        refreshByDelete: (n: number) => void;
-        scrollToFirstRow: (selector?: string) => void;
-        getSearchFormValuesIfSetted: (transform?: boolean) => Partial<any>;
-    }>): void;
+    expose(exposed: ShallowUnwrapRef<ApListExpose>): void;
     attrs: any;
     slots: {
         header?(_: {