@aplus-frontend/ui 0.5.27 → 0.5.29

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

@@ -1,9 +1,9 @@
-import { defineComponent as Fe, useSlots as Be, getCurrentInstance as Ie, ref as k, computed as n, unref as o, watch as T, createElementBlock as F, openBlock as s, normalizeStyle as z, normalizeClass as f, createCommentVNode as C, createElementVNode as B, createVNode as U, mergeProps as g, createSlots as G, withCtx as v, Fragment as X, renderList as A, createBlock as c, resolveDynamicComponent as _, renderSlot as V, normalizeProps as J, guardReactiveProps as Pe } from "vue";
+import { defineComponent as Fe, useSlots as Be, getCurrentInstance as Ie, ref as k, computed as n, unref as o, watch as F, createElementBlock as B, openBlock as s, normalizeStyle as z, normalizeClass as f, createCommentVNode as b, createElementVNode as I, createVNode as U, mergeProps as g, createSlots as G, withCtx as v, Fragment as X, renderList as A, createBlock as p, resolveDynamicComponent as _, renderSlot as V, normalizeProps as J, guardReactiveProps as Pe } from "vue";
 import { VxeTable as Ee, VxeColumn as Q } from "vxe-table";
 import "vxe-table/es/style.css";
 import "vxe-pc-ui/es/style.css";
 import { VxeUI as Y } from "vxe-pc-ui";
-import { isUndefined as b, omit as Ne } from "lodash-unified";
+import { isUndefined as w, omit as Ne } from "lodash-unified";
 import { ApForm as Te } from "../ap-form/index.mjs";
 import "../config-provider/index.mjs";
 import { noRenderAsFormItemValueList as ze } from "../ap-table/constants.mjs";
@@ -83,6 +83,8 @@ const ko = /* @__PURE__ */ Fe({
     cellConfig: {},
     loading: { type: Boolean, default: void 0 },
     loadingConfig: {},
+    headerCellConfig: {},
+    footerCellConfig: {},
     columns: {},
     rowSelection: { type: Boolean },
     card: { type: Boolean, default: !1 },
@@ -109,17 +111,17 @@ const ko = /* @__PURE__ */ Fe({
   },
   setup(ae, { expose: re }) {
     var q;
-    const L = Be(), a = ae, w = (q = Ie()) == null ? void 0 : q.appContext.app;
-    w && !w.__VXE_PC_UI_INSTALLED__ && (w.use(Y), w.__VXE_PC_UI_INSTALLED__ = !0);
-    const { e: I, b: d, be: te } = Xe("ap-grid"), le = Je("valueTypeMap"), i = k([]), D = k([]), p = k(), S = k(a.size), [, m] = Ge(), { t: ne } = Qe();
+    const L = Be(), a = ae, S = (q = Ie()) == null ? void 0 : q.appContext.app;
+    S && !S.__VXE_PC_UI_INSTALLED__ && (S.use(Y), S.__VXE_PC_UI_INSTALLED__ = !0);
+    const { e: P, b: d, be: te } = Xe("ap-grid"), le = Je("valueTypeMap"), i = k([]), D = k([]), m = k(), h = k(a.size), [, c] = Ge(), { t: ne } = Qe();
     Y.setConfig({
       i18n: (e, l) => ne(`ap.${e}`, l)
     });
     const { renderConfig: se, updateSignal: ie } = Ue(i);
     let O = 0;
     const de = n(() => {
-      if (p.value)
-        return p.value.$el.querySelector(
+      if (m.value)
+        return m.value.$el.querySelector(
           ".vxe-table--header-inner-wrapper"
         );
     }), K = n(() => {
@@ -148,7 +150,7 @@ const ko = /* @__PURE__ */ Fe({
           o(le)
         ), y;
       })) || [];
-    }), ue = n(() => [
+    }), ce = n(() => [
       d(),
       a.card ? null : d("wrapper"),
       a.adaptive ? d("adaptive") : null,
@@ -160,18 +162,18 @@ const ko = /* @__PURE__ */ Fe({
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
-      formRef: P,
+      formRef: E,
       submit: j,
       reset: W,
-      refresh: ce,
-      data: h,
+      refresh: ue,
+      data: C,
       tableProps: M,
       setDataSource: pe,
       handleTableChange: me
     } = Le({
       async request(e) {
         var t;
-        if (!R.value.preserveSelectedRowKeys && b(a.dataSource) && N(), !b(a.dataSource)) {
+        if (!R.value.preserveSelectedRowKeys && w(a.dataSource) && T(), !w(a.dataSource)) {
           const r = e.pageSize * (e.current - 1);
           return {
             data: (a.pagination === !1 ? a.dataSource : a.dataSource.slice(r, r + e.pageSize)) || [],
@@ -196,38 +198,38 @@ const ko = /* @__PURE__ */ Fe({
     We({
       columns: n(() => i.value),
       columnsBackup: n(() => D.value),
-      size: n(() => S.value ? qe[S.value] : "middle"),
+      size: n(() => h.value ? qe[h.value] : "middle"),
       updateColumns(e) {
         i.value = e;
       },
       updateSize(e) {
-        S.value = Me[e];
+        h.value = Me[e];
       },
       renderConfig: n(() => ({
         className: te("table-header", "title"),
-        color: m.value.colorPrimary
+        color: c.value.colorPrimary
       }))
     });
     const he = n(
       () => i.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
-    ), ye = n(
-      () => b(a.loading) ? h.loading : a.loading
     ), Ce = n(
-      () => b(a.dataSource) ? h.records : a.dataSource
+      () => w(a.loading) ? C.loading : a.loading
+    ), ye = n(
+      () => w(a.dataSource) ? C.records : a.dataSource
     ), { selectedRows: x, rowSelection: R, ...be } = je({
       ...a.rowSelection === !0 ? {} : a.rowSelection,
-      dataSource: Ce,
+      dataSource: ye,
       rowKey: a.rowKey
-    }), E = () => {
-      const e = p.value;
+    }), N = () => {
+      const e = m.value;
       e && (x.value = [
         ...e.getCheckboxReserveRecords(),
         ...e.getCheckboxRecords()
       ]);
     }, we = () => {
-      const e = p.value;
+      const e = m.value;
       e && (x.value = [e.getRadioRecord()]);
     };
     function Se() {
@@ -236,25 +238,25 @@ const ko = /* @__PURE__ */ Fe({
     }
     function xe(e) {
       var l, t, r;
-      (r = (t = (l = P.value) == null ? void 0 : l.apForm) == null ? void 0 : t.setFieldsValue) == null || r.call(t, e);
+      (r = (t = (l = E.value) == null ? void 0 : l.apForm) == null ? void 0 : t.setFieldsValue) == null || r.call(t, e);
     }
     function Re(e = !1) {
       var t, r, u;
       const l = e ? "getFieldsValueTransformed" : "getFieldsValue";
-      return (u = (r = (t = P.value) == null ? void 0 : t.apForm) == null ? void 0 : r[l]) == null ? void 0 : u.call(r, !0);
+      return (u = (r = (t = E.value) == null ? void 0 : t.apForm) == null ? void 0 : r[l]) == null ? void 0 : u.call(r, !0);
     }
-    function N() {
+    function T() {
       be.clearAll();
-      const e = p.value;
+      const e = m.value;
       e && (R.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
     }
     async function ke(e, l) {
       var r;
-      const t = h.records[e];
+      const t = C.records[e];
       if (t)
-        return (r = p.value) == null ? void 0 : r.scrollToRow(t, l);
+        return (r = m.value) == null ? void 0 : r.scrollToRow(t, l);
     }
-    return T(
+    return F(
       () => [a.columnResizable, a.columns],
       () => {
         const e = Se();
@@ -264,49 +266,54 @@ const ko = /* @__PURE__ */ Fe({
         deep: !0,
         immediate: !0
       }
-    ), T(
+    ), F(
       () => a.dataSource,
       (e) => {
         pe(e);
       },
       { immediate: !0, deep: !0 }
-    ), T(
-      () => o(h).loading,
+    ), F(
+      () => o(C).loading,
       (e) => {
         var l;
         (l = a.onLoadingChange) == null || l.call(a, e);
       }
+    ), F(
+      () => a.size,
+      (e) => {
+        h.value = e;
+      }
     ), re({
       submit: j,
       reset: W,
-      refresh: ce,
+      refresh: ue,
       setSearchFormValues: xe,
       getSearchFormValues: Re,
       getShowColumns: () => o(i),
       rowSelection: {
         selectedRows: n(() => x.value),
-        clearAll: N
+        clearAll: T
       },
       scrollToRow: ke
-    }), (e, l) => (s(), F("div", {
-      class: f(ue.value),
+    }), (e, l) => (s(), B("div", {
+      class: f(ce.value),
       style: z(e.wrapperStyle)
     }, [
-      o(b)(e.dataSource) && e.searchForm !== !1 && K.value.length > 0 ? (s(), F("div", {
+      o(w)(e.dataSource) && e.searchForm !== !1 && K.value.length > 0 ? (s(), B("div", {
         key: 0,
-        class: f(e.card ? o(I)("search-wrapper") : null),
+        class: f(e.card ? o(P)("search-wrapper") : null),
         style: z(e.searchFormWrapperStyle)
       }, [
         U(o(Te).SearchForm, g(e.searchForm || {}, {
           ref_key: "formRef",
-          ref: P,
+          ref: E,
           "custom-reset": "",
           "submit-loading": o(M).loading,
           onSubmit: o(j),
           onReset: o(W)
         }), G({
           default: v(() => [
-            (s(!0), F(X, null, A(K.value, (t) => (s(), c(_(t.renderNode.Comp), g({
+            (s(!0), B(X, null, A(K.value, (t) => (s(), p(_(t.renderNode.Comp), g({
               key: t.dataIndex,
               item: t,
               ref_for: !0
@@ -325,52 +332,54 @@ const ko = /* @__PURE__ */ Fe({
             key: "0"
           } : void 0
         ]), 1040, ["submit-loading", "onSubmit", "onReset"])
-      ], 6)) : C("", !0),
-      B("div", {
-        class: f([o(I)("table-wrapper"), e.card ? o(I)("table-wrapper-card") : null]),
+      ], 6)) : b("", !0),
+      I("div", {
+        class: f([o(P)("table-wrapper"), e.card ? o(P)("table-wrapper-card") : null]),
         style: z(e.tableWrapperStyle)
       }, [
-        B("div", {
+        I("div", {
           class: f(o(d)("header-wrapper"))
         }, [
           V(e.$slots, "title", {
             selectedRows: o(x),
             selectedRowKeys: o(R).selectedRowKeys,
             shownColumns: i.value,
-            clearAll: N
+            clearAll: T
           })
         ], 2),
-        B("div", {
+        I("div", {
           class: f(o(d)("vxe-wrapper"))
         }, [
-          (s(), c(o(Ee), g(o(Ke)(a), {
+          (s(), p(o(Ee), g(o(Ke)(a), {
             ref_key: "tableRef",
-            ref: p,
+            ref: m,
             key: o(ie),
-            data: o(h).records,
+            data: o(C).records,
             "sort-config": { remote: $.value.length > 0 },
             "filter-config": { remote: H.value.length > 0 },
-            loading: ye.value,
+            loading: Ce.value,
             "row-config": {
               isHover: !0,
               keyField: a.rowKey
             },
             style: {
-              "--vxe-ui-table-row-checkbox-checked-background-color": o(m).controlItemBgActive,
-              "--vxe-ui-table-row-hover-checkbox-checked-background-color": o(m).controlItemBgActiveHover,
-              "--vxe-ui-font-primary-color": o(m).colorPrimary,
+              "--vxe-ui-table-row-checkbox-checked-background-color": o(c).controlItemBgActive,
+              "--vxe-ui-table-row-hover-checkbox-checked-background-color": o(c).controlItemBgActiveHover,
+              "--vxe-ui-font-primary-color": o(c).colorPrimary,
               "--vxe-ui-table-header-background-color": "var(--ap-table-header-bg)",
               "--vxe-ui-table-cell-padding-default": "12px",
               "--vxe-ui-table-cell-padding-medium": "9px",
-              "--vxe-ui-table-row-radio-checked-background-color": o(m).controlItemBgActive,
-              "--vxe-ui-table-row-hover-radio-checked-background-color": o(m).controlItemBgActiveHover
+              "--vxe-ui-table-row-radio-checked-background-color": o(c).controlItemBgActive,
+              "--vxe-ui-table-row-hover-radio-checked-background-color": o(c).controlItemBgActiveHover,
+              "--vxe-ui-font-color": o(c).colorTextBase,
+              "--vxe-ui-table-border-color": o(c).colorBorderSecondary
             },
-            size: S.value,
+            size: h.value,
             onSortChange: o(fe),
             onFilterChange: o(ge),
-            onCheckboxChange: E,
-            onCheckboxRangeChange: E,
-            onCheckboxAll: E,
+            onCheckboxChange: N,
+            onCheckboxRangeChange: N,
+            onCheckboxAll: N,
             onRadioChange: we
           }), G({
             empty: v(() => [
@@ -379,14 +388,14 @@ const ko = /* @__PURE__ */ Fe({
               }, null, 8, ["image"])
             ]),
             default: v(() => [
-              a.expandable ? (s(), c(o(Q), g({ key: 0 }, o($e)(e.expandable), { fixed: he.value }), {
+              a.expandable ? (s(), p(o(Q), g({ key: 0 }, o($e)(e.expandable), { fixed: he.value }), {
                 content: v((t) => [
-                  (s(), c(_(a.expandable.renderContent(t))))
+                  (s(), p(_(a.expandable.renderContent(t))))
                 ]),
                 _: 1
-              }, 16, ["fixed"])) : C("", !0),
-              a.rowSelection ? (s(), c(o(Q), J(g({ key: 1 }, o(He)(o(R), i.value))), null, 16)) : C("", !0),
-              (s(!0), F(X, null, A(o(se), (t) => (s(), c(_(t), {
+              }, 16, ["fixed"])) : b("", !0),
+              a.rowSelection ? (s(), p(o(Q), J(g({ key: 1 }, o(He)(o(R), i.value))), null, 16)) : b("", !0),
+              (s(!0), B(X, null, A(o(se), (t) => (s(), p(_(t), {
                 key: t.props.colId
               }))), 128))
             ]),
@@ -400,18 +409,18 @@ const ko = /* @__PURE__ */ Fe({
             }))
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "row-config", "style", "size", "onSortChange", "onFilterChange"]))
         ], 2),
-        B("div", {
+        I("div", {
           class: f(o(d)("pagination-wrapper"))
         }, [
-          e.sticky ? (s(), c(o(Ye), {
+          e.sticky ? (s(), p(o(Ye), {
             key: 0,
             direction: "horizontal",
             "scroll-container": de.value
-          }, null, 8, ["scroll-container"])) : C("", !0),
-          e.pagination !== !1 ? (s(), c(o(De), g({
+          }, null, 8, ["scroll-container"])) : b("", !0),
+          e.pagination !== !1 ? (s(), p(o(De), g({
             key: 1,
             class: o(d)("pagination")
-          }, o(M).pagination, { onChange: o(ve) }), null, 16, ["class", "onChange"])) : C("", !0)
+          }, o(M).pagination, { onChange: o(ve) }), null, 16, ["class", "onChange"])) : b("", !0)
         ], 2)
       ], 6)
     ], 6));

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

@@ -60,6 +60,10 @@ export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueTyp
      * 指定值类型（将会用于默认渲染和查询表单生成）
      */
     valueType?: MergedValueType;
+    /**
+     * 指定渲染内容是否为html
+     */
+    html?: boolean;
     /**
      * 值类型额外配置的参数（用于查询表单渲染）
      */
@@ -115,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'> & {
+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'> & {
     /**
      * 列配置
      */

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

@@ -1,19 +1,19 @@
 import { createVNode as v, Fragment as S } from "vue";
-import { isUndefined as $, isArray as M, isString as x, isBoolean as c, isNumber as V, pick as A } from "lodash-unified";
-import { valueEnumToArray as j, objectToString as B, getTableTitle as R, getTableRenderType as N, getTableRenderProps as W, getTableCellRenderNode as _ } from "../../ap-table/utils.mjs";
+import { isUndefined as $, isArray as M, isString as x, isBoolean as A, isNumber as V, pick as R } from "lodash-unified";
+import { valueEnumToArray as j, objectToString as B, getTableTitle as c, getTableRenderType as N, getTableRenderProps as W, getTableCellRenderNode as _ } from "../../ap-table/utils.mjs";
 import { noRenderAsFormItemValueList as k } from "../../ap-table/constants.mjs";
 import "../../ap-table/components/paragraph-ellipsis/index.vue.mjs";
 import z from "../../ap-table/components/paragraph-ellipsis/index.vue2.mjs";
 function b(e) {
   if (!$(e))
-    return M(e) ? e.reduce((r, t) => x(t) ? `${r}.${t}` : `${r}[${t}]`, "") : String(e);
+    return M(e) ? e.reduce((r, i) => x(i) ? `${r}.${i}` : `${r}[${i}]`, "") : String(e);
 }
 function w(e) {
   if (e)
     return e === !0 ? "left" : e;
 }
 function G(e) {
-  return c(e) ? {
+  return A(e) ? {
     sortable: e
   } : e ? {
     sortable: !0,
@@ -25,9 +25,9 @@ function G(e) {
 }
 function I(e) {
   let r;
-  return c(e.filters) && e.valueEnum ? r = j(e.valueEnum) : r = e.filters, r == null ? void 0 : r.map((t) => ({
-    label: x(t.text) ? t.text : "",
-    value: t.value
+  return A(e.filters) && e.valueEnum ? r = j(e.valueEnum) : r = e.filters, r == null ? void 0 : r.map((i) => ({
+    label: x(i.text) ? i.text : "",
+    value: i.value
   }));
 }
 function L(e) {
@@ -47,88 +47,88 @@ function U(e, r) {
     htmlTitle: e === "title" ? r : ""
   } : !1;
 }
-function q(e, r, t) {
+function q(e, r, i) {
   if (k.includes(e.valueType))
-    return t;
+    return i;
   if (e.copyable || e.ellipsis) {
-    const n = U(e.ellipsis, r), i = B(r);
+    const l = U(e.ellipsis, r), t = B(r);
     return v(z, {
-      rawValue: i,
+      rawValue: t,
       copyable: e.copyable,
-      ellipsis: n,
-      content: t
+      ellipsis: l,
+      content: i
     }, null);
   }
-  return t;
+  return i;
 }
-function y(e, r, t) {
-  const n = A(e, ["width", "minWidth", "align"]);
-  return n.field = b(e.dataIndex), n.fixed = w(e.fixed), n.slots = {
-    header: () => R(e, t, void 0, r)
-  }, n.headerAlign = e.align, n.showOverflow = !1, n.showFooterOverflow = !1, n;
+function y(e, r, i) {
+  const l = R(e, ["width", "minWidth", "align"]);
+  return l.field = b(e.dataIndex), l.fixed = w(e.fixed), l.slots = {
+    header: () => c(e, i, void 0, r)
+  }, l.headerAlign = e.align, l.showOverflow = !1, l.showFooterOverflow = !1, l;
 }
-function F(e, r, t, n) {
-  const i = A(e, ["width", "minWidth", "align", "resizable"]);
-  i.field = b(e.dataIndex), i.fixed = w(e.fixed), i.headerAlign = e.align, i.footerAlign = e.align, i.showOverflow = !1, i.showFooterOverflow = !1, Object.assign(i, G(e.sorter)), i.filters = I(e), i.filterMultiple = e.filterMultiple, i.filterMethod = L(e.onFilter);
+function F(e, r, i, l) {
+  const t = R(e, ["width", "minWidth", "align", "resizable"]);
+  t.field = b(e.dataIndex), t.fixed = w(e.fixed), t.headerAlign = e.align, t.footerAlign = e.align, t.showOverflow = !1, t.showFooterOverflow = !1, Object.assign(t, G(e.sorter)), t.filters = I(e), t.filterMultiple = e.filterMultiple, t.filterMethod = L(e.onFilter);
   const a = ({
     value: d,
-    ...l
+    ...n
   }) => {
-    var T, o;
+    var o, T;
     const f = N(e), u = W({
       ...e,
       valueType: f
     }, {
       value: d,
-      ...l
-    }), E = _(f, u, l.record, n), h = ((T = e.renderText) == null ? void 0 : T.call(e, {
+      ...n
+    }), E = _(f, u, n.record, l), h = ((o = e.renderText) == null ? void 0 : o.call(e, {
       value: d,
-      ...l
-    })) || d, O = e.renderText ? v(S, null, [(o = e.renderText) == null ? void 0 : o.call(e, {
+      ...n
+    })) || d, O = e.renderText ? v(S, null, [(T = e.renderText) == null ? void 0 : T.call(e, {
       value: d,
-      ...l
+      ...n
     })]) : E;
     let p = q(e, h, O);
     return e.customRender && (p = e.customRender({
       value: d,
-      ...l,
+      ...n,
       column: e,
       originalNode: p,
       originalText: h
     })), p;
   }, s = ({
     row: d,
-    rowIndex: l
+    rowIndex: n
   }) => a({
-    value: d[i.field],
-    text: d[i.field],
+    value: d[t.field],
+    text: d[t.field],
     record: d,
-    index: l,
-    renderIndex: l,
+    index: n,
+    renderIndex: n,
     column: e
   });
-  return i.slots = {
-    header: () => R(e, t, void 0, r),
+  return t.slots = {
+    header: () => c(e, i, void 0, r),
     default: s,
     footer: s
-  }, i;
+  }, e.html && (delete t.slots.default, delete t.slots.footer, t.type = "html"), t;
 }
-function Y(e, r, t, n) {
+function Y(e, r, i, l) {
   var s;
   if (!((s = e.children) != null && s.length))
-    return F(e, r, t, n);
-  function i(d) {
-    return d.map((l) => {
+    return F(e, r, i, l);
+  function t(d) {
+    return d.map((n) => {
       var f;
-      if ((f = l.children) != null && f.length) {
-        const u = y(l, r, t);
-        return u.children = i(l.children), u;
+      if ((f = n.children) != null && f.length) {
+        const u = y(n, r, i);
+        return u.children = t(n.children), u;
       }
-      return F(l, r, t, n);
+      return F(n, r, i, l);
     });
   }
-  const a = y(e, r, t);
-  return a.children = i(e.children), a;
+  const a = y(e, r, i);
+  return a.children = t(e.children), a;
 }
 export {
   Y as transformCol,

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

@@ -39,7 +39,7 @@ function m(e) {
       range: o.range || !1
     };
   }
-  return t.border = e.bordered, e.expandable && (t.expandConfig = l(e.expandable, [
+  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = l(e.expandable, [
     "renderContent",
     "width",
     "title"
@@ -47,7 +47,7 @@ function m(e) {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t;
+  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t.round = !0, t;
 }
 function a(e, t, i) {
   const o = t === "X", r = o ? "x" : "y", n = o ? "virtualXConfig" : "virtualYConfig", s = i == null ? void 0 : i[r], f = s !== !1, d = o ? w : x, c = b(s) && s >= 0 ? s : d;