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

package/es/src/ap-form/search-form/components/popover-sorter/index.vue2.mjs

@@ -1,13 +1,14 @@
-import { defineComponent as T, ref as h, unref as e, createBlock as w, openBlock as B, withCtx as t, createVNode as o, createElementVNode as n, normalizeClass as r, toDisplayString as l, createTextVNode as C } from "vue";
-import { Popover as N, Tooltip as D, Button as u, Flex as y, Divider as L } from "@aplus-frontend/antdv";
+import { defineComponent as T, ref as h, unref as e, createBlock as w, openBlock as B, withCtx as t, createVNode as o, createElementVNode as n, normalizeClass as r, toDisplayString as l, createTextVNode as y } from "vue";
+import { Popover as S, Tooltip as D, Button as v, Flex as C, Divider as L } from "@aplus-frontend/antdv";
 import { IconApLayoutOutlined as P } from "@aplus-frontend/icon";
 import "../../../../config-provider/index.mjs";
-import S from "vuedraggable";
+import V from "vuedraggable";
 import "./sortable-item.vue.mjs";
-import { useNamespace as _ } from "../../../../config-provider/hooks/use-namespace.mjs";
-import { useLocale as V } from "../../../../config-provider/hooks/use-locale.mjs";
-import j from "./sortable-item.vue2.mjs";
-const G = /* @__PURE__ */ T({
+import { getStringName as j } from "../../../item-group/helper.mjs";
+import { useNamespace as g } from "../../../../config-provider/hooks/use-namespace.mjs";
+import { useLocale as A } from "../../../../config-provider/hooks/use-locale.mjs";
+import I from "./sortable-item.vue2.mjs";
+const J = /* @__PURE__ */ T({
   name: "ApFormSearchFormPopoverSorter",
   __name: "index",
   props: {
@@ -15,22 +16,25 @@ const G = /* @__PURE__ */ T({
     onClickConfirm: { type: Function }
   },
   setup(k) {
-    const d = k, c = h(d.children);
-    let g = [...d.children];
-    const { e: p } = _("ap-form-search-form"), { b: a } = _("search-form-sorter"), { t: s } = V(), i = h(!1);
-    function F(v) {
-      return v.closest(".ant-form") || document.body;
+    const d = k, p = h(d.children);
+    let _ = [...d.children];
+    const { e: c } = g("ap-form-search-form"), { b: a } = g("search-form-sorter"), { t: s } = A(), i = h(!1);
+    function F(m) {
+      return m.closest(".ant-form") || document.body;
     }
     function b() {
-      i.value = !1, console.log(e(c)), d.onClickConfirm(e(c));
+      i.value = !1, console.log(e(p)), d.onClickConfirm(e(p));
     }
     function x() {
-      c.value = [...g];
+      p.value = [..._];
     }
-    return (v, m) => (B(), w(e(N), {
+    function N(m) {
+      return j(m.props.name);
+    }
+    return (m, f) => (B(), w(e(S), {
       open: i.value,
-      "onUpdate:open": m[1] || (m[1] = (f) => i.value = f),
-      "overlay-class-name": e(p)("popover"),
+      "onUpdate:open": f[1] || (f[1] = (u) => i.value = u),
+      "overlay-class-name": e(c)("popover"),
       trigger: "click",
       placement: "bottom",
       mask: "",
@@ -44,7 +48,7 @@ const G = /* @__PURE__ */ T({
           n("span", {
             class: r(e(a)("header-title"))
           }, l(e(s)("ap.apForm.search.sorterTitle")), 3),
-          o(e(y), { justify: "space-between" }, {
+          o(e(C), { justify: "space-between" }, {
             default: t(() => [
               n("span", {
                 class: r(e(a)("header-desc"))
@@ -62,39 +66,40 @@ const G = /* @__PURE__ */ T({
           })
         ], 2),
         n("div", {
-          class: r([e(p)("popover-content"), e(a)("content")])
+          class: r([e(c)("popover-content"), e(a)("content")])
         }, [
-          o(e(S), {
-            list: c.value,
-            class: r(e(a)("sorter-wrapper"))
+          o(e(V), {
+            list: p.value,
+            class: r(e(a)("sorter-wrapper")),
+            "item-key": N
           }, {
-            item: t(({ element: f }) => [
-              o(j, { item: f }, null, 8, ["item"])
+            item: t(({ element: u }) => [
+              o(I, { item: u }, null, 8, ["item"])
             ]),
             _: 1
           }, 8, ["list", "class"])
         ], 2),
         o(e(L), { style: { margin: "0" } }),
         n("div", {
-          class: r(e(p)("popover-footer"))
+          class: r(e(c)("popover-footer"))
         }, [
-          o(e(y), { justify: "end" }, {
+          o(e(C), { justify: "end" }, {
             default: t(() => [
-              o(e(u), {
-                onClick: m[0] || (m[0] = (f) => i.value = !1)
+              o(e(v), {
+                onClick: f[0] || (f[0] = (u) => i.value = !1)
               }, {
                 default: t(() => [
-                  C(l(e(s)("ap.common.cancelText")), 1)
+                  y(l(e(s)("ap.common.cancelText")), 1)
                 ]),
                 _: 1
               }),
-              o(e(u), {
-                class: r(e(p)("popover-footer-confirm-btn")),
+              o(e(v), {
+                class: r(e(c)("popover-footer-confirm-btn")),
                 type: "primary",
                 onClick: b
               }, {
                 default: t(() => [
-                  C(l(e(s)("ap.apForm.search.sorterConfirmBtn")), 1)
+                  y(l(e(s)("ap.apForm.search.sorterConfirmBtn")), 1)
                 ]),
                 _: 1
               }, 8, ["class"])
@@ -109,7 +114,7 @@ const G = /* @__PURE__ */ T({
           placement: "top"
         }, {
           default: t(() => [
-            o(e(u), null, {
+            o(e(v), null, {
               icon: t(() => [
                 o(e(P))
               ]),
@@ -124,5 +129,5 @@ const G = /* @__PURE__ */ T({
   }
 });
 export {
-  G as default
+  J as default
 };

package/es/src/ap-grid/editable/form-item.vue.mjs

@@ -1,4 +1,4 @@
-import { defineComponent as P, useSlots as A, toRef as H, ref as h, unref as u, watch as K, nextTick as W, createBlock as G, openBlock as U, mergeProps as g, withCtx as y, createVNode as $, createSlots as q, renderList as J, renderSlot as Q, normalizeProps as X, guardReactiveProps as Y } from "vue";
+import { defineComponent as P, useSlots as A, toRef as H, ref as h, unref as u, watch as K, nextTick as W, createBlock as G, openBlock as U, mergeProps as y, withCtx as g, createVNode as $, createSlots as q, renderList as J, renderSlot as Q, normalizeProps as X, guardReactiveProps as Y } from "vue";
 import { ApForm as C } from "../../ap-form/index.mjs";
 import { isArray as Z, isUndefined as I, isNumber as m, cloneDeep as M, omit as ee } from "lodash-unified";
 import "../../config-provider/index.mjs";
@@ -9,7 +9,7 @@ import { useInjectForm as te } from "../../ap-form/context.mjs";
 import { useNamespace as ae } from "../../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as le } from "../../config-provider/hooks/use-global-config.mjs";
 import ne from "../index.vue.mjs";
-const ye = /* @__PURE__ */ P({
+const ge = /* @__PURE__ */ P({
   name: "EditableGrid",
   __name: "form-item",
   props: {
@@ -108,6 +108,9 @@ const ye = /* @__PURE__ */ P({
     loadingConfig: {},
     headerCellConfig: {},
     footerCellConfig: {},
+    round: {
+      type: Boolean
+    },
     rowSelection: {
       type: Boolean,
       default: void 0
@@ -182,32 +185,32 @@ const ye = /* @__PURE__ */ P({
       const a = {
         ...e || {}
       };
-      t == null || t.setFieldValue(l.name, a, !0, (r, f) => {
-        if (!r[f]) {
-          r[f] = [a];
+      t == null || t.setFieldValue(l.name, a, !0, (f, r) => {
+        if (!f[r]) {
+          f[r] = [a];
           return;
         }
-        I(o) ? r[f].push(a) : r[f].splice(o, 0, a);
+        I(o) ? f[r].push(a) : f[r].splice(o, 0, a);
       });
     }
     function L(e, o = "suffix") {
-      var r;
-      const n = ((r = u(d)) == null ? void 0 : r.length) || 0, a = m(e) ? e : e.length;
+      var f;
+      const n = ((f = u(d)) == null ? void 0 : f.length) || 0, a = m(e) ? e : e.length;
       if (w(l.maxLength) && n + a > l.maxLength)
         return;
       const s = m(e) ? new Array(e).fill(0).map(() => ({})) : M(e);
-      t == null || t.setFieldValue(l.name, s, !0, (f, i) => {
-        if (!f[i]) {
-          f[i] = [...s];
+      t == null || t.setFieldValue(l.name, s, !0, (r, i) => {
+        if (!r[i]) {
+          r[i] = [...s];
           return;
         }
-        o === "suffix" ? f[i].push(...s) : f[i].unshift(...s);
+        o === "suffix" ? r[i].push(...s) : r[i].unshift(...s);
       });
     }
     function V(e) {
       const o = new Set(m(e) ? [e] : e);
       t == null || t.setFieldValue(l.name, void 0, !0, (n, a) => {
-        n[a] = n[a].filter((s, r) => !o.has(r));
+        n[a] = n[a].filter((s, f) => !o.has(f));
       });
     }
     function T() {
@@ -221,9 +224,9 @@ const ye = /* @__PURE__ */ P({
       t == null || t.setFieldValue(l.name, void 0, !0, (a, s) => {
         if (!(!a[s] || !a[s][e])) {
           if (!n) {
-            const r = Object.keys(a[s][e]);
-            for (const f of r)
-              f !== l.rowKey && delete a[s][e][f];
+            const f = Object.keys(a[s][e]);
+            for (const r of f)
+              r !== l.rowKey && delete a[s][e][r];
           }
           Object.assign(a[s][e], {
             ...o
@@ -253,11 +256,11 @@ const ye = /* @__PURE__ */ P({
       scrollTo: O,
       setTableData: E,
       clear: z
-    }), (e, o) => (U(), G(u(C).FormItem, g(e.formItem, {
+    }), (e, o) => (U(), G(u(C).FormItem, y(e.formItem, {
       name: e.name,
       label: e.label
     }), {
-      default: y(() => [$(ne, g(u(ee)(l, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
+      default: g(() => [$(ne, y(u(ee)(l, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
         ref_key: "tableRef",
         ref: c,
         class: u(B)(),
@@ -268,12 +271,12 @@ const ye = /* @__PURE__ */ P({
         _: 2
       }, [J(R, (n, a) => ({
         name: a,
-        fn: y((s) => [Q(e.$slots, a, X(Y(s || {})))])
+        fn: g((s) => [Q(e.$slots, a, X(Y(s || {})))])
       }))]), 1040, ["class", "columns", "data-source"])]),
       _: 3
     }, 16, ["name", "label"]));
   }
 });
 export {
-  ye as default
+  ge as default
 };

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

@@ -109,6 +109,9 @@ const be = /* @__PURE__ */ U({
     loadingConfig: {},
     headerCellConfig: {},
     footerCellConfig: {},
+    round: {
+      type: Boolean
+    },
     rowSelection: {
       type: Boolean,
       default: void 0

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

@@ -1,4 +1,4 @@
-import { defineComponent as Fe, useSlots as Be, getCurrentInstance as Ie, ref as F, computed as n, unref as o, watch as B, createElementBlock as I, openBlock as s, normalizeStyle as V, normalizeClass as g, createCommentVNode as b, createElementVNode as E, createVNode as X, mergeProps as h, createSlots as J, withCtx as v, Fragment as Q, renderList as L, createBlock as p, resolveDynamicComponent as D, renderSlot as O, normalizeProps as Ee, guardReactiveProps as Pe } from "vue";
+import { defineComponent as Be, useSlots as Fe, getCurrentInstance as Ie, ref as B, computed as n, unref as o, watch as F, createElementBlock as I, openBlock as s, normalizeStyle as V, normalizeClass as g, createCommentVNode as S, createElementVNode as E, createVNode as X, mergeProps as h, createSlots as J, withCtx as v, Fragment as Q, renderList as L, createBlock as p, resolveDynamicComponent as D, renderSlot as O, normalizeProps as Ee, guardReactiveProps as Pe } from "vue";
 import { VxeTable as Ne, VxeColumn as Y } from "vxe-table";
 import "vxe-table/es/style.css";
 import "vxe-pc-ui/es/style.css";
@@ -24,7 +24,7 @@ import { useNamespace as Ze } from "../config-provider/hooks/use-namespace.mjs";
 import { useGlobalConfig as eo } from "../config-provider/hooks/use-global-config.mjs";
 import { useLocale as oo } from "../config-provider/hooks/use-locale.mjs";
 import ao from "../scroll-bar/index.vue.mjs";
-const No = /* @__PURE__ */ Fe({
+const No = /* @__PURE__ */ Be({
   name: "ApGrid",
   __name: "index",
   props: {
@@ -87,6 +87,7 @@ const No = /* @__PURE__ */ Fe({
     loadingConfig: {},
     headerCellConfig: {},
     footerCellConfig: {},
+    round: { type: Boolean, default: void 0 },
     columns: {},
     rowSelection: { type: Boolean },
     card: { type: Boolean, default: !1 },
@@ -114,15 +115,15 @@ const No = /* @__PURE__ */ Fe({
   },
   setup(re, { expose: te }) {
     var G;
-    const C = Be(), a = re, x = (G = Ie()) == null ? void 0 : G.appContext.app;
+    const C = Fe(), a = re, x = (G = Ie()) == null ? void 0 : G.appContext.app;
     x && !x.__VXE_PC_UI_INSTALLED__ && (x.use(Z), x.__VXE_PC_UI_INSTALLED__ = !0);
-    const { e: P, b: c, be: le } = Ze("ap-grid"), ne = eo("valueTypeMap"), i = F([]), $ = F([]), m = F(), y = F(a.size), [, d] = Je(), { t: se } = oo();
+    const { e: P, b: u, be: le } = Ze("ap-grid"), ne = eo("valueTypeMap"), i = B([]), $ = B([]), m = B(), y = B(a.size), [, d] = Je(), { t: se } = oo();
     Z.setConfig({
       i18n: (e, r) => se(`ap.${e}`, r)
     });
     const { renderConfig: ie, updateSignal: de } = Xe(i);
     let K = 0;
-    const ce = n(() => {
+    const ue = n(() => {
       if (m.value)
         return m.value.$el.querySelector(
           ".vxe-table--header-inner-wrapper"
@@ -131,39 +132,39 @@ const No = /* @__PURE__ */ Fe({
       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) && !_e.includes(t.valueType)
-      )) == null ? void 0 : r.sort((t, u) => {
-        let S = ee(t.order);
-        return ee(u.order) - S;
+      )) == null ? void 0 : r.sort((t, c) => {
+        let b = ee(t.order);
+        return ee(c.order) - b;
       })) == null ? void 0 : l.map((t) => {
-        const u = Ae(
+        const c = Ae(
           t,
           Ve(t.fieldProps, {})
-        ), S = {
+        ), b = {
           ...t,
           fieldProps: {
             label: t.title,
             name: t.dataIndex,
-            ...u || {},
+            ...c || {},
             _signal: K
           },
           renderNode: void 0
         };
-        return S.renderNode = Le(
-          S,
+        return b.renderNode = Le(
+          b,
           o(ne)
-        ), S;
+        ), b;
       })) || [];
-    }), ue = n(() => {
+    }), ce = n(() => {
       var r;
       return Qe(a.manual) ? a.manual : Ye(((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
+      u(),
+      a.card ? null : u("wrapper"),
+      a.adaptive ? u("adaptive") : null,
+      a.sticky ? u("sticky") : null
     ].filter(Boolean)), j = n(() => oe(o(i), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
@@ -200,7 +201,7 @@ const No = /* @__PURE__ */ Fe({
       sortFields: j,
       defaultParams: a.params,
       defaultData: a.defaultData,
-      manual: o(ue),
+      manual: o(ce),
       formatParams: a.beforeSearchSubmit,
       pagination: a.pagination
     }), { sortChangeEvent: he, filterChangeEvent: ve, paginationChangeEvent: Ce } = $e(ge);
@@ -229,13 +230,13 @@ const No = /* @__PURE__ */ Fe({
       () => i.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
-    ), Se = n(
-      () => w(a.loading) ? f.loading : a.loading
     ), be = n(
+      () => w(a.loading) ? f.loading : a.loading
+    ), Se = n(
       () => w(a.dataSource) ? f.records : a.dataSource
     ), { selectedRows: R, rowSelection: k, ...we } = He({
       ...a.rowSelection === !0 ? {} : a.rowSelection,
-      dataSource: be,
+      dataSource: Se,
       rowKey: a.rowKey
     }), _ = () => {
       const e = m.value;
@@ -256,9 +257,9 @@ const No = /* @__PURE__ */ Fe({
       (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, c;
       const r = e ? "getFieldsValueTransformed" : "getFieldsValue";
-      return (u = (t = (l = N.value) == null ? void 0 : l.apForm) == null ? void 0 : t[r]) == null ? void 0 : u.call(t, !0);
+      return (c = (t = (l = N.value) == null ? void 0 : l.apForm) == null ? void 0 : t[r]) == null ? void 0 : c.call(t, !0);
     }
     function A() {
       we.clearAll();
@@ -271,7 +272,7 @@ const No = /* @__PURE__ */ Fe({
       if (l)
         return (t = m.value) == null ? void 0 : t.scrollToRow(l, r);
     }
-    return B(
+    return F(
       () => [a.columnResizable, a.columns],
       () => {
         var r;
@@ -282,19 +283,19 @@ const No = /* @__PURE__ */ Fe({
         deep: !0,
         immediate: !0
       }
-    ), B(
+    ), F(
       () => a.dataSource,
       (e) => {
         fe(e);
       },
       { immediate: !0, deep: !0 }
-    ), B(
+    ), F(
       () => o(f).loading,
       (e) => {
         var r;
         (r = a.onLoadingChange) == null || r.call(a, e);
       }
-    ), B(
+    ), F(
       () => a.size,
       (e) => {
         y.value = e;
@@ -349,13 +350,13 @@ const No = /* @__PURE__ */ Fe({
             key: "0"
           } : void 0
         ]), 1040, ["submit-loading", "onSubmit", "onReset"])
-      ], 6)) : b("", !0),
+      ], 6)) : S("", !0),
       E("div", {
         class: g([o(P)("table-wrapper"), e.card ? o(P)("table-wrapper-card") : null]),
         style: V(e.tableWrapperStyle)
       }, [
         E("div", {
-          class: g(o(c)("header-wrapper"))
+          class: g(o(u)("header-wrapper"))
         }, [
           O(e.$slots, "title", {
             selectedRows: o(R),
@@ -365,7 +366,7 @@ const No = /* @__PURE__ */ Fe({
           })
         ], 2),
         E("div", {
-          class: g(o(c)("vxe-wrapper"))
+          class: g(o(u)("vxe-wrapper"))
         }, [
           (s(), p(o(Ne), h(o(Ke)(a), {
             ref_key: "tableRef",
@@ -374,7 +375,7 @@ const No = /* @__PURE__ */ Fe({
             data: o(f).records,
             "sort-config": { remote: j.value.length > 0 },
             "filter-config": { remote: H.value.length > 0 },
-            loading: Se.value,
+            loading: be.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,
@@ -387,7 +388,8 @@ const No = /* @__PURE__ */ Fe({
               "--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-cell-padding-mini": "8px",
+              "--vxe-ui-table-row-line-height": "18px"
             },
             size: y.value,
             onSortChange: o(he),
@@ -408,8 +410,8 @@ const No = /* @__PURE__ */ Fe({
                   (s(), p(D(a.expandable.renderContent(l))))
                 ]),
                 _: 1
-              }, 16, ["fixed"])) : b("", !0),
-              a.rowSelection ? (s(), p(o(Y), h({ key: 1 }, o(je)(o(k), i.value), { field: o(Ge) }), null, 16, ["field"])) : b("", !0),
+              }, 16, ["fixed"])) : S("", !0),
+              a.rowSelection ? (s(), p(o(Y), h({ key: 1 }, o(je)(o(k), i.value), { field: o(Ge) }), null, 16, ["field"])) : S("", !0),
               (s(!0), I(Q, null, L(o(ie), (l) => (s(), p(D(l), {
                 key: l.props.colId
               }))), 128))
@@ -418,25 +420,25 @@ const No = /* @__PURE__ */ Fe({
           }, [
             L(o(Te)(C, ["searchFormExtra"]), (l, t) => ({
               name: t,
-              fn: v((u) => [
-                O(e.$slots, t, Ee(Pe(u || {})))
+              fn: v((c) => [
+                O(e.$slots, t, Ee(Pe(c || {})))
               ])
             }))
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "style", "size", "onSortChange", "onFilterChange"]))
         ], 2),
         E("div", {
-          class: g(o(c)("pagination-wrapper"))
+          class: g(o(u)("pagination-wrapper"))
         }, [
           e.sticky ? (s(), p(o(ao), {
             key: 0,
             direction: "horizontal",
-            "scroll-container": ce.value,
+            "scroll-container": ue.value,
             "extra-size": -4.2
-          }, null, 8, ["scroll-container"])) : b("", !0),
+          }, null, 8, ["scroll-container"])) : S("", !0),
           e.pagination !== !1 ? (s(), p(o(Oe), h({
             key: 1,
-            class: o(c)("pagination")
-          }, o(M).pagination, { onChange: o(Ce) }), null, 16, ["class", "onChange"])) : b("", !0)
+            class: o(u)("pagination")
+          }, o(M).pagination, { onChange: o(Ce) }), null, 16, ["class", "onChange"])) : S("", !0)
         ], 2)
       ], 6)
     ], 6));

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'> & {
     /**
      * 列配置
      */

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-table/components/setting/tree-select/index.vue2.mjs

@@ -30,7 +30,7 @@ const q = /* @__PURE__ */ x({
     }
     return (r, e) => (c(), i("div", null, [
       s(o(N), {
-        gutter: [24, 16],
+        gutter: [24, 12],
         align: "middle"
       }, {
         default: d(() => [