intable 0.0.65 → 0.0.67

package/dist/plugins/EditablePlugin.js

@@ -11,40 +11,40 @@ const EditablePlugin = {
 	name: "editable",
 	store: () => ({ editors: { ...editors } }),
 	rewriteProps: {
-		editable: ({ editable: e }, { store: f }) => (m) => {
-			let h = [m.col.editable, e].filter((e) => e != null);
-			return !!h.length && h.every((e) => unFn(e, m)) && !m.data[f.internal] && !m.col[f.internal];
+		editable: ({ editable: e }, { store: u }) => (f) => {
+			let p = [f.col.editable, e].filter((e) => e != null);
+			return !!p.length && p.every((e) => unFn(e, f)) && !f.data[u.internal] && !f.col[u.internal];
 		},
-		Td: ({ Td: e }, { store: f }) => (h) => {
-			let { props: g } = f, y, b = () => unFn(f.props.editable, h);
-			return createMemo(() => b() ? unFn(() => {
-				let p = "", [S, C] = createSignal(!1), D = () => (([e, f]) => h.x == e && h.y == f)(f.selected.start || []), O = () => b() && !S() && D(), [k, A] = createSignal(!1), j = createAsyncMemo(() => {
-					if (S()) {
-						let e = createMemo(() => JSON.stringify(f.selected ?? "{}"));
-						createEffect(on(e, () => C(!1), { defer: !0 })), P.w = y.getBoundingClientRect().width, P.h = y.getBoundingClientRect().height;
-						let m = !1, _ = h.data[h.col.id], v = ((e) => typeof e == "string" ? f.editors[e] : e)(h.col.editor ?? h.col.type ?? (h.col.enum && "select")) ?? (_ == null ? null : f.editors[typeof _]) ?? f.editors.text, b = {
-							props: h.col.editorProps,
-							col: h.col,
-							eventKey: p,
-							data: h.data,
-							value: _,
+		Td: ({ Td: e }, { store: u }) => (p) => {
+			let { props: m } = u, _, v = () => unFn(u.props.editable, p);
+			return createMemo(() => v() ? unFn(() => {
+				let d = "", [b, x] = createSignal(!1), T = () => (([e, u]) => p.x == e && p.y == u)(u.selected.start || []), O = () => v() && !b() && T(), [k, A] = createSignal(!1), j = createAsyncMemo(() => {
+					if (b()) {
+						let e = createMemo(() => JSON.stringify(u.selected ?? "{}"));
+						createEffect(on(e, () => x(!1), { defer: !0 })), P.w = _.getBoundingClientRect().width, P.h = _.getBoundingClientRect().height;
+						let f = !1, h = p.data[p.col.id], g = ((e) => typeof e == "string" ? u.editors[e] : e)(p.col.editor ?? p.col.type ?? (p.col.enum && "select")) ?? (h == null ? null : u.editors[typeof h]) ?? u.editors.text, v = {
+							props: p.col.editorProps,
+							col: p.col,
+							eventKey: d,
+							data: p.data,
+							value: h,
 							ok: async () => {
-								await M(x.getValue()), C(!1);
+								await M(y.getValue()), x(!1);
 							},
-							cancel: () => (m = !0, C(!1)),
-							onChange: (e) => S() && M(e).catch(() => {})
-						}, x = v(b);
-						return queueMicrotask(() => x.focus?.()), onCleanup(() => {
-							!m && x.getValue() !== _ && f.commands.rowChange({
-								...g.data[h.y],
-								[h.col.id]: x.getValue()
-							}), m || M(x.getValue()).catch(() => {}), p = "", x.destroy();
-						}), [b, x];
+							cancel: () => (f = !0, x(!1)),
+							onChange: (e) => b() && M(e).catch(() => {})
+						}, y = g(v);
+						return queueMicrotask(() => y.focus?.()), onCleanup(() => {
+							!f && y.getValue() !== h && u.commands.rowChange({
+								...m.data[p.y],
+								[p.col.id]: y.getValue()
+							}), f || M(y.getValue()).catch(() => {}), d = "", y.destroy?.();
+						}), [v, y];
 					}
 				});
 				async function M(e) {
 					try {
-						A(!0), await f.validateCell(e, h.data, h.col);
+						A(!0), await u.validateCell(e, p.data, p.col);
 					} finally {
 						A(!1);
 					}
@@ -52,19 +52,19 @@ const EditablePlugin = {
 				let N, P = createMutable({
 					w: 0,
 					h: 0
-				}), F = mergeProps$2(h, {
-					ref: (e) => (y = e, h.ref?.(e)),
+				}), F = mergeProps$2(p, {
+					ref: (e) => (_ = e, p.ref?.(e)),
 					get class() {
-						return [S() ? "is-editing" : "", h.class].filter(Boolean).join(" ");
+						return [b() ? "is-editing" : "", p.class].filter(Boolean).join(" ");
 					},
 					get style() {
-						return [S() ? `width: ${P.w}px; height: ${P.h}px; ` : "", h.style].filter(Boolean).join(" ");
+						return [b() ? `width: ${P.w}px; height: ${P.h}px; ` : "", p.style].filter(Boolean).join(" ");
 					},
-					onClick: (e) => (N?.focus?.(), h.onClick?.(e)),
-					onDblClick: (e) => (C(b()), h.onDblClick?.(e))
+					onClick: (e) => (N?.focus?.(), p.onClick?.(e)),
+					onDblClick: (e) => (x(v()), p.onDblClick?.(e))
 				});
 				return createComponent(e, mergeProps$2(F, { get children() {
-					return [() => j()?.[1]?.dialog ? [memo(() => h.children), memo(() => j()?.[1]?.el)] : j()?.[1]?.el ? (() => {
+					return [() => j()?.[1]?.dialog ? [memo(() => p.children), memo(() => j()?.[1]?.el)] : j()?.[1]?.el ? (() => {
 						var e = _tmpl$();
 						return addEventListener(e, "keydown", (e) => {
 							e.stopPropagation(), e.key == "Enter" && !e.shiftKey && (j()?.[0].ok(), e.preventDefault()), e.key == "Escape" && j()?.[0].cancel();
@@ -72,12 +72,12 @@ const EditablePlugin = {
 							var e = memo(() => !!k());
 							return () => e() && _tmpl$2();
 						})(), null), e;
-					})() : h.children, () => O() && (() => {
+					})() : p.children, () => O() && (() => {
 						var e = _tmpl$3();
 						return e.addEventListener("compositionend", () => {
-							C(!0);
+							x(!0);
 						}), e.$$input = (e) => {
-							p = e.target.value, C(!e.isComposing);
+							d = e.target.value, x(!e.isComposing);
 						}, e.$$keydown = (e) => {
 							e.key == " " && e.preventDefault();
 						}, use((e) => {
@@ -85,34 +85,34 @@ const EditablePlugin = {
 						}, e), e;
 					})()];
 				} }));
-			}) : createComponent(e, h));
+			}) : createComponent(e, p));
 		}
 	}
-};
-var createEditor = (e, p, h) => ({ eventKey: g, value: _, col: y, ok: b, cancel: x, props: S, onChange: C }) => createRoot((x) => {
-	let w = p?.out ?? ((e) => e), [T, E] = createSignal(g || _), D;
-	return createComponent(e, mergeProps$2({
-		ref: (e) => D = e,
-		class: "relative block px-2 size-full z-9 box-border resize-none outline-0",
-		get value() {
-			return T();
-		},
-		onInput: (e) => (E(w(e instanceof Event ? e.target.value : e)), C?.(T())),
-		onChange: (e) => (E(w(e instanceof Event ? e.target.value : e)), C?.(T()), h && b()),
-		get options() {
-			return memo(() => !!y.enum)() ? resolveOptions(y.enum ?? []) : void 0;
-		}
-	}, p, S)), setTimeout(() => {
-		h && D?.showPicker?.();
+}, createEditor = (e, d, p) => (m) => createRoot((h) => {
+	let { eventKey: _, value: v, col: y, ok: b, cancel: x, props: S, onChange: C } = m, w = d?.out ?? ((e) => e), [T, E] = createSignal(p && _ || v), D;
+	return setTimeout(() => {
+		p && D?.showPicker?.();
 	}, 0), {
-		el: D,
+		el: createComponent(e, mergeProps$2({
+			ref: (e) => D = e,
+			class: "relative block px-2 size-full z-9 box-border resize-none outline-0",
+			get value() {
+				return T();
+			},
+			onInput: (e) => (E(w(e instanceof Event ? e.target.value : e)), C?.(T())),
+			onChange: (e) => (E(w(e instanceof Event ? e.target.value : e)), C?.(T()), p && !Array.isArray(T()) && b()),
+			get options() {
+				return memo(() => !!y.enum)() ? resolveOptions(y.enum ?? []) : void 0;
+			}
+		}, d, S, { aaa: m })),
 		getValue: T,
 		focus: () => D.focus(),
-		destroy: x
+		destroy: h
 	};
-}), Input = (e) => (() => {
-	var f = _tmpl$4();
-	return spread(f, e, !1, !1), f;
+});
+var Input = (e) => (() => {
+	var u = _tmpl$4();
+	return spread(u, e, !1, !1), u;
 })();
 const editors = {
 	text: createEditor(Input),
@@ -136,31 +136,31 @@ const editors = {
 	color: createEditor(Input, { type: "color" }),
 	tel: createEditor(Input, { type: "tel" }),
 	password: createEditor(Input, { type: "password" }),
-	file: createEditor((f) => createComponent(Files, mergeProps$2(f, {
+	file: createEditor((u) => createComponent(Files, mergeProps$2(u, {
 		class: "relative z-9 outline-2 outline-blue min-h-a! h-a! p-1 bg-#fff",
-		onAdd: () => chooseFile({ multiple: !0 }).then((e) => f.onChange([...f.value || [], ...e.map((e) => ({
+		onAdd: () => chooseFile({ multiple: !0 }).then((e) => u.onChange([...u.value || [], ...e.map((e) => ({
 			name: e.name,
 			size: e.size
 		}))]))
 	}))),
 	checkbox: createEditor((e) => (() => {
-		var f = _tmpl$5(), p = e.ref;
-		return typeof p == "function" ? use(p, f) : e.ref = f, insert(f, createComponent(Checkbox, mergeProps$2(e, {
+		var u = _tmpl$5(), d = e.ref;
+		return typeof d == "function" ? use(d, u) : e.ref = u, insert(u, createComponent(Checkbox, mergeProps$2(e, {
 			ref: () => {},
 			onInput: () => {},
 			class: "mx-3!"
-		}))), f;
+		}))), u;
 	})()),
 	select: createEditor((e) => (() => {
-		var f = _tmpl$6();
-		return spread(f, e, !1, !0), insert(f, (() => {
-			var f = memo(() => !e.multiple);
-			return () => f() && _tmpl$7();
-		})(), null), insert(f, () => e.options?.map((e) => (() => {
-			var f = _tmpl$8();
-			return insert(f, () => e.label), effect(() => f.value = e.value), f;
-		})()), null), effect(() => f.value = e.value), f;
+		var u = _tmpl$6();
+		return spread(u, e, !1, !0), insert(u, (() => {
+			var u = memo(() => !e.multiple);
+			return () => u() && _tmpl$7();
+		})(), null), insert(u, () => e.options?.map((e) => (() => {
+			var u = _tmpl$8();
+			return insert(u, () => e.label), effect(() => u.value = e.value), u;
+		})()), null), effect(() => u.value = e.value), u;
 	})(), {}, !0)
 };
 editors.boolean = editors.checkbox, delegateEvents(["keydown", "input"]);
-export { EditablePlugin, editors };
+export { EditablePlugin, createEditor, editors };

package/dist/plugins/ExpressPlugin.d.ts

@@ -0,0 +1,10 @@
+import { type Plugin } from '..';
+declare module '../index' {
+    interface TableProps {
+    }
+    interface TableColumn {
+        valueGetter?: (o: TDProps) => any;
+        valueSetter?: (o: TDProps, v: any) => void;
+    }
+}
+export declare const ExpressPlugin: Plugin;

package/dist/plugins/ExpressPlugin.js

@@ -0,0 +1,32 @@
+import { createComponent } from "solid-js/web";
+import { createComputed, untrack } from "solid-js";
+const ExpressPlugin = {
+	name: "expand",
+	store: (e) => ({}),
+	rewriteProps: { Table: ({ Table: r }, { store: i }) => (a) => (createComputed(() => {
+		for (let e = 0; e < i.props.columns.length; e++) {
+			let n = i.props.columns[e];
+			if (!(!n.valueGetter && !n.valueSetter)) for (let r = 0; r < i.props.data.length; r++) {
+				let a = i.props.data[r];
+				n.id in a || Object.defineProperty(a, n.id, {
+					get: () => n.valueGetter?.({
+						col: n,
+						data: a,
+						x: e,
+						y: r
+					}),
+					set: (i) => untrack(() => n.valueSetter?.({
+						col: n,
+						data: a,
+						value: a[n.id],
+						x: e,
+						y: r
+					}, i)),
+					enumerable: !0,
+					configurable: !0
+				});
+			}
+		}
+	}), createComponent(r, a)) }
+};
+export { ExpressPlugin };

package/dist/plugins/OrmPlugin.d.ts

@@ -1,15 +1,27 @@
-import { type Plugin } from '..';
+import { type Plugin, type TableProps } from '..';
 declare module '../index' {
     interface TableProps {
     }
     interface TableColumn {
+        table?: TableProps | ((p: {
+            data: any;
+        }) => TableProps);
         /**
          * 外键对象的属性。
          * 会自动将外键对象 组装到当前行数据中，便于在表格中显示外键对象中的其他属性。
          */
         foreignField?: string;
+        dialog?: boolean;
     }
     interface TableStore {
     }
 }
 export declare const OrmPlugin: Plugin;
+export declare const TableSelect: (o: {
+    value: any;
+    valueObject?: any;
+    onChange?: (value: any) => void;
+    table: TableProps;
+    [key: string]: any;
+}) => import("solid-js").JSX.Element;
+export declare const fetchDataByKeys: (keys: any[], table: TableProps) => Promise<any[]>;

package/dist/plugins/OrmPlugin.js

@@ -1,8 +1,9 @@
-import { toArr } from "../utils.js";
+import { isEmpty, toArr, unFn } from "../utils.js";
 import { Tags } from "./RenderPlugin/components.js";
 import { editors } from "./EditablePlugin.js";
 import { renders } from "./RenderPlugin/index.js";
 import { Dialog } from "../components/Dialog.js";
+import { Select } from "../components/Select.js";
 import { Intable } from "../index.js";
 import { createComponent, delegateEvents, insert, memo, mergeProps, template } from "solid-js/web";
 import { createComputed, createResource, createRoot, createSignal, mergeProps as mergeProps$1, splitProps, untrack } from "solid-js";
@@ -13,123 +14,178 @@ const OrmPlugin = {
 	name: "orm",
 	priority: -Infinity,
 	store: (e) => ({}),
-	rewriteProps: { Table: ({ Table: e }, { store: p }) => (m) => {
-		let h = createMutable({});
+	rewriteProps: { Table: ({ Table: e }, { store: _ }) => (v) => {
+		let y = createMutable({});
 		return createComputed(() => {
-			let e = p.props.columns?.filter((e) => (e.type == "fk" || e.type == "fks") && e.foreignField);
-			if (e.length) for (let m of e) for (let e of p.props.data) {
-				if (m.foreignField in e) continue;
-				Object.defineProperty(e, m.foreignField, {
-					get: () => get(h, [m.id, e[p.props.rowKey]]),
-					set: (g) => untrack(() => set(h, [m.id, e[p.props.rowKey]], g)),
+			let e = _.props.columns?.filter((e) => (e.type == "fk" || e.type == "fks") && e.foreignField);
+			if (e.length) for (let v of e) for (let e of _.props.data) {
+				if (v.foreignField in e) continue;
+				Object.defineProperty(e, v.foreignField, {
+					get: () => get(y, [v.id, e[_.props.rowKey]]),
+					set: (b) => untrack(() => set(y, [v.id, e[_.props.rowKey]], b)),
 					enumerable: !0,
 					configurable: !0
 				});
 			}
-		}), createComponent(e, m);
+		}), createComponent(e, v);
 	} }
 };
-var createDialogEditor = (e, p) => (m) => createRoot((h) => {
-	let { eventKey: _, value: v, col: y, ok: b, cancel: x, props: S, onChange: C } = m, w = p?.out ?? ((e) => e), [E, D] = createSignal(_ || v), O = createComponent(e, mergeProps({
-		get value() {
-			return E();
-		},
-		onChange: (e) => (D(w(e)), C?.(E()), b())
-	}, p, S, { aaa: m }));
-	return {
-		el: createComponent(Dialog, {
-			get title() {
-				return `选择 ${y.name}`;
+var createEditor = (e) => (_) => createRoot((v) => {
+	let { eventKey: y, value: b, col: x, ok: S, cancel: C, props: w, onChange: T } = _, [E, D] = createSignal(b), O;
+	return setTimeout(() => {
+		O?.showPicker?.();
+	}, 0), {
+		el: createComponent(e, mergeProps({
+			ref: (e) => O = e,
+			get value() {
+				return E();
 			},
-			onCancel: x,
-			onOk: b,
-			class: "min-w-[40vw]",
-			children: O
-		}),
+			onChange: (e) => (D(e), T?.(E()), !Array.isArray(E()) && S())
+		}, w, { aaa: _ })),
 		getValue: E,
-		destroy: h,
-		dialog: !0
+		destroy: v,
+		dialog: x.dialog
 	};
-}), ObjTags = (m) => {
-	let h;
-	[m, h] = splitProps(m, [
+}), ObjTags = (e) => {
+	let b;
+	[e, b] = splitProps(e, [
 		"col",
 		"data",
 		"value",
 		"onChange",
 		"multiple"
 	]);
-	let g = () => m.col.table?.columns?.[0].id, _ = () => m.col.table?.rowKey ?? "id";
+	let x = () => unFn(e.col.table, { data: e.data }), S = () => x()?.columns?.[0].id, C = () => x()?.rowKey ?? "id";
 	return createComponent(Tags, mergeProps({
 		get value() {
-			return toArr(m.value).map((e) => ({
-				label: e[g()],
-				value: e[_()]
+			return toArr(e.value).map((e) => ({
+				label: e[S()],
+				value: e[C()]
 			}));
 		},
-		onChange: (e) => m.onChange?.(m.multiple ? e : e[0])
-	}, h));
-}, FKTags = (m) => {
-	let h;
-	[m, h] = splitProps(m, [
+		onChange: (_) => e.onChange?.(e.multiple ? _ : _[0])
+	}, b));
+}, FKTags = (e) => {
+	let b;
+	[e, b] = splitProps(e, [
 		"col",
 		"data",
 		"value",
 		"onChange",
 		"multiple"
 	]);
-	let g = () => m.col.table?.columns?.[0].id, _ = () => m.col.table?.rowKey ?? "id", [v] = createResource(() => m.value, () => fetchDataByKeys(toArr(m.value).map((e) => e && typeof e != "object" ? e : e[_()]), m.col.table), { initialValue: [] });
+	let x = () => unFn(e.col.table, { data: e.data }), S = () => x()?.columns?.[0].id, C = () => x()?.rowKey ?? "id", [w] = createResource(() => e.value, () => fetchDataByKeys(toArr(e.value).map((e) => e && typeof e != "object" ? e : e[C()]), x()), { initialValue: [] });
 	return createComputed(() => {
-		v(), untrack(() => set(m.data, m.col.foreignField, m.multiple ? v() : v()[0]));
+		w(), untrack(() => set(e.data, e.col.foreignField, e.multiple ? w() : w()[0]));
 	}), createComponent(Tags, mergeProps({
 		get value() {
-			return v().map((e) => ({
-				label: e[g()],
-				value: e[_()]
+			return w().map((e) => ({
+				label: e[S()],
+				value: e[C()]
 			}));
 		},
-		onChange: (e) => m.onChange?.(m.multiple ? e : e[0])
-	}, h));
-}, ObjEditor = createDialogEditor((p) => {
-	let m = mergeProps$1(() => p.aaa.col), h = () => m.table?.rowKey ?? "id", g = () => m.type == "objs" || m.type == "fks", v = () => m.type == "fk" || m.type == "fks", x = () => v() ? toArr(p.value).map((e) => ({ [h()]: e })) : toArr(p.value), S = (e) => p.onChange(v() ? g() ? e.map((e) => e[h()]) : e?.[h()] ?? null : e);
-	return (() => {
-		var e = _tmpl$(), h = e.firstChild, C = h.firstChild, w = C.firstChild, T = w.firstChild, E = T.nextSibling;
-		E.nextSibling;
-		var D = w.nextSibling, O = h.nextSibling;
-		return insert(w, () => x().length, E), D.$$click = () => p.onChange?.(g() ? [] : null), insert(h, (() => {
-			var e = memo(() => !!v());
-			return () => e() ? createComponent(FKTags, mergeProps(p, {
-				class: "ml-2",
-				col: m,
-				get value() {
-					return x();
-				},
-				onChange: S,
-				get multiple() {
-					return g();
-				}
-			})) : createComponent(ObjTags, mergeProps(p, {
-				class: "ml-2",
-				col: m,
-				get value() {
-					return x();
-				},
-				onChange: S,
-				get multiple() {
-					return g();
+		onChange: (_) => e.onChange?.(e.multiple ? _ : _[0])
+	}, b));
+}, ObjEditor = createEditor((e) => {
+	let y = mergeProps$1(() => e.aaa.col), b = () => unFn(y.table, { data: e.aaa.data })?.rowKey ?? "id", x = () => y.type == "objs" || y.type == "fks", C = () => y.type == "fk" || y.type == "fks", T = () => C() ? toArr(e.value).map((e) => ({ [b()]: e })) : toArr(e.value), O = (_) => e.onChange(C() ? x() ? _.map((e) => e[b()]) : _?.[b()] ?? null : _);
+	return memo(() => memo(() => !!y.dialog)() ? createComponent(Dialog, {
+		get title() {
+			return `选择 ${y.name}`;
+		},
+		get onCancel() {
+			return e.aaa.cancel;
+		},
+		get onOk() {
+			return e.aaa.ok;
+		},
+		class: "min-w-[40vw]",
+		get children() {
+			var _ = _tmpl$(), v = _.firstChild, b = v.firstChild, S = b.firstChild, k = S.firstChild, A = k.nextSibling;
+			A.nextSibling;
+			var j = S.nextSibling, M = v.nextSibling;
+			return insert(S, () => T().length, A), j.$$click = () => e.onChange?.(x() ? [] : null), insert(v, (() => {
+				var _ = memo(() => !!C());
+				return () => _() ? createComponent(FKTags, mergeProps(e, {
+					class: "ml-2",
+					col: y,
+					get value() {
+						return T();
+					},
+					onChange: O,
+					get multiple() {
+						return x();
+					}
+				})) : createComponent(ObjTags, mergeProps(e, {
+					class: "ml-2",
+					col: y,
+					get value() {
+						return T();
+					},
+					onChange: O,
+					get multiple() {
+						return x();
+					}
+				}));
+			})(), null), insert(M, createComponent(Intable, mergeProps(() => e.aaa.col.table, {
+				class: "max-h-[65vh]",
+				get rowSelection() {
+					return {
+						...e.aaa.col.table?.rowSelection,
+						enable: !0,
+						multiple: x(),
+						value: T(),
+						onChange: O
+					};
 				}
-			}));
-		})(), null), insert(O, createComponent(Intable, mergeProps(() => p.aaa.col.table, { get rowSelection() {
-			return {
-				...p.aaa.col.table?.rowSelection,
-				enable: !0,
-				multiple: g(),
-				value: p.value,
-				onChange: S
-			};
-		} }))), e;
-	})();
+			}))), _;
+		}
+	}) : createComponent(TableSelect, mergeProps(e, {
+		get table() {
+			return unFn(y.table, { data: e.aaa.data });
+		},
+		get valueObject() {
+			return !C();
+		},
+		class: "min-h-full outline-1.5 outline-offset--1.5 outline-[--c-primary] bg-[--table-bg] py-1",
+		border: !1,
+		get multiple() {
+			return x();
+		}
+	})));
 });
+const TableSelect = (e) => {
+	let v = () => e.table?.rowKey ?? "id", y = () => e.multiple, b = () => !e.valueObject, x = () => b() ? toArr(e.value) : toArr(e.value).map((e) => e[v()]), [S] = createResource(x, () => fetchDataByKeys(x(), e.table), { initialValue: [] });
+	return createComponent(Select, mergeProps(e, {
+		searchable: !0,
+		get options() {
+			return S().map((_) => ({
+				label: _[e.table?.columns?.[0].id],
+				value: b() ? _[v()] : _
+			}));
+		},
+		request: ({ keyword: _ }) => {
+			let y = [];
+			return _ && y.push({
+				field: e.table?.columns?.[0].id,
+				op: "like",
+				value: _
+			}), e.table?.filter && y.push(...e.table.filter.value ?? e.table.filter.initialValue ?? e.table.filter.defaultValue ?? []), e.table?.request?.({ filters: y }).then((_) => _.data.map((_) => ({
+				label: _[e.table?.columns?.[0].id],
+				value: b() ? _[v()] : _
+			})));
+		},
+		get valueKey() {
+			return memo(() => !!b())() ? void 0 : v();
+		},
+		get value() {
+			return e.value;
+		},
+		onChange: (_) => e.onChange?.(_),
+		get multiple() {
+			return y();
+		}
+	}));
+};
 editors.obj = ObjEditor, editors.objs = ObjEditor, editors.fk = ObjEditor, editors.fks = ObjEditor, renders.fk = (e) => createComponent(FKTags, mergeProps(e, { disabled: !0 })), renders.fks = (e) => createComponent(FKTags, mergeProps(e, {
 	disabled: !0,
 	multiple: !0
@@ -137,25 +193,26 @@ editors.obj = ObjEditor, editors.objs = ObjEditor, editors.fk = ObjEditor, edito
 	disabled: !0,
 	multiple: !0
 }));
-var fetchDataByKeys = (() => {
-	let e = /* @__PURE__ */ new WeakMap(), p = (p) => {
-		let m = e.get(p.request) || e.set(p.request, {}).get(p.request);
-		return m[p.rowKey] ??= [{}, {}];
+const fetchDataByKeys = (() => {
+	let _ = /* @__PURE__ */ new WeakMap(), v = (e) => {
+		let v = _.get(e.request) || _.set(e.request, {}).get(e.request);
+		return v[e.rowKey] ??= [{}, {}];
 	};
-	return async (e, m) => {
-		let [h, g] = p(m), _ = e.filter((e) => !h[e]);
-		if (_.length) {
-			let e = _.filter((e) => !g[e]), p = m.request?.({ filters: [{
-				field: m.rowKey,
+	return async (_, y) => {
+		if (!y.request || (_ = _.filter((_) => !isEmpty(_)), !_.length)) return [];
+		let [b, x] = v(y), S = _.filter((e) => !b[e]);
+		if (S.length) {
+			let e = S.filter((e) => !x[e]), _ = y.request({ filters: [{
+				field: y.rowKey,
 				op: "in",
 				value: e
 			}] });
-			e.forEach((e, m) => {
-				g[e] = p.then((p) => h[e] = p.data[m]).finally(() => delete g[e]);
-			}), await Promise.all(_.map((e) => g[e]));
+			e.forEach((e, v) => {
+				x[e] = _.then((_) => b[e] = _.data[v]).finally(() => delete x[e]);
+			}), await Promise.all(S.map((e) => x[e]));
 		}
-		return e.map((e) => h[e]);
+		return _.map((e) => b[e]);
 	};
 })();
 delegateEvents(["click"]);
-export { OrmPlugin };
+export { OrmPlugin, TableSelect, fetchDataByKeys };

package/dist/plugins/PaginationPlugin.d.ts

@@ -7,16 +7,10 @@ declare module '..' {
             defaultValue?: number;
             value?: number;
             onChange?: (page: number) => void;
-            /** Server-side pagination: called on page change with (page, pageSize).
-             *  Parent should update `data` and `total` in response. */
-            request?: (page: number, pageSize: number) => void | Promise<void>;
-            /** Total record count (required for server-side pagination) */
             total?: number;
         };
     }
     interface TableStore {
-        _pgnTotal: number;
-        _pgnLoading: boolean;
     }
 }
 export declare const PaginationPlugin: Plugin;