@aplus-frontend/ui 0.6.0-beta.1 → 0.6.0-beta.10

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

@@ -1,28 +1,30 @@
-import { defineComponent as ke, useSlots as Be, getCurrentInstance as Fe, ref as k, computed as n, unref as o, watch as B, createElementBlock as F, openBlock as s, normalizeStyle as A, normalizeClass as g, createCommentVNode as S, createElementVNode as I, createVNode as X, mergeProps as h, createSlots as J, withCtx as v, Fragment as Q, renderList as V, createBlock as p, resolveDynamicComponent as L, renderSlot as D, normalizeProps as Ie, guardReactiveProps as Ee } from "vue";
-import { VxeTable as Pe, VxeColumn as Y } from "vxe-table";
+import { defineComponent as Be, useSlots as Ie, getCurrentInstance as Ee, ref as F, computed as n, unref as o, watch as B, createElementBlock as I, openBlock as i, normalizeStyle as V, normalizeClass as g, createCommentVNode as y, createElementVNode as E, createVNode as X, mergeProps as h, createSlots as J, withCtx as v, Fragment as Q, renderList as L, createBlock as m, resolveDynamicComponent as D, renderSlot as O, normalizeProps as Pe, guardReactiveProps as Ne } from "vue";
+import { VxeTable as Te, VxeColumn as Y } 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 b, omit as Ne } from "lodash-unified";
-import { ApForm as Te } from "../ap-form/index.mjs";
+import { isUndefined as S, omit as ze } from "lodash-unified";
+import { ApForm as Ae } from "../ap-form/index.mjs";
 import "../config-provider/index.mjs";
-import { noRenderAsFormItemValueList as ze } from "../ap-table/constants.mjs";
-import { getColumnOrder as ee, updateFormProps as _e, getFieldProps as Ae, getSearchFormItemRenderNode as Ve, recursionApColumns as oe } from "../ap-table/utils.mjs";
-import { useTablePaging as Le } from "../ap-table/hooks/use-table-paging-ng.mjs";
-import { Empty as ae, Pagination as De } from "@aplus-frontend/antdv";
-import { useInnerParams as Oe } from "./hooks/use-inner-params.mjs";
-import { toVxeProps as $e, getRowExpandProps as Ke, getRowSelectionProps as We } from "./utils/table.mjs";
-import je from "../ap-table/hooks/use-table-row-selection.mjs";
-import { useProvideApTable as He } from "../ap-table/context.mjs";
-import { sizeReverseMap as Me, sizeMap as qe, ROW_SELECTION_FIELD as Ue } from "./constants.mjs";
-import { useRenderColumns as Ge } from "./hooks/use-render-columns.mjs";
-import { useToken as Xe } from "@aplus-frontend/antdv/es/theme/internal";
+import { noRenderAsFormItemValueList as _e } from "../ap-table/constants.mjs";
+import { getColumnOrder as ee, updateFormProps as Ve, getFieldProps as Le, getSearchFormItemRenderNode as De, recursionApColumns as oe } from "../ap-table/utils.mjs";
+import { useTablePaging as Oe } from "../ap-table/hooks/use-table-paging-ng.mjs";
+import { Empty as ae, Pagination as $e } from "@aplus-frontend/antdv";
+import { useInnerParams as Ke } from "./hooks/use-inner-params.mjs";
+import { toVxeProps as We, getRowExpandProps as je, getRowSelectionProps as He } from "./utils/table.mjs";
+import Me from "../ap-table/hooks/use-table-row-selection.mjs";
+import { useProvideApTable as qe } from "../ap-table/context.mjs";
+import { sizeReverseMap as Ue, sizeMap as Ge, ROW_SELECTION_FIELD as Xe } from "./constants.mjs";
+import { useRenderColumns as Je } from "./hooks/use-render-columns.mjs";
+import { useToken as Qe } from "@aplus-frontend/antdv/es/theme/internal";
 import "../scroll-bar/index.mjs";
-import { useNamespace as Je } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as Qe } from "../config-provider/hooks/use-global-config.mjs";
-import { useLocale as Ye } from "../config-provider/hooks/use-locale.mjs";
-import Ze from "../scroll-bar/index.vue.mjs";
-const Bo = /* @__PURE__ */ ke({
+import { isDef as Ye } from "../utils/index.mjs";
+import { getValidVNodeList as Ze } from "../utils/slot.mjs";
+import { useNamespace as eo } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as oo } from "../config-provider/hooks/use-global-config.mjs";
+import { useLocale as ao } from "../config-provider/hooks/use-locale.mjs";
+import ro from "../scroll-bar/index.vue.mjs";
+const To = /* @__PURE__ */ Be({
   name: "ApGrid",
   __name: "index",
   props: {
@@ -85,6 +87,7 @@ const Bo = /* @__PURE__ */ ke({
     loadingConfig: {},
     headerCellConfig: {},
     footerCellConfig: {},
+    round: { type: Boolean, default: void 0 },
     columns: {},
     rowSelection: { type: Boolean },
     card: { type: Boolean, default: !1 },
@@ -100,7 +103,7 @@ const Bo = /* @__PURE__ */ ke({
     searchFormWrapperStyle: {},
     tableWrapperStyle: {},
     wrapperStyle: {},
-    manual: { type: Boolean, default: !1 },
+    manual: { type: Boolean, default: void 0 },
     size: { default: "mini" },
     adaptive: { type: Boolean, default: !1 },
     columnResizable: { type: [Boolean, Object], default: !1 },
@@ -112,69 +115,77 @@ const Bo = /* @__PURE__ */ ke({
   },
   setup(re, { expose: te }) {
     var G;
-    const O = Be(), a = re, w = (G = Fe()) == null ? void 0 : G.appContext.app;
+    const C = Ie(), a = re, w = (G = Ee()) == null ? void 0 : G.appContext.app;
     w && !w.__VXE_PC_UI_INSTALLED__ && (w.use(Z), w.__VXE_PC_UI_INSTALLED__ = !0);
-    const { e: E, b: c, be: le } = Je("ap-grid"), ne = Qe("valueTypeMap"), i = k([]), $ = k([]), m = k(), C = k(a.size), [, d] = Xe(), { t: se } = Ye();
+    const { e: P, b: c, be: le } = eo("ap-grid"), ne = oo("valueTypeMap"), s = F([]), $ = F([]), u = F(), x = F(a.size), [, d] = Qe(), { t: se } = ao();
     Z.setConfig({
       i18n: (e, r) => se(`ap.${e}`, r)
     });
-    const { renderConfig: ie, updateSignal: de } = Ge(i);
+    const { renderConfig: ie, updateSignal: de } = Je(s);
     let K = 0;
     const ce = n(() => {
-      if (m.value)
-        return m.value.$el.querySelector(
+      if (u.value)
+        return u.value.$el.querySelector(
           ".vxe-table--header-inner-wrapper"
         );
     }), W = n(() => {
       var e, r, l;
       return K++, ((l = (r = (e = a.columns) == null ? void 0 : e.filter(
-        (t) => !t.hideInSearch && t.dataIndex && (t.valueType || t.customRenderFormItem) && !ze.includes(t.valueType)
-      )) == null ? void 0 : r.sort((t, u) => {
-        let y = ee(t.order);
-        return ee(u.order) - y;
+        (t) => !t.hideInSearch && t.dataIndex && (t.valueType || t.customRenderFormItem) && !_e.includes(t.valueType)
+      )) == null ? void 0 : r.sort((t, p) => {
+        let b = ee(t.order);
+        return ee(p.order) - b;
       })) == null ? void 0 : l.map((t) => {
-        const u = _e(
+        const p = Ve(
           t,
-          Ae(t.fieldProps, {})
-        ), y = {
+          Le(t.fieldProps, {})
+        ), b = {
           ...t,
           fieldProps: {
             label: t.title,
             name: t.dataIndex,
-            ...u || {},
+            // tips: 在表格中的查询表单项默认是带边框的
+            bordered: !0,
+            ...p || {},
             _signal: K
           },
           renderNode: void 0
         };
-        return y.renderNode = Ve(
-          y,
+        return b.renderNode = De(
+          b,
           o(ne)
-        ), y;
+        ), b;
       })) || [];
-    }), ue = n(() => [
+    }), ue = n(() => {
+      var r;
+      return Ye(a.manual) ? a.manual : Ze(((r = C.searchFormExtra) == null ? void 0 : r.call(C)) || []).some((l) => {
+        var t;
+        return ((t = l.type) == null ? void 0 : t.name) === "ApView";
+      });
+    }), pe = n(() => [
       c(),
       a.card ? null : c("wrapper"),
       a.adaptive ? c("adaptive") : null,
       a.sticky ? c("sticky") : null
-    ].filter(Boolean)), j = n(() => oe(o(i), (e) => {
+    ].filter(Boolean)), j = n(() => oe(o(s), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), H = n(() => oe(o(i), (e) => {
+    }).filter(Boolean)), H = n(() => oe(o(s), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
-      formRef: P,
-      submit: N,
-      reset: T,
-      refresh: pe,
+      formRef: N,
+      submit: T,
+      reset: z,
+      refresh: me,
       data: f,
       tableProps: M,
-      setDataSource: me,
-      handleTableChange: fe
-    } = Le({
+      setDataSource: fe,
+      handleTableChangeOptional: ge
+    } = Oe({
       async request(e) {
         var l;
-        if (!R.value.preserveSelectedRowKeys && b(a.dataSource) && _(), !b(a.dataSource)) {
+        if (!k.value.preserveSelectedRowKeys && S(a.dataSource) && _(), !S(a.dataSource)) {
           const t = e.pageSize * (e.current - 1);
           return {
             data: (a.pagination === !1 ? a.dataSource : a.dataSource.slice(t, t + e.pageSize)) || [],
@@ -192,20 +203,21 @@ const Bo = /* @__PURE__ */ ke({
       sortFields: j,
       defaultParams: a.params,
       defaultData: a.defaultData,
-      manual: a.manual,
+      manual: o(ue),
       formatParams: a.beforeSearchSubmit,
-      pagination: a.pagination
-    }), { sortChangeEvent: ge, filterChangeEvent: he, paginationChangeEvent: ve } = Oe(fe);
-    He({
-      columns: n(() => i.value),
+      pagination: a.pagination,
+      onClickReset: ke
+    }), { sortChangeEvent: he, filterChangeEvent: ve, paginationChangeEvent: Ce } = Ke(ge);
+    qe({
+      columns: n(() => s.value),
       columnsBackup: n(() => $.value),
-      size: n(() => C.value ? qe[C.value] : "middle"),
+      size: n(() => Ge[x.value]),
       updateColumns(e) {
         var r;
-        i.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e);
+        s.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e);
       },
       updateSize(e) {
-        C.value = Me[e];
+        x.value = Ue[e];
       },
       renderConfig: n(() => ({
         className: le("table-header", "title"),
@@ -214,61 +226,65 @@ const Bo = /* @__PURE__ */ ke({
       dataSource: n(() => o(f).records),
       getSearchFormValues: U,
       setSearchFormValues: q,
-      submit: N,
-      reset: T
+      submit: T,
+      reset: z
     });
-    const Ce = n(
-      () => i.value.some(
+    const be = n(
+      () => s.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
     ), ye = n(
-      () => b(a.loading) ? f.loading : a.loading
+      () => S(a.loading) ? f.loading : a.loading
     ), Se = n(
-      () => b(a.dataSource) ? f.records : a.dataSource
-    ), { selectedRows: x, rowSelection: R, ...be } = je({
+      () => S(a.dataSource) ? f.records : a.dataSource
+    ), { selectedRows: R, rowSelection: k, ...we } = Me({
       ...a.rowSelection === !0 ? {} : a.rowSelection,
       dataSource: Se,
       rowKey: a.rowKey
-    }), z = () => {
-      const e = m.value;
-      e && (x.value = [
+    }), A = () => {
+      const e = u.value;
+      e && (R.value = [
         ...e.getCheckboxReserveRecords(),
         ...e.getCheckboxRecords()
       ]);
-    }, we = () => {
-      const e = m.value;
-      e && (x.value = [e.getRadioRecord()]);
+    }, xe = () => {
+      const e = u.value;
+      e && (R.value = [e.getRadioRecord()]);
     };
-    function xe() {
+    function Re() {
       var e;
       return ((e = a.columns) == null ? void 0 : e.filter((r) => !r.hideInTable)) || [];
     }
     function q(e) {
       var r, l, t;
-      (t = (l = (r = P.value) == null ? void 0 : r.apForm) == null ? void 0 : l.setFieldsValue) == null || t.call(l, e);
+      (t = (l = (r = N.value) == null ? void 0 : r.apForm) == null ? void 0 : l.setFieldsValue) == null || t.call(l, e);
     }
     function U(e = !1) {
-      var l, t, u;
+      var l, t, p;
       const r = e ? "getFieldsValueTransformed" : "getFieldsValue";
-      return (u = (t = (l = P.value) == null ? void 0 : l.apForm) == null ? void 0 : t[r]) == null ? void 0 : u.call(t, !0);
+      return (p = (t = (l = N.value) == null ? void 0 : l.apForm) == null ? void 0 : t[r]) == null ? void 0 : p.call(t, !0);
     }
     function _() {
-      be.clearAll();
-      const e = m.value;
-      e && (R.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
+      we.clearAll();
+      const e = u.value;
+      e && (k.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
     }
-    async function Re(e, r) {
+    function ke() {
+      const e = u.value;
+      e && (e.clearSort(), e.clearFilter());
+    }
+    async function Fe(e, r) {
       var t;
       const l = f.records[e];
       if (l)
-        return (t = m.value) == null ? void 0 : t.scrollToRow(l, r);
+        return (t = u.value) == null ? void 0 : t.scrollToRow(l, r);
     }
     return B(
       () => [a.columnResizable, a.columns],
       () => {
         var r;
-        const e = xe();
-        i.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e), $.value = e;
+        const e = Re();
+        s.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e), $.value = e;
       },
       {
         deep: !0,
@@ -277,7 +293,7 @@ const Bo = /* @__PURE__ */ ke({
     ), B(
       () => a.dataSource,
       (e) => {
-        me(e);
+        fe(e);
       },
       { immediate: !0, deep: !0 }
     ), B(
@@ -289,40 +305,40 @@ const Bo = /* @__PURE__ */ ke({
     ), B(
       () => a.size,
       (e) => {
-        C.value = e;
+        x.value = e;
       }
     ), te({
-      submit: N,
-      reset: T,
-      refresh: pe,
+      submit: T,
+      reset: z,
+      refresh: me,
       setSearchFormValues: q,
       getSearchFormValues: U,
-      getShowColumns: () => o(i),
+      getShowColumns: () => o(s),
       rowSelection: {
-        selectedRows: n(() => x.value),
+        selectedRows: n(() => R.value),
         clearAll: _
       },
-      scrollToRow: Re,
+      scrollToRow: Fe,
       getDataSource: () => o(f.records)
-    }), (e, r) => (s(), F("div", {
-      class: g(ue.value),
-      style: A(e.wrapperStyle)
+    }), (e, r) => (i(), I("div", {
+      class: g(pe.value),
+      style: V(e.wrapperStyle)
     }, [
-      o(b)(e.dataSource) && e.searchForm !== !1 && W.value.length > 0 ? (s(), F("div", {
+      o(S)(e.dataSource) && e.searchForm !== !1 && W.value.length > 0 ? (i(), I("div", {
         key: 0,
-        class: g(e.card ? o(E)("search-wrapper") : null),
-        style: A(e.searchFormWrapperStyle)
+        class: g(e.card ? o(P)("search-wrapper") : null),
+        style: V(e.searchFormWrapperStyle)
       }, [
-        X(o(Te).SearchForm, h(e.searchForm || {}, {
+        X(o(Ae).SearchForm, h(e.searchForm || {}, {
           ref_key: "formRef",
-          ref: P,
+          ref: N,
           "custom-reset": "",
           "submit-loading": o(M).loading,
-          onSubmit: o(N),
-          onReset: o(T)
+          onSubmit: o(T),
+          onReset: o(z)
         }), J({
           default: v(() => [
-            (s(!0), F(Q, null, V(W.value, (l) => (s(), p(L(l.renderNode.Comp), h({
+            (i(!0), I(Q, null, L(W.value, (l) => (i(), m(D(l.renderNode.Comp), h({
               key: l.dataIndex,
               item: l,
               ref_for: !0
@@ -333,39 +349,44 @@ const Bo = /* @__PURE__ */ ke({
           ]),
           _: 2
         }, [
-          O.searchFormExtra ? {
+          C.searchFormExtra ? {
             name: "extra",
             fn: v(() => [
-              D(e.$slots, "searchFormExtra")
+              O(e.$slots, "searchFormExtra")
             ]),
             key: "0"
           } : void 0
         ]), 1040, ["submit-loading", "onSubmit", "onReset"])
-      ], 6)) : S("", !0),
-      I("div", {
-        class: g([o(E)("table-wrapper"), e.card ? o(E)("table-wrapper-card") : null]),
-        style: A(e.tableWrapperStyle)
+      ], 6)) : y("", !0),
+      E("div", {
+        class: g([o(P)("table-wrapper"), e.card ? o(P)("table-wrapper-card") : null]),
+        style: V(e.tableWrapperStyle)
       }, [
-        I("div", {
+        E("div", {
           class: g(o(c)("header-wrapper"))
         }, [
-          D(e.$slots, "title", {
-            selectedRows: o(x),
-            selectedRowKeys: o(R).selectedRowKeys,
-            shownColumns: i.value,
+          O(e.$slots, "title", {
+            selectedRows: o(R),
+            selectedRowKeys: o(k).selectedRowKeys,
+            shownColumns: s.value,
             clearAll: _
           })
         ], 2),
-        I("div", {
+        E("div", {
           class: g(o(c)("vxe-wrapper"))
         }, [
-          (s(), p(o(Pe), h(o($e)(a), {
+          (i(), m(o(Te), h(o(We)(a), {
             ref_key: "tableRef",
-            ref: m,
+            ref: u,
             key: o(de),
             data: o(f).records,
-            "sort-config": { remote: j.value.length > 0 },
-            "filter-config": { remote: H.value.length > 0 },
+            "sort-config": {
+              remote: j.value.length > 0,
+              trigger: "cell"
+            },
+            "filter-config": {
+              remote: H.value.length > 0
+            },
             loading: ye.value,
             style: {
               "--vxe-ui-table-row-checkbox-checked-background-color": o(d).controlItemBgActive,
@@ -378,16 +399,15 @@ const Bo = /* @__PURE__ */ ke({
               "--vxe-ui-table-row-hover-radio-checked-background-color": o(d).controlItemBgActiveHover,
               "--vxe-ui-font-color": o(d).colorTextBase,
               "--vxe-ui-table-border-color": o(d).colorBorderSecondary,
-              "--vxe-ui-table-header-font-color": o(d).colorTextBase,
-              "--vxe-ui-table-cell-padding-mini": "8px"
+              "--vxe-ui-table-header-font-color": o(d).colorTextBase
             },
-            size: C.value,
-            onSortChange: o(ge),
-            onFilterChange: o(he),
-            onCheckboxChange: z,
-            onCheckboxRangeChange: z,
-            onCheckboxAll: z,
-            onRadioChange: we
+            size: x.value,
+            onSortChange: o(he),
+            onFilterChange: o(ve),
+            onCheckboxChange: A,
+            onCheckboxRangeChange: A,
+            onCheckboxAll: A,
+            onRadioChange: xe
           }), J({
             empty: v(() => [
               X(o(ae), {
@@ -395,45 +415,47 @@ const Bo = /* @__PURE__ */ ke({
               }, null, 8, ["image"])
             ]),
             default: v(() => [
-              a.expandable ? (s(), p(o(Y), h({ key: 0 }, o(Ke)(e.expandable), { fixed: Ce.value }), {
+              a.expandable && s.value.length ? (i(), m(o(Y), h({ key: 0 }, o(je)(e.expandable), { fixed: be.value }), {
                 content: v((l) => [
-                  (s(), p(L(a.expandable.renderContent(l))))
+                  (i(), m(D(a.expandable.renderContent(l))))
                 ]),
                 _: 1
-              }, 16, ["fixed"])) : S("", !0),
-              a.rowSelection ? (s(), p(o(Y), h({ key: 1 }, o(We)(o(R), i.value), { field: o(Ue) }), null, 16, ["field"])) : S("", !0),
-              (s(!0), F(Q, null, V(o(ie), (l) => (s(), p(L(l), {
+              }, 16, ["fixed"])) : y("", !0),
+              a.rowSelection && s.value.length ? (i(), m(o(Y), h({ key: 1 }, o(He)(o(k), s.value), { field: o(Xe) }), null, 16, ["field"])) : y("", !0),
+              (i(!0), I(Q, null, L(o(ie), (l) => (i(), m(D(l), {
                 key: l.props.colId
               }))), 128))
             ]),
             _: 2
           }, [
-            V(o(Ne)(O, ["searchFormExtra"]), (l, t) => ({
+            L(o(ze)(C, ["searchFormExtra"]), (l, t) => ({
               name: t,
-              fn: v((u) => [
-                D(e.$slots, t, Ie(Ee(u || {})))
+              fn: v((p) => [
+                O(e.$slots, t, Pe(Ne(p || {})))
               ])
             }))
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "style", "size", "onSortChange", "onFilterChange"]))
         ], 2),
-        I("div", {
+        E("div", {
           class: g(o(c)("pagination-wrapper"))
         }, [
-          e.sticky ? (s(), p(o(Ze), {
+          e.sticky ? (i(), m(o(ro), {
             key: 0,
             direction: "horizontal",
             "scroll-container": ce.value,
-            "extra-size": -4.2
-          }, null, 8, ["scroll-container"])) : S("", !0),
-          e.pagination !== !1 ? (s(), p(o(De), h({
+            "extra-size": -4.2,
+            "bar-color": "var(--basic-scrollbar-thumb-color-base, #bfbfbf)",
+            "track-color": "var(--ap-table-header-bg, #f2f6f9)"
+          }, null, 8, ["scroll-container"])) : y("", !0),
+          e.pagination !== !1 ? (i(), m(o($e), h({
             key: 1,
             class: o(c)("pagination")
-          }, o(M).pagination, { onChange: o(ve) }), null, 16, ["class", "onChange"])) : S("", !0)
+          }, o(M).pagination, { onChange: o(Ce) }), null, 16, ["class", "onChange"])) : y("", !0)
         ], 2)
       ], 6)
     ], 6));
   }
 });
 export {
-  Bo as default
+  To as default
 };

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

@@ -119,7 +119,7 @@ export type ApGridRowSelection<RecordType> = Pick<TableRowSelection<RecordType>,
      */
     range?: boolean;
 };
-export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size' | 'rowSelection' | 'rowKey' | 'rowClassName' | 'footer' | 'loading'> & Pick<VxeTableProps<RecordType>, 'rowClassName' | 'stripe' | 'headerRowClassName' | 'footerRowClassName' | 'cellClassName' | 'headerCellClassName' | 'footerCellClassName' | 'rowStyle' | 'headerRowStyle' | 'footerRowStyle' | 'cellStyle' | 'headerCellStyle' | 'footerCellStyle' | 'height' | 'minHeight' | 'maxHeight' | 'mergeCells' | 'mergeFooterItems' | 'cellConfig' | 'loading' | 'loadingConfig' | 'headerCellConfig' | 'footerCellConfig'> & {
+export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<RecordType>, 'columns' | 'pagination' | 'dataSource' | 'size' | 'rowSelection' | 'rowKey' | 'rowClassName' | 'footer' | 'loading'> & Pick<VxeTableProps<RecordType>, 'rowClassName' | 'stripe' | 'headerRowClassName' | 'footerRowClassName' | 'cellClassName' | 'headerCellClassName' | 'footerCellClassName' | 'rowStyle' | 'headerRowStyle' | 'footerRowStyle' | 'cellStyle' | 'headerCellStyle' | 'footerCellStyle' | 'height' | 'minHeight' | 'maxHeight' | 'mergeCells' | 'mergeFooterItems' | 'cellConfig' | 'loading' | 'loadingConfig' | 'headerCellConfig' | 'footerCellConfig' | 'round'> & {
     /**
      * 列配置
      */
@@ -200,7 +200,7 @@ export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
     /**
      * 表格尺寸（只支持中等大小和小尺寸）
      */
-    size?: 'medium' | 'small' | 'mini';
+    size?: 'medium' | 'mini';
     /**
      * 表格是否自适应高度
      */

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

@@ -1,20 +1,23 @@
-import { omit as l, isUndefined as u, isFunction as h, isNumber as w } from "lodash-unified";
-const b = 20, y = 50;
-function R(e) {
+import { omit as u, isUndefined as l, isFunction as h, isNumber as m } from "lodash-unified";
+import { isDef as w } from "../../utils/index.mjs";
+const y = 20, C = 50, b = (e) => e.some((t) => !!t.html);
+function v(e) {
   var i;
   const t = {
-    ...l(e, [
+    ...u(e, [
       "columns",
       "request",
       "searchForm",
       "dataSource",
       "rowKey",
-      "value"
+      "value",
+      "round"
     ])
   };
-  if (e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig ? t.columnConfig.resizable = !0 : t.columnConfig = {
-    resizable: !0
-  }), e.rowSelection) {
+  if (t.rowConfig = {
+    isHover: !0,
+    keyField: e.rowKey
+  }, t.columnConfig = {}, b(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,
@@ -25,7 +28,7 @@ function R(e) {
         return o.shown ? o.shown(r) : !0;
       },
       checkRowKey: (i = o.defaultSelectedRowKeys) == null ? void 0 : i[0],
-      reserve: u(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
+      reserve: l(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
     } : t.checkboxConfig = {
       highlight: !0,
       checkMethod({ row: r }) {
@@ -35,11 +38,11 @@ function R(e) {
         return o.shown ? o.shown(r) : !0;
       },
       checkRowKeys: o.defaultSelectedRowKeys,
-      reserve: u(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys,
+      reserve: l(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys,
       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"
@@ -47,34 +50,31 @@ function R(e) {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t.rowConfig = {
-    isHover: !0,
-    keyField: e.rowKey
-  }, t.round = !0, t;
+  }) : (f(t, "X", e.virtual), f(t, "Y", e.virtual)), t.round = w(e.round) ? e.round : !e.card, t;
 }
-function a(e, t, i) {
-  const o = t === "X", r = o ? "x" : "y", n = o ? "virtualXConfig" : "virtualYConfig", d = i == null ? void 0 : i[r], f = d !== !1, s = o ? b : y, c = w(d) && d >= 0 ? d : s;
-  e[n] = {
-    enabled: f,
+function f(e, t, n) {
+  const i = t === "X", o = i ? "x" : "y", r = i ? "virtualXConfig" : "virtualYConfig", d = n == null ? void 0 : n[o], a = d !== !1, s = i ? y : C, c = m(d) && d >= 0 ? d : s;
+  e[r] = {
+    enabled: a,
     gt: c,
-    oSize: (i == null ? void 0 : i.oSize) || 0
+    oSize: (n == null ? void 0 : n.oSize) || 0
   };
 }
 function x(e) {
   return e === !0 ? "left" : e;
 }
-function m(e, t) {
-  const i = e === !0 || !e.type ? "checkbox" : e.type, o = e === !0 ? 60 : e.columnWidth || 60;
-  let r = e === !0 ? void 0 : x(e.fixed);
-  return r || (r === !1 ? r = void 0 : r = t.some(
-    (n) => n.fixed === "left" || n.fixed === !0
+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 : x(e.fixed);
+  return o || (o === !1 ? o = void 0 : o = t.some(
+    (r) => r.fixed === "left" || r.fixed === !0
   ) ? "left" : void 0), {
-    type: i,
-    width: o,
-    fixed: r
+    type: n,
+    width: i,
+    fixed: o
   };
 }
-function g(e) {
+function k(e) {
   const t = (e == null ? void 0 : e.width) || "auto";
   return {
     type: "expand",
@@ -83,7 +83,7 @@ function g(e) {
   };
 }
 export {
-  g as getRowExpandProps,
-  m as getRowSelectionProps,
-  R as toVxeProps
+  k as getRowExpandProps,
+  K as getRowSelectionProps,
+  v as toVxeProps
 };

package/es/src/ap-info-layout/ap-info-layout-admin/ApInfoLayoutAdmin.vue.d.ts

@@ -14,8 +14,8 @@ declare function __VLS_template(): {
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
 declare const __VLS_component: DefineComponent<ApInfoLayoutAdminProps, {}, {}, {}, {}, ComponentOptionsMixin, ComponentOptionsMixin, {}, string, PublicProps, Readonly<ApInfoLayoutAdminProps> & Readonly<{}>, {
-    bordered: boolean;
     headerStyle: CSSProperties;
+    bordered: boolean;
 }, {}, {}, {}, string, ComponentProvideOptions, false, {
     containerRef: HTMLDivElement;
     headerRef: HTMLDivElement;