intable 0.0.68 → 0.0.70

package/dist/plugins/OrmPlugin.js

@@ -4,9 +4,9 @@ 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 { Ctx, 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";
+import { createComputed, createResource, createRoot, createSignal, mergeProps as mergeProps$1, splitProps, untrack, useContext } from "solid-js";
 import { createMutable } from "solid-js/store";
 import { get, set } from "es-toolkit/compat";
 var _tmpl$ = /* @__PURE__ */ template("<div class><div class=\"flex items-center p-3\"><div class=\"flex items-center gap-2\"><span class=\"text-sm text-gray-500\">已选择 <!> 项</span><button type=button class=\"text-xs text-gray-400 hover:text-red-500 transition-colors\">清空</button></div></div><div class=\"border-t border-gray/20 p-3\">");
@@ -87,7 +87,7 @@ var createEditor = (e) => (_) => createRoot((v) => {
 		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 : _);
+	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 : _);
 	return memo(() => memo(() => !!y.dialog)() ? createComponent(Dialog, {
 		get title() {
 			return `选择 ${y.name}`;
@@ -100,11 +100,11 @@ var createEditor = (e) => (_) => createRoot((v) => {
 		},
 		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());
+			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, {
 					class: "ml-2",
 					col: y,
@@ -112,11 +112,11 @@ var createEditor = (e) => (_) => createRoot((v) => {
 						return e.aaa.data;
 					},
 					get value() {
-						return T();
+						return k();
 					},
-					onChange: O,
+					onChange: A,
 					get multiple() {
-						return x();
+						return C();
 					}
 				})) : createComponent(ObjTags, mergeProps(e, {
 					class: "ml-2",
@@ -125,37 +125,39 @@ var createEditor = (e) => (_) => createRoot((v) => {
 						return e.aaa.data;
 					},
 					get value() {
-						return T();
+						return k();
 					},
-					onChange: O,
+					onChange: A,
 					get multiple() {
-						return x();
+						return C();
 					}
 				}));
-			})(), null), insert(M, createComponent(Intable, mergeProps(() => e.aaa.col.table, {
+			})(), null), insert(P, createComponent(Intable, mergeProps({ get renderer() {
+				return useContext(Ctx).props.renderer;
+			} }, b, {
 				class: "max-h-[65vh]",
 				get rowSelection() {
 					return {
-						...e.aaa.col.table?.rowSelection,
+						...b()?.rowSelection,
 						enable: !0,
-						multiple: x(),
-						value: T(),
-						onChange: O
+						multiple: C(),
+						value: k(),
+						onChange: A
 					};
 				}
 			}))), _;
 		}
 	}) : createComponent(TableSelect, mergeProps(e, {
 		get table() {
-			return unFn(y.table, { data: e.aaa.data });
+			return b();
 		},
 		get valueObject() {
-			return !C();
+			return !E();
 		},
 		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();
+			return C();
 		}
 	})));
 });
@@ -169,7 +171,7 @@ const TableSelect = (e) => {
 				value: b() ? _[v()] : _
 			}));
 		},
-		request: ({ keyword: _ }) => {
+		request: async ({ keyword: _ }) => {
 			let y = [];
 			return _ && y.push({
 				field: e.table?.columns?.[0].id,
@@ -178,7 +180,7 @@ const TableSelect = (e) => {
 			}), 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();

package/package.json

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