intable 0.0.3 → 0.0.4

package/dist/plugins/RenderPlugin/components.js

@@ -3,102 +3,84 @@ import x_default from "../../x.js";
 import { createComponent, insert, memo, mergeProps, spread, template } from "solid-js/web";
 import { For, splitProps } from "solid-js";
 import { combineProps } from "@solid-primitives/props";
-var _tmpl$ = /* @__PURE__ */ template(`<input type=checkbox>`), _tmpl$2 = /* @__PURE__ */ template(`<div>`);
-const Checkbox = (_props) => {
-	let props;
-	[_props, props] = splitProps(_props, ["value", "onChange"]);
-	props = combineProps({ get class() {
-		return `you-checkbox ${_props.value && "checked"}`;
-	} }, props);
-	return (() => {
-		var _el$ = _tmpl$();
-		_el$.addEventListener("change", (e) => _props.onChange?.(e.currentTarget.checked));
-		spread(_el$, mergeProps({ get checked() {
-			return _props.value || false;
-		} }, props), false, false);
-		return _el$;
+var _tmpl$ = /* @__PURE__ */ template("<input type=checkbox>"), _tmpl$2 = /* @__PURE__ */ template("<div>");
+const Checkbox = (e) => {
+	let f;
+	return [e, f] = splitProps(e, ["value", "onChange"]), f = combineProps({ get class() {
+		return `you-checkbox ${e.value && "checked"}`;
+	} }, f), (() => {
+		var p = _tmpl$();
+		return p.addEventListener("change", (f) => e.onChange?.(f.currentTarget.checked)), spread(p, mergeProps({ get checked() {
+			return e.value || !1;
+		} }, f), !1, !1), p;
 	})();
-};
-const Files = (_props2) => {
-	let props;
-	[_props2, props] = splitProps(_props2, []);
-	return createComponent(Tags, props);
-};
-const Tags = (_props3) => {
-	let props;
-	[_props3, props] = splitProps(_props3, [
+}, Files = (e) => {
+	let f;
+	return [e, f] = splitProps(e, []), createComponent(Tags, f);
+}, Tags = (f) => {
+	let h;
+	[f, h] = splitProps(f, [
 		"value",
 		"children",
 		"disabled",
 		"onChange",
 		"onAdd"
-	]);
-	props = combineProps({ class: "flex flex-wrap items-center gap-2 h-full" }, props);
-	const toarr = (v) => Array.isArray(v) ? v : v != null ? [v] : [];
+	]), h = combineProps({ class: "flex flex-wrap items-center gap-2 h-full" }, h);
+	let g = (e) => Array.isArray(e) ? e : e == null ? [] : [e];
 	return (() => {
-		var _el$2 = _tmpl$2();
-		spread(_el$2, props, false, true);
-		insert(_el$2, createComponent(For, {
+		var _ = _tmpl$2();
+		return spread(_, h, !1, !0), insert(_, createComponent(For, {
 			get each() {
-				return toarr(_props3.value);
+				return g(f.value);
 			},
 			children: (e) => createComponent(Tag, {
 				get style() {
 					return `background: ${e.color}`;
 				},
 				get disabled() {
-					return _props3.disabled;
+					return f.disabled;
 				},
-				onDel: () => _props3.onChange(toarr(_props3.value).filter((e2) => e2 != e)),
+				onDel: () => f.onChange(g(f.value).filter((f) => f != e)),
 				get children() {
-					return memo(() => !!_props3.children)() ? _props3.children(e) : e?.text ?? e?.label ?? e?.name ?? e;
+					return memo(() => !!f.children)() ? f.children(e) : e?.text ?? e?.label ?? e?.name ?? e;
 				}
 			})
-		}), null);
-		insert(_el$2, (() => {
-			var _c$ = memo(() => !!!_props3.disabled);
-			return () => _c$() && createComponent(Tag, {
-				disabled: true,
+		}), null), insert(_, (() => {
+			var m = memo(() => !f.disabled);
+			return () => m() && createComponent(Tag, {
+				disabled: !0,
 				get onClick() {
-					return _props3.onAdd;
+					return f.onAdd;
 				},
 				get children() {
 					return createComponent(plus_default, {});
 				}
 			});
-		})(), null);
-		return _el$2;
+		})(), null), _;
 	})();
-};
-const Tag = (_props4) => {
-	let props;
-	[_props4, props] = splitProps(_props4, [
+}, Tag = (e) => {
+	let h;
+	return [e, h] = splitProps(e, [
 		"disabled",
 		"children",
 		"onDel"
-	]);
-	props = combineProps({ class: "flex items-center px-2 py-1 rd-sm bg-gray/20 text-3.5 lh-[1]" }, props);
-	return (() => {
-		var _el$3 = _tmpl$2();
-		spread(_el$3, props, false, true);
-		insert(_el$3, () => _props4.children, null);
-		insert(_el$3, (() => {
-			var _c$2 = memo(() => !!!_props4.disabled);
-			return () => _c$2() && createComponent(x_default, {
-				"class": "icon-clickable flex-shrink-0 size-4! ml-1 mr--1 op-75",
+	]), h = combineProps({ class: "flex items-center px-2 py-1 rd-sm bg-gray/20 text-3.5 lh-[1]" }, h), (() => {
+		var g = _tmpl$2();
+		return spread(g, h, !1, !0), insert(g, () => e.children, null), insert(g, (() => {
+			var m = memo(() => !e.disabled);
+			return () => m() && createComponent(x_default, {
+				class: "icon-clickable flex-shrink-0 size-4! ml-1 mr--1 op-75",
 				get onClick() {
-					return _props4.onDel;
+					return e.onDel;
 				}
 			});
-		})(), null);
-		return _el$3;
+		})(), null), g;
 	})();
-};
-const evaluateFormula = (formula, data) => {
+}, evaluateFormula = (e, f) => {
 	try {
-		const ctx = { data };
-		return new Function(...Object.keys(ctx), `return ` + formula)(...Object.values(ctx));
-	} catch (error) {
+		let p = { data: f };
+		return Function(...Object.keys(p), "return " + e)(...Object.values(p));
+	} catch {
 		return "公式错误";
 	}
 };

package/dist/plugins/RenderPlugin/index.js

@@ -3,59 +3,46 @@ import { Checkbox, Files } from "./components.js";
 import { renderComponent, solidComponent } from "../../components/utils.js";
 import { createComponent, insert, memo, mergeProps, template } from "solid-js/web";
 import { mergeProps as mergeProps$1 } from "solid-js";
-var _tmpl$ = /* @__PURE__ */ template(`<div class="flex items-center h-full">`);
+var _tmpl$ = /* @__PURE__ */ template("<div class=\"flex items-center h-full\">");
 const RenderPlugin = {
 	priority: -Infinity,
 	store: () => ({ renders: { ...renders } }),
-	rewriteProps: { Td: ({ Td }, { store }) => (o) => {
-		return createComponent(Td, mergeProps(o, { get children() {
-			return (() => {
-				let Comp = ((e) => typeof e == "string" ? store.renders[e] : e)(o.col.render) || text;
-				return renderComponent(Comp, mergeProps$1(o, { onChange: (v) => store.commands.rowChange({
-					...o.data,
-					[o.col.id]: v
-				}, o.y) }), store.props.renderer);
-			})();
-		} }));
-	} }
+	rewriteProps: { Td: ({ Td: e }, { store: p }) => (m) => createComponent(e, mergeProps(m, { get children() {
+		return (() => {
+			let e = ((e) => typeof e == "string" ? p.renders[e] : e)(m.col.render) || text;
+			return renderComponent(e, mergeProps$1(m, { onChange: (e) => p.commands.rowChange({
+				...m.data,
+				[m.col.id]: e
+			}, m.y) }), p.props.renderer);
+		})();
+	} })) }
 };
-var text = (_props) => {
-	return memo(() => ((v) => _props.col.enum ? resolveOptions(_props.col.enum).find((e) => e.value == v)?.label ?? v : v)(_props.data[_props.col.id]));
-};
-var number = text;
-var date = text;
-var checkbox = (_props2) => {
-	return (() => {
-		var _el$ = _tmpl$();
-		insert(_el$, createComponent(Checkbox, {
-			"class": "",
+var text = (p) => memo(() => ((m) => p.col.enum ? resolveOptions(p.col.enum).find((e) => e.value == m)?.label ?? m : m)(p.data[p.col.id]));
+const renders = {
+	text,
+	number: text,
+	date: text,
+	checkbox: (e) => (() => {
+		var m = _tmpl$();
+		return insert(m, createComponent(Checkbox, {
+			class: "",
 			get value() {
-				return _props2.data[_props2.col.id];
+				return e.data[e.col.id];
 			},
 			get onChange() {
-				return _props2.onChange;
+				return e.onChange;
 			}
-		}));
-		return _el$;
-	})();
-};
-var file = (_props3) => {
-	return createComponent(Files, {
+		})), m;
+	})(),
+	file: (e) => createComponent(Files, {
 		get value() {
-			return _props3.data[_props3.col.id];
+			return e.data[e.col.id];
 		},
 		get onChange() {
-			return _props3.onChange;
+			return e.onChange;
 		},
-		disabled: true
-	});
-};
-const renders = {
-	text,
-	number,
-	date,
-	checkbox,
-	file
+		disabled: !0
+	})
 };
-for (const k in renders) renders[k] = solidComponent(renders[k]);
+for (let e in renders) renders[e] = solidComponent(renders[e]);
 export { RenderPlugin, renders };

package/dist/plugins/ResizePlugin.js

@@ -8,62 +8,34 @@ import { combineProps } from "@solid-primitives/props";
 import { clamp } from "es-toolkit";
 import { createEventListener } from "@solid-primitives/event-listener";
 import { defaultsDeep } from "es-toolkit/compat";
-var _tmpl$ = /* @__PURE__ */ template(`<div>`);
-var COL = Symbol("col_size");
-var ROW = Symbol("row_size");
-var ColHandle = (o) => {
-	const { props, store } = useContext(Ctx);
-	let el;
-	usePointerDrag(() => el, { start(e, move, end) {
-		e.stopPropagation();
-		const i = o.x;
-		const { min, max } = props.resizable.col;
-		const th = el.parentElement;
-		const sw = th.offsetWidth;
-		move((e$1, { ox }) => store[COL][o.x] = clamp(sw + ox, min, max));
-		end(() => {
-			const col = props.columns[i];
-			const cols = [...store.rawProps.columns || []];
-			const index = cols.indexOf(col[store.raw] ?? col);
-			if (index > -1) {
-				cols[index] = {
-					...cols[index],
-					width: th.offsetWidth
-				};
-				props.onColumnsChange?.(cols);
-			}
-			col.onWidthChange?.(th.offsetWidth);
+var _tmpl$ = /* @__PURE__ */ template("<div>"), COL = Symbol("col_size"), ROW = Symbol("row_size"), ColHandle = (e) => {
+	let { props: g, store: v } = useContext(Ctx), y;
+	return usePointerDrag(() => y, { start(p, m, h) {
+		p.stopPropagation();
+		let _ = e.x, { min: b, max: x } = g.resizable.col, S = y.parentElement, C = S.offsetWidth;
+		m((p, { ox: m }) => v[COL][e.x] = clamp(C + m, b, x)), h(() => {
+			let e = g.columns[_], p = [...v.rawProps.columns || []], m = p.indexOf(e[v.raw] ?? e);
+			m > -1 && (p[m] = {
+				...p[m],
+				width: S.offsetWidth
+			}, g.onColumnsChange?.(p)), e.onWidthChange?.(S.offsetWidth);
 		});
-	} });
-	return (() => {
-		var _el$ = _tmpl$();
-		var _ref$ = el;
-		typeof _ref$ === "function" ? use(_ref$, _el$) : el = _el$;
-		effect(() => className(_el$, `in-cell__resize-handle absolute top-0 right-0 flex justify-center w-10px! ${o.x == props.columns.length - 1 ? "justify-end!" : "w-10px! translate-x-1/2"} after:w-1 cursor-w-resize z-1`));
-		return _el$;
+	} }), (() => {
+		var p = _tmpl$(), m = y;
+		return typeof m == "function" ? use(m, p) : y = p, effect(() => className(p, `in-cell__resize-handle absolute top-0 right-0 flex justify-center w-10px! ${e.x == g.columns.length - 1 ? "justify-end!" : "w-10px! translate-x-1/2"} after:w-1 cursor-w-resize z-1`)), p;
 	})();
-};
-var RowHandle = (o) => {
-	const { props, store } = useContext(Ctx);
-	let el;
-	usePointerDrag(() => el, { start(e, move, end) {
-		e.stopPropagation();
-		const i = o.y;
-		const { min, max } = props.resizable.row;
-		const sh = el.parentElement.offsetHeight;
-		move((e$1, { oy }) => store[ROW][o.y] = clamp(sh + oy, min, max));
-		end(() => {
-			const row = props.data[i];
-			if ([...store.rawProps.data || []].indexOf(row[store.raw] ?? row) > -1) {}
+}, RowHandle = (e) => {
+	let { props: g, store: v } = useContext(Ctx), y;
+	return usePointerDrag(() => y, { start(p, m, h) {
+		p.stopPropagation();
+		let _ = e.y, { min: b, max: x } = g.resizable.row, S = y.parentElement.offsetHeight;
+		m((p, { oy: m }) => v[ROW][e.y] = clamp(S + m, b, x)), h(() => {
+			let e = g.data[_];
+			[...v.rawProps.data || []].indexOf(e[v.raw] ?? e);
 		});
-	} });
-	createEventListener(() => el, "dblclick", () => o.data[COL] = void 0);
-	return (() => {
-		var _el$2 = _tmpl$();
-		var _ref$2 = el;
-		typeof _ref$2 === "function" ? use(_ref$2, _el$2) : el = _el$2;
-		effect(() => className(_el$2, `in-cell__resize-handle absolute bottom-0 left-0 flex flex-col justify-center h-1! ${o.y == props.data.length - 1 ? "justify-end!" : ""} after:h-1 cursor-s-resize z-1`));
-		return _el$2;
+	} }), createEventListener(() => y, "dblclick", () => e.data[COL] = void 0), (() => {
+		var p = _tmpl$(), m = y;
+		return typeof m == "function" ? use(m, p) : y = p, effect(() => className(p, `in-cell__resize-handle absolute bottom-0 left-0 flex flex-col justify-center h-1! ${e.y == g.data.length - 1 ? "justify-end!" : ""} after:h-1 cursor-s-resize z-1`)), p;
 	})();
 };
 const ResizePlugin = {
@@ -72,45 +44,37 @@ const ResizePlugin = {
 		[ROW]: []
 	}),
 	rewriteProps: {
-		resizable: ({ resizable }) => defaultsDeep(resizable, {
+		resizable: ({ resizable: e }) => defaultsDeep(e, {
 			col: {
-				enable: true,
+				enable: !0,
 				min: 45,
 				max: 800
 			},
 			row: {
-				enable: false,
+				enable: !1,
 				min: 20,
 				max: 400
 			}
 		}),
-		columns: ({ columns }, { store }) => (columns = columns.map((e, i) => ({
+		columns: ({ columns: e }, { store: p }) => (e = e.map((e, m) => ({
 			...e,
-			[store.raw]: e[store.raw] ?? e
-		})), columns = columns.map((e) => e.resizable === void 0 ? {
+			[p.raw]: e[p.raw] ?? e
+		})), e = e.map((e) => e.resizable === void 0 ? {
 			...e,
-			resizable: store.props?.resizable?.col.enable,
-			[store.raw]: e[store.raw] ?? e
-		} : e), columns = columns.map((e, i) => store[COL][i] ? {
+			resizable: p.props?.resizable?.col.enable,
+			[p.raw]: e[p.raw] ?? e
+		} : e), e = e.map((e, m) => p[COL][m] ? {
 			...e,
-			width: store[COL][i],
-			[store.raw]: e[store.raw] ?? e
-		} : e), untrack(() => batch(() => reconcile(columns, { key: store.raw })(store.__resize__cols ??= [])))),
-		Th: ({ Th }, { store }) => (o) => {
-			o = combineProps({ class: "relative" }, o);
-			return createComponent(Th, mergeProps(o, { get children() {
-				return [memo(() => o.children), memo(() => memo(() => !!o.col.resizable)() && createComponent(ColHandle, o))];
-			} }));
-		},
-		Td: ({ Td }, { store }) => !store.props?.resizable?.row.enable ? Td : (o) => {
-			o = combineProps({ class: "relative" }, o);
-			return createComponent(Td, mergeProps(o, { get children() {
-				return [memo(() => o.children), memo(() => memo(() => !!(o.x == 0 && store.props?.resizable?.row.enable))() && createComponent(RowHandle, o))];
-			} }));
-		},
-		cellStyle: ({ cellStyle }, { store }) => (o) => {
-			return `${unFn(cellStyle, o)};` + (store[ROW][o.y] ? `height: ${store[ROW][o.y]}px` : "");
-		}
+			width: p[COL][m],
+			[p.raw]: e[p.raw] ?? e
+		} : e), untrack(() => batch(() => reconcile(e, { key: p.raw })(p.__resize__cols ??= [])))),
+		Th: ({ Th: e }, { store: p }) => (p) => (p = combineProps({ class: "relative" }, p), createComponent(e, mergeProps(p, { get children() {
+			return [memo(() => p.children), memo(() => memo(() => !!p.col.resizable)() && createComponent(ColHandle, p))];
+		} }))),
+		Td: ({ Td: e }, { store: p }) => p.props?.resizable?.row.enable ? (m) => (m = combineProps({ class: "relative" }, m), createComponent(e, mergeProps(m, { get children() {
+			return [memo(() => m.children), memo(() => memo(() => !!(m.x == 0 && p.props?.resizable?.row.enable))() && createComponent(RowHandle, m))];
+		} }))) : e,
+		cellStyle: ({ cellStyle: p }, { store: m }) => (h) => `${unFn(p, h)};` + (m[ROW][h.y] ? `height: ${m[ROW][h.y]}px` : "")
 	}
 };
 export { ResizePlugin };

package/dist/plugins/RowGroupPlugin.js

@@ -4,95 +4,79 @@ import { createComponent, delegateEvents, effect, insert, memo, mergeProps, styl
 import { batch, createMemo, useContext } from "solid-js";
 import { groupBy, isEqual, remove, zipObject } from "es-toolkit";
 import { findLast } from "es-toolkit/compat";
-var _tmpl$ = /* @__PURE__ */ template(`<div class="flex items-center">`);
+var _tmpl$ = /* @__PURE__ */ template("<div class=\"flex items-center\">");
 const RowGroupPlugin = {
 	priority: -Infinity,
-	store: (store) => ({ rowGroup: {
+	store: (e) => ({ rowGroup: {
 		expands: [],
-		isExpand: (data) => store.rowGroup.expands.some((e) => isEqual(e, data[GROUP].path)),
-		expand: (data, r) => batch(() => r ? data[GROUP].path2.forEach((e) => store.rowGroup.isExpand(e) || store.rowGroup.expands.push(e[GROUP].path)) : store.rowGroup.isExpand(data) || store.rowGroup.expands.push(data[GROUP].path)),
-		toggleExpand: (data) => store.rowGroup.isExpand(data) ? remove(store.rowGroup.expands, (e) => isEqual(e, data[GROUP].path)) : store.rowGroup.expand(data)
+		isExpand: (u) => e.rowGroup.expands.some((e) => isEqual(e, u[GROUP].path)),
+		expand: (u, d) => batch(() => d ? u[GROUP].path2.forEach((u) => e.rowGroup.isExpand(u) || e.rowGroup.expands.push(u[GROUP].path)) : e.rowGroup.isExpand(u) || e.rowGroup.expands.push(u[GROUP].path)),
+		toggleExpand: (u) => e.rowGroup.isExpand(u) ? remove(e.rowGroup.expands, (e) => isEqual(e, u[GROUP].path)) : e.rowGroup.expand(u)
 	} }),
-	commands: (store, { addRows }) => ({ addRows(i, rows, before) {
-		const { data, rowGroup, rowKey } = store.props;
-		if (rowGroup?.fields?.length) {
-			const group = findLast(data, (e) => e[GROUP], i);
-			if (group) {
-				if (data[i][GROUP]) {
-					const leaf = function r(group$1) {
-						return group$1[GROUP]?.children[0]?.[GROUP] ? r(group$1[GROUP].children[0]) : group$1;
-					}(group);
-					store.rowGroup.expand(leaf, true);
-					const anchor = leaf[GROUP].children[0];
-					i = store.props.data.indexOf(anchor);
-					before = true;
-				}
+	commands: (e, { addRows: u }) => ({ addRows(d, f, p) {
+		let { data: m, rowGroup: h, rowKey: g } = e.props;
+		if (h?.fields?.length) {
+			let h = findLast(m, (e) => e[GROUP], d);
+			if (h && m[d][GROUP]) {
+				let u = function e(u) {
+					return u[GROUP]?.children[0]?.[GROUP] ? e(u[GROUP].children[0]) : u;
+				}(h);
+				e.rowGroup.expand(u, !0);
+				let f = u[GROUP].children[0];
+				d = e.props.data.indexOf(f), p = !0;
 			}
-			addRows?.(i, rows, before);
-		} else addRows?.(...arguments);
+			u?.(d, f, p);
+		} else u?.(...arguments);
 	} }),
 	rewriteProps: {
-		data: ({ data }, { store }) => store.props?.rowGroup?.fields?.length ? expandData(data, store) : data,
-		newRow: ({ newRow }, { store }) => function(i) {
-			const row = newRow(...arguments);
-			const { data, rowGroup } = store.props;
-			if (rowGroup?.fields?.length) {
-				const group = findLast(data, (e) => e[GROUP], i);
-				if (group) {
-					const leaf = function r(group$1) {
-						return group$1[GROUP]?.children[0]?.[GROUP] ? r(group$1[GROUP].children[0]) : group$1;
-					}(group);
-					const extra = zipObject(rowGroup.fields, leaf[GROUP].path);
-					Object.assign(row, extra);
+		data: ({ data: e }, { store: u }) => u.props?.rowGroup?.fields?.length ? expandData(e, u) : e,
+		newRow: ({ newRow: e }, { store: u }) => function(d) {
+			let f = e(...arguments), { data: p, rowGroup: m } = u.props;
+			if (m?.fields?.length) {
+				let e = findLast(p, (e) => e[GROUP], d);
+				if (e) {
+					let u = function e(u) {
+						return u[GROUP]?.children[0]?.[GROUP] ? e(u[GROUP].children[0]) : u;
+					}(e), d = zipObject(m.fields, u[GROUP].path);
+					Object.assign(f, d);
 				}
 			}
-			return row;
+			return f;
 		},
-		Td: ({ Td }, { store }) => (o) => {
-			if (!o.data?.[GROUP]) return createComponent(Td, o);
-			const { props } = useContext(Ctx);
-			const show = createMemo(() => store.rowGroup.isExpand(o.data));
-			return createComponent(Td, mergeProps(o, { get children() {
-				return memo(() => props.columns?.findIndex((e) => !e[store.internal]) == o.x)() ? (() => {
-					var _el$ = _tmpl$();
-					_el$.$$dblclick = () => store.rowGroup.toggleExpand(o.data);
-					insert(_el$, createComponent(chevron_right_default, {
-						"class": "icon-clickable mr-2",
+		Td: ({ Td: f }, { store: v }) => (y) => {
+			if (!y.data?.[GROUP]) return createComponent(f, y);
+			let { props: b } = useContext(Ctx), x = createMemo(() => v.rowGroup.isExpand(y.data));
+			return createComponent(f, mergeProps(y, { get children() {
+				return memo(() => b.columns?.findIndex((e) => !e[v.internal]) == y.x)() ? (() => {
+					var e = _tmpl$();
+					return e.$$dblclick = () => v.rowGroup.toggleExpand(y.data), insert(e, createComponent(chevron_right_default, {
+						class: "icon-clickable mr-2",
 						get style() {
-							return `transform: rotate(${show() ? 90 : 0}deg); opacity: .6`;
+							return `transform: rotate(${x() ? 90 : 0}deg); opacity: .6`;
 						},
-						onClick: () => store.rowGroup.toggleExpand(o.data)
-					}), null);
-					insert(_el$, () => o.data[GROUP].value, null);
-					effect((_$p) => style(_el$, `padding-left: ${(o.data[GROUP].path.length - 1) * 16}px`, _$p));
-					return _el$;
-				})() : o.children;
+						onClick: () => v.rowGroup.toggleExpand(y.data)
+					}), null), insert(e, () => y.data[GROUP].value, null), effect((u) => style(e, `padding-left: ${(y.data[GROUP].path.length - 1) * 16}px`, u)), e;
+				})() : y.children;
 			} }));
 		}
 	}
 };
-var GROUP = Symbol("row-group");
-var expandData = (data, store, path2 = []) => {
-	const fields = store.props.rowGroup.fields;
-	const col = store.props.columns.find((e) => !e[store.internal]);
-	if (!col) return data;
-	if (fields.length == path2.length) return data;
-	const path = path2[path2.length - 1]?.[GROUP].path || [];
-	const obj = groupBy(data, (e) => e[fields[path.length]]);
-	return Object.keys(obj).flatMap((k) => {
-		const group = {
-			[col.id]: k,
-			[store.internal]: 1
-		};
-		const ps = [...path2, group];
-		group[GROUP] = {
-			path: [...path, k],
-			value: k,
-			path2: ps
-		};
-		group[GROUP].children = expandData(obj[k], store, ps);
-		const arr = store.rowGroup.isExpand(group) ? group[GROUP].children : [];
-		return [group, ...arr];
+var GROUP = Symbol("row-group"), expandData = (e, u, d = []) => {
+	let f = u.props.rowGroup.fields, p = u.props.columns.find((e) => !e[u.internal]);
+	if (!p || f.length == d.length) return e;
+	let m = d[d.length - 1]?.[GROUP].path || [], h = groupBy(e, (e) => e[f[m.length]]);
+	return Object.keys(h).flatMap((e) => {
+		let f = {
+			[p.id]: e,
+			[u.internal]: 1
+		}, g = [...d, f];
+		f[GROUP] = {
+			path: [...m, e],
+			value: e,
+			path2: g
+		}, f[GROUP].children = expandData(h[e], u, g);
+		let _ = u.rowGroup.isExpand(f) ? f[GROUP].children : [];
+		return [f, ..._];
 	});
 };
 delegateEvents(["dblclick"]);