@unizhen/ui 0.1.147 → 0.1.148

package/lib/components/bom/index.vue.d.ts

@@ -37,7 +37,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
     };
     height: {
         type: PropType<number | string | undefined>;
-        default: undefined;
+        default: string;
     };
     status: {
         type: PropType<number>;
@@ -122,7 +122,7 @@ declare const __VLS_export: DefineComponent<ExtractPropTypes<{
     };
     height: {
         type: PropType<number | string | undefined>;
-        default: undefined;
+        default: string;
     };
     status: {
         type: PropType<number>;

package/lib/ui.js

@@ -2843,29 +2843,30 @@ var fi = () => new Promise((e) => {
 			t && (clearInterval(i), e(JSON.parse(t)));
 		}, 500);
 	}
-}), pi = async (e, t, n) => {
-	if (t && typeof t == "string") {
-		let r = t.match(li);
-		if (r && t.indexOf("return") === -1) {
-			let t = r[0].split(":");
-			if (t[0] === "date") return (t) => jt(t[e], r[0].replace("date:", "") || "YYYY-MM-DD");
-			if (t[0] === "city") return (t) => t[`${e}Str`];
-			if (t[0] === "modules" && n && Object.keys(n).length > 0) {
-				let e = r[0].replace("modules:", ""), t = Object.keys(n).find((t) => t.includes(e));
-				if (t) {
-					let e = n[t], r = m(u(e));
-					return (e) => f(r, { rowData: e }, {});
-				}
-				return f("div", "Module not found");
+}), pi = async (e, t) => {
+	let n = e.key, r = e.table.render, i = {
+		isModules: !1,
+		render: null
+	};
+	if (r && typeof r == "string") {
+		let e = r.match(li);
+		if (e && r.indexOf("return") === -1) {
+			let r = e[0].split(":");
+			if (r[0] === "date" && (i.render = (t) => jt(t[n], e[0].replace("date:", "") || "YYYY-MM-DD")), r[0] === "city" && (i.render = (e) => e[`${n}Str`]), r[0] === "modules" && t && Object.keys(t).length > 0) {
+				let n = e[0].replace("modules:", ""), r = Object.keys(t).find((e) => e.includes(n));
+				if (r) {
+					let e = t[r], n = m(u(e));
+					i.isModules = !0, i.render = (e) => f(n, { rowData: e }, {});
+				} else i.render = f("div", "Module not found");
 			}
 		} else try {
-			let e = Function("rowData", "rowIndex", "h", t);
-			return (t, n) => e(t, n, f);
+			let e = Function("rowData", "rowIndex", "h", r);
+			i.render = (t, n) => e(t, n, f);
 		} catch (e) {
 			K(e);
 		}
 	}
-	return t && typeof t == "function" ? (e, n) => t(e, n, f) : "";
+	return r && typeof r == "function" && (i.render = (e, t) => r(e, t, f)), i;
 }, mi = (e, t, n) => {
 	let r = t.map((t) => {
 		let r = [], i = t.id;
@@ -3296,6 +3297,11 @@ async function Ei(e, t = !1, n = 0, r = () => {}, i = {}, a = !1, o = !1) {
 			return f(Wr, { value: e[s.key] }, { default: () => null });
 		});
 		let p = {
+			isModules: !1,
+			render: null
+		};
+		s.table.render ? p = await pi(s, i) : s.table.render = void 0;
+		let m = {
 			input: s.input,
 			title: s.label,
 			key: s.key,
@@ -3304,24 +3310,24 @@ async function Ei(e, t = !1, n = 0, r = () => {}, i = {}, a = !1, o = !1) {
 			ellipsisComponent: "performant-ellipsis",
 			...s.table,
 			width: Number(s.table.width || 140),
+			render: p.render,
 			ellipsis: s.table.ellipsis ? {
 				tooltip: !0,
 				"line-clamp": s.table.clamp ?? 0
 			} : !1,
-			render: s.table.render ? await pi(s.key, s.table.render, i) : void 0,
 			show: Y.isMobile ? s.table.mobile ?? !1 : s.table.show ?? !0,
 			pin: !!s.table.fixed,
 			fixTemp: s.table.fixed
 		};
-		if (p.resizable && (p.minWidth = 80), t) {
-			if (!p.form.edit.show) p = null;
+		if (p.isModules && (m.isModules = !0), m.resizable && (m.minWidth = 80), t) {
+			if (!m.form.edit.show) m = null;
 			else {
-				if (p.ellipsis = !1, p.resizable = !0, Y.isMobile && (p.show = s.table.mobile), s.table.show && (n === 0 && (p.show = s.form.create.show), n === 1 && (p.show = s.form.edit.show), n === 2 && (p.show = s.form.show)), o && (s.form.rule.validator = () => !0), o === !1 && s.form.rule?.required && typeof s.form.rule.validator == "string") {
+				if (m.ellipsis = !1, m.resizable = !0, Y.isMobile && (m.show = s.table.mobile), s.table.show && (n === 0 && (m.show = s.form.create.show), n === 1 && (m.show = s.form.edit.show), n === 2 && (m.show = s.form.show)), o && (s.form.rule.validator = () => !0), o === !1 && s.form.rule?.required && typeof s.form.rule.validator == "string") {
 					delete s.form.rule.message;
 					let e = s.form.rule.validator, t = Function("rule", "value", "index", "formValues", e);
 					s.form.rule.validator === "" ? s.form.rule.validator = (e, t) => r()[e.index].delete || t ? !0 : Error(s.form.rule.message) : s.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(me, {
 						showLabel: !1,
 						showFeedback: !1,
@@ -3339,7 +3345,7 @@ async function Ei(e, t = !1, n = 0, r = () => {}, i = {}, a = !1, o = !1) {
 				};
 			}
 		}
-		if (p && s.input !== "divider" && s.input !== "subTable" && (o && (p.show = s.form.expand.show), d.push(p)), s.input !== "divider" && s.input !== "switch" && s.input !== "subTable" && s.input !== "upload" && s.search.show) {
+		if (m && s.input !== "divider" && s.input !== "subTable" && (o && (m.show = s.form.expand.show), d.push(m)), s.input !== "divider" && s.input !== "switch" && s.input !== "subTable" && s.input !== "upload" && s.search.show) {
 			if (s.search.title && (s.label = s.search.title), s.search.source) {
 				if (s.input = "select", s.params.type = s.search.type, s.params.valueKey = s.search.valueKey, s.params.valueKey = s.search.valueKey, s.search.source === "from-up") s.params.options = s.params.options;
 				else if (s.params.immediately || s.search.defaultValue) {
@@ -3452,7 +3458,7 @@ var Di = (e) => e.key === "product_no" || e.key === "product_name" || typeof e.t
 		},
 		height: {
 			type: [Number, String],
-			default: void 0
+			default: "300px"
 		},
 		status: {
 			type: Number,
@@ -3692,7 +3698,7 @@ var Di = (e) => e.key === "product_no" || e.key === "product_name" || typeof e.t
 			e.value?.length || t("update:value", m.value);
 			let n = await Jn("bom_col");
 			n = tt.parse(n.viewJson), n = bi(n.table);
-			let { tableColumns: r } = await Ei(n, !1, 0, () => {}, a), i = r.filter((e) => ue(e)).map((t) => ({
+			let { tableColumns: r } = await Ei(n, !1, e.status, () => {}, a), i = r.filter((e) => ue(e)).map((t) => t.isModules ? t : {
 				title: t.title,
 				key: t.key,
 				width: t.width ?? 120,
@@ -3711,7 +3717,7 @@ var Di = (e) => e.key === "product_no" || e.key === "product_name" || typeof e.t
 					status: e.status,
 					itemIndex: r
 				}) })
-			}));
+			});
 			c.value = [
 				N,
 				ie,
@@ -7885,7 +7891,7 @@ function oc(e, t, n) {
 }
 //#endregion
 //#region package.json
-var sc = "0.1.147", cc;
+var sc = "0.1.148", cc;
 async function lc() {
 	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.147",
+  "version": "0.1.148",
   "author": {
     "name": "Donovan"
   },