@aplus-frontend/ui 0.6.5 → 0.6.7

package/es/index.mjs

@@ -128,19 +128,20 @@ import { default as dp } from "./src/portal/index.vue.mjs";
 import { default as up } from "./src/full-screen/index.vue.mjs";
 import { default as ip } from "./src/resize-observer/index.vue.mjs";
 import { ROW_SELECTION_FIELD as cp } from "./src/ap-grid/constants.mjs";
-import { default as Ip } from "./src/ap-grid/index.vue.mjs";
-import { default as Sp } from "./src/ap-grid/editable/index.vue.mjs";
-import { default as Cp } from "./src/ap-grid/editable/form-item.vue.mjs";
-import { default as Dp } from "./src/text/index.vue.mjs";
-import { default as Gp } from "./src/text/group.vue.mjs";
-import { default as Ep } from "./src/mask/index.vue.mjs";
-import { Splitter as Lp } from "./src/splitter/index.mjs";
-import { useMessage as vp } from "./src/hooks/useMessage.mjs";
-import { useControllableValue as yp } from "./src/hooks/useControllableValue.mjs";
-import { useManualRef as kp } from "./src/hooks/useManualRef.mjs";
-import { useThrottleRef as Kp } from "./src/hooks/useThrottleRef.mjs";
-import { useFullScreen as Up } from "./src/hooks/useFullScreen.mjs";
-import { useResize as _p } from "./src/hooks/useResize.mjs";
+import { toTreeArray as Ip } from "./src/ap-grid/utils/to-tree-array.mjs";
+import { default as Sp } from "./src/ap-grid/index.vue.mjs";
+import { default as Cp } from "./src/ap-grid/editable/index.vue.mjs";
+import { default as Dp } from "./src/ap-grid/editable/form-item.vue.mjs";
+import { default as Gp } from "./src/text/index.vue.mjs";
+import { default as Ep } from "./src/text/group.vue.mjs";
+import { default as Lp } from "./src/mask/index.vue.mjs";
+import { Splitter as vp } from "./src/splitter/index.mjs";
+import { useMessage as yp } from "./src/hooks/useMessage.mjs";
+import { useControllableValue as kp } from "./src/hooks/useControllableValue.mjs";
+import { useManualRef as Kp } from "./src/hooks/useManualRef.mjs";
+import { useThrottleRef as Up } from "./src/hooks/useThrottleRef.mjs";
+import { useFullScreen as _p } from "./src/hooks/useFullScreen.mjs";
+import { useResize as Wp } from "./src/hooks/useResize.mjs";
 const a = console.log;
 a(`APlus-UI version ${p}`);
 const l = {
@@ -215,7 +216,7 @@ export {
   Re as ApFormProvider,
   ne as ApFormSearchForm,
   be as ApFormSet,
-  Ip as ApGrid,
+  Sp as ApGrid,
   ct as ApGroupSearch,
   vr as ApImage,
   vo as ApInfoLayout,
@@ -240,8 +241,8 @@ export {
   fr as ApTableModal,
   Eo as ApTag,
   Lo as ApTagGroup,
-  Dp as ApText,
-  Gp as ApTextGroup,
+  Gp as ApText,
+  Ep as ApTextGroup,
   qr as ApTitle,
   pr as ApTransformDataHelper,
   ko as ApUpload,
@@ -254,21 +255,21 @@ export {
   n as DEFAULT_NAMESPACE,
   c as DEFAULT_UIMODE,
   bo as DictCode,
-  Sp as EditableGrid,
-  Cp as EditableGridFormItem,
+  Cp as EditableGrid,
+  Dp as EditableGridFormItem,
   Qt as EditableTable,
   Yt as EditableTableFormItem,
   up as FullScreen,
   fp as InternalScrollBar,
   Ut as LruCacher,
-  Ep as Mask,
+  Lp as Mask,
   yo as NeedNameKeyDefault,
   dp as Portal,
   cp as ROW_SELECTION_FIELD,
   ip as ResizeObserver,
   pp as ScrollBar,
   lp as ScrollView,
-  Lp as Splitter,
+  vp as Splitter,
   Go as WorkOrderModal,
   mo as adminToken,
   lo as aplusToken,
@@ -296,23 +297,24 @@ export {
   L as namespaceContextKey,
   s as pathMap,
   S as provideGlobalConfig,
+  Ip as toTreeArray,
   G as translate,
   _t as useApKeepAliveInject,
-  yp as useControllableValue,
-  Up as useFullScreen,
+  kp as useControllableValue,
+  _p as useFullScreen,
   M as useGetDerivedNamespace,
   b as useGlobalConfig,
   rt as useGridRefresh,
   P as useLocale,
-  kp as useManualRef,
-  vp as useMessage,
+  Kp as useManualRef,
+  yp as useMessage,
   v as useNamespace,
   et as usePageListApGrid,
   Qr as usePageListApTable,
-  _p as useResize,
+  Wp as useResize,
   lr as useTableModal,
   jt as useTablePaging,
   Yr as useTableRefresh,
   dr as useTableSelectModal,
-  Kp as useThrottleRef
+  Up as useThrottleRef
 };

package/es/src/ap-form/list/index.vue.d.ts

@@ -7,8 +7,9 @@ type FormListField = {
     fieldName: number;
 };
 type FormListActions = {
-    add: (defaultValue?: any) => void;
+    add: (defaultValue?: any) => number;
     remove: (name: number) => void;
+    getFieldKeys: () => number[];
 };
 type ApFormListSlots = {
     default(props: {

package/es/src/ap-form/list/index.vue.mjs

@@ -1,7 +1,7 @@
-import { defineComponent as V, onMounted as k, computed as f, unref as s, renderSlot as v } from "vue";
-import { useInjectForm as h } from "../context.mjs";
-import { isArray as j } from "lodash-unified";
-const g = /* @__PURE__ */ V({
+import { defineComponent as v, onMounted as V, computed as p, unref as i, renderSlot as K } from "vue";
+import { useInjectForm as g } from "../context.mjs";
+import { isArray as h } from "lodash-unified";
+const b = /* @__PURE__ */ v({
   name: "ApFormList",
   __name: "index",
   props: {
@@ -9,43 +9,47 @@ const g = /* @__PURE__ */ V({
     initialValue: {},
     transform: { type: [Function, Object] }
   },
-  setup(p) {
-    let o = 1;
-    const a = [], t = p, { model: i, updateModel: r, internalInstance: c } = h();
-    k(() => {
+  setup(y) {
+    let s = 1;
+    const a = [], t = y, { model: u, updateModel: o, internalInstance: c } = g();
+    V(() => {
       c == null || c.registerField({
         name: t.name,
         initialValue: t.initialValue,
         transform: t.transform
       });
     });
-    const u = f(() => t.name ? j(t.name) ? t.name.reduce((e, n) => e == null ? void 0 : e[n], s(i)) : i == null ? void 0 : i.value[t.name] : null);
-    function y(e = void 0) {
-      const n = s(u) ? [...s(u), e] : [e];
-      a.push(o), o += 1, r == null || r(t.name, n);
+    const m = p(() => t.name ? h(t.name) ? t.name.reduce((e, n) => e == null ? void 0 : e[n], i(u)) : u == null ? void 0 : u.value[t.name] : null);
+    function d(e = void 0) {
+      const n = i(m) ? [...i(m), e] : [e], r = s;
+      return a.push(r), s += 1, o == null || o(t.name, n), r;
     }
-    function d(e) {
-      let n = s(u) || [];
-      n = [...n.slice(0, e), ...n.slice(e + 1)], a.splice(e, 1), r == null || r(t.name, n);
+    function F(e) {
+      let n = i(m) || [];
+      n = [...n.slice(0, e), ...n.slice(e + 1)], a.splice(e, 1), o == null || o(t.name, n);
     }
-    const _ = {
-      add: y,
-      remove: d
-    }, F = f(() => (s(u) || []).map((n, m) => {
-      let l = a[m];
-      return typeof l > "u" && (a[m] = o, l = o, o += 1), {
+    function _() {
+      return f.value.map((e) => e.key);
+    }
+    const k = {
+      add: d,
+      remove: F,
+      getFieldKeys: _
+    }, f = p(() => (i(m) || []).map((n, r) => {
+      let l = a[r];
+      return typeof l > "u" && (a[r] = s, l = s, s += 1), {
         key: l,
-        fieldName: m,
-        name: [t.name, m].flat(),
+        fieldName: r,
+        name: [t.name, r].flat(),
         value: n
       };
     }));
-    return (e, n) => v(e.$slots, "default", {
-      fields: F.value,
-      actions: _
+    return (e, n) => K(e.$slots, "default", {
+      fields: f.value,
+      actions: k
     });
   }
 });
 export {
-  g as default
+  b as default
 };

package/es/src/ap-form/search-form/hooks/use-sorter.mjs

@@ -28,7 +28,10 @@ const w = (s) => {
     };
   }));
   function i(a) {
-    const n = l(a, s.value);
+    const n = l(
+      a || [],
+      s.value || []
+    );
     r.value = !0, s.value = n;
   }
   return {

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

@@ -1,4 +1,4 @@
-import { defineComponent as P, useSlots as A, toRef as W, ref as h, unref as r, watch as G, nextTick as U, createBlock as $, openBlock as q, mergeProps as y, withCtx as g, createVNode as J, createSlots as Q, renderList as X, renderSlot as Y, normalizeProps as Z, guardReactiveProps as I } from "vue";
+import { defineComponent as P, useSlots as A, toRef as W, ref as h, unref as u, watch as G, nextTick as U, createBlock as $, openBlock as q, mergeProps as y, withCtx as g, createVNode as J, createSlots as Q, renderList as X, renderSlot as Y, normalizeProps as Z, guardReactiveProps as I } from "vue";
 import { ApForm as C } from "../../ap-form/index.mjs";
 import { isArray as w, isUndefined as M, isNumber as m, cloneDeep as ee, omit as oe } from "lodash-unified";
 import "../../config-provider/index.mjs";
@@ -148,6 +148,7 @@ const Ce = /* @__PURE__ */ P({
     rowHighlightable: {
       type: [Boolean, Function]
     },
+    treeConfig: {},
     columns: {},
     defaultValue: {},
     "onUpdate:value": {},
@@ -172,7 +173,7 @@ const Ce = /* @__PURE__ */ P({
     const {
       internalInstance: o,
       model: v
-    } = ae(), p = W(l.name), d = h(F(r(v), p.value) || []), N = C.useWatch(p);
+    } = ae(), p = W(l.name), d = h(F(u(v), p.value) || []), N = C.useWatch(p);
     G(() => N.value, async (e) => {
       var t;
       await U(), d.value = e, (t = l.onChange) == null || t.call(l, e);
@@ -182,61 +183,61 @@ const Ce = /* @__PURE__ */ P({
     const c = h(), D = ne("valueTypeMap"), V = te(l, D);
     function L(e, t) {
       var f;
-      const n = ((f = r(d)) == null ? void 0 : f.length) || 0;
+      const n = ((f = u(d)) == null ? void 0 : f.length) || 0;
       if (b(l.maxLength) && n >= l.maxLength)
         return;
       const a = {
         ...e || {}
       };
-      o == null || o.setFieldValue(l.name, a, !0, (s, u) => {
-        if (!s[u]) {
-          s[u] = [a];
+      o == null || o.setFieldValue(l.name, a, !0, (r, s) => {
+        if (!r[s]) {
+          r[s] = [a];
           return;
         }
-        M(t) ? s[u].push(a) : s[u].splice(t, 0, a);
+        M(t) ? r[s].push(a) : r[s].splice(t, 0, a);
       });
     }
     function T(e, t = "suffix") {
-      var s;
-      const n = ((s = r(d)) == null ? void 0 : s.length) || 0, a = m(e) ? e : e.length;
+      var r;
+      const n = ((r = u(d)) == null ? void 0 : r.length) || 0, a = m(e) ? e : e.length;
       if (b(l.maxLength) && n + a > l.maxLength)
         return;
       const f = m(e) ? new Array(e).fill(0).map(() => ({})) : ee(e);
-      o == null || o.setFieldValue(l.name, f, !0, (u, i) => {
-        if (!u[i]) {
-          u[i] = [...f];
+      o == null || o.setFieldValue(l.name, f, !0, (s, i) => {
+        if (!s[i]) {
+          s[i] = [...f];
           return;
         }
-        t === "suffix" ? u[i].push(...f) : u[i].unshift(...f);
+        t === "suffix" ? s[i].push(...f) : s[i].unshift(...f);
       });
     }
     function k(e) {
       const t = new Set(m(e) ? [e] : e);
       o == null || o.setFieldValue(l.name, void 0, !0, (n, a) => {
-        n[a] = n[a].filter((f, s) => !t.has(s));
+        n[a] = n[a].filter((f, r) => !t.has(r));
       });
     }
     function _(e) {
       var n;
       const t = new Set(w(e) ? e : [e]);
       t.size !== 0 && ((n = o == null ? void 0 : o.setFieldValue) == null || n.call(o, l.name, void 0, !0, (a, f) => {
-        a[f] = a[f].filter((s) => !t.has(s[l.rowKey]));
+        a[f] = a[f].filter((r) => !t.has(r[l.rowKey]));
       }));
     }
     function j() {
-      return r(d);
+      return u(d);
     }
     function E(e) {
       var t;
-      return (t = r(d)) == null ? void 0 : t[e];
+      return (t = u(d)) == null ? void 0 : t[e];
     }
     function O(e, t, n = !0) {
       o == null || o.setFieldValue(l.name, void 0, !0, (a, f) => {
         if (!(!a[f] || !a[f][e])) {
           if (!n) {
-            const s = Object.keys(a[f][e]);
-            for (const u of s)
-              u !== l.rowKey && delete a[f][e][u];
+            const r = Object.keys(a[f][e]);
+            for (const s of r)
+              s !== l.rowKey && delete a[f][e][s];
           }
           Object.assign(a[f][e], {
             ...t
@@ -267,15 +268,15 @@ const Ce = /* @__PURE__ */ P({
       setTableData: z,
       clear: H,
       removeByKey: _
-    }), (e, t) => (q(), $(r(C).FormItem, y(e.formItem, {
+    }), (e, t) => (q(), $(u(C).FormItem, y(e.formItem, {
       name: e.name,
       label: e.label
     }), {
-      default: g(() => [J(fe, y(r(oe)(l, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
+      default: g(() => [J(fe, y(u(oe)(l, ["name", "value", "onUpdate:value", "maxLength", "onChange", "defaultValue", "formItem"]), {
         ref_key: "tableRef",
         ref: c,
-        class: r(S)(),
-        columns: r(V),
+        class: u(S)(),
+        columns: u(V),
         "data-source": d.value,
         "search-form": !1
       }), Q({

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

@@ -149,6 +149,7 @@ const Re = /* @__PURE__ */ $({
     rowHighlightable: {
       type: [Boolean, Function]
     },
+    treeConfig: {},
     columns: {},
     defaultValue: {},
     "onUpdate:value": {},

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

@@ -5,3 +5,4 @@ export { ApGrid, EditableGrid, EditableGridFormItem };
 export * from './interface';
 export * from './editable/interface';
 export { ROW_SELECTION_FIELD } from './constants';
+export { toTreeArray } from './utils/to-tree-array';

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

@@ -3,7 +3,9 @@ import "./editable/index.vue2.mjs";
 import "./editable/form-item.vue2.mjs";
 import "./interface.mjs";
 import "./editable/interface.mjs";
-import { ROW_SELECTION_FIELD as I } from "./constants.mjs";
+import { ROW_SELECTION_FIELD as E } from "./constants.mjs";
+import { toTreeArray as x } from "./utils/to-tree-array.mjs";
 export {
-  I as ROW_SELECTION_FIELD
+  E as ROW_SELECTION_FIELD,
+  x as toTreeArray
 };

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

@@ -111,7 +111,8 @@ const Go = /* @__PURE__ */ Oe({
     virtual: { type: [Boolean, Object], default: void 0 },
     expandable: {},
     value: {},
-    rowHighlightable: { type: [Boolean, Function], default: !1 }
+    rowHighlightable: { type: [Boolean, Function], default: !1 },
+    treeConfig: {}
   },
   setup(se, { expose: ie }) {
     var Y;

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

@@ -65,6 +65,14 @@ export type ApGridColumnType<RecordType = any, ExtraValueType = 'text', ValueTyp
      * 指定渲染内容是否为html
      */
     html?: boolean;
+    /**
+     * 指定当前列是否是VxeTable内置的序号列
+     */
+    seq?: boolean;
+    /**
+     * 指定当前列为树节点
+     */
+    treeNode?: boolean;
     /**
      * 值类型额外配置的参数（用于查询表单渲染）
      */
@@ -244,6 +252,10 @@ export type ApGridProps<RecordType = any, ParamsType = any> = Omit<TableProps<Re
      * 行是否可以被高亮（传入函数可以获取当前被选中的行）
      */
     rowHighlightable?: boolean | ((current: RecordType) => void);
+    /**
+     * 树形表格设置（部分vxe-table.treeConfig配置）
+     */
+    treeConfig?: Omit<VxeTablePropTypes.TreeConfig<RecordType>, 'transform' | 'iconOpen' | 'iconClose' | 'iconLoaded'>;
 };
 export type ApGridVirtualConfig = {
     x?: false | number;

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

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

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

@@ -1,20 +1,20 @@
-import { createVNode as m } from "vue";
+import { createVNode as l } from "vue";
 import { VxeColumn as u, VxeColgroup as p } from "vxe-table";
-import { transformCol as d } from "./col.mjs";
+import { transformCol as s } from "./col.mjs";
 function n(r) {
   var e;
-  return (e = r.children) != null && e.length ? m(p, r, {
+  return (e = r.children) != null && e.length ? l(p, r, {
     ...r.slots || {},
     default: () => {
-      var t;
-      return (t = r.children) == null ? void 0 : t.map((o) => n(o));
+      var o;
+      return (o = r.children) == null ? void 0 : o.map((t) => n(t));
     }
-  }) : m(u, r, {
+  }) : (console.log("config", r), l(u, r, {
     ...r.slots || {}
-  });
+  }));
 }
-function C(r, e, t, o) {
-  return r.map((l) => n(d(l, e, t, o)));
+function C(r, e, o, t) {
+  return r.map((m) => n(s(m, e, o, t)));
 }
 export {
   C as renderWithColumns

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

@@ -1,10 +1,10 @@
-import { omit as u, isUndefined as s, isFunction as c, isNumber as C } from "lodash-unified";
+import { omit as d, isUndefined as s, isFunction as c, isNumber as C } from "lodash-unified";
 import { isDef as m } from "../../utils/index.mjs";
-const w = 20, b = 50, g = (e) => e.some((t) => !!t.html);
+const g = 20, w = 50, b = (e) => e.some((t) => !!t.html);
 function R(e) {
   var n;
   const t = {
-    ...u(e, [
+    ...d(e, [
       "columns",
       "request",
       "searchForm",
@@ -18,7 +18,7 @@ function R(e) {
     isHover: !0,
     keyField: e.rowKey,
     isCurrent: !!e.rowHighlightable
-  }, t.columnConfig = {}, g(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) {
+  }, 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,
@@ -42,7 +42,7 @@ function R(e) {
       range: o.range || !1
     };
   }
-  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = u(e.expandable, [
+  return t.border = e.bordered === !1 ? "inner" : !0, e.expandable && (t.expandConfig = d(e.expandable, [
     "renderContent",
     "width",
     "title"
@@ -50,15 +50,21 @@ function R(e) {
     enabled: !1
   }, t.virtualYConfig = {
     enabled: !1
-  }) : (a(t, "X", e.virtual), a(t, "Y", e.virtual)), t.round = m(e.round) ? e.round : !e.card, e.virtual !== !1 && (t.headerCellConfig = {
+  }) : (f(t, "X", e.virtual), f(t, "Y", e.virtual)), t.round = m(e.round) ? e.round : !e.card, e.virtual !== !1 && (t.headerCellConfig = {
     height: 36,
     ...t.headerCellConfig || {}
+  }), t.treeConfig && (t.treeConfig = {
+    ...t.treeConfig || {},
+    /**
+     * 使用非树层级列表，配合transform
+     */
+    transform: !0
   }), t;
 }
-function a(e, t, i) {
-  const n = t === "X", o = n ? "x" : "y", r = n ? "virtualXConfig" : "virtualYConfig", l = i == null ? void 0 : i[o], f = l !== !1, d = n ? w : b, h = C(l) && l >= 0 ? l : d;
+function f(e, t, i) {
+  const n = t === "X", o = n ? "x" : "y", r = n ? "virtualXConfig" : "virtualYConfig", l = i == null ? void 0 : i[o], a = l !== !1, u = n ? g : w, h = C(l) && l >= 0 ? l : u;
   e[r] = {
-    enabled: f,
+    enabled: a,
     gt: h,
     oSize: (i == null ? void 0 : i.oSize) || 0
   };