@aplus-frontend/ui 0.6.1 → 0.6.2

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

@@ -1,31 +1,29 @@
-import { defineComponent as Ke, useSlots as Le, getCurrentInstance as De, ref as k, computed as n, unref as a, toRef as Oe, nextTick as $e, watch as F, createElementBlock as E, openBlock as d, normalizeStyle as A, normalizeClass as g, createCommentVNode as S, createElementVNode as B, createVNode as X, mergeProps as h, createSlots as J, withCtx as C, Fragment as Q, renderList as V, createBlock as p, resolveDynamicComponent as K, renderSlot as L, normalizeProps as Me, guardReactiveProps as We } from "vue";
-import { VxeTable as je, VxeColumn as Y } from "vxe-table";
+import { defineComponent as Ke, useSlots as Le, getCurrentInstance as De, ref as E, computed as n, unref as t, toRef as Oe, nextTick as $e, watch as B, createElementBlock as I, openBlock as d, normalizeStyle as A, normalizeClass as g, createCommentVNode as S, createElementVNode as b, createVNode as V, mergeProps as C, createSlots as J, withCtx as h, Fragment as Q, renderList as K, createBlock as p, resolveDynamicComponent as L, renderSlot as D, normalizeProps as Me, guardReactiveProps as We } from "vue";
+import { VxeUI as Y, VxeTable as je, VxeColumn as Z } from "vxe-table";
 import "vxe-table/es/style.css";
-import "vxe-pc-ui/es/style.css";
-import { VxeUI as Z } from "vxe-pc-ui";
 import { isUndefined as R, isFunction as ee, omit as He } from "lodash-unified";
 import { ApForm as qe } from "../ap-form/index.mjs";
 import "../config-provider/index.mjs";
 import { noRenderAsFormItemValueList as Ue } from "../ap-table/constants.mjs";
-import { getColumnOrder as oe, updateFormProps as Ge, getFieldProps as Xe, getSearchFormItemRenderNode as Je, recursionApColumns as te } from "../ap-table/utils.mjs";
+import { getColumnOrder as oe, updateFormProps as Ge, getFieldProps as Xe, getSearchFormItemRenderNode as Je, recursionApColumns as ae } from "../ap-table/utils.mjs";
 import { useTablePaging as Qe } from "../ap-table/hooks/use-table-paging-ng.mjs";
-import { Empty as ae, Pagination as Ye } from "@aplus-frontend/antdv";
-import { useInnerParams as Ze } from "./hooks/use-inner-params.mjs";
-import { toVxeProps as eo, getRowExpandProps as oo, getRowSelectionProps as to } from "./utils/table.mjs";
-import ao from "./hooks/use-row-selection.mjs";
-import { useProvideApTable as ro } from "../ap-table/context.mjs";
-import { sizeReverseMap as lo, sizeMap as no, ROW_SELECTION_FIELD as so } from "./constants.mjs";
-import { useRenderColumns as io } from "./hooks/use-render-columns.mjs";
-import { useToken as uo } from "@aplus-frontend/antdv/es/theme/internal";
+import { Spin as Ye, Empty as te, Pagination as Ze } from "@aplus-frontend/antdv";
+import { useInnerParams as eo } from "./hooks/use-inner-params.mjs";
+import { toVxeProps as oo, getRowExpandProps as ao, getRowSelectionProps as to } from "./utils/table.mjs";
+import ro from "./hooks/use-row-selection.mjs";
+import { useProvideApTable as lo } from "../ap-table/context.mjs";
+import { sizeReverseMap as no, sizeMap as so, ROW_SELECTION_FIELD as io } from "./constants.mjs";
+import { useRenderColumns as uo } from "./hooks/use-render-columns.mjs";
+import { useToken as co } from "@aplus-frontend/antdv/es/theme/internal";
 import "../scroll-bar/index.mjs";
-import { isDef as co } from "../utils/index.mjs";
-import { getValidVNodeList as po } from "../utils/slot.mjs";
-import { useTableStyle as fo } from "./hooks/use-table-style.mjs";
-import { useNamespace as mo } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as go } from "../config-provider/hooks/use-global-config.mjs";
-import { useLocale as ho } from "../config-provider/hooks/use-locale.mjs";
-import Co from "../scroll-bar/index.vue.mjs";
-const qo = /* @__PURE__ */ Ke({
+import { isDef as po } from "../utils/index.mjs";
+import { getValidVNodeList as fo } from "../utils/slot.mjs";
+import { useTableStyle as mo } from "./hooks/use-table-style.mjs";
+import { useNamespace as go } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as ho } from "../config-provider/hooks/use-global-config.mjs";
+import { useLocale as Co } from "../config-provider/hooks/use-locale.mjs";
+import yo from "../scroll-bar/index.vue.mjs";
+const Ho = /* @__PURE__ */ Ke({
   name: "ApGrid",
   __name: "index",
   props: {
@@ -116,23 +114,23 @@ const qo = /* @__PURE__ */ Ke({
     rowHighlightable: { type: [Boolean, Function], default: !1 }
   },
   setup(re, { expose: le }) {
-    var G;
-    const y = Le(), t = re, b = (G = De()) == null ? void 0 : G.appContext.app;
-    b && !b.__VXE_PC_UI_INSTALLED__ && (b.use(Z), b.__VXE_PC_UI_INSTALLED__ = !0);
-    const { e: I, b: u, be: ne } = mo("ap-grid"), se = go("valueTypeMap"), i = k([]), D = k([]), s = k(), x = k(t.size), ie = fo(), [, de] = uo(), { t: ue } = ho();
-    Z.setConfig({
+    var X;
+    const y = Le(), a = re, x = (X = De()) == null ? void 0 : X.appContext.app;
+    x && !x.__VXE_PC_UI_INSTALLED__ && (x.use(Y), x.__VXE_PC_UI_INSTALLED__ = !0);
+    const { e: k, b: u, be: ne } = go("ap-grid"), se = ho("valueTypeMap"), i = E([]), O = E([]), s = E(), F = E(a.size), ie = mo(), [, de] = co(), { t: ue } = Co();
+    Y.setConfig({
       i18n: (e, o) => ue(`ap.${e}`, o)
     });
-    const { renderConfig: ce, updateSignal: pe } = io(i);
-    let O = 0;
+    const { renderConfig: ce, updateSignal: pe } = uo(i);
+    let $ = 0;
     const fe = n(() => {
       if (s.value)
         return s.value.$el.querySelector(
           ".vxe-table--header-inner-wrapper"
         );
-    }), $ = n(() => {
+    }), M = n(() => {
       var e, o, r;
-      return O++, ((r = (o = (e = t.columns) == null ? void 0 : e.filter(
+      return $++, ((r = (o = (e = a.columns) == null ? void 0 : e.filter(
         (l) => !l.hideInSearch && l.dataIndex && (l.valueType || l.customRenderFormItem) && !Ue.includes(l.valueType)
       )) == null ? void 0 : o.sort((l, c) => {
         let w = oe(l.order);
@@ -149,30 +147,30 @@ const qo = /* @__PURE__ */ Ke({
             // tips: 在表格中的查询表单项默认是带边框的
             bordered: !0,
             ...c || {},
-            _signal: O
+            _signal: $
           },
           renderNode: void 0
         };
         return w.renderNode = Je(
           w,
-          a(se)
+          t(se)
         ), w;
       })) || [];
     }), me = n(() => {
       var o;
-      return co(t.manual) ? t.manual : po(((o = y.searchFormExtra) == null ? void 0 : o.call(y)) || []).some((r) => {
+      return po(a.manual) ? a.manual : fo(((o = y.searchFormExtra) == null ? void 0 : o.call(y)) || []).some((r) => {
         var l;
         return ((l = r.type) == null ? void 0 : l.name) === "ApView";
       });
     }), ge = n(() => [
       u(),
-      t.card ? null : u("wrapper"),
-      t.adaptive ? u("adaptive") : null,
-      t.sticky ? u("sticky") : null
-    ].filter(Boolean)), M = n(() => te(a(i), (e) => {
+      a.card ? null : u("wrapper"),
+      a.adaptive ? u("adaptive") : null,
+      a.sticky ? u("sticky") : null
+    ].filter(Boolean)), W = n(() => ae(t(i), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), W = n(() => te(a(i), (e) => {
+    }).filter(Boolean)), j = n(() => ae(t(i), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
@@ -181,7 +179,7 @@ const qo = /* @__PURE__ */ Ke({
       reset: T,
       refresh: he,
       data: f,
-      tableProps: j,
+      tableProps: H,
       setDataSource: Ce,
       handleTableChangeOptional: ye,
       getPaging: ve,
@@ -189,48 +187,48 @@ const qo = /* @__PURE__ */ Ke({
     } = Qe({
       async request(e) {
         var r;
-        if (!m.value.preserveSelectedRowKeys && R(t.dataSource) && _(), !R(t.dataSource)) {
+        if (!m.value.preserveSelectedRowKeys && R(a.dataSource) && _(), !R(a.dataSource)) {
           const l = e.pageSize * (e.current - 1);
           return {
-            data: (t.pagination === !1 ? t.dataSource : t.dataSource.slice(l, l + e.pageSize)) || [],
-            total: t.dataSource.length || 0
+            data: (a.pagination === !1 ? a.dataSource : a.dataSource.slice(l, l + e.pageSize)) || [],
+            total: a.dataSource.length || 0
           };
         }
-        const o = await ((r = t.request) == null ? void 0 : r.call(t, e));
+        const o = await ((r = a.request) == null ? void 0 : r.call(a, e));
         return {
           data: (o == null ? void 0 : o.data) || [],
           total: (o == null ? void 0 : o.total) || 0
         };
       },
       namespace: "ap-grid",
-      filterFields: W,
-      sortFields: M,
-      params: Oe(t, "params"),
-      defaultData: t.defaultData,
-      manual: a(me),
-      formatParams: t.beforeSearchSubmit,
-      pagination: t.pagination,
+      filterFields: j,
+      sortFields: W,
+      params: Oe(a, "params"),
+      defaultData: a.defaultData,
+      manual: t(me),
+      formatParams: a.beforeSearchSubmit,
+      pagination: a.pagination,
       onClickReset: Ae,
-      onAfterRequest: U
-    }), { sortChangeEvent: Se, filterChangeEvent: Re, paginationChangeEvent: be } = Ze(ye);
-    ro({
+      onAfterRequest: G
+    }), { sortChangeEvent: Se, filterChangeEvent: be, paginationChangeEvent: Re } = eo(ye);
+    lo({
       columns: n(() => i.value),
-      columnsBackup: n(() => D.value),
-      size: n(() => no[x.value]),
+      columnsBackup: n(() => O.value),
+      size: n(() => so[F.value]),
       updateColumns(e) {
         var o;
-        i.value = e, (o = t.onShownColumnsChange) == null || o.call(t, e);
+        i.value = e, (o = a.onShownColumnsChange) == null || o.call(a, e);
       },
       updateSize(e) {
-        x.value = lo[e];
+        F.value = no[e];
       },
       renderConfig: n(() => ({
         className: ne("table-header", "title"),
         color: de.value.colorTextTertiary
       })),
-      dataSource: n(() => a(f).records),
-      getSearchFormValues: q,
-      setSearchFormValues: H,
+      dataSource: n(() => t(f).records),
+      getSearchFormValues: U,
+      setSearchFormValues: q,
       submit: N,
       reset: T
     });
@@ -239,13 +237,13 @@ const qo = /* @__PURE__ */ Ke({
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
     ), ke = n(
-      () => R(t.loading) ? f.loading : t.loading
+      () => R(a.loading) ? f.loading : a.loading
     ), Fe = n(
-      () => R(t.dataSource) ? f.records : t.dataSource
-    ), { selectedRows: z, rowSelection: m, ...v } = ao({
-      ...t.rowSelection === !0 ? {} : t.rowSelection,
+      () => R(a.dataSource) ? f.records : a.dataSource
+    ), { selectedRows: z, rowSelection: m, ...v } = ro({
+      ...a.rowSelection === !0 ? {} : a.rowSelection,
       dataSource: Fe,
-      rowKey: t.rowKey
+      rowKey: a.rowKey
     }), Ee = ({
       checked: e,
       row: o
@@ -278,18 +276,18 @@ const qo = /* @__PURE__ */ Ke({
     }, Ne = ({
       row: e
     }) => {
-      const o = t.rowHighlightable;
+      const o = a.rowHighlightable;
       ee(o) && o(e);
     };
     function Te() {
       var e;
-      return ((e = t.columns) == null ? void 0 : e.filter((o) => !o.hideInTable)) || [];
+      return ((e = a.columns) == null ? void 0 : e.filter((o) => !o.hideInTable)) || [];
     }
-    function H(e) {
+    function q(e) {
       var o, r, l;
       (l = (r = (o = P.value) == null ? void 0 : o.apForm) == null ? void 0 : r.setFieldsValue) == null || l.call(r, e);
     }
-    function q(e = !1) {
+    function U(e = !1) {
       var r, l, c;
       const o = e ? "getFieldsValueTransformed" : "getFieldsValue";
       return (c = (l = (r = P.value) == null ? void 0 : r.apForm) == null ? void 0 : l[o]) == null ? void 0 : c.call(l, !0);
@@ -300,20 +298,20 @@ const qo = /* @__PURE__ */ Ke({
       e && (m.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
     }
     function ze(e) {
-      ee(t.rowKey) || (v.selectMultiByKeys(e), U());
+      ee(a.rowKey) || (v.selectMultiByKeys(e), G());
     }
     function _e(e) {
       const o = s.value;
       if (!o)
         return;
-      const r = String(e[t.rowKey]), l = o.getRowById(r);
+      const r = String(e[a.rowKey]), l = o.getRowById(r);
       o.setCurrentRow(l);
     }
     function Ae() {
       const e = s.value;
       e && (e.clearSort(), e.clearFilter());
     }
-    function U() {
+    function G() {
       $e(() => {
         var e, o;
         m.value.type === "radio" ? (e = s.value) == null || e.setRadioRowKey(m.value.selectedRowKeys[0]) : (o = s.value) == null || o.setCheckboxRowKey(
@@ -328,70 +326,70 @@ const qo = /* @__PURE__ */ Ke({
       if (r)
         return (l = s.value) == null ? void 0 : l.scrollToRow(r, o);
     }
-    return F(
-      () => [t.columnResizable, t.columns],
+    return B(
+      () => [a.columnResizable, a.columns],
       () => {
         var o;
         const e = Te();
-        i.value = e, (o = t.onShownColumnsChange) == null || o.call(t, e), D.value = e;
+        i.value = e, (o = a.onShownColumnsChange) == null || o.call(a, e), O.value = e;
       },
       {
         deep: !0,
         immediate: !0
       }
-    ), F(
-      () => t.dataSource,
+    ), B(
+      () => a.dataSource,
       (e) => {
         Ce(e);
       },
       { immediate: !0, deep: !0 }
-    ), F(
-      () => a(f).loading,
+    ), B(
+      () => t(f).loading,
       (e) => {
         var o;
-        (o = t.onLoadingChange) == null || o.call(t, e);
+        (o = a.onLoadingChange) == null || o.call(a, e);
       }
-    ), F(
-      () => t.size,
+    ), B(
+      () => a.size,
       (e) => {
-        x.value = e;
+        F.value = e;
       }
     ), le({
       submit: N,
       reset: T,
       refresh: he,
-      setSearchFormValues: H,
-      getSearchFormValues: q,
-      getShowColumns: () => a(i),
+      setSearchFormValues: q,
+      getSearchFormValues: U,
+      getShowColumns: () => t(i),
       rowSelection: {
         selectedRows: n(() => z.value),
         setSelectedRowKeys: ze,
         clearAll: _
       },
       scrollToRow: Ve,
-      getDataSource: () => a(f.records),
+      getDataSource: () => t(f.records),
       setCurrentRow: _e,
       getPaging: ve,
       setPaging: we
-    }), (e, o) => (d(), E("div", {
+    }), (e, o) => (d(), I("div", {
       class: g(ge.value),
       style: A(e.wrapperStyle)
     }, [
-      a(R)(e.dataSource) && e.searchForm !== !1 && $.value.length > 0 ? (d(), E("div", {
+      t(R)(e.dataSource) && e.searchForm !== !1 && M.value.length > 0 ? (d(), I("div", {
         key: 0,
-        class: g(e.card ? a(I)("search-wrapper") : null),
+        class: g(e.card ? t(k)("search-wrapper") : null),
         style: A(e.searchFormWrapperStyle)
       }, [
-        X(a(qe).SearchForm, h(e.searchForm || {}, {
+        V(t(qe).SearchForm, C(e.searchForm || {}, {
           ref_key: "formRef",
           ref: P,
           "custom-reset": "",
-          "submit-loading": a(j).loading,
-          onSubmit: a(N),
-          onReset: a(T)
+          "submit-loading": t(H).loading,
+          onSubmit: t(N),
+          onReset: t(T)
         }), J({
-          default: C(() => [
-            (d(!0), E(Q, null, V($.value, (r) => (d(), p(K(r.renderNode.Comp), h({
+          default: h(() => [
+            (d(!0), I(Q, null, K(M.value, (r) => (d(), p(L(r.renderNode.Comp), C({
               key: r.dataIndex,
               item: r,
               ref_for: !0
@@ -404,84 +402,91 @@ const qo = /* @__PURE__ */ Ke({
         }, [
           y.searchFormExtra ? {
             name: "extra",
-            fn: C(() => [
-              L(e.$slots, "searchFormExtra")
+            fn: h(() => [
+              D(e.$slots, "searchFormExtra")
             ]),
             key: "0"
           } : void 0
         ]), 1040, ["submit-loading", "onSubmit", "onReset"])
       ], 6)) : S("", !0),
-      B("div", {
-        class: g([a(I)("table-wrapper"), e.card ? a(I)("table-wrapper-card") : null]),
+      b("div", {
+        class: g([t(k)("table-wrapper"), e.card ? t(k)("table-wrapper-card") : null]),
         style: A(e.tableWrapperStyle)
       }, [
-        B("div", {
-          class: g(a(u)("header-wrapper"))
+        b("div", {
+          class: g(t(u)("header-wrapper"))
         }, [
-          L(e.$slots, "title", {
-            selectedRows: a(z),
-            selectedRowKeys: a(m).selectedRowKeys,
+          D(e.$slots, "title", {
+            selectedRows: t(z),
+            selectedRowKeys: t(m).selectedRowKeys,
             shownColumns: i.value,
             clearAll: _
           })
         ], 2),
-        B("div", {
-          class: g(a(u)("vxe-wrapper"))
+        b("div", {
+          class: g(t(u)("vxe-wrapper"))
         }, [
-          (d(), p(a(je), h(a(eo)(t), {
+          (d(), p(t(je), C(t(oo)(a), {
             ref_key: "tableRef",
             ref: s,
-            key: a(pe),
-            data: a(f).records,
+            key: t(pe),
+            data: t(f).records,
             "sort-config": {
-              remote: M.value.length > 0,
+              remote: W.value.length > 0,
               trigger: "cell"
             },
             "filter-config": {
-              remote: W.value.length > 0
+              remote: j.value.length > 0
             },
             loading: ke.value,
-            style: a(ie),
-            size: x.value,
-            onSortChange: a(Se),
-            onFilterChange: a(Re),
+            style: t(ie),
+            size: F.value,
+            onSortChange: t(Se),
+            onFilterChange: t(be),
             onCheckboxChange: Ee,
             onCheckboxRangeChange: Ie,
             onCheckboxAll: Be,
             onRadioChange: Pe,
             onCurrentChange: Ne
           }), J({
-            empty: C(() => [
-              X(a(ae), {
-                image: a(ae).PRESENTED_IMAGE_SIMPLE
+            empty: h(() => [
+              V(t(te), {
+                image: t(te).PRESENTED_IMAGE_SIMPLE
               }, null, 8, ["image"])
             ]),
-            default: C(() => [
-              t.expandable && i.value.length ? (d(), p(a(Y), h({ key: 0 }, a(oo)(e.expandable), { fixed: xe.value }), {
-                content: C((r) => [
-                  (d(), p(K(t.expandable.renderContent(r))))
+            loading: h(() => [
+              b("div", {
+                class: g(t(k)("table-loading-wrapper"))
+              }, [
+                V(t(Ye))
+              ], 2)
+            ]),
+            default: h(() => [
+              a.expandable && i.value.length ? (d(), p(t(Z), C({ key: 0 }, t(ao)(e.expandable), { fixed: xe.value }), {
+                content: h((r) => [
+                  (d(), p(L(a.expandable.renderContent(r))))
                 ]),
                 _: 1
               }, 16, ["fixed"])) : S("", !0),
-              t.rowSelection && i.value.length ? (d(), p(a(Y), h({ key: 1 }, a(to)(a(m), i.value), { field: a(so) }), null, 16, ["field"])) : S("", !0),
-              (d(!0), E(Q, null, V(a(ce), (r) => (d(), p(K(r), {
+              a.rowSelection && i.value.length ? (d(), p(t(Z), C({ key: 1 }, t(to)(t(m), i.value), { field: t(io) }), null, 16, ["field"])) : S("", !0),
+              (d(!0), I(Q, null, K(t(ce), (r) => (d(), p(L(r), {
                 key: r.props.colId
               }))), 128))
             ]),
             _: 2
           }, [
-            V(a(He)(y, ["searchFormExtra"]), (r, l) => ({
+            K(t(He)(y, ["searchFormExtra"]), (r, l) => ({
               name: l,
-              fn: C((c) => [
-                L(e.$slots, l, Me(We(c || {})))
+              fn: h((c) => [
+                D(e.$slots, l, Me(We(c || {})))
               ])
             }))
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "style", "size", "onSortChange", "onFilterChange"]))
         ], 2),
-        B("div", {
-          class: g(a(u)("pagination-wrapper"))
+        b("div", {
+          class: g(t(u)("pagination-wrapper"))
         }, [
-          e.sticky ? (d(), p(a(Co), {
+          e.sticky ? (d(), p(t(yo), {
             key: 0,
             direction: "horizontal",
             "scroll-container": fe.value,
@@ -489,15 +494,15 @@ const qo = /* @__PURE__ */ Ke({
             "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 ? (d(), p(a(Ye), h({
+          e.pagination !== !1 ? (d(), p(t(Ze), C({
             key: 1,
-            class: a(u)("pagination")
-          }, a(j).pagination, { onChange: a(be) }), null, 16, ["class", "onChange"])) : S("", !0)
+            class: t(u)("pagination")
+          }, t(H).pagination, { onChange: t(Re) }), null, 16, ["class", "onChange"])) : S("", !0)
         ], 2)
       ], 6)
     ], 6));
   }
 });
 export {
-  qo as default
+  Ho as default
 };

package/es/src/ap-grid/utils/table.mjs

@@ -1,10 +1,10 @@
-import { omit as l, isUndefined as s, isFunction as h, isNumber as m } from "lodash-unified";
-import { isDef as w } from "../../utils/index.mjs";
-const C = 20, b = 50, y = (e) => e.some((t) => !!t.html);
-function v(e) {
-  var i;
+import { omit as u, isUndefined as s, isFunction as c, isNumber as C } from "lodash-unified";
+import { isDef as m } from "../../utils/index.mjs";
+const w = 20, b = 50, g = (e) => e.some((t) => !!t.html);
+function R(e) {
+  var n;
   const t = {
-    ...l(e, [
+    ...u(e, [
       "columns",
       "request",
       "searchForm",
@@ -18,7 +18,7 @@ function v(e) {
     isHover: !0,
     keyField: e.rowKey,
     isCurrent: !!e.rowHighlightable
-  }, t.columnConfig = {}, y(e.columns || []) && (t.rowConfig.useKey = !0, t.columnConfig.useKey = !0), e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig.resizable = !0), e.rowSelection) {
+  }, t.columnConfig = {}, g(e.columns || []) && (t.rowConfig.useKey = !0, t.columnConfig.useKey = !0), e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig.resizable = !0), e.rowSelection) {
     const o = e.rowSelection === !0 ? {} : e.rowSelection;
     o.type === "radio" ? t.radioConfig = {
       highlight: !0,
@@ -28,7 +28,7 @@ function v(e) {
       visibleMethod({ row: r }) {
         return o.shown ? o.shown(r) : !0;
       },
-      checkRowKey: (i = o.defaultSelectedRowKeys) == null ? void 0 : i[0],
+      checkRowKey: (n = o.defaultSelectedRowKeys) == null ? void 0 : n[0],
       reserve: s(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
     } : t.checkboxConfig = {
       highlight: !0,
@@ -42,35 +42,38 @@ function v(e) {
       range: o.range || !1
     };
   }
-  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = l(e.expandable, [
+  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = u(e.expandable, [
     "renderContent",
     "width",
     "title"
-  ])), e.footer && (t.showFooter = !0, h(e.footer) ? t.footerMethod = e.footer : t.footerData = e.footer), e.virtual === !1 ? (t.virtualXConfig = {
+  ])), e.footer && (t.showFooter = !0, c(e.footer) ? t.footerMethod = e.footer : t.footerData = e.footer), e.virtual === !1 ? (t.virtualXConfig = {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t.round = w(e.round) ? e.round : !e.card, t;
+  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t.round = m(e.round) ? e.round : !e.card, e.virtual !== !1 && (t.headerCellConfig = {
+    height: 36,
+    ...t.headerCellConfig || {}
+  }), t;
 }
-function a(e, t, n) {
-  const i = t === "X", o = i ? "x" : "y", r = i ? "virtualXConfig" : "virtualYConfig", u = n == null ? void 0 : n[o], f = u !== !1, d = i ? C : b, c = m(u) && u >= 0 ? u : d;
+function a(e, t, i) {
+  const n = t === "X", o = n ? "x" : "y", r = n ? "virtualXConfig" : "virtualYConfig", l = i == null ? void 0 : i[o], f = l !== !1, d = n ? w : b, h = C(l) && l >= 0 ? l : d;
   e[r] = {
     enabled: f,
-    gt: c,
-    oSize: (n == null ? void 0 : n.oSize) || 0
+    gt: h,
+    oSize: (i == null ? void 0 : i.oSize) || 0
   };
 }
-function g(e) {
+function y(e) {
   return e === !0 ? "left" : e;
 }
 function K(e, t) {
-  const n = e === !0 || !e.type ? "checkbox" : e.type, i = e === !0 ? 60 : e.columnWidth || 60;
-  let o = e === !0 ? void 0 : g(e.fixed);
+  const i = e === !0 || !e.type ? "checkbox" : e.type, n = e === !0 ? 60 : e.columnWidth || 60;
+  let o = e === !0 ? void 0 : y(e.fixed);
   return o || (o === !1 ? o = void 0 : o = t.some(
     (r) => r.fixed === "left" || r.fixed === !0
   ) ? "left" : void 0), {
-    type: n,
-    width: i,
+    type: i,
+    width: n,
     fixed: o
   };
 }
@@ -85,5 +88,5 @@ function k(e) {
 export {
   k as getRowExpandProps,
   K as getRowSelectionProps,
-  v as toVxeProps
+  R as toVxeProps
 };

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

@@ -1,5 +1,5 @@
 import { isVNode as E, createVNode as l, mergeProps as b, cloneVNode as j, Fragment as O } from "vue";
-import { isObject as p, isArray as a, isUndefined as g, isFunction as T, omit as C, isBoolean as F, isString as N, isEqual as S, sortBy as d, isPlainObject as m, every as v, isEmpty as I } from "lodash-unified";
+import { isObject as p, isArray as a, isUndefined as g, isFunction as T, omit as C, isBoolean as F, isString as N, isEqual as S, sortBy as d, isPlainObject as m, every as I, isEmpty as v } from "lodash-unified";
 import { apTableRenderItemMap as P, apTableFormItemMap as V } from "./constants.mjs";
 import { isType as x } from "@fruits-chain/utils";
 import "../ap-form/index.mjs";
@@ -179,7 +179,7 @@ function ut(t, e, n, o) {
   }, {
     default: () => [l(w, {
       style: {
-        padding: "4px",
+        paddingInline: "4px",
         color: o,
         verticalAlign: "middle"
       }
@@ -199,7 +199,7 @@ function ct(t, e) {
   if (a(t) && a(e))
     return S(d(t), d(e));
   if (m(t) && m(e)) {
-    const n = (o) => v(o, (i) => i == null) || I(o);
+    const n = (o) => I(o, (i) => i == null) || v(o);
     if (n(t) && n(e))
       return !0;
   }