@unizhen/ui 0.1.68 → 0.1.70

package/lib/ui.js

@@ -2349,15 +2349,15 @@ function vd(e, t) {
 	return n === "" || e.toLowerCase().includes(n) || _d(e).includes(n);
 }
 function yd(e, t) {
-	let n = new Map(e.map((e) => [e.key, e])), r = new Map(t.map((e) => [e.key, e])), i = r.get("action") || n.get("action"), a = t.filter((e) => e.key !== "action").map((e) => ({
-		...n.get(e.key) || {},
-		...e
-	})), o = e.filter((e) => !r.has(e.key) && e.key !== "action");
-	return [
-		...a,
-		...o.map((e) => ({ ...e })),
-		...i ? [{ ...i }] : []
-	];
+	e.forEach((e) => {
+		let n = t.find((t) => t.key === e.key);
+		n && (e.hide = n.hide, e.show = n.show, e.width = n.width);
+	});
+	let n = new Map(t.map((e, t) => [e.key, t])), r = (e) => e.type === "expand" ? -2 : e.key === "index" ? -1 : e.key === "action" ? 2 ** 53 - 1 : n.has(e.key) ? n.get(e.key) : 2 ** 53 - 1 - 1;
+	return e.map((e, t) => ({
+		item: e,
+		index: t
+	})).sort((e, t) => r(e.item) - r(t.item) || e.index - t.index).map(({ item: e }) => e);
 }
 //#endregion
 //#region components/fetch.ts
@@ -4580,7 +4580,8 @@ var fp = /*#__PURE__*/ U(op, [["render", dp]]), pp = d({
 							key: e.key,
 							value: t,
 							range: !1,
-							fuzzy: e.search.fuzzy
+							fuzzy: e.search.fuzzy,
+							child: e.search.child
 						};
 						(e.input === "cascader" || e.input === "select") && (n.str = a[`${e.key}Str`]), (e.input === "cascader" || e.input === "select") && e.params.multiple && (n.range = !0), e.input === "date" && e.params.type.indexOf("range") > -1 && (n.range = !0, n.time = !0), o.push(n);
 					}
@@ -4838,7 +4839,8 @@ var vp = /*#__PURE__*/ U(pp, [["render", _p]]), yp = d({
 							key: e.key,
 							value: t,
 							range: !1,
-							fuzzy: e.search.fuzzy
+							fuzzy: e.search.fuzzy,
+							child: e.search.child
 						};
 						(e.input === "cascader" || e.input === "select") && e.params.multiple && (n.range = !0), e.input === "date" && e.params.type.indexOf("range") > -1 && (n.range = !0, n.time = !0), c.push(n);
 					}
@@ -5109,6 +5111,7 @@ var Ip = (e) => e.map((e) => {
 			e: (e.search.title || "").replace(/\s*/g, ""),
 			l: (e.search.labelKeys || "").replace(/\s*/g, ""),
 			a: (e.search.valueKey || "").replace(/\s*/g, ""),
+			d: (e.search.child || "").replace(/\s*/g, ""),
 			m: +!!e.search.multiple,
 			t: +!!e.search.tab,
 			p: e.search.span
@@ -5181,6 +5184,7 @@ var Ip = (e) => e.map((e) => {
 			title: e.c.e,
 			labelKeys: e.c.l,
 			valueKey: e.c.a,
+			child: e.c.d,
 			multiple: !!e.c.m,
 			tab: !!e.c.t,
 			span: e.c.p
@@ -5391,7 +5395,11 @@ function Hp(e, t, n, r) {
 	});
 }
 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 = [];
+	let s = 0, c = [], l = [], u = {
+		key: "",
+		link: "",
+		merge: ""
+	}, 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,
@@ -5442,7 +5450,7 @@ async function Up(e, t = !1, n = 0, r = () => {}, i = {}, a = !1, o = !1) {
 		};
 		if (m.resizable && (m.minWidth = 80), t) if (!m.form.edit.show) m = null;
 		else {
-			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") {
+			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)), o && (p.form.rule.validator = () => !0), o === !1 && 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());
@@ -5503,9 +5511,10 @@ async function Up(e, t = !1, n = 0, r = () => {}, i = {}, a = !1, o = !1) {
 				});
 			}
 		}
-		p.input === "subTable" && p.params.link && !p.params.quest && (l.push(p.params.link), p.params.expandable && u.push({
+		p.input === "subTable" && p.params.link && !p.params.quest && (l.push(p.params.link), p.params.expandable && (u = {
 			key: p.key,
-			link: p.params.link
+			link: p.params.link,
+			merge: p.params.merge
 		}));
 	}
 	let g = [];
@@ -5617,19 +5626,26 @@ var Kp = /*#__PURE__*/ U(Wp, [["render", Gp]]), qp = d({
 		NForm: he
 	},
 	props: {
-		linkId: {
+		data: {
 			required: !0,
-			type: String
+			type: Object,
+			default: () => {}
 		},
 		value: {
-			type: Array,
-			default: () => []
+			type: Object,
+			default: () => {}
 		}
 	},
 	setup(e) {
 		let t = w(!0), n = w([]), r = w([]), i = w(0);
-		return y(() => {
-			Fp(e.linkId).then(async (e) => {
+		return y(async () => {
+			if (e.data.merge) try {
+				let t = e.data.merge, n = Function("formValue", "mainFormValue", "POST", t);
+				r.value = await n(e.value[`sub_${e.data.key}`], { value: () => e.value }, Z);
+			} catch (e) {
+				q(e);
+			}
+			Fp(e.data.link).then(async (e) => {
 				let { tableColumns: r } = await Up(Lp(rt.parse(e.viewJson).table), !0, 2, () => {}, {}, !1, !0), a = 0, o = r.map((e) => ({
 					...e,
 					sorter: !1,
@@ -5644,7 +5660,7 @@ var Kp = /*#__PURE__*/ U(Wp, [["render", Gp]]), qp = d({
 		}), {
 			loading: t,
 			columns: n,
-			tableData: r,
+			columnsData: r,
 			tableScrollX: i
 		};
 	}
@@ -5652,29 +5668,26 @@ var Kp = /*#__PURE__*/ U(Wp, [["render", Gp]]), qp = d({
 //#endregion
 //#region components/table/expand.vue
 function Jp(e, t, r, i, a, o) {
-	let s = D("NDataTable"), c = D("NForm");
-	return x(), n(c, { class: "uz-table-expand" }, {
-		default: N(() => [l(s, {
-			columns: e.columns,
-			data: e.value,
-			pagination: !1,
-			loading: e.loading,
-			"scroll-x": e.tableScrollX,
-			"min-height": 120,
-			"scrollbar-props": {
-				size: 8,
-				trigger: "none"
-			},
-			size: "small",
-			remote: ""
-		}, null, 8, [
-			"columns",
-			"data",
-			"loading",
-			"scroll-x"
-		])]),
-		_: 1
-	});
+	let s = D("NDataTable");
+	return x(), n(s, {
+		columns: e.columns,
+		data: e.columnsData,
+		pagination: !1,
+		loading: e.loading,
+		"scroll-x": e.tableScrollX,
+		"min-height": 102,
+		"scrollbar-props": {
+			size: 8,
+			trigger: "none"
+		},
+		size: "small",
+		remote: ""
+	}, null, 8, [
+		"columns",
+		"data",
+		"loading",
+		"scroll-x"
+	]);
 }
 var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 	name: "UzTable",
@@ -6101,8 +6114,8 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 			}
 		}, Se = async () => {
 			I.value = !1, Np();
-			let { tableColumns: t, search: n, subTableIds: r, subTableExpand: i } = await Up(A.value, e.child, 0, () => ({}), ie), s = 0;
-			!c.value && F.value.index && (t.unshift({
+			let { tableColumns: t, search: n, subTableIds: r, subTableExpand: i } = await Up(A.value, e.child, 0, () => ({}), ie);
+			!c.value && F.value.index && t.unshift({
 				title: "#",
 				key: "index",
 				align: "center",
@@ -6117,7 +6130,7 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 						return (e - 1) * n + (t + 1);
 					} });
 				}
-			}), s += 60), !c.value && (e.selection || F.value.selection !== 0) && (t.unshift({
+			}), !c.value && (e.selection || F.value.selection !== 0) && t.unshift({
 				type: "selection",
 				fixed: "left",
 				width: 60,
@@ -6125,8 +6138,8 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 				show: !0,
 				multiple: e.selection === 2 || F.value.selection === 2,
 				options: ["all", "none"]
-			}), s += 60);
-			let l = e.id || a.params.id;
+			});
+			let s = e.id || a.params.id;
 			if (!c.value && F.value.commonTime && t.push(..._e()), e.enableAction === !0 && M.value && M.value.length > 0) {
 				let e = H(M.value);
 				for (let t of e) t.type === "group" ? t.children.forEach((e) => {
@@ -6137,41 +6150,45 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 					key: "action",
 					align: "center",
 					fixed: "right",
-					width: F.value.actionWidth,
 					resizable: !1,
 					checked: !0,
 					show: !0,
 					hide: !0,
+					width: Number(typeof F.value.actionWidth == "string" ? F.value.actionWidth.replace("px", "") : F.value.actionWidth),
 					render(t) {
 						return Wd({
 							buttons: e,
 							rowData: t,
 							callback: R,
-							tableId: l
+							tableId: s
 						});
 					}
 				};
-				s += Number(typeof F.value.actionWidth == "string" ? F.value.actionWidth.replace("px", "") : F.value.actionWidth), t.push(n);
+				t.push(n);
 			}
-			let u = t;
-			if (l) {
-				let e = Y(`tables_filter_${l}`, !1);
+			let l = t;
+			if (s) {
+				let e = Y(`tables_filter_${s}`, !1);
 				if (e) try {
-					let n = await Id(l);
-					n && (e = JSON.parse(n), u = yd(t, e));
+					let n = await Id(s);
+					n && (e = JSON.parse(n), l = yd(t, e));
 				} catch {}
 			}
-			i && i[0] && (u.unshift({
+			i.link && l.unshift({
 				type: "expand",
 				show: !0,
 				hide: !0,
+				width: 40,
+				fixed: "left",
 				renderExpand: (e) => f(Yp, {
-					linkId: i[0].link,
-					value: e[`sub_${i[0].key}`]
+					data: i,
+					value: e
 				})
-			}), s += 40), u.forEach((e) => {
-				s += Number(e.width);
-			}), C.value = u, ee.value = n, E.value = s;
+			});
+			let u = 0;
+			l.forEach((e) => {
+				e.show && (u += Number(e.width || 140));
+			}), C.value = l, ee.value = n, E.value = u;
 		}, Ce = (e) => typeof e == "number" ? `${e}px` : e, we = () => {
 			if (e.height) {
 				let t = Ce(e.height);
@@ -6180,14 +6197,19 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 			}
 		}, Te = (t) => {
 			let n = e.id || a.params.id;
-			n && (J(`tables_filter_${n}`, t), Ld({
-				table_id: n,
-				data: JSON.stringify(t)
-			}).catch(() => null));
+			if (n) {
+				let e = 0;
+				C.value.forEach((t) => {
+					t.show && (e += Number(t.width || 140));
+				}), E.value = e, J(`tables_filter_${n}`, t.filter((e) => e.key)), Ld({
+					table_id: n,
+					data: JSON.stringify(t)
+				}).catch(() => null);
+			}
 		}, { run: Ee } = Tp(Te), { run: De } = Tp((e, t) => {
 			let n = [];
 			C.value.forEach((r) => {
-				(r.key !== "action" || r.type !== "expand") && n.push({
+				r.key !== "action" && r.key !== "index" && r.type !== "expand" && n.push({
 					key: r.key,
 					show: r.show,
 					hide: r.hide,
@@ -6198,7 +6220,7 @@ var Yp = /*#__PURE__*/ U(qp, [["render", Jp]]), Xp = d({
 		}), B = () => {
 			let e = [];
 			C.value.forEach((t) => {
-				(t.key !== "action" || t.type !== "expand") && e.push({
+				t.key !== "action" && t.key !== "index" && t.type !== "expand" && e.push({
 					key: t.key,
 					show: t.show,
 					hide: t.hide,
@@ -6619,6 +6641,7 @@ function am(t, s, u, d, f, p) {
 					trigger: "hover"
 				},
 				"onUpdate:checkedRowKeys": t.handleCheckRowKeys,
+				"sticky-expanded-rows": "",
 				remote: ""
 			}, null, 8, [
 				"columns",
@@ -8506,7 +8529,7 @@ function qh(e, t, n) {
 }
 //#endregion
 //#region package.json
-var Jh = "0.1.68", Yh;
+var Jh = "0.1.70", 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.68",
+  "version": "0.1.70",
   "author": {
     "name": "Donovan"
   },