@unizhen/ui 0.1.20 → 0.1.21

package/lib/components/table/factory.d.ts

@@ -98,7 +98,7 @@ export declare const fnOptionSimplify: (option: ITableOptions) => {
     r: string;
 };
 export declare const fnOptionReduction: (simplify?: ObjectKey) => ITableOptions;
-export declare function fnPrepareFormData(items: IUzFormItems, formData?: ObjectKey | any[], formValues?: () => ObjectKey): Promise<{
+export declare function fnPrepareFormData(items: IUzFormItems, formData?: ObjectKey | any[], formValues?: () => ObjectKey, childTable?: boolean): Promise<{
     form: ObjectKey;
     formDefaultValue: ObjectKey;
     fillingDefaultValue: ObjectKey;

package/lib/ui.js

@@ -5219,11 +5219,11 @@ var bp = (e) => e.map((e) => {
 		summary: e.r
 	}), Object.assign({}, dp, H(t));
 };
-function Ep(e, t, n) {
-	return new Promise(async (r, i) => {
-		let a = [], o = {}, s = {}, c = {}, l = [], u = [], d = H(e), f = [];
-		for (let e of d) e.input === "group" ? f.push(...e.params.children) : f.push(e);
-		for (let e of f) {
+function Ep(e, t, n, r) {
+	return new Promise(async (i, a) => {
+		let o = [], s = {}, c = {}, l = {}, u = [], d = [], f = H(e), p = [];
+		for (let e of f) e.input === "group" ? p.push(...e.params.children) : p.push(e);
+		for (let e of p) {
 			if (e.source && (e.input === "select" || e.input === "cascader")) {
 				let n = [];
 				if (t && !Array.isArray(t) && t[e.key]) {
@@ -5253,7 +5253,7 @@ function Ep(e, t, n) {
 					value: "loading",
 					disabled: !0
 				}];
-				if (e.params.immediately) {
+				if (e.params.immediately || r) {
 					let { sourceData: t, n: r } = await vp(e.source);
 					if (t && Array.isArray(t)) if (e.sourceFn) {
 						let r = e.sourceFn;
@@ -5268,17 +5268,17 @@ function Ep(e, t, n) {
 				};
 				if (e.params.options = n, e.form.backfill && t) if (Array.isArray(t)) t.forEach((t, r) => {
 					let i = n.find((n) => n.value === t[e.key]);
-					i && (l[r] || (l[r] = {}), l[r][e.key] = i.params);
+					i && (u[r] || (u[r] = {}), u[r][e.key] = i.params);
 				});
 				else {
 					let r = n.find((n) => n.value === t[e.key]);
-					r && (s[e.key] = r.params);
+					r && (c[e.key] = r.params);
 				}
 			}
 			if (e.input === "filling") try {
 				Array.isArray(t) ? t.forEach((t, n) => {
-					u[n] || (u[n] = {}), l[n] && l[n][e.params.parentKey] && l[n][e.params.parentKey][e.key] ? (u[n][e.key] = l[n][e.params.parentKey][e.key], l[n][e.params.parentKey][`${e.key}Str`] && (u[n][`${e.key}Str`] = l[n][e.params.parentKey][`${e.key}Str`])) : (u[n][e.key] = t[e.key] || null, u[n][`${e.key}Str`] = t[`${e.key}Str`] || null);
-				}) : s[e.params.parentKey] && s[e.params.parentKey][e.key] ? (c[e.key] = s[e.params.parentKey][e.key], s[e.params.parentKey][`${e.key}Str`] && (c[`${e.key}Str`] = s[e.params.parentKey][`${e.key}Str`])) : (c[e.key] = null, c[`${e.key}Str`] = null);
+					d[n] || (d[n] = {}), u[n] && u[n][e.params.parentKey] && u[n][e.params.parentKey][e.key] ? (d[n][e.key] = u[n][e.params.parentKey][e.key], u[n][e.params.parentKey][`${e.key}Str`] && (d[n][`${e.key}Str`] = u[n][e.params.parentKey][`${e.key}Str`])) : (d[n][e.key] = t[e.key] || null, d[n][`${e.key}Str`] = t[`${e.key}Str`] || null);
+				}) : c[e.params.parentKey] && c[e.params.parentKey][e.key] ? (l[e.key] = c[e.params.parentKey][e.key], c[e.params.parentKey][`${e.key}Str`] && (l[`${e.key}Str`] = c[e.params.parentKey][`${e.key}Str`])) : (l[e.key] = null, l[`${e.key}Str`] = null);
 			} catch (e) {
 				q(e);
 			}
@@ -5300,7 +5300,7 @@ function Ep(e, t, n) {
 			}
 			if (e.input === "subTable" && e.params.link) {
 				let t = await yp(e.params.link).catch(() => {
-					i();
+					a();
 				});
 				if (t) try {
 					let n = nt.parse(t.viewJson);
@@ -5309,10 +5309,10 @@ function Ep(e, t, n) {
 					r.forEach((e) => {
 						e.table.sorter = !1;
 					});
-					let a = r.filter((e) => e.input === "subTable");
-					if (a) for await (let e of a) {
+					let i = r.filter((e) => e.input === "subTable");
+					if (i) for await (let e of i) {
 						let t = await yp(e.params.link).catch(() => {
-							i();
+							a();
 						});
 						if (t) try {
 							let n = nt.parse(t.viewJson), r = xp(n.table);
@@ -5320,17 +5320,17 @@ function Ep(e, t, n) {
 								e.table.sorter = !1;
 							}), e.params.columns = r, e.params.actions = n.action;
 						} catch (e) {
-							i(e);
+							a(e);
 							return;
 						}
 					}
 					e.params.columns = r, e.params.actions = n.action;
 				} catch (e) {
-					i(e);
+					a(e);
 					return;
 				}
 			}
-			a.push({
+			o.push({
 				input: e.input,
 				label: e.label,
 				key: e.key,
@@ -5339,13 +5339,13 @@ function Ep(e, t, n) {
 				params: e.params,
 				form: e.form,
 				_suffix: e._suffix
-			}), e.input === "date" || e.input === "number" || e.input === "time" ? o[e.key] = Number(e.form.defaultValue) || 0 : o[e.key] = e.form.defaultValue;
+			}), e.input === "date" || e.input === "number" || e.input === "time" ? s[e.key] = Number(e.form.defaultValue) || 0 : s[e.key] = e.form.defaultValue;
 		}
-		r({
-			form: a,
-			formDefaultValue: o,
-			fillingDefaultValue: c,
-			fillingDefaultArray: u
+		i({
+			form: o,
+			formDefaultValue: s,
+			fillingDefaultValue: l,
+			fillingDefaultArray: d
 		});
 	});
 }
@@ -6480,7 +6480,7 @@ var Bp = /* @__PURE__ */ U(jp, [["render", zp]]), Vp = d({
 	emits: ["update:value"],
 	setup(e, { emit: t, expose: n }) {
 		let r = p("emitSuffix"), i = p("modules"), a = p("mainFormValue"), { t: o } = Xe(), s = T(), c = T(), l = T(), u = T(!1), d = T(!0), m = T([]), h = T({ child: [] }), _ = T(""), v = T({}), b = T([]), x = T(void 0), S = async (t, n) => {
-			let { formDefaultValue: r, fillingDefaultArray: i } = await Ep(H(n ?? e.item.params.columns), t);
+			let { formDefaultValue: r, fillingDefaultArray: i } = await Ep(H(n ?? e.item.params.columns), t, void 0, !0);
 			return v.value = r, i;
 		}, C = async (t) => {
 			if (u.value) return;
@@ -7917,7 +7917,7 @@ function Qm(e, t, n) {
 }
 //#endregion
 //#region package.json
-var $m = "0.1.20", eh;
+var $m = "0.1.21", eh;
 async function th() {
 	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.20",
+  "version": "0.1.21",
   "author": {
     "name": "Donovan"
   },