@aplus-frontend/ui 0.5.29 → 0.5.31

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 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 { 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 g, createCommentVNode as S, createElementVNode as I, createVNode as U, mergeProps as h, 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 w, omit as Ne } from "lodash-unified";
+import { isUndefined as b, 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";
@@ -93,6 +93,7 @@ const ko = /* @__PURE__ */ Fe({
     defaultData: {},
     dataSource: {},
     onLoadingChange: {},
+    onShownColumnsChange: {},
     searchForm: { type: [Boolean, Object], default: void 0 },
     beforeSearchSubmit: {},
     pagination: { type: [Boolean, Object], default: void 0 },
@@ -111,35 +112,35 @@ const ko = /* @__PURE__ */ Fe({
   },
   setup(ae, { expose: re }) {
     var q;
-    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();
+    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: P, b: i, be: te } = Xe("ap-grid"), le = Je("valueTypeMap"), d = k([]), D = k([]), m = k(), C = k(a.size), [, c] = Ge(), { t: ne } = Qe();
     Y.setConfig({
-      i18n: (e, l) => ne(`ap.${e}`, l)
+      i18n: (e, r) => ne(`ap.${e}`, r)
     });
-    const { renderConfig: se, updateSignal: ie } = Ue(i);
+    const { renderConfig: se, updateSignal: de } = Ue(d);
     let O = 0;
-    const de = n(() => {
+    const ie = n(() => {
       if (m.value)
         return m.value.$el.querySelector(
           ".vxe-table--header-inner-wrapper"
         );
     }), K = n(() => {
-      var e, l, t;
-      return O++, ((t = (l = (e = a.columns) == null ? void 0 : e.filter(
-        (r) => !r.hideInSearch && r.dataIndex && (r.valueType || r.customRenderFormItem) && !ze.includes(r.valueType)
-      )) == null ? void 0 : l.sort((r, u) => {
-        let y = Z(r.order);
+      var e, r, l;
+      return O++, ((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 = Z(t.order);
         return Z(u.order) - y;
-      })) == null ? void 0 : t.map((r) => {
+      })) == null ? void 0 : l.map((t) => {
         const u = Ae(
-          r,
-          _e(r.fieldProps, {})
+          t,
+          _e(t.fieldProps, {})
         ), y = {
-          ...r,
+          ...t,
           fieldProps: {
-            label: r.title,
-            name: r.dataIndex,
+            label: t.title,
+            name: t.dataIndex,
             ...u || {},
             _signal: O
           },
@@ -151,14 +152,14 @@ const ko = /* @__PURE__ */ Fe({
         ), y;
       })) || [];
     }), ce = n(() => [
-      d(),
-      a.card ? null : d("wrapper"),
-      a.adaptive ? d("adaptive") : null,
-      a.sticky ? d("sticky") : null
-    ].filter(Boolean)), $ = n(() => ee(o(i), (e) => {
+      i(),
+      a.card ? null : i("wrapper"),
+      a.adaptive ? i("adaptive") : null,
+      a.sticky ? i("sticky") : null
+    ].filter(Boolean)), $ = n(() => ee(o(d), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), H = n(() => ee(o(i), (e) => {
+    }).filter(Boolean)), H = n(() => ee(o(d), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
@@ -166,24 +167,24 @@ const ko = /* @__PURE__ */ Fe({
       submit: j,
       reset: W,
       refresh: ue,
-      data: C,
+      data: f,
       tableProps: M,
       setDataSource: pe,
       handleTableChange: me
     } = Le({
       async request(e) {
-        var t;
-        if (!R.value.preserveSelectedRowKeys && w(a.dataSource) && T(), !w(a.dataSource)) {
-          const r = e.pageSize * (e.current - 1);
+        var l;
+        if (!R.value.preserveSelectedRowKeys && b(a.dataSource) && T(), !b(a.dataSource)) {
+          const t = e.pageSize * (e.current - 1);
           return {
-            data: (a.pagination === !1 ? a.dataSource : a.dataSource.slice(r, r + e.pageSize)) || [],
+            data: (a.pagination === !1 ? a.dataSource : a.dataSource.slice(t, t + e.pageSize)) || [],
             total: a.dataSource.length || 0
           };
         }
-        const l = await ((t = a.request) == null ? void 0 : t.call(a, e));
+        const r = await ((l = a.request) == null ? void 0 : l.call(a, e));
         return {
-          data: (l == null ? void 0 : l.data) || [],
-          total: (l == null ? void 0 : l.total) || 0
+          data: (r == null ? void 0 : r.data) || [],
+          total: (r == null ? void 0 : r.total) || 0
         };
       },
       namespace: "ap-grid",
@@ -194,31 +195,33 @@ const ko = /* @__PURE__ */ Fe({
       manual: a.manual,
       formatParams: a.beforeSearchSubmit,
       pagination: a.pagination
-    }), { sortChangeEvent: fe, filterChangeEvent: ge, paginationChangeEvent: ve } = Oe(me);
+    }), { sortChangeEvent: fe, filterChangeEvent: ge, paginationChangeEvent: he } = Oe(me);
     We({
-      columns: n(() => i.value),
+      columns: n(() => d.value),
       columnsBackup: n(() => D.value),
-      size: n(() => h.value ? qe[h.value] : "middle"),
+      size: n(() => C.value ? qe[C.value] : "middle"),
       updateColumns(e) {
-        i.value = e;
+        var r;
+        d.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e);
       },
       updateSize(e) {
-        h.value = Me[e];
+        C.value = Me[e];
       },
       renderConfig: n(() => ({
         className: te("table-header", "title"),
         color: c.value.colorPrimary
-      }))
+      })),
+      dataSource: n(() => o(f).records)
     });
-    const he = n(
-      () => i.value.some(
+    const ve = n(
+      () => d.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
     ), Ce = n(
-      () => w(a.loading) ? C.loading : a.loading
+      () => b(a.loading) ? f.loading : a.loading
     ), ye = n(
-      () => w(a.dataSource) ? C.records : a.dataSource
-    ), { selectedRows: x, rowSelection: R, ...be } = je({
+      () => b(a.dataSource) ? f.records : a.dataSource
+    ), { selectedRows: x, rowSelection: R, ...Se } = je({
       ...a.rowSelection === !0 ? {} : a.rowSelection,
       dataSource: ye,
       rowKey: a.rowKey
@@ -228,39 +231,40 @@ const ko = /* @__PURE__ */ Fe({
         ...e.getCheckboxReserveRecords(),
         ...e.getCheckboxRecords()
       ]);
-    }, we = () => {
+    }, be = () => {
       const e = m.value;
       e && (x.value = [e.getRadioRecord()]);
     };
-    function Se() {
+    function we() {
       var e;
-      return ((e = a.columns) == null ? void 0 : e.filter((l) => !l.hideInTable)) || [];
+      return ((e = a.columns) == null ? void 0 : e.filter((r) => !r.hideInTable)) || [];
     }
     function xe(e) {
-      var l, t, r;
-      (r = (t = (l = E.value) == null ? void 0 : l.apForm) == null ? void 0 : t.setFieldsValue) == null || r.call(t, e);
+      var r, l, t;
+      (t = (l = (r = E.value) == null ? void 0 : r.apForm) == null ? void 0 : l.setFieldsValue) == null || t.call(l, e);
     }
     function Re(e = !1) {
-      var t, r, u;
-      const l = e ? "getFieldsValueTransformed" : "getFieldsValue";
-      return (u = (r = (t = E.value) == null ? void 0 : t.apForm) == null ? void 0 : r[l]) == null ? void 0 : u.call(r, !0);
+      var l, t, u;
+      const r = e ? "getFieldsValueTransformed" : "getFieldsValue";
+      return (u = (t = (l = E.value) == null ? void 0 : l.apForm) == null ? void 0 : t[r]) == null ? void 0 : u.call(t, !0);
     }
     function T() {
-      be.clearAll();
+      Se.clearAll();
       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 = C.records[e];
-      if (t)
-        return (r = m.value) == null ? void 0 : r.scrollToRow(t, l);
+    async function ke(e, r) {
+      var t;
+      const l = f.records[e];
+      if (l)
+        return (t = m.value) == null ? void 0 : t.scrollToRow(l, r);
     }
     return F(
       () => [a.columnResizable, a.columns],
       () => {
-        const e = Se();
-        i.value = e, D.value = e;
+        var r;
+        const e = we();
+        d.value = e, (r = a.onShownColumnsChange) == null || r.call(a, e), D.value = e;
       },
       {
         deep: !0,
@@ -273,15 +277,15 @@ const ko = /* @__PURE__ */ Fe({
       },
       { immediate: !0, deep: !0 }
     ), F(
-      () => o(C).loading,
+      () => o(f).loading,
       (e) => {
-        var l;
-        (l = a.onLoadingChange) == null || l.call(a, e);
+        var r;
+        (r = a.onLoadingChange) == null || r.call(a, e);
       }
     ), F(
       () => a.size,
       (e) => {
-        h.value = e;
+        C.value = e;
       }
     ), re({
       submit: j,
@@ -289,22 +293,22 @@ const ko = /* @__PURE__ */ Fe({
       refresh: ue,
       setSearchFormValues: xe,
       getSearchFormValues: Re,
-      getShowColumns: () => o(i),
+      getShowColumns: () => o(d),
       rowSelection: {
         selectedRows: n(() => x.value),
         clearAll: T
       },
       scrollToRow: ke
-    }), (e, l) => (s(), B("div", {
-      class: f(ce.value),
+    }), (e, r) => (s(), B("div", {
+      class: g(ce.value),
       style: z(e.wrapperStyle)
     }, [
-      o(w)(e.dataSource) && e.searchForm !== !1 && K.value.length > 0 ? (s(), B("div", {
+      o(b)(e.dataSource) && e.searchForm !== !1 && K.value.length > 0 ? (s(), B("div", {
         key: 0,
-        class: f(e.card ? o(P)("search-wrapper") : null),
+        class: g(e.card ? o(P)("search-wrapper") : null),
         style: z(e.searchFormWrapperStyle)
       }, [
-        U(o(Te).SearchForm, g(e.searchForm || {}, {
+        U(o(Te).SearchForm, h(e.searchForm || {}, {
           ref_key: "formRef",
           ref: E,
           "custom-reset": "",
@@ -313,13 +317,13 @@ const ko = /* @__PURE__ */ Fe({
           onReset: o(W)
         }), G({
           default: v(() => [
-            (s(!0), B(X, null, A(K.value, (t) => (s(), p(_(t.renderNode.Comp), g({
-              key: t.dataIndex,
-              item: t,
+            (s(!0), B(X, null, A(K.value, (l) => (s(), p(_(l.renderNode.Comp), h({
+              key: l.dataIndex,
+              item: l,
               ref_for: !0
-            }, t.fieldProps || {}, {
-              span: t.span,
-              "custom-render": t.renderNode.render
+            }, l.fieldProps || {}, {
+              span: l.span,
+              "custom-render": l.renderNode.render
             }), null, 16, ["item", "span", "custom-render"]))), 128))
           ]),
           _: 2
@@ -332,29 +336,29 @@ const ko = /* @__PURE__ */ Fe({
             key: "0"
           } : void 0
         ]), 1040, ["submit-loading", "onSubmit", "onReset"])
-      ], 6)) : b("", !0),
+      ], 6)) : S("", !0),
       I("div", {
-        class: f([o(P)("table-wrapper"), e.card ? o(P)("table-wrapper-card") : null]),
+        class: g([o(P)("table-wrapper"), e.card ? o(P)("table-wrapper-card") : null]),
         style: z(e.tableWrapperStyle)
       }, [
         I("div", {
-          class: f(o(d)("header-wrapper"))
+          class: g(o(i)("header-wrapper"))
         }, [
           V(e.$slots, "title", {
             selectedRows: o(x),
             selectedRowKeys: o(R).selectedRowKeys,
-            shownColumns: i.value,
+            shownColumns: d.value,
             clearAll: T
           })
         ], 2),
         I("div", {
-          class: f(o(d)("vxe-wrapper"))
+          class: g(o(i)("vxe-wrapper"))
         }, [
-          (s(), p(o(Ee), g(o(Ke)(a), {
+          (s(), p(o(Ee), h(o(Ke)(a), {
             ref_key: "tableRef",
             ref: m,
-            key: o(ie),
-            data: o(C).records,
+            key: o(de),
+            data: o(f).records,
             "sort-config": { remote: $.value.length > 0 },
             "filter-config": { remote: H.value.length > 0 },
             loading: Ce.value,
@@ -374,13 +378,13 @@ const ko = /* @__PURE__ */ Fe({
               "--vxe-ui-font-color": o(c).colorTextBase,
               "--vxe-ui-table-border-color": o(c).colorBorderSecondary
             },
-            size: h.value,
+            size: C.value,
             onSortChange: o(fe),
             onFilterChange: o(ge),
             onCheckboxChange: N,
             onCheckboxRangeChange: N,
             onCheckboxAll: N,
-            onRadioChange: we
+            onRadioChange: be
           }), G({
             empty: v(() => [
               U(o(oe), {
@@ -388,39 +392,39 @@ const ko = /* @__PURE__ */ Fe({
               }, null, 8, ["image"])
             ]),
             default: v(() => [
-              a.expandable ? (s(), p(o(Q), g({ key: 0 }, o($e)(e.expandable), { fixed: he.value }), {
-                content: v((t) => [
-                  (s(), p(_(a.expandable.renderContent(t))))
+              a.expandable ? (s(), p(o(Q), h({ key: 0 }, o($e)(e.expandable), { fixed: ve.value }), {
+                content: v((l) => [
+                  (s(), p(_(a.expandable.renderContent(l))))
                 ]),
                 _: 1
-              }, 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
+              }, 16, ["fixed"])) : S("", !0),
+              a.rowSelection ? (s(), p(o(Q), J(h({ key: 1 }, o(He)(o(R), d.value))), null, 16)) : S("", !0),
+              (s(!0), B(X, null, A(o(se), (l) => (s(), p(_(l), {
+                key: l.props.colId
               }))), 128))
             ]),
             _: 2
           }, [
-            A(o(Ne)(L, ["searchFormExtra"]), (t, r) => ({
-              name: r,
+            A(o(Ne)(L, ["searchFormExtra"]), (l, t) => ({
+              name: t,
               fn: v((u) => [
-                V(e.$slots, r, J(Pe(u || {})))
+                V(e.$slots, t, J(Pe(u || {})))
               ])
             }))
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "row-config", "style", "size", "onSortChange", "onFilterChange"]))
         ], 2),
         I("div", {
-          class: f(o(d)("pagination-wrapper"))
+          class: g(o(i)("pagination-wrapper"))
         }, [
           e.sticky ? (s(), p(o(Ye), {
             key: 0,
             direction: "horizontal",
-            "scroll-container": de.value
-          }, null, 8, ["scroll-container"])) : b("", !0),
-          e.pagination !== !1 ? (s(), p(o(De), g({
+            "scroll-container": ie.value
+          }, null, 8, ["scroll-container"])) : S("", !0),
+          e.pagination !== !1 ? (s(), p(o(De), h({
             key: 1,
-            class: o(d)("pagination")
-          }, o(M).pagination, { onChange: o(ve) }), null, 16, ["class", "onChange"])) : b("", !0)
+            class: o(i)("pagination")
+          }, o(M).pagination, { onChange: o(he) }), null, 16, ["class", "onChange"])) : S("", !0)
         ], 2)
       ], 6)
     ], 6));

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

@@ -162,6 +162,11 @@ export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
      * @returns
      */
     onLoadingChange?: (loading: boolean) => void;
+    /**
+     * 当可显示列变更后触发
+     * @returns
+     */
+    onShownColumnsChange?: (columns: ApGridColumnType<RecordType>[]) => void;
     /**
      * 查询表单配置，设置为false表示不渲染查询表单
      */

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