intable 0.0.70 → 0.0.72

package/dist/plugins/OrmPlugin.js

@@ -1,3 +1,4 @@
+import { solidComponent } from "../components/utils.js";
 import { isEmpty, toArr, unFn } from "../utils.js";
 import { Tags } from "./RenderPlugin/components.js";
 import { editors } from "./EditablePlugin.js";
@@ -14,80 +15,82 @@ const OrmPlugin = {
 	name: "orm",
 	priority: -Infinity,
 	store: (e) => ({}),
-	rewriteProps: { Table: ({ Table: e }, { store: _ }) => (v) => {
-		let y = createMutable({});
+	rewriteProps: { Table: ({ Table: e }, { store: y }) => (b) => {
+		let x = createMutable({});
 		return createComputed(() => {
-			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)),
+			let e = y.props.columns?.filter((e) => (e.type == "fk" || e.type == "fks") && e.foreignField);
+			if (e.length) for (let b of e) for (let e of y.props.data) {
+				if (b.foreignField in e) continue;
+				Object.defineProperty(e, b.foreignField, {
+					get: () => get(x, [b.id, e[y.props.rowKey]]),
+					set: (S) => untrack(() => set(x, [b.id, e[y.props.rowKey]], S)),
 					enumerable: !0,
 					configurable: !0
 				});
 			}
-		}), createComponent(e, v);
+		}), createComponent(e, b);
 	} }
 };
-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;
+var createEditor = (e) => (y) => createRoot((b) => {
+	let { eventKey: x, value: S, col: C, ok: w, cancel: T, props: E, onChange: D } = y, [O, k] = createSignal(S), A;
 	return setTimeout(() => {
-		O?.showPicker?.();
+		A?.showPicker?.();
 	}, 0), {
 		el: createComponent(e, mergeProps({
-			ref: (e) => O = e,
+			ref: (e) => A = e,
 			get value() {
-				return E();
+				return O();
 			},
-			onChange: (e) => (D(e), T?.(E()), !Array.isArray(E()) && S())
-		}, w, { aaa: _ })),
-		getValue: E,
-		destroy: v,
-		dialog: x.dialog
+			onChange: (e) => (k(e), D?.(O()), !Array.isArray(O()) && w())
+		}, E, { aaa: y })),
+		getValue: O,
+		destroy: b,
+		dialog: C.dialog
 	};
 }), ObjTags = (e) => {
-	let b;
-	[e, b] = splitProps(e, [
+	let y;
+	[e, y] = splitProps(e, [
 		"col",
 		"data",
 		"value",
 		"onChange",
 		"multiple"
 	]);
-	let x = () => unFn(e.col.table, { data: e.data }), S = () => x()?.columns?.[0].id, C = () => x()?.rowKey ?? "id";
+	let C = () => unFn(e.col.table, { data: e.data }), w = () => C()?.columns?.[0].id, T = () => C()?.rowKey ?? "id";
 	return createComponent(Tags, mergeProps({
 		get value() {
 			return toArr(e.value).map((e) => ({
-				label: e[S()],
-				value: e[C()]
+				label: e[w()],
+				value: e[T()]
 			}));
 		},
-		onChange: (_) => e.onChange?.(e.multiple ? _ : _[0])
-	}, b));
+		onChange: (y) => e.onChange?.(e.multiple ? y : y[0]),
+		color: ""
+	}, y));
 }, FKTags = (e) => {
-	let b;
-	[e, b] = splitProps(e, [
+	let y;
+	[e, y] = splitProps(e, [
 		"col",
 		"data",
 		"value",
 		"onChange",
 		"multiple"
 	]);
-	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: [] });
+	let C = () => unFn(e.col.table, { data: e.data }), w = () => C()?.columns?.[0].id, T = () => C()?.rowKey ?? "id", [E] = createResource(() => e.value, () => fetchDataByKeys(toArr(e.value).map((e) => e && typeof e != "object" ? e : e[T()]), C()), { initialValue: [] });
 	return createComputed(() => {
-		w(), untrack(() => set(e.data, e.col.foreignField, e.multiple ? w() : w()[0]));
+		E(), untrack(() => set(e.data, e.col.foreignField, e.multiple ? E() : E()[0]));
 	}), createComponent(Tags, mergeProps({
 		get value() {
-			return w().map((e) => ({
-				label: e[S()],
-				value: e[C()]
+			return E().map((e) => ({
+				label: e[w()],
+				value: e[T()]
 			}));
 		},
-		onChange: (_) => e.onChange?.(e.multiple ? _ : _[0])
-	}, b));
+		onChange: (y) => e.onChange?.(e.multiple ? y : y[0]),
+		color: ""
+	}, y));
 }, ObjEditor = createEditor((e) => {
-	let y = mergeProps$1(() => e.aaa.col), b = () => unFn(y.table, { data: e.aaa.data }), x = () => b()?.rowKey ?? "id", C = () => y.type == "objs" || y.type == "fks", E = () => y.type == "fk" || y.type == "fks", k = () => E() ? toArr(e.value).map((e) => ({ [x()]: e })) : toArr(e.value), A = (_) => e.onChange(E() ? C() ? _.map((e) => e[x()]) : _?.[x()] ?? null : _);
+	let y = mergeProps$1(() => e.aaa.col), S = () => unFn(y.table, { data: e.aaa.data }), C = () => S()?.rowKey ?? "id", w = () => y.type == "objs" || y.type == "fks", E = () => y.type == "fk" || y.type == "fks", k = () => E() ? toArr(e.value).map((e) => ({ [C()]: e })) : toArr(e.value), j = (y) => e.onChange(E() ? w() ? y.map((e) => e[C()]) : y?.[C()] ?? null : y);
 	return memo(() => memo(() => !!y.dialog)() ? createComponent(Dialog, {
 		get title() {
 			return `选择 ${y.name}`;
@@ -100,12 +103,12 @@ var createEditor = (e) => (_) => createRoot((v) => {
 		},
 		class: "min-w-[40vw]",
 		get children() {
-			var _ = _tmpl$(), v = _.firstChild, x = v.firstChild, S = x.firstChild, j = S.firstChild, M = j.nextSibling;
-			M.nextSibling;
-			var N = S.nextSibling, P = v.nextSibling;
-			return insert(S, () => k().length, M), N.$$click = () => e.onChange?.(C() ? [] : null), insert(v, (() => {
-				var _ = memo(() => !!E());
-				return () => _() ? createComponent(FKTags, mergeProps(e, {
+			var b = _tmpl$(), x = b.firstChild, C = x.firstChild, T = C.firstChild, M = T.firstChild, N = M.nextSibling;
+			N.nextSibling;
+			var P = T.nextSibling, F = x.nextSibling;
+			return insert(T, () => k().length, N), P.$$click = () => e.onChange?.(w() ? [] : null), insert(x, (() => {
+				var b = memo(() => !!E());
+				return () => b() ? createComponent(FKTags, mergeProps(e, {
 					class: "ml-2",
 					col: y,
 					get data() {
@@ -114,9 +117,9 @@ var createEditor = (e) => (_) => createRoot((v) => {
 					get value() {
 						return k();
 					},
-					onChange: A,
+					onChange: j,
 					get multiple() {
-						return C();
+						return w();
 					}
 				})) : createComponent(ObjTags, mergeProps(e, {
 					class: "ml-2",
@@ -127,29 +130,29 @@ var createEditor = (e) => (_) => createRoot((v) => {
 					get value() {
 						return k();
 					},
-					onChange: A,
+					onChange: j,
 					get multiple() {
-						return C();
+						return w();
 					}
 				}));
-			})(), null), insert(P, createComponent(Intable, mergeProps({ get renderer() {
+			})(), null), insert(F, createComponent(Intable, mergeProps({ get renderer() {
 				return useContext(Ctx).props.renderer;
-			} }, b, {
+			} }, S, {
 				class: "max-h-[65vh]",
 				get rowSelection() {
 					return {
-						...b()?.rowSelection,
+						...S()?.rowSelection,
 						enable: !0,
-						multiple: C(),
+						multiple: w(),
 						value: k(),
-						onChange: A
+						onChange: j
 					};
 				}
-			}))), _;
+			}))), b;
 		}
 	}) : createComponent(TableSelect, mergeProps(e, {
 		get table() {
-			return b();
+			return S();
 		},
 		get valueObject() {
 			return !E();
@@ -157,69 +160,69 @@ var createEditor = (e) => (_) => createRoot((v) => {
 		class: "min-h-full outline-1.5 outline-offset--1.5 outline-[--c-primary] bg-[--table-bg] py-1",
 		border: !1,
 		get multiple() {
-			return C();
+			return w();
 		}
 	})));
 });
 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: [] });
+	let y = () => e.table?.rowKey ?? "id", x = () => e.multiple, S = () => !e.valueObject, C = () => S() ? toArr(e.value) : toArr(e.value).map((e) => e[y()]), [w] = createResource(C, () => fetchDataByKeys(C(), e.table), { initialValue: [] });
 	return createComponent(Select, mergeProps(e, {
 		searchable: !0,
 		get options() {
-			return S().map((_) => ({
-				label: _[e.table?.columns?.[0].id],
-				value: b() ? _[v()] : _
+			return w().map((b) => ({
+				label: b[e.table?.columns?.[0].id],
+				value: S() ? b[y()] : b
 			}));
 		},
-		request: async ({ keyword: _ }) => {
-			let y = [];
-			return _ && y.push({
+		request: async ({ keyword: b }) => {
+			let x = [];
+			return b && x.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()] : _
+				value: b
+			}), e.table?.filter && x.push(...e.table.filter.value ?? e.table.filter.initialValue ?? e.table.filter.defaultValue ?? []), e.table?.request?.({ filters: x }).then((b) => b.data.map((b) => ({
+				label: b[e.table?.columns?.[0].id],
+				value: S() ? b[y()] : b
 			}))) ?? [];
 		},
 		get valueKey() {
-			return memo(() => !!b())() ? void 0 : v();
+			return memo(() => !!S())() ? void 0 : y();
 		},
 		get value() {
 			return e.value;
 		},
-		onChange: (_) => e.onChange?.(_),
+		onChange: (y) => e.onChange?.(y),
 		get multiple() {
-			return y();
+			return x();
 		}
 	}));
 };
-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, {
+editors.obj = ObjEditor, editors.objs = ObjEditor, editors.fk = ObjEditor, editors.fks = ObjEditor, renders.fk = solidComponent((e) => createComponent(FKTags, mergeProps(e, { disabled: !0 }))), renders.fks = solidComponent((e) => createComponent(FKTags, mergeProps(e, {
 	disabled: !0,
 	multiple: !0
-})), renders.obj = (e) => createComponent(ObjTags, mergeProps(e, { disabled: !0 })), renders.objs = (e) => createComponent(ObjTags, mergeProps(e, {
+}))), renders.obj = solidComponent((e) => createComponent(ObjTags, mergeProps(e, { disabled: !0 }))), renders.objs = solidComponent((e) => createComponent(ObjTags, mergeProps(e, {
 	disabled: !0,
 	multiple: !0
-}));
+})));
 const fetchDataByKeys = (() => {
-	let _ = /* @__PURE__ */ new WeakMap(), v = (e) => {
-		let v = _.get(e.request) || _.set(e.request, {}).get(e.request);
-		return v[e.rowKey] ??= [{}, {}];
+	let e = /* @__PURE__ */ new WeakMap(), b = (y) => {
+		let b = e.get(y.request) || e.set(y.request, {}).get(y.request);
+		return b[y.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,
+	return async (e, x) => {
+		if (!x.request || (e = e.filter((e) => !isEmpty(e)), !e.length)) return [];
+		let [S, C] = b(x), w = e.filter((e) => !S[e]), T = w.filter((e) => !C[e]);
+		if (T.length) {
+			let e = x.request({ filters: [{
+				field: x.rowKey,
 				op: "in",
-				value: e
+				value: T
 			}] });
-			e.forEach((e, v) => {
-				x[e] = _.then((_) => b[e] = _.data[v]).finally(() => delete x[e]);
-			}), await Promise.all(S.map((e) => x[e]));
+			T.forEach((y, b) => {
+				C[y] = e.then((e) => S[y] = e.data[b]).finally(() => delete C[y]);
+			}), await Promise.all(w.map((e) => C[e]));
 		}
-		return _.map((e) => b[e]);
+		return e.map((e) => S[e]);
 	};
 })();
 delegateEvents(["click"]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intable",
-  "version": "0.0.70",
+  "version": "0.0.72",
   "license": "MIT",
   "type": "module",
   "files": [