@unizhen/ui 0.1.65 → 0.1.66

package/lib/ui.js

@@ -5140,6 +5140,11 @@ var Ip = (e) => e.map((e) => {
 				d: +!!e.form.edit.disabled,
 				r: +!!e.form.edit.readonly,
 				s: +!!e.form.edit.show
+			},
+			p: {
+				d: +!!e.form.expand.disabled,
+				r: +!!e.form.expand.readonly,
+				s: +!!e.form.expand.show
 			}
 		}
 	};
@@ -5211,6 +5216,11 @@ var Ip = (e) => e.map((e) => {
 				disabled: !!e.f.e.d,
 				readonly: !!e.f.e.r,
 				show: !!e.f.e.s
+			},
+			expand: {
+				disabled: !!e.f.p?.d,
+				readonly: !!e.f.p?.r,
+				show: !!e.f.p?.s
 			}
 		}
 	};
@@ -5388,104 +5398,104 @@ function Hp(e, t, n, r) {
 		});
 	});
 }
-async function Up(e, t = !1, n = 0, r = () => {}, i = {}, a = !1) {
-	let o = 0, s = [], c = [], l = [], u = [], d = H(e), p = [], m = [];
-	for (let e of d) e.input === "group" ? (p.push(...e.params.children), m.push({
+async function Up(e, t = !1, n = 0, r = () => {}, i = {}, a = !1, o = !1) {
+	let s = 0, c = [], l = [], u = [], d = [], p = H(e), m = [], h = [];
+	for (let e of p) e.input === "group" ? (m.push(...e.params.children), h.push({
 		title: e.label,
 		key: e.key,
 		...e.table,
 		children: e.params.children.map((e) => e.key)
-	})) : (p.push(e), m.push(e.key));
-	for await (let [e, d] of p.entries()) {
-		if (d.source && !d.table.render && (d.input === "select" || d.input === "cascader")) if (d.table.render = (e) => e[`${d.key}Str`], t || d.params.immediately || d.search.defaultValue) {
-			let { sourceData: t, n } = await Pp(d.source, a && e === 0);
-			if (t && Array.isArray(t)) if (d.sourceFn) {
-				let e = d.sourceFn, n = Function("sourceData", e);
-				d.params.options = n(t);
-			} else d.params.options = jp(d, t, n);
-		} else d.params.options = [{
+	})) : (m.push(e), h.push(e.key));
+	for await (let [e, p] of m.entries()) {
+		if (p.source && !p.table.render && (p.input === "select" || p.input === "cascader")) if (p.table.render = (e) => e[`${p.key}Str`], t || p.params.immediately || p.search.defaultValue) {
+			let { sourceData: t, n } = await Pp(p.source, a && e === 0);
+			if (t && Array.isArray(t)) if (p.sourceFn) {
+				let e = p.sourceFn, n = Function("sourceData", e);
+				p.params.options = n(t);
+			} else p.params.options = jp(p, t, n);
+		} else p.params.options = [{
 			label: "加载中......",
 			value: "loading",
 			disabled: !0
-		}], d.params._async = !0, d.params._fetch = !1, d.params._asyncFn = async () => {
-			let { sourceData: e, n: t } = await Pp(d.source);
-			if (e && Array.isArray(e)) if (d.sourceFn) {
-				let t = d.sourceFn;
+		}], p.params._async = !0, p.params._fetch = !1, p.params._asyncFn = async () => {
+			let { sourceData: e, n: t } = await Pp(p.source);
+			if (e && Array.isArray(e)) if (p.sourceFn) {
+				let t = p.sourceFn;
 				return Function("sourceData", t)(e);
-			} else return jp(d, e, t);
+			} else return jp(p, e, t);
 		};
-		!d.table.render && !d.source && d.input === "select" && typeof d.params.options != "function" && d.params.options.length > 0 && (d.table.render = (e) => {
-			let t = d.params.options.find((t) => t.value === e[d.key]);
+		!p.table.render && !p.source && p.input === "select" && typeof p.params.options != "function" && p.params.options.length > 0 && (p.table.render = (e) => {
+			let t = p.params.options.find((t) => t.value === e[p.key]);
 			if (t) return t.label;
-		}), d.input === "upload" && !d.table.render && (d.table.render = function(e) {
-			return f(tp, { value: e[d.key] }, { default: () => null });
-		}), o += Number(d.table.width || 140);
-		let p = {
-			input: d.input,
-			title: d.label,
-			key: d.key,
-			params: d.params,
-			form: d.form,
+		}), p.input === "upload" && !p.table.render && (p.table.render = function(e) {
+			return f(tp, { value: e[p.key] }, { default: () => null });
+		}), s += Number(p.table.width || 140), console.log(o, p);
+		let m = {
+			input: p.input,
+			title: p.label,
+			key: p.key,
+			params: p.params,
+			form: p.form,
 			ellipsisComponent: "performant-ellipsis",
-			...d.table,
-			width: Number(d.table.width || 140),
-			ellipsis: d.table.ellipsis ? {
+			...p.table,
+			width: Number(p.table.width || 140),
+			ellipsis: p.table.ellipsis ? {
 				tooltip: !0,
-				"line-clamp": d.table.clamp ?? 0
+				"line-clamp": p.table.clamp ?? 0
 			} : !1,
-			render: d.table.render ? await Ap(d.key, d.table.render, i) : void 0,
-			show: K.isMobile ? d.table.mobile ?? !1 : d.table.show ?? !0,
-			pin: !!d.table.fixed,
-			fixTemp: d.table.fixed
+			render: p.table.render ? await Ap(p.key, p.table.render, i) : void 0,
+			show: K.isMobile ? p.table.mobile ?? !1 : o ? p.form.expand.show ?? !0 : p.table.show ?? !0,
+			pin: !!p.table.fixed,
+			fixTemp: p.table.fixed
 		};
-		if (p.resizable && (p.minWidth = 80), t) if (!p.form.edit.show) p = null;
+		if (m.resizable && (m.minWidth = 80), t) if (!m.form.edit.show) m = null;
 		else {
-			if (p.ellipsis = !1, p.resizable = !0, K.isMobile && (p.show = d.table.mobile), d.table.show && (n === 0 && (p.show = d.form.create.show), n === 1 && (p.show = d.form.edit.show), n === 2 && (p.show = d.form.show)), d.form.rule?.required && typeof d.form.rule.validator == "string") {
-				delete d.form.rule.message;
-				let e = d.form.rule.validator, t = Function("rule", "value", "index", "formValues", e);
-				d.form.rule.validator === "" ? d.form.rule.validator = (e, t) => r()[e.index].delete || t ? !0 : Error(d.form.rule.message) : d.form.rule.validator = (e, n) => r()[e.index].delete ? !0 : t(e, n, e.index, () => r());
+			if (m.ellipsis = !1, m.resizable = !0, K.isMobile && (m.show = p.table.mobile), p.table.show && (n === 0 && (m.show = p.form.create.show), n === 1 && (m.show = p.form.edit.show), n === 2 && (m.show = p.form.show)), p.form.rule?.required && typeof p.form.rule.validator == "string") {
+				delete p.form.rule.message;
+				let e = p.form.rule.validator, t = Function("rule", "value", "index", "formValues", e);
+				p.form.rule.validator === "" ? p.form.rule.validator = (e, t) => r()[e.index].delete || t ? !0 : Error(p.form.rule.message) : p.form.rule.validator = (e, n) => r()[e.index].delete ? !0 : t(e, n, e.index, () => r());
 			}
-			p.render = function(e, t) {
+			m.render = function(e, t) {
 				return f(ge, {
 					showLabel: !1,
 					showFeedback: !1,
-					path: `child[${t}].${d.key}`,
-					rule: d.form.rule?.required ? {
-						...d.form.rule,
+					path: `child[${t}].${p.key}`,
+					rule: p.form.rule?.required ? {
+						...p.form.rule,
 						index: t
 					} : void 0
 				}, { default: () => f(If, {
-					item: d,
+					item: p,
 					formValue: e,
 					status: n,
 					itemIndex: t
 				}) });
 			};
 		}
-		if (p && d.input !== "divider" && d.input !== "subTable" && u.push(p), d.input !== "divider" && d.input !== "switch" && d.input !== "subTable" && d.input !== "upload" && d.search.show) {
-			if (d.search.title && (d.label = d.search.title), d.search.source) if (d.input = "select", d.params.type = d.search.type, d.params.valueKey = d.search.valueKey, d.params.valueKey = d.search.valueKey, d.search.source === "from-up") d.params.options = d.params.options;
-			else if (d.params.immediately || d.search.defaultValue) {
-				let { sourceData: e, n: t } = await Pp(d.search.source);
-				if (e && Array.isArray(e)) if (d.sourceFn) {
-					let t = d.sourceFn, n = Function("sourceData", t);
-					d.params.options = n(e);
-				} else d.params.options = jp(d, e, t);
-			} else d.params._async = !0, d.params._fetch = !1, d.params._asyncFn = async () => {
-				let { sourceData: e, n: t } = await Pp(d.search.source);
-				if (e && Array.isArray(e)) if (d.sourceFn) {
-					let t = d.sourceFn;
+		if (m && p.input !== "divider" && p.input !== "subTable" && d.push(m), p.input !== "divider" && p.input !== "switch" && p.input !== "subTable" && p.input !== "upload" && p.search.show) {
+			if (p.search.title && (p.label = p.search.title), p.search.source) if (p.input = "select", p.params.type = p.search.type, p.params.valueKey = p.search.valueKey, p.params.valueKey = p.search.valueKey, p.search.source === "from-up") p.params.options = p.params.options;
+			else if (p.params.immediately || p.search.defaultValue) {
+				let { sourceData: e, n: t } = await Pp(p.search.source);
+				if (e && Array.isArray(e)) if (p.sourceFn) {
+					let t = p.sourceFn, n = Function("sourceData", t);
+					p.params.options = n(e);
+				} else p.params.options = jp(p, e, t);
+			} else p.params._async = !0, p.params._fetch = !1, p.params._asyncFn = async () => {
+				let { sourceData: e, n: t } = await Pp(p.search.source);
+				if (e && Array.isArray(e)) if (p.sourceFn) {
+					let t = p.sourceFn;
 					return Function("sourceData", t)(e);
-				} else return jp(d, e, t);
+				} else return jp(p, e, t);
 			};
-			if (d.search.multiple && (d.params.multiple = !0, d.search.defaultValue && (d.search.defaultValue = Op(d.search.defaultValue))), d.search.show) {
-				let e = H(d);
+			if (p.search.multiple && (p.params.multiple = !0, p.search.defaultValue && (p.search.defaultValue = Op(p.search.defaultValue))), p.search.show) {
+				let e = H(p);
 				e.params._async && (e.params._search = !0, e.params._asyncFn = async () => {
 					let { sourceData: t, n } = await Pp(e.source || e.search.source);
 					if (t && Array.isArray(t)) if (e.sourceFn) {
 						let n = e.sourceFn;
 						return Function("sourceData", n)(t);
 					} else return jp(e, t, n);
-				}), s.push({
+				}), c.push({
 					input: e.input,
 					label: e.label,
 					key: e.key,
@@ -5501,35 +5511,35 @@ async function Up(e, t = !1, n = 0, r = () => {}, i = {}, a = !1) {
 				});
 			}
 		}
-		d.input === "subTable" && d.params.link && !d.params.quest && (c.push(d.params.link), d.params.expandable && l.push({
-			key: d.key,
-			link: d.params.link
+		p.input === "subTable" && p.params.link && !p.params.quest && (l.push(p.params.link), p.params.expandable && u.push({
+			key: p.key,
+			link: p.params.link
 		}));
 	}
-	let h = [];
-	if (m.length > 0) {
-		for (let e of m) {
+	let g = [];
+	if (h.length > 0) {
+		for (let e of h) {
 			if (typeof e == "string") {
-				let t = u.find((t) => t.key === e);
-				t && h.push(t);
+				let t = d.find((t) => t.key === e);
+				t && g.push(t);
 			}
 			if (typeof e == "object") {
 				let t = e.children, n = [];
 				for (let e of t) {
-					let t = u.find((t) => t.key === e);
+					let t = d.find((t) => t.key === e);
 					t && n.push(t);
 				}
-				e.children = n, h.push(e);
+				e.children = n, g.push(e);
 			}
 		}
-		u = h;
+		d = g;
 	}
 	return {
-		tableColumns: u,
-		search: s,
-		subTableIds: c,
-		subTableExpand: l,
-		tableWidth: o
+		tableColumns: d,
+		search: c,
+		subTableIds: l,
+		subTableExpand: u,
+		tableWidth: s
 	};
 }
 //#endregion
@@ -5628,7 +5638,7 @@ var Kp = /*#__PURE__*/ U(Wp, [["render", Gp]]), qp = d({
 		let t = w(!0), n = w([]), r = w([]), i = w(0);
 		return y(() => {
 			Fp(e.linkId).then(async (e) => {
-				let { tableColumns: r, tableWidth: a } = await Up(Lp(rt.parse(e.viewJson).table), !0, 2);
+				let { tableColumns: r, tableWidth: a } = await Up(Lp(rt.parse(e.viewJson).table), !0, 2, () => {}, {}, !1, !0);
 				n.value = r.map((e) => ({
 					...e,
 					sorter: !1,
@@ -8502,7 +8512,7 @@ function qh(e, t, n) {
 }
 //#endregion
 //#region package.json
-var Jh = "0.1.65", Yh;
+var Jh = "0.1.66", Yh;
 async function Xh() {
 	let e = await fetch(`${window.location.protocol}//${window.location.host}`, {
 		method: "HEAD",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unizhen/ui",
-  "version": "0.1.65",
+  "version": "0.1.66",
   "author": {
     "name": "Donovan"
   },