@aplus-frontend/ui 0.6.0-beta.2 → 0.6.0-beta.21

package/es/src/ap-table/hooks/use-table-paging-ng.mjs

@@ -1,131 +1,135 @@
-import { ref as ae, reactive as j, unref as m, nextTick as se, onMounted as ie, watch as ce, computed as A, createVNode as x } from "vue";
-import { useTableSortedAndFiltered as ue } from "./use-sorted-filtered.mjs";
+import { ref as le, reactive as M, unref as m, nextTick as fe, onMounted as ge, watch as de, computed as y, createVNode as C } from "vue";
+import { useTableSortedAndFiltered as pe } from "./use-sorted-filtered.mjs";
 import "../../config-provider/index.mjs";
-import { parseFieldValue as le, dataIndexToStr as fe, isEqualCustom as ge } from "../utils.mjs";
-import { isArray as q, isEqualWith as de, isUndefined as pe } from "lodash-unified";
-import { isDef as N } from "../../utils/index.mjs";
-import { useLocale as me } from "../../config-provider/hooks/use-locale.mjs";
-import { useNamespace as he } from "../../config-provider/hooks/use-namespace.mjs";
-const h = 1, D = 10, B = {
-  defaultCurrent: h,
-  defaultPageSize: D,
+import { parseFieldValue as me, dataIndexToStr as Se, isEqualCustom as he } from "../utils.mjs";
+import { isArray as Q, isEqualWith as ze, isUndefined as Te } from "lodash-unified";
+import { isDef as $ } from "../../utils/index.mjs";
+import { useLocale as Pe } from "../../config-provider/hooks/use-locale.mjs";
+import { useNamespace as we } from "../../config-provider/hooks/use-namespace.mjs";
+const S = 1, I = 20, G = {
+  defaultCurrent: S,
+  defaultPageSize: I,
   showLessItems: !1,
   showTotal: !0
 };
-function Se(s) {
-  return s === !1 ? {} : s == null || s === !0 ? B : {
-    ...B,
-    ...s
+function Fe(c) {
+  return c === !1 ? {} : c == null || c === !0 ? G : {
+    ...G,
+    ...c
   };
 }
-function ze(s) {
+function be(c) {
   const f = {};
-  return s === !1 || (s === !0 || s == null ? (f.current = h, f.pageSize = D) : (f.current = s.defaultCurrent || h, f.pageSize = s.defaultPageSize || D)), f;
+  return c === !1 || (c === !0 || c == null ? (f.current = S, f.pageSize = I) : (f.current = c.defaultCurrent || S, f.pageSize = c.defaultPageSize || I)), f;
 }
-const Ae = ({
-  manual: s = !1,
+const Ie = ({
+  manual: c = !1,
   request: f,
-  defaultParams: L = {},
-  defaultData: v = [],
-  formatParams: O,
-  paramsValueTypeMap: R,
-  resetFieldsIgnores: y,
-  filterFields: J,
-  sortFields: K,
-  namespace: M = "ap-table",
-  pagination: S
+  defaultParams: V = {},
+  defaultData: j = [],
+  formatParams: U,
+  paramsValueTypeMap: _,
+  resetFieldsIgnores: A,
+  filterFields: W,
+  sortFields: Z,
+  namespace: H = "ap-table",
+  pagination: h,
+  onClickReset: x,
+  onAfterRequest: E
 }) => {
-  let b = 0, i = {};
-  const Q = Se(S), $ = (e) => O ? O(e) : e, z = ae(), c = j(ze(S)), {
-    getColumnSFConfig: G,
-    setSF: W,
-    clearAll: Z,
-    sortedInfo: H,
-    filteredInfo: X
-  } = ue(), {
+  let v = 0, s = {};
+  const X = Fe(h), Y = (e) => U ? U(e) : e, z = le(), i = M(be(h)), {
+    getColumnSFConfig: q,
+    setSF: R,
+    clearAll: k,
+    sortedInfo: N,
+    filteredInfo: B
+  } = pe(), {
     t: T
-  } = me(), {
+  } = Pe(), {
     b: P
-  } = he(M), o = j({
-    total: v.length,
-    records: v,
+  } = we(H), o = M({
+    total: j.length,
+    records: j,
     loading: !1
   }), w = () => {
     var e, t;
     return ((t = (e = z.value) == null ? void 0 : e.apForm) == null ? void 0 : t.getFieldsValueTransformed(!0)) || {};
-  }, I = async (e) => {
+  }, J = async (e) => {
     var r;
-    const t = $(e), n = Date.now();
-    b = n, o.loading = !0;
+    const t = Y(e), n = Date.now();
+    v = n, o.loading = !0;
     try {
       const a = await f({
-        ...m(L),
+        ...m(V),
         ...t
       });
-      b === n && (o.total = a.total || ((r = a.data) == null ? void 0 : r.length) || 0, o.records = [...a.data || []], o.loading = !1);
+      v === n && (o.total = a.total || ((r = a.data) == null ? void 0 : r.length) || 0, o.records = [...a.data || []], o.loading = !1);
     } catch {
-      b === n && (o.records = [], o.total = 0, o.loading = !1);
+      v === n && (o.records = [], o.total = 0, o.loading = !1);
+    } finally {
+      E == null || E();
     }
-  }, V = (e) => {
+  }, K = (e) => {
     const t = {};
     return Object.entries(e).forEach(([n, r]) => {
-      if (t[n] = r, R && r) {
-        const a = R[n];
-        a && (t[n] = le(a, r));
+      if (t[n] = r, _ && r) {
+        const a = _[n];
+        a && (t[n] = me(a, r));
       }
     }), t;
-  }, Y = async (e) => {
+  }, ee = async (e) => {
     var r, a, l, g, d;
     const t = w(), n = {};
-    Object.entries(t).forEach(([p, F]) => {
-      y && y.indexOf(p) > -1 && (n[p] = F);
-    }), await ((a = (r = z.value) == null ? void 0 : r.apForm) == null ? void 0 : a.resetFields()), (d = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || d.call(g, n), se(() => {
+    Object.entries(t).forEach(([p, b]) => {
+      A && A.indexOf(p) > -1 && (n[p] = b);
+    }), await ((a = (r = z.value) == null ? void 0 : r.apForm) == null ? void 0 : a.resetFields()), (d = (g = (l = z.value) == null ? void 0 : l.apForm) == null ? void 0 : g.setFieldsValue) == null || d.call(g, n), fe(() => {
       e == null || e();
     });
-  }, C = (e) => {
-    i = e;
-    const t = V(e);
-    I(t);
-  }, k = (e) => {
-    C({
-      ...i,
+  }, F = (e) => {
+    s = e;
+    const t = K(e);
+    J(t);
+  }, te = (e) => {
+    F({
+      ...s,
       ...e
     });
-  }, E = () => {
-    const e = w(), t = S !== !1;
-    t && (c.current = h), C({
+  }, D = () => {
+    const e = w(), t = h !== !1;
+    t && (i.current = S), F({
       ...e,
-      filter: i.filter,
-      sort: i.sort,
-      current: t ? h : void 0,
-      pageSize: t ? i.pageSize || c.pageSize : void 0
+      filter: s.filter,
+      sort: s.sort,
+      current: t ? S : void 0,
+      pageSize: t ? s.pageSize || i.pageSize : void 0
     });
-  }, ee = () => {
-    Z(), i.sort = {}, i.filter = {}, Y(E);
-  }, U = () => {
-    C(i);
-  }, te = (e) => {
-    if (S === !1)
-      U();
+  }, ne = () => {
+    k(), s.sort = {}, s.filter = {}, x == null || x(), ee(D);
+  }, O = () => {
+    F(s);
+  }, re = (e) => {
+    if (h === !1)
+      O();
     else {
       const {
         current: t,
         pageSize: n
-      } = c, r = o.total - e, a = Math.ceil(r / n), l = t > a ? a : t;
-      k({
+      } = i, r = o.total - e, a = Math.ceil(r / n), l = t > a ? a : t;
+      te({
         current: l > 0 ? l : 1
       });
     }
-  }, _ = (e, t, n) => {
-    var p, F;
+  }, L = (e, t, n) => {
+    var p, b;
     const r = w();
-    c.current = e.current, c.pageSize = e.pageSize, W(t, n);
-    const a = q(n) ? [...n] : [n], l = {};
+    i.current = e.current, i.pageSize = e.pageSize, R(t, n);
+    const a = Q(n) ? [...n] : [n], l = {};
     for (const u of a)
-      (p = m(K)) != null && p.includes(u.columnKey || u.field) && u.order && (l[fe(u.columnKey || u.field)] = u.order);
+      (p = m(Z)) != null && p.includes(u.columnKey || u.field) && u.order && (l[Se(u.columnKey || u.field)] = u.order);
     const g = {};
     for (const u of Object.keys(t))
-      (F = m(J)) != null && F.includes(u) && t[u] && (g[u] = t[u]);
+      (b = m(W)) != null && b.includes(u) && t[u] && (g[u] = t[u]);
     const d = {
       ...r,
       filter: g,
@@ -133,93 +137,117 @@ const Ae = ({
       current: e.current,
       pageSize: e.pageSize
     };
-    de(i, d, ge) || C(d);
+    ze(s, d, he) || F(d);
+  }, ae = (e, t = B.value || {}, n = N.value || {}) => {
+    const r = (e == null ? void 0 : e.current) ?? i.current, a = (e == null ? void 0 : e.pageSize) ?? i.pageSize;
+    L(
+      {
+        current: r,
+        pageSize: a
+      },
+      t,
+      n,
+      // 此参数随意传递，并无使用
+      {
+        action: "sort",
+        currentDataSource: []
+      }
+    );
   };
-  ie(() => {
+  ge(() => {
     const e = w(), {
       current: t,
       pageSize: n
-    } = c;
-    if (i = {
+    } = i;
+    if (s = {
       current: t,
       pageSize: n,
       filter: {},
       sort: {},
       ...e
-    }, !s) {
-      const r = V(i);
-      I(r);
+    }, !c) {
+      const r = K(s);
+      J(r);
     }
-  }), ce(() => m(L), () => {
-    E();
+  }), de(() => m(V), () => {
+    D();
   }, {
     deep: !0
   });
-  const ne = A(() => {
+  const oe = y(() => {
     if (o.total === 0)
       return "-";
     const {
       current: e,
       pageSize: t
-    } = c;
+    } = i;
     return `${e}/${Math.ceil(o.total / t)}`;
   });
-  function re(e) {
-    q(e) && (o.records = e, o.total = e.length);
+  function se(e) {
+    Q(e) && (o.records = e, o.total = e.length);
   }
-  const oe = A(() => {
+  const ie = y(() => {
     const {
       showLessItems: e,
       showTotal: t,
       showQuickJumper: n,
       showSizeChanger: r,
       pageSizeOptions: a
-    } = Q;
+    } = X;
     return {
       loading: o.loading,
       pagination: {
-        current: c.current,
-        pageSize: c.pageSize,
+        current: i.current,
+        pageSize: i.pageSize,
         total: o.total,
-        showSizeChanger: N(r) ? r : !e,
-        showQuickJumper: N(n) ? n : !e,
+        showSizeChanger: $(r) ? r : !e,
+        showQuickJumper: $(n) ? n : !e,
         showLessItems: e,
         size: "default",
-        pageSizeOptions: pe(a) ? ["10", "20", "50", "100"] : a,
-        showTotal: t ? (l) => x("span", {
+        pageSizeOptions: Te(a) ? ["10", "20", "50", "100"] : a,
+        showTotal: t ? (l) => C("span", {
           class: P("pagination-total-wrapper")
-        }, [T("ap.apTable.pagination.totalLeftPrefix"), " ", x("span", {
+        }, [T("ap.apTable.pagination.totalLeftPrefix"), " ", C("span", {
           class: P("pagination-count-text")
-        }, [l]), " ", T("ap.apTable.pagination.totalLeftSuffix"), x("span", {
+        }, [l]), " ", T("ap.apTable.pagination.totalLeftSuffix"), C("span", {
           class: P("pagination--total-right")
-        }, [T("ap.apTable.pagination.totalRightPrefix"), " ", x("span", {
+        }, [T("ap.apTable.pagination.totalRightPrefix"), " ", C("span", {
           class: P("pagination-count-text")
-        }, [m(ne)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
+        }, [m(oe)]), " ", T("ap.apTable.pagination.totalRightSuffix")])]) : void 0
       },
-      onChange: _,
+      onChange: L,
       dataSource: o.records
     };
   });
+  function ce(e, t = !0) {
+    Object.assign(i, e), s.current = e.current, s.pageSize = e.pageSize, t && O();
+  }
+  function ue() {
+    return {
+      ...i
+    };
+  }
   return {
     formRef: z,
-    submit: E,
-    reset: ee,
-    refresh: U,
-    refreshByDelete: te,
+    submit: D,
+    reset: ne,
+    refresh: O,
+    refreshByDelete: re,
     data: o,
-    current: c.current,
-    pageSize: c.pageSize,
-    handleTableChange: _,
-    tableProps: oe,
-    dataSource: A(() => o.records),
-    setDataSource: re,
-    getColumnSFConfig: G,
-    sortedInfo: H,
-    filteredInfo: X
+    handleTableChange: L,
+    handleTableChangeOptional: ae,
+    tableProps: ie,
+    dataSource: y(() => o.records),
+    setDataSource: se,
+    getColumnSFConfig: q,
+    sortedInfo: N,
+    filteredInfo: B,
+    getPaging: ue,
+    setPaging: ce
   };
 };
 export {
-  h as DEFAULT_CURRENT,
-  D as DEFAULT_PAGE_SIZE,
-  Ae as useTablePaging
+  S as DEFAULT_CURRENT,
+  I as DEFAULT_PAGE_SIZE,
+  Ie as useTablePaging
 };

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

@@ -9,6 +9,7 @@ import { ApTableIndexProps } from './components/interface';
 import { EllipsisConfig } from '@aplus-frontend/antdv/es/typography/Base';
 import { RowSelectionReturnType } from './hooks/use-table-row-selection';
 import { PaginationProps } from '@aplus-frontend/antdv';
+import { InternalPagingType } from './hooks/use-table-paging-ng';
 export type ValueEnumType = {
     text: string;
     /**
@@ -371,7 +372,7 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
     /**
      * 表格数据源
      */
-    dataSource: ComputedRef<RecordType>;
+    dataSource: RecordType;
     /**
      * 行选中相关的数据和API
      */
@@ -393,6 +394,18 @@ export type ApTableExpose<SearchParamsType = Recordable, RecordType = any> = {
         };
         y: undefined;
     };
+    /**
+     * 获取分页参数
+     * @returns
+     */
+    getPaging: () => InternalPagingType;
+    /**
+     * 设置表格分页参数
+     * @param nextPaging 新的分页参数
+     * @param refreshImmediately 是否立刻刷新数据，默认为`true`
+     * @returns
+     */
+    setPaging: (nextPaging: InternalPagingType, refreshImmediately?: boolean) => void;
 };
 export type ApTableContextRenderConfig = {
     color: string;

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

@@ -1,7 +1,7 @@
 import { ApColumnType, ValueEnum, ValueEnumType } from './interface';
 import { ValueTypeRenderConfig } from '../config-provider';
 import { apTableRenderItemMap } from './constants';
-import { VNode, DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, GlobalComponents, GlobalDirectives, ComponentInternalInstance, VNodeProps, AllowedComponentProps, ComponentCustomProps, Slot, ComponentPublicInstance, ComponentOptionsBase, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, ComputedRef, ExtractPropTypes, PropType, CSSProperties, VNodeArrayChildren, RendererNode, RendererElement } from 'vue';
+import { VNode, DefineComponent, ComponentOptionsMixin, PublicProps, ComponentProvideOptions, CreateComponentPublicInstanceWithMixins, GlobalComponents, GlobalDirectives, ComponentInternalInstance, VNodeProps, AllowedComponentProps, ComponentCustomProps, Slot, ComponentPublicInstance, ComponentOptionsBase, DebuggerEvent, nextTick, WatchOptions, WatchStopHandle, ShallowUnwrapRef, ComponentCustomProperties, ExtractPropTypes, PropType, CSSProperties, VNodeArrayChildren, RendererNode, RendererElement } from 'vue';
 import { EditableColumnType } from '../editable-table/interface';
 import { ColumnType, ColumnGroupType } from '@aplus-frontend/antdv/es/table';
 import { ApTableDynamicCompProps } from './components/interface';
@@ -133,12 +133,12 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly onMousedown?: MouseEventHandler | undefined;
                     readonly value?: string | number | undefined;
                     readonly disabled?: boolean | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly name?: string | undefined;
                     readonly loading?: boolean | undefined;
                     readonly autofocus?: boolean | undefined;
                     readonly 'onUpdate:value'?: (((val: string) => void) & ((...args: any[]) => any)) | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly suffix?: any;
                     readonly focused?: boolean | undefined;
                     readonly placeholder?: string | number | undefined;
@@ -344,12 +344,12 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly onMousedown?: MouseEventHandler | undefined;
                     readonly value?: string | number | undefined;
                     readonly disabled?: boolean | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly name?: string | undefined;
                     readonly loading?: boolean | undefined;
                     readonly autofocus?: boolean | undefined;
                     readonly 'onUpdate:value'?: (((val: string) => void) & ((...args: any[]) => any)) | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly suffix?: any;
                     readonly focused?: boolean | undefined;
                     readonly placeholder?: string | number | undefined;
@@ -534,7 +534,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
             }>, {
                 focus: (options?: InputFocusOptions) => void;
                 blur: () => void;
-                resizableTextArea: ComputedRef<any>;
+                resizableTextArea: any;
             }, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {
                 "update:value": (...args: any[]) => void;
             }, PublicProps, {
@@ -816,7 +816,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
             }>, {
                 focus: (options?: InputFocusOptions) => void;
                 blur: () => void;
-                resizableTextArea: ComputedRef<any>;
+                resizableTextArea: any;
             }, {}, {}, {}, {
                 type: "number" | "reset" | "submit" | "button" | "search" | "time" | "month" | "date" | "week" | "hidden" | "checkbox" | "radio" | "color" | "text" | "range" | "tel" | "url" | "email" | "image" | "datetime-local" | "file" | "password";
                 mode: FieldMode;
@@ -863,13 +863,13 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
         field: Omit< ApFieldTextAreaProps, "value" | "onUpdate:value">;
     }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
         $slots: Readonly<{
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         }> & {
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         };
     })) | ({
         new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly< ApFormItemNumberProps> & Readonly<{}>, {
@@ -899,11 +899,11 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly onInput?: ((text: string) => void) | undefined;
                     readonly value?: ValueType | undefined;
                     readonly disabled?: boolean | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly keyboard?: boolean | undefined;
                     readonly autofocus?: boolean | undefined;
                     readonly 'onUpdate:value'?: (((value: ValueType) => void) & ((...args: any[]) => any)) | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly max?: ValueType | undefined;
                     readonly min?: ValueType | undefined;
                     readonly defaultValue?: ValueType | undefined;
@@ -1282,8 +1282,8 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 }, string, {
                     step: ValueType;
                     disabled: boolean;
-                    bordered: boolean;
                     keyboard: boolean;
+                    bordered: boolean;
                     max: ValueType;
                     min: ValueType;
                     controls: boolean;
@@ -1312,8 +1312,8 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
             } & Readonly<{
                 step: ValueType;
                 disabled: boolean;
-                bordered: boolean;
                 keyboard: boolean;
+                bordered: boolean;
                 max: ValueType;
                 min: ValueType;
                 controls: boolean;
@@ -1321,7 +1321,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 thousands: boolean;
             }> & Omit<Readonly< ApFieldNumberProps> & Readonly<{
                 "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-            }>, "blur" | "focus" | ("step" | "disabled" | "bordered" | "keyboard" | "max" | "min" | "controls" | "emptyText" | "thousands")> & ShallowUnwrapRef<{
+            }>, "blur" | "focus" | ("step" | "disabled" | "keyboard" | "bordered" | "max" | "min" | "controls" | "emptyText" | "thousands")> & ShallowUnwrapRef<{
                 focus: () => void;
                 blur: () => void;
             }> & {} & ComponentCustomProperties & {} & {
@@ -1681,13 +1681,13 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
         field: Omit< ApFieldRadioProps, "value" | "onUpdate:value">;
     }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
         $slots: Readonly<{
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         }> & {
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         };
     })) | ({
         new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly< ApFormItemSelectProps> & Readonly<{}>, {
@@ -1727,11 +1727,11 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly direction?: "ltr" | "rtl" | undefined;
                     readonly animation?: string | undefined;
                     readonly children?: VueNode[] | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly loading?: boolean | undefined;
                     readonly transitionName?: string | undefined;
                     readonly autofocus?: boolean | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly getPopupContainer?: RenderDOMFunc | undefined;
                     readonly placeholder?: any;
                     readonly defaultValue?: SelectValue;
@@ -2225,9 +2225,9 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     open: boolean;
                     multiple: boolean;
                     disabled: boolean;
-                    bordered: boolean;
                     loading: boolean;
                     autofocus: boolean;
+                    bordered: boolean;
                     virtual: boolean;
                     lazy: boolean;
                     allowClear: boolean;
@@ -2266,9 +2266,9 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 open: boolean;
                 multiple: boolean;
                 disabled: boolean;
-                bordered: boolean;
                 loading: boolean;
                 autofocus: boolean;
+                bordered: boolean;
                 virtual: boolean;
                 lazy: boolean;
                 allowClear: boolean;
@@ -2284,7 +2284,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 searchDelay: number;
             }> & Omit<Readonly< ApFieldSelectProps> & Readonly<{
                 "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-            }>, "blur" | "focus" | "request" | ("mode" | "open" | "multiple" | "disabled" | "bordered" | "loading" | "autofocus" | "virtual" | "lazy" | "allowClear" | "defaultOpen" | "showSearch" | "showArrow" | "autoClearSearchValue" | "defaultActiveFirstOption" | "labelInValue" | "emptyText" | "searchMode" | "refetchOnFocus" | "searchDelay")> & ShallowUnwrapRef<{
+            }>, "blur" | "focus" | "request" | ("mode" | "open" | "multiple" | "disabled" | "loading" | "autofocus" | "bordered" | "virtual" | "lazy" | "allowClear" | "defaultOpen" | "showSearch" | "showArrow" | "autoClearSearchValue" | "defaultActiveFirstOption" | "labelInValue" | "emptyText" | "searchMode" | "refetchOnFocus" | "searchDelay")> & ShallowUnwrapRef<{
                 focus: () => void;
                 blur: () => void;
                 request: (clear?: boolean) => Promise<void>;
@@ -2467,13 +2467,13 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
         field: Omit< ApFieldCheckboxProps, "value" | "onUpdate:value">;
     }, {}, string, {}, GlobalComponents, GlobalDirectives, string, ComponentProvideOptions> & VNodeProps & AllowedComponentProps & ComponentCustomProps & (new () => {
         $slots: Readonly<{
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         }> & {
-            label: any;
-            help: any;
-            extra: any;
+            label?: any;
+            help?: any;
+            extra?: any;
         };
     })) | ({
         new (...args: any[]): CreateComponentPublicInstanceWithMixins<Readonly< ApFormItemTreeSelectProps> & Readonly<{}>, {
@@ -2515,12 +2515,12 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     readonly direction?: "ltr" | "rtl" | undefined;
                     readonly animation?: string | undefined;
                     readonly children?: VueNode[] | undefined;
-                    readonly bordered?: boolean | undefined;
                     readonly prefixCls?: string | undefined;
                     readonly loading?: boolean | undefined;
                     readonly transitionName?: string | undefined;
                     readonly autofocus?: boolean | undefined;
                     readonly 'onUpdate:value'?: (((value: any) => void) & ((...args: any[]) => any)) | undefined;
+                    readonly bordered?: boolean | undefined;
                     readonly getPopupContainer?: RenderDOMFunc | undefined;
                     readonly placeholder?: any;
                     readonly defaultValue?: unknown;
@@ -3158,9 +3158,9 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                     open: boolean;
                     multiple: boolean;
                     disabled: boolean;
-                    bordered: boolean;
                     loading: boolean;
                     autofocus: boolean;
+                    bordered: boolean;
                     virtual: boolean;
                     dropdownMatchSelectWidth: number | boolean;
                     allowClear: boolean;
@@ -3198,9 +3198,9 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 open: boolean;
                 multiple: boolean;
                 disabled: boolean;
-                bordered: boolean;
                 loading: boolean;
                 autofocus: boolean;
+                bordered: boolean;
                 virtual: boolean;
                 dropdownMatchSelectWidth: number | boolean;
                 allowClear: boolean;
@@ -3215,7 +3215,7 @@ export declare function getSearchFormItemRenderNode(item: any, extraRenderMap?:
                 emptyText: string;
             }> & Omit<Readonly< ApFieldTreeSelectProps> & Readonly<{
                 "onUpdate:value"?: ((...args: any[]) => any) | undefined;
-            }>, "blur" | "focus" | "request" | ("mode" | "open" | "multiple" | "disabled" | "bordered" | "loading" | "autofocus" | "virtual" | "dropdownMatchSelectWidth" | "allowClear" | "defaultOpen" | "showSearch" | "showArrow" | "autoClearSearchValue" | "labelInValue" | "treeCheckable" | "treeDefaultExpandAll" | "treeCheckStrictly" | "emptyText")> & ShallowUnwrapRef<{
+            }>, "blur" | "focus" | "request" | ("mode" | "open" | "multiple" | "disabled" | "loading" | "autofocus" | "bordered" | "virtual" | "dropdownMatchSelectWidth" | "allowClear" | "defaultOpen" | "showSearch" | "showArrow" | "autoClearSearchValue" | "labelInValue" | "treeCheckable" | "treeDefaultExpandAll" | "treeCheckStrictly" | "emptyText")> & ShallowUnwrapRef<{
                 blur: () => void;
                 focus: () => void;
                 request: (currentNode?: LegacyDataNode, clear?: boolean) => Promise<void>;