@aplus-frontend/ui 0.5.4 → 0.5.6

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

@@ -1,25 +1,28 @@
-import { defineComponent as Ce, useSlots as be, ref as x, computed as n, unref as o, watch as E, createElementBlock as R, openBlock as s, normalizeStyle as N, normalizeClass as f, createCommentVNode as w, createElementVNode as k, createVNode as q, mergeProps as g, createSlots as _, withCtx as v, Fragment as G, renderList as z, createBlock as u, resolveDynamicComponent as T, renderSlot as A, normalizeProps as Se, guardReactiveProps as xe } from "vue";
-import { VxeTable as Re, VxeColumn as U } from "vxe-table";
-import { isUndefined as F, omit as ke } from "lodash-unified";
-import { ApForm as Fe } from "../ap-form/index.mjs";
+import { defineComponent as ke, useSlots as Fe, getCurrentInstance as Be, ref as R, computed as n, unref as o, watch as N, createElementBlock as k, openBlock as s, normalizeStyle as z, normalizeClass as f, createCommentVNode as C, createElementVNode as F, createVNode as U, mergeProps as g, createSlots as G, withCtx as v, Fragment as X, renderList as T, createBlock as u, resolveDynamicComponent as A, renderSlot as _, normalizeProps as J, guardReactiveProps as Ie } from "vue";
+import { VxeTable as Pe, VxeColumn as Q } from "vxe-table";
+import "vxe-table/lib/style.css";
+import "vxe-pc-ui/lib/style.css";
+import { VxeUI as V } from "vxe-pc-ui";
+import { isUndefined as B, omit as Ee } from "lodash-unified";
+import { ApForm as Ne } from "../ap-form/index.mjs";
 import "../config-provider/index.mjs";
-import { noRenderAsFormItemValueList as Be } from "../ap-table/constants.mjs";
-import { getColumnOrder as J, updateFormProps as Pe, getFieldProps as Ie, getSearchFormItemRenderNode as Ee, recursionApColumns as Q } from "../ap-table/utils.mjs";
-import { useTablePaging as Ne } from "../ap-table/hooks/use-table-paging-ng.mjs";
-import { Empty as X, Pagination as ze } from "@aplus-frontend/antdv";
-import { useInnerParams as Te } from "./hooks/use-inner-params.mjs";
-import { toVxeProps as Ae, getRowExpandProps as Ve, getRowSelectionProps as Oe } from "./utils/table.mjs";
-import Ke from "../ap-table/hooks/use-table-row-selection.mjs";
-import { useProvideApTable as De } from "../ap-table/context.mjs";
-import { sizeReverseMap as Le, sizeMap as $e } from "./constants.mjs";
-import { useRenderColumns as je } from "./hooks/use-render-columns.mjs";
-import { useToken as He } from "@aplus-frontend/antdv/es/theme/internal";
+import { noRenderAsFormItemValueList as ze } from "../ap-table/constants.mjs";
+import { getColumnOrder as Y, updateFormProps as Te, getFieldProps as Ae, getSearchFormItemRenderNode as _e, recursionApColumns as Z } from "../ap-table/utils.mjs";
+import { useTablePaging as Ve } from "../ap-table/hooks/use-table-paging-ng.mjs";
+import { Empty as ee, Pagination as Le } from "@aplus-frontend/antdv";
+import { useInnerParams as Oe } from "./hooks/use-inner-params.mjs";
+import { toVxeProps as De, getRowExpandProps as Ke, getRowSelectionProps as $e } 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 We, sizeMap as Me } from "./constants.mjs";
+import { useRenderColumns as qe } from "./hooks/use-render-columns.mjs";
+import { useToken as Ue } from "@aplus-frontend/antdv/es/theme/internal";
 import "../scroll-bar/index.mjs";
-import { useLoadVxe as We } from "./hooks/use-load-vxe.mjs";
-import { useNamespace as Me } from "../config-provider/hooks/use-namespace.mjs";
-import { useGlobalConfig as qe } from "../config-provider/hooks/use-global-config.mjs";
-import _e from "../scroll-bar/index.vue.mjs";
-const vo = /* @__PURE__ */ Ce({
+import { useNamespace as Ge } from "../config-provider/hooks/use-namespace.mjs";
+import { useGlobalConfig as Xe } from "../config-provider/hooks/use-global-config.mjs";
+import { useLocale as Je } from "../config-provider/hooks/use-locale.mjs";
+import Qe from "../scroll-bar/index.vue.mjs";
+const Ro = /* @__PURE__ */ ke({
   name: "ApGrid",
   __name: "index",
   props: {
@@ -103,66 +106,72 @@ const vo = /* @__PURE__ */ Ce({
     expandable: {},
     value: {}
   },
-  setup(Y, { expose: Z }) {
-    const V = be(), a = Y, { e: B, b: i, be: ee } = Me("ap-grid"), oe = qe("valueTypeMap");
-    We();
-    const d = x([]), O = x([]), p = x(), C = x(a.size), [, m] = He(), { renderConfig: ae, updateSignal: re } = je(d);
-    let K = 0;
-    const te = n(() => {
+  setup(oe, { expose: ae }) {
+    var q;
+    console.log(V);
+    const L = Fe(), a = oe, w = (q = Be()) == null ? void 0 : q.appContext.app;
+    w && !w.__VXE_PC_UI_INSTALLED__ && (w.use(V), w.__VXE_PC_UI_INSTALLED__ = !0);
+    const { e: I, b: i, be: re } = Ge("ap-grid"), te = Xe("valueTypeMap"), d = R([]), O = R([]), p = R(), b = R(a.size), [, m] = Ue(), { t: le } = Je();
+    V.setConfig({
+      i18n: (e, l) => le(`ap.${e}`, l)
+    });
+    const { renderConfig: ne, updateSignal: se } = qe(d);
+    let D = 0;
+    const de = n(() => {
       if (p.value)
         return p.value.$el.querySelector(
           ".vxe-table--header-inner-wrapper"
         );
-    }), D = n(() => {
+    }), K = n(() => {
       var e, l, t;
-      return K++, ((t = (l = (e = a.columns) == null ? void 0 : e.filter(
-        (r) => !r.hideInSearch && r.dataIndex && (r.valueType || r.customRenderFormItem) && !Be.includes(r.valueType)
+      return D++, ((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, c) => {
-        let y = J(r.order);
-        return J(c.order) - y;
+        let y = Y(r.order);
+        return Y(c.order) - y;
       })) == null ? void 0 : t.map((r) => {
-        const c = Pe(
+        const c = Te(
           r,
-          Ie(r.fieldProps, {})
+          Ae(r.fieldProps, {})
         ), y = {
           ...r,
           fieldProps: {
             label: r.title,
             name: r.dataIndex,
             ...c || {},
-            _signal: K
+            _signal: D
           },
           renderNode: void 0
         };
-        return y.renderNode = Ee(
+        return y.renderNode = _e(
           y,
-          o(oe)
+          o(te)
         ), y;
       })) || [];
-    }), le = n(() => [
+    }), ie = n(() => [
       i(),
       a.card ? null : i("wrapper"),
       a.adaptive ? i("adaptive") : null,
       a.sticky ? i("sticky") : null
-    ].filter(Boolean)), L = n(() => Q(o(d), (e) => {
+    ].filter(Boolean)), $ = n(() => Z(o(d), (e) => {
       if (e.sorter === !0)
         return e.key || e.dataIndex;
-    }).filter(Boolean)), $ = n(() => Q(o(d), (e) => {
+    }).filter(Boolean)), j = n(() => Z(o(d), (e) => {
       if (e.filters && !e.onFilter)
         return e.key || e.dataIndex;
     }).filter(Boolean)), {
       formRef: P,
-      submit: j,
-      reset: H,
-      refresh: ne,
+      submit: H,
+      reset: W,
+      refresh: ce,
       data: h,
-      tableProps: se,
-      setDataSource: de,
-      handleTableChange: ie
-    } = Ne({
+      tableProps: ue,
+      setDataSource: pe,
+      handleTableChange: me
+    } = Ve({
       async request(e) {
         var t;
-        if (!S.value.preserveSelectedRowKeys && F(a.dataSource) && I(), !F(a.dataSource)) {
+        if (!x.value.preserveSelectedRowKeys && B(a.dataSource) && E(), !B(a.dataSource)) {
           const r = e.pageSize * (e.current - 1);
           return {
             data: (a.pagination === !1 ? a.dataSource : a.dataSource.slice(r, r + e.pageSize)) || [],
@@ -176,126 +185,126 @@ const vo = /* @__PURE__ */ Ce({
         };
       },
       namespace: "ap-grid",
-      filterFields: $,
-      sortFields: L,
+      filterFields: j,
+      sortFields: $,
       defaultParams: a.params,
       defaultData: a.defaultData,
       manual: a.manual,
       formatParams: a.beforeSearchSubmit,
       pagination: a.pagination
-    }), { sortChangeEvent: ce, filterChangeEvent: ue, paginationChangeEvent: pe } = Te(ie);
-    De({
+    }), { sortChangeEvent: fe, filterChangeEvent: ge, paginationChangeEvent: ve } = Oe(me);
+    He({
       columns: n(() => d.value),
       columnsBackup: n(() => O.value),
-      size: n(() => C.value ? $e[C.value] : "middle"),
+      size: n(() => b.value ? Me[b.value] : "middle"),
       updateColumns(e) {
         d.value = e;
       },
       updateSize(e) {
-        C.value = Le[e];
+        b.value = We[e];
       },
       renderConfig: n(() => ({
-        className: ee("table-header", "title"),
+        className: re("table-header", "title"),
         color: m.value.colorPrimary
       }))
     });
-    const W = n(
+    const he = n(
       () => d.value.some(
         (e) => e.fixed === "left" || e.fixed === !0
       ) ? "left" : void 0
-    ), me = n(
-      () => F(a.dataSource) ? h.records : a.dataSource
-    ), { selectedRows: b, rowSelection: S, ...fe } = Ke({
+    ), ye = n(
+      () => B(a.dataSource) ? h.records : a.dataSource
+    ), { selectedRows: S, rowSelection: x, ...Ce } = je({
       ...a.rowSelection === !0 ? {} : a.rowSelection,
-      dataSource: me,
+      dataSource: ye,
       rowKey: a.rowKey
     }), M = () => {
       const e = p.value;
-      e && (b.value = [
+      e && (S.value = [
         ...e.getCheckboxReserveRecords(),
         ...e.getCheckboxRecords()
       ]);
-    }, ge = () => {
+    }, we = () => {
       const e = p.value;
-      e && (b.value = [e.getRadioRecord()]);
+      e && (S.value = [e.getRadioRecord()]);
     };
-    function ve() {
+    function be() {
       var e;
       return ((e = a.columns) == null ? void 0 : e.filter((l) => !l.hideInTable)) || [];
     }
-    function he(e) {
+    function Se(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);
     }
-    function ye(e = !1) {
+    function xe(e = !1) {
       var t, r, c;
       const l = e ? "getFieldsValueTransformed" : "getFieldsValue";
       return (c = (r = (t = P.value) == null ? void 0 : t.apForm) == null ? void 0 : r[l]) == null ? void 0 : c.call(r, !0);
     }
-    function I() {
-      fe.clearAll();
+    function E() {
+      Ce.clearAll();
       const e = p.value;
-      e && (S.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
+      e && (x.value.type === "radio" ? (e.clearRadioRow(), e.clearRadioReserve()) : (e.clearCheckboxRow(), e.clearCheckboxReserve()));
     }
-    async function we(e, l) {
+    async function Re(e, l) {
       var r;
       const t = h.records[e];
       if (t)
         return (r = p.value) == null ? void 0 : r.scrollToRow(t, l);
     }
-    return E(
+    return N(
       () => [a.columnResizable, a.columns],
       () => {
-        const e = ve();
+        const e = be();
         d.value = e, O.value = e;
       },
       {
         deep: !0,
         immediate: !0
       }
-    ), E(
+    ), N(
       () => a.dataSource,
       (e) => {
-        de(e);
+        pe(e);
       },
       { immediate: !0 }
-    ), E(
+    ), N(
       () => o(h).loading,
       (e) => {
         var l;
         (l = a.onLoadingChange) == null || l.call(a, e);
       }
-    ), Z({
-      submit: j,
-      reset: H,
-      refresh: ne,
-      setSearchFormValues: he,
-      getSearchFormValues: ye,
+    ), ae({
+      submit: H,
+      reset: W,
+      refresh: ce,
+      setSearchFormValues: Se,
+      getSearchFormValues: xe,
       getShowColumns: () => o(d),
       rowSelection: {
-        selectedRows: n(() => b.value),
-        clearAll: I
+        selectedRows: n(() => S.value),
+        clearAll: E
       },
-      scrollToRow: we
-    }), (e, l) => (s(), R("div", {
-      class: f(le.value),
-      style: N(e.wrapperStyle)
+      scrollToRow: Re
+    }), (e, l) => (s(), k("div", {
+      class: f(ie.value),
+      style: z(e.wrapperStyle)
     }, [
-      o(F)(e.dataSource) && e.searchForm !== !1 && D.value.length > 0 ? (s(), R("div", {
+      o(B)(e.dataSource) && e.searchForm !== !1 && K.value.length > 0 ? (s(), k("div", {
         key: 0,
-        class: f(e.card ? o(B)("search-wrapper") : null),
-        style: N(e.searchFormWrapperStyle)
+        class: f(e.card ? o(I)("search-wrapper") : null),
+        style: z(e.searchFormWrapperStyle)
       }, [
-        q(o(Fe).SearchForm, g(e.searchForm || {}, {
+        U(o(Ne).SearchForm, g(e.searchForm || {}, {
           ref_key: "formRef",
           ref: P,
           "custom-reset": "",
           "submit-loading": !1,
-          onSubmit: o(j),
-          onReset: o(H)
-        }), _({
+          onSubmit: o(H),
+          onReset: o(W)
+        }), G({
           default: v(() => [
-            (s(!0), R(G, null, z(D.value, (t) => (s(), u(T(t.renderNode.Comp), g({
+            (s(!0), k(X, null, T(K.value, (t) => (s(), u(A(t.renderNode.Comp), g({
               key: t.dataIndex,
               item: t,
               ref_for: !0
@@ -306,39 +315,39 @@ const vo = /* @__PURE__ */ Ce({
           ]),
           _: 2
         }, [
-          V.searchFormExtra ? {
+          L.searchFormExtra ? {
             name: "extra",
             fn: v(() => [
-              A(e.$slots, "searchFormExtra")
+              _(e.$slots, "searchFormExtra")
             ]),
             key: "0"
           } : void 0
         ]), 1040, ["onSubmit", "onReset"])
-      ], 6)) : w("", !0),
-      k("div", {
-        class: f([o(B)("table-wrapper"), e.card ? o(B)("table-wrapper-card") : null]),
-        style: N(e.tableWrapperStyle)
+      ], 6)) : C("", !0),
+      F("div", {
+        class: f([o(I)("table-wrapper"), e.card ? o(I)("table-wrapper-card") : null]),
+        style: z(e.tableWrapperStyle)
       }, [
-        k("div", {
+        F("div", {
           class: f(o(i)("header-wrapper"))
         }, [
-          A(e.$slots, "title", {
-            selectedRows: o(b),
-            selectedRowKeys: o(S).selectedRowKeys,
+          _(e.$slots, "title", {
+            selectedRows: o(S),
+            selectedRowKeys: o(x).selectedRowKeys,
             shownColumns: d.value,
-            clearAll: I
+            clearAll: E
           })
         ], 2),
-        k("div", {
+        F("div", {
           class: f(o(i)("vxe-wrapper"))
         }, [
-          (s(), u(o(Re), g(o(Ae)(a), {
+          (s(), u(o(Pe), g(o(De)(a), {
             ref_key: "tableRef",
             ref: p,
-            key: o(re),
+            key: o(se),
             data: o(h).records,
-            "sort-config": { remote: L.value.length > 0 },
-            "filter-config": { remote: $.value.length > 0 },
+            "sort-config": { remote: $.value.length > 0 },
+            "filter-config": { remote: j.value.length > 0 },
             loading: o(h).loading,
             "row-config": {
               isHover: !0,
@@ -354,57 +363,57 @@ const vo = /* @__PURE__ */ Ce({
               "--vxe-ui-table-row-radio-checked-background-color": o(m).controlItemBgActive,
               "--vxe-ui-table-row-hover-radio-checked-background-color": o(m).controlItemBgActiveHover
             },
-            size: C.value,
-            onSortChange: o(ce),
-            onFilterChange: o(ue),
+            size: b.value,
+            onSortChange: o(fe),
+            onFilterChange: o(ge),
             onCheckboxChange: M,
             onCheckboxAll: M,
-            onRadioChange: ge
-          }), _({
+            onRadioChange: we
+          }), G({
             empty: v(() => [
-              q(o(X), {
-                image: o(X).PRESENTED_IMAGE_SIMPLE
+              U(o(ee), {
+                image: o(ee).PRESENTED_IMAGE_SIMPLE
               }, null, 8, ["image"])
             ]),
             default: v(() => [
-              a.expandable ? (s(), u(o(U), g({ key: 0 }, o(Ve)(e.expandable), { fixed: W.value }), {
+              a.expandable ? (s(), u(o(Q), g({ key: 0 }, o(Ke)(e.expandable), { fixed: he.value }), {
                 content: v((t) => [
-                  (s(), u(T(a.expandable.renderContent(t))))
+                  (s(), u(A(a.expandable.renderContent(t))))
                 ]),
                 _: 1
-              }, 16, ["fixed"])) : w("", !0),
-              a.rowSelection ? (s(), u(o(U), g({ key: 1 }, o(Oe)(o(S)), { fixed: W.value }), null, 16, ["fixed"])) : w("", !0),
-              (s(!0), R(G, null, z(o(ae), (t) => (s(), u(T(t), {
+              }, 16, ["fixed"])) : C("", !0),
+              a.rowSelection ? (s(), u(o(Q), J(g({ key: 1 }, o($e)(o(x), d.value))), null, 16)) : C("", !0),
+              (s(!0), k(X, null, T(o(ne), (t) => (s(), u(A(t), {
                 key: t.props.colId
               }))), 128))
             ]),
             _: 2
           }, [
-            z(o(ke)(V, ["searchFormExtra"]), (t, r) => ({
+            T(o(Ee)(L, ["searchFormExtra"]), (t, r) => ({
               name: r,
               fn: v((c) => [
-                A(e.$slots, r, Se(xe(c || {})))
+                _(e.$slots, r, J(Ie(c || {})))
               ])
             }))
           ]), 1040, ["data", "sort-config", "filter-config", "loading", "row-config", "style", "size", "onSortChange", "onFilterChange"]))
         ], 2),
-        k("div", {
+        F("div", {
           class: f(o(i)("pagination-wrapper"))
         }, [
-          e.sticky ? (s(), u(o(_e), {
+          e.sticky ? (s(), u(o(Qe), {
             key: 0,
             direction: "horizontal",
-            "scroll-container": te.value
-          }, null, 8, ["scroll-container"])) : w("", !0),
-          e.pagination !== !1 ? (s(), u(o(ze), g({
+            "scroll-container": de.value
+          }, null, 8, ["scroll-container"])) : C("", !0),
+          e.pagination !== !1 ? (s(), u(o(Le), g({
             key: 1,
             class: o(i)("pagination")
-          }, o(se).pagination, { onChange: o(pe) }), null, 16, ["class", "onChange"])) : w("", !0)
+          }, o(ue).pagination, { onChange: o(ve) }), null, 16, ["class", "onChange"])) : C("", !0)
         ], 2)
       ], 6)
     ], 6));
   }
 });
 export {
-  vo as default
+  Ro as default
 };

package/es/src/ap-grid/utils/table.d.ts

@@ -1,10 +1,11 @@
 import { VxeTableEventProps, VxeTableProps } from 'vxe-table';
-import { ApGridProps, ApGridRowSelection } from '../interface';
+import { ApGridColumnType, ApGridProps, ApGridRowSelection } from '../interface';
 import { RowSelectionType } from '@aplus-frontend/antdv/es/table/interface';
 export declare function toVxeProps<RecordType>(props: any): VxeTableProps<RecordType> & VxeTableEventProps<RecordType>;
-export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true): {
+export declare function getRowSelectionProps(rowSelection: ApGridRowSelection<any> | true, columns: ApGridColumnType[]): {
     type: RowSelectionType;
     width: string | number;
+    fixed: "left" | "right" | undefined;
 };
 export declare function getRowExpandProps(config: ApGridProps['expandable']): {
     readonly type: "expand";

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

@@ -1,9 +1,9 @@
-import { omit as u, isUndefined as d, isFunction as c, isNumber as f } from "lodash-unified";
-const h = 30, b = 50;
-function v(e) {
-  var r, l, n;
+import { omit as d, isUndefined as n, isFunction as f, isNumber as c } from "lodash-unified";
+const h = 30, v = 50;
+function R(e) {
+  var r, l, o;
   const t = {
-    ...u(e, [
+    ...d(e, [
       "columns",
       "request",
       "searchForm",
@@ -15,48 +15,55 @@ function v(e) {
   if (e.adaptive && (t.autoResize = !0, t.height = "100%"), e.columnResizable && (t.columnConfig ? t.columnConfig.resizable = !0 : t.columnConfig = {
     resizable: !0
   }), e.rowSelection) {
-    const o = e.rowSelection === !0 ? {} : e.rowSelection;
-    o.type === "radio" ? t.radioConfig = {
+    const i = e.rowSelection === !0 ? {} : e.rowSelection;
+    i.type === "radio" ? t.radioConfig = {
       highlight: !0,
-      checkMethod({ row: i }) {
-        return o.disabled ? !o.disabled(i) : !0;
+      checkMethod({ row: u }) {
+        return i.disabled ? !i.disabled(u) : !0;
       },
-      checkRowKey: (r = o.defaultSelectedRowKeys) == null ? void 0 : r[0],
-      reserve: d(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
+      checkRowKey: (r = i.defaultSelectedRowKeys) == null ? void 0 : r[0],
+      reserve: n(i.preserveSelectedRowKeys) ? !0 : i.preserveSelectedRowKeys
     } : t.checkboxConfig = {
       highlight: !0,
-      checkMethod({ row: i }) {
-        return o.disabled ? !o.disabled(i) : !0;
+      checkMethod({ row: u }) {
+        return i.disabled ? !i.disabled(u) : !0;
       },
-      checkRowKeys: o.defaultSelectedRowKeys,
-      reserve: d(o.preserveSelectedRowKeys) ? !0 : o.preserveSelectedRowKeys
+      checkRowKeys: i.defaultSelectedRowKeys,
+      reserve: n(i.preserveSelectedRowKeys) ? !0 : i.preserveSelectedRowKeys
     };
   }
-  return t.border = e.bordered, e.expandable && (t.expandConfig = u(e.expandable, [
+  return t.border = e.bordered, e.expandable && (t.expandConfig = d(e.expandable, [
     "renderContent",
     "width",
     "title"
-  ])), e.footer && (t.showFooter = !0, c(e.footer) ? t.footerMethod = e.footer : t.footerData = e.footer), e.virtual === !1 ? (t.virtualXConfig = {
+  ])), e.footer && (t.showFooter = !0, f(e.footer) ? t.footerMethod = e.footer : t.footerData = e.footer), e.virtual === !1 ? (t.virtualXConfig = {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (a(t, "X", (l = e.virtual) == null ? void 0 : l.x), a(t, "Y", (n = e.virtual) == null ? void 0 : n.y)), t;
+  }) : (a(t, "X", (l = e.virtual) == null ? void 0 : l.x), a(t, "Y", (o = e.virtual) == null ? void 0 : o.y)), t;
 }
 function a(e, t, r) {
-  const l = t === "X", n = l ? "virtualXConfig" : "virtualYConfig", o = r !== !1, i = l ? h : b, s = f(r) && r >= 0 ? r : i;
-  e[n] = {
-    enabled: o,
+  const l = t === "X", o = l ? "virtualXConfig" : "virtualYConfig", i = r !== !1, u = l ? h : v, s = c(r) && r >= 0 ? r : u;
+  e[o] = {
+    enabled: i,
     gt: s
   };
 }
-function y(e) {
-  const t = e === !0 || !e.type ? "checkbox" : e.type, r = e === !0 ? 60 : e.columnWidth || 60;
-  return {
-    type: t,
-    width: r
+function b(e) {
+  return e === !0 ? "left" : e;
+}
+function w(e, t) {
+  const r = e === !0 || !e.type ? "checkbox" : e.type, l = e === !0 ? 60 : e.columnWidth || 60;
+  let o = e === !0 ? void 0 : b(e.fixed);
+  return o || (o === !1 ? o = void 0 : o = t.some(
+    (i) => i.fixed === "left" || i.fixed === !0
+  ) ? "left" : void 0), {
+    type: r,
+    width: l,
+    fixed: o
   };
 }
-function R(e) {
+function x(e) {
   const t = (e == null ? void 0 : e.width) || "auto";
   return {
     type: "expand",
@@ -65,7 +72,7 @@ function R(e) {
   };
 }
 export {
-  R as getRowExpandProps,
-  y as getRowSelectionProps,
-  v as toVxeProps
+  x as getRowExpandProps,
+  w as getRowSelectionProps,
+  R as toVxeProps
 };