aoi-comp 1.0.17 → 1.0.18

package/dist/comps.js

@@ -20717,81 +20717,81 @@ var FE = 4, IE = [
 	"button",
 	"query",
 	"action"
-], LE = ({ pSize: e, tHeight: t, whereConfig: n, where: r, setKey: i, onQuery: a, onInit: o, toolClick: s }) => {
-	let { t: c } = ge(), l = n.map((n) => {
-		let { label: l, span: u, labelWidth: d = 70, type: f, ...p } = n, m = n.prop;
-		if (!u) return;
-		let h = !IE.includes(f);
-		h && (p.value = r[m]), p.width = `calc(100% - ${h ? `${d}px - ${FE}px` : "0px"} )`;
-		let g = null;
-		switch (f) {
+], LE = ({ pSize: e, tHeight: t, whereConfig: n, where: r, labelWidths: i = 70, setKey: a, onQuery: o, onInit: s, toolClick: c }) => {
+	let { t: l } = ge(), u = n.map((n) => {
+		let { label: u, span: d, labelWidth: f = i, type: p, ...m } = n, h = n.prop;
+		if (!d) return;
+		let g = !IE.includes(p);
+		g && (m.value = r[h]), m.width = `calc(100% - ${g ? `${f}px - ${FE}px` : "0px"} )`;
+		let _ = null;
+		switch (p) {
 			case "number":
-				g = /* @__PURE__ */ G(TE, {
-					...p,
-					onChange: (e) => i(m, e)
-				}, l);
+				_ = /* @__PURE__ */ G(TE, {
+					...m,
+					onChange: (e) => a(h, e)
+				}, u);
 				break;
 			case "input":
-				g = /* @__PURE__ */ G(CE, {
-					...p,
-					onChange: (e) => i(m, e)
-				}, l);
+				_ = /* @__PURE__ */ G(CE, {
+					...m,
+					onChange: (e) => a(h, e)
+				}, u);
 				break;
 			case "date":
-				g = /* @__PURE__ */ G(yE, {
-					...p,
-					onChange: (e) => i(m, e)
-				}, l);
+				_ = /* @__PURE__ */ G(yE, {
+					...m,
+					onChange: (e) => a(h, e)
+				}, u);
 				break;
 			case "button":
 			case "query": {
-				let { width: e, onClick: t, ...r } = p;
-				g = /* @__PURE__ */ G(mn, {
+				let { width: e, onClick: t, ...r } = m;
+				_ = /* @__PURE__ */ G(mn, {
 					style: { width: e },
-					onClick: f === "query" ? () => a() : s(t),
+					onClick: p === "query" ? () => o() : c(t),
 					...r,
-					children: c(n.label)
-				}, l);
+					children: l(n.label)
+				}, u);
 				break;
 			}
 			case "form":
 			case "action":
-				g = p?.render?.({
-					label: l,
-					...p,
-					setKey: h ? i : void 0
+				_ = m?.render?.({
+					label: u,
+					...m,
+					setKey: g ? a : void 0
 				});
 				break;
-			default: g = /* @__PURE__ */ G(ME, {
+			default: _ = /* @__PURE__ */ G(ME, {
 				allowClear: !0,
-				...p,
-				initFetch: o,
-				onChange: (e) => i(m, e)
-			}, l);
+				...m,
+				initFetch: s,
+				onChange: (e) => a(h, e)
+			}, u);
 		}
 		return /* @__PURE__ */ K("div", {
 			style: {
-				width: u,
+				width: d,
 				height: t,
 				padding: e
 			},
 			className: "where-item",
-			children: [h ? /* @__PURE__ */ K("div", {
+			children: [g ? /* @__PURE__ */ K("div", {
 				className: "where-label",
-				title: c(n.label),
+				title: l(n.label),
 				style: {
 					lineHeight: `${t - e * 2}px`,
-					width: d,
-					minWidth: d
+					width: f,
+					minWidth: f
 				},
-				children: [c(n.label), "："]
-			}) : /* @__PURE__ */ G(Zn, {}), g]
-		}, l);
+				children: [l(n.label), "："]
+			}) : /* @__PURE__ */ G(Zn, {}), _]
+		}, u);
 	});
 	return /* @__PURE__ */ G("div", {
 		className: "aoi-where-tools",
 		style: { "--aoi-where-gap": `${FE}px` },
-		children: l
+		children: u
 	});
 };
 LE.gSize = FE, LE.propTypes = {
@@ -20801,6 +20801,7 @@ LE.gSize = FE, LE.propTypes = {
 	onQuery: q.default.func,
 	onInit: q.default.func,
 	tHeight: q.default.string,
+	labelWidths: q.default.number,
 	pSize: q.default.string,
 	toolClick: q.default.func
 };
@@ -21247,157 +21248,158 @@ $E.propTypes = {
 var { Sider: eD, Content: tD, Footer: nD } = Sn, { gSize: rD } = LE, iD = "calc(50% - var(--ant-layout-gap) / 2)", { MeasureLineSvg: aD, DeleteLineSvg: oD } = Y, sD = ({ dataKey: e = "id", column: t, columns: n = [], toolColumns: a = [1, 6], visibleOk: o = !0, rightWidth: s = iD, footerHeight: c = iD, contentInitial: l = {
 	width: 906,
 	height: 467
-}, whereConfig: u = [], toolConfig: d = ["measure"], menuConfig: f = ["delete"], viewProps: p, rightProps: m, initWhere: h, queryWhere: g, statisWhere: _, getterData: v, footer: y, right: b, rightLayer: x = !1, onWhere: S, onLayer: C }) => {
-	let w = U(), T = U(), D = U(), O = U(), { t: k } = ge(), { db: A, defects: j, level: M } = Ce("simple"), [N, P] = Oe((e) => Ie(e)), [F] = ve(null, w, l), [I, ee] = W(!1), [L, R] = W(!1), [z, te] = W(!1), [ne, re] = W(!1), [ie, ae] = W([]), [oe, se] = W({
+}, labelWidths: u, whereConfig: d = [], toolConfig: f = ["measure"], menuConfig: p = ["delete"], viewProps: m, rightProps: h, initWhere: g, queryWhere: _, statisWhere: v, getterData: y, footer: b, right: x, rightLayer: S = !1, onWhere: C, onLayer: w }) => {
+	let T = U(), D = U(), O = U(), k = U(), { t: A } = ge(), { db: j, defects: M, level: N } = Ce("simple"), [P, F] = Oe((e) => Le(e)), [I] = ve(null, T, l), [ee, L] = W(!1), [R, z] = W(!1), [te, ne] = W(!1), [re, ie] = W(!1), [ae, oe] = W([]), [se, ce] = W({
 		id: null,
 		x: 0,
 		y: 0
-	}), [ce, le] = W(1), [ue, de] = W(j.reduce((e, t) => ({
+	}), [le, ue] = W(1), [de, fe] = W(M.reduce((e, t) => ({
 		...e,
 		[t.type]: !0
-	}), o ? { 0: !0 } : {})), [fe, pe] = be({
+	}), o ? { 0: !0 } : {})), [pe, me] = be({
 		data: null,
 		statis: null
-	}), [me, { cSize: he, pSize: _e, cHeight: ye, tHeight: xe }, we] = wp(u, t), [Te, Ee] = Cp(x ? O : D, ne, ce), De = [{
+	}), [he, { cSize: _e, pSize: ye, cHeight: xe, tHeight: we }, Te] = wp(d, t), [Ee, De] = Cp(S ? k : O, re, le), ke = [{
 		type: "measure",
 		icon: aD,
-		active: ne,
-		title: k("ui.tool.measure"),
-		onClick: () => re((e) => !e && JE)
-	}], ke = [{
+		active: re,
+		title: A("ui.tool.measure"),
+		onClick: () => ie((e) => !e && JE)
+	}], Ae = [{
 		type: "delete",
 		icon: oD,
 		color: "danger",
-		title: k("ui.tool.delete")
-	}], Ae = ` ORDER BY ${e} DESC`, je = Xn(() => d.map((e) => {
-		let t = E(e, "string"), n = De.find((t) => t.type === (e?.type ?? e));
-		return n ? Object.assign({ ...n }, t ? {} : e) : e;
-	}), [d]), Me = Xn(() => f.map((e) => {
+		title: A("ui.tool.delete")
+	}], je = ` ORDER BY ${e} DESC`, Me = Xn(() => f.map((e) => {
 		let t = E(e, "string"), n = ke.find((t) => t.type === (e?.type ?? e));
 		return n ? Object.assign({ ...n }, t ? {} : e) : e;
-	}), [f]), Ne = B((e, t) => {
-		let n = we.setKey(e, t);
-		S?.(n);
-	}), Pe = B(async (e) => {
-		if (!E(_, "function")) return null;
-		R(!0);
-		let t = await _(e);
-		return R(!1), t;
+	}), [f]), Ne = Xn(() => p.map((e) => {
+		let t = E(e, "string"), n = Ae.find((t) => t.type === (e?.type ?? e));
+		return n ? Object.assign({ ...n }, t ? {} : e) : e;
+	}), [p]), Pe = B((e, t) => {
+		let n = Te.setKey(e, t);
+		C?.(n);
 	}), Fe = B(async (e) => {
-		if (!h) return Promise.resolve([]);
-		if (E(h, "function")) return await h(e);
-		let t = h.tableName, n = A.getTable(t);
+		if (!E(v, "function")) return null;
+		z(!0);
+		let t = await v(e);
+		return z(!1), t;
+	}), Ie = B(async (e) => {
+		if (!g) return Promise.resolve([]);
+		if (E(g, "function")) return await g(e);
+		let t = g.tableName, n = j.getTable(t);
 		if (!n) return [];
-		let r = e.prop, i = (n.sqls?.[h.sqlKey] ?? h.sqlKey).replace(/\?/g, r);
-		return (await A.select(t, i)).map((e) => ({
+		let r = e.prop, i = (n.sqls?.[g.sqlKey] ?? g.sqlKey).replace(/\?/g, r);
+		return (await j.select(t, i)).map((e) => ({
 			label: e[r],
 			value: e[r]
 		}));
-	}), Ie = B(async (e) => {
-		if (!g) return null;
-		let t = we.getSql();
-		ee(!0);
-		let { current: n, pageSize: r } = e ?? P, i = ` LIMIT ${(n - 1) * r}, ${r}`, a = 0, o = [];
-		if (E(g, "function")) [a, o] = await g({
+	}), Le = B(async (e) => {
+		if (!_) return null;
+		let t = Te.getSql();
+		L(!0);
+		let { current: n, pageSize: r } = e ?? F, i = ` LIMIT ${(n - 1) * r}, ${r}`, a = 0, o = [];
+		if (E(_, "function")) [a, o] = await _({
 			limitSql: i,
-			sortSql: Ae,
+			sortSql: je,
 			whereSql: t
 		}, e);
 		else {
-			let n = g.tableName;
-			e || (a = (await A.getter(n, `${g.totalSql}${t}`))?.total ?? 0), o = await A.select(n, `${g.querySql}${t}${Ae}${i}`);
-		}
-		if (P.setValue(o, e ? void 0 : a), !e) {
-			pe.data = null;
-			let e = await Pe(t, !0);
-			pe.statis = e, x ? Ee.destroy() : Ee.clear(), C?.(!1), ae([]);
-		}
-		ee(!1);
-	}), Le = B(async (e, t) => {
-		if (!v) return;
-		if (te(!0), E(v, "function")) {
-			let n = await v(e, t);
-			pe.data = n;
+			let n = _.tableName;
+			e || (a = (await j.getter(n, `${_.totalSql}${t}`))?.total ?? 0), o = await j.select(n, `${_.querySql}${t}${je}${i}`);
+		}
+		if (F.setValue(o, e ? void 0 : a), !e) {
+			me.data = null;
+			let e = await Fe(t, !0);
+			me.statis = e, S ? De.destroy() : De.clear(), w?.(!1), oe([]);
+		}
+		L(!1);
+	}), Re = B(async (e, t) => {
+		if (!y) return;
+		if (ne(!0), E(y, "function")) {
+			let n = await y(e, t);
+			me.data = n;
 		} else {
-			let n = await A.getter(v.tableName, v.sqlKey, e);
-			pe.data = n && Object.assign(n, t);
-		}
-		let n = await Pe(t, !1);
-		pe.statis = n, x ? Ee.destroy() : Ee.clear(), C?.(!1), te(!1);
-	}), Re = B((e, t, n) => {
-		if (!M.editing) return;
-		let { offsetWidth: r } = w.current, i = n?.clientX ?? 0;
-		i > r && (i = r - 12), se({
+			let n = await j.getter(y.tableName, y.sqlKey, e);
+			me.data = n && Object.assign(n, t);
+		}
+		let n = await Fe(t, !1);
+		me.statis = n, S ? De.destroy() : De.clear(), w?.(!1), ne(!1);
+	}), V = B((e, t, n) => {
+		if (!N.editing) return;
+		let { offsetWidth: r } = T.current, i = n?.clientX ?? 0;
+		i > r && (i = r - 12), ce({
 			id: e,
 			x: i,
 			y: n?.clientY ?? 0
 		});
-	}), V = B((e) => {
-		oe?.id !== e && se({
+	}), ze = B((e) => {
+		se?.id !== e && ce({
 			id: null,
 			x: 0,
 			y: 0
 		});
-	}), ze = (e) => {
-		e ? Ee.clear() : Ee.pop();
-	}, Be = (e) => {
-		e || Ee.destroy(), C?.(e);
-	}, Ve = (e) => async () => {
-		let t = oe?.id;
-		await e?.(t), se({
+	}), Be = (e) => {
+		e ? De.clear() : De.pop();
+	}, Ve = (e) => {
+		e || De.destroy(), w?.(e);
+	}, He = (e) => async () => {
+		let t = se?.id;
+		await e?.(t), ce({
 			id: null,
 			x: 0,
 			y: 0
 		});
-	}, He = (e) => async () => {
-		let t = g && we.getSql();
+	}, Ue = (e) => async () => {
+		let t = _ && Te.getSql();
 		await e?.(t);
-	}, Ue = B(() => {
-		de(j.reduce((e, t) => ({
+	}, We = B(() => {
+		fe(M.reduce((e, t) => ({
 			...e,
-			[t.type]: ue?.[t.type] ?? !0
+			[t.type]: de?.[t.type] ?? !0
 		}), o ? { 0: !0 } : {}));
 	});
-	return Jn(Ue, [j, o]), Se(() => {
-		Ie?.();
+	return Jn(We, [M, o]), Se(() => {
+		Le?.();
 	}, i.historyUpdated, !0), /* @__PURE__ */ K(Zn, { children: [/* @__PURE__ */ K(Sn, { children: [/* @__PURE__ */ K(tD, {
-		ref: w,
+		ref: T,
 		className: "aoi-layout-content",
 		children: [
 			/* @__PURE__ */ G(LE, {
-				pSize: _e,
-				tHeight: xe,
-				where: me,
-				whereConfig: u,
-				setKey: Ne,
-				onQuery: Ie,
-				onInit: Fe,
-				toolClick: He
+				pSize: ye,
+				tHeight: we,
+				labelWidths: u,
+				where: he,
+				whereConfig: d,
+				setKey: Pe,
+				onQuery: Le,
+				onInit: Ie,
+				toolClick: Ue
 			}),
 			/* @__PURE__ */ G(XT, {
 				rowKey: e,
 				selected: !0,
-				loading: I,
-				width: F.width - _e / 2,
-				height: F.height - ye * 2 - xe * he - rD - 1,
-				pagination: P,
-				total: P?.total,
-				selecteds: ie,
-				setSelecteds: ae,
-				data: N,
+				loading: ee,
+				width: I.width - ye / 2,
+				height: I.height - xe * 2 - we * _e - rD - 1,
+				pagination: F,
+				total: F?.total,
+				selecteds: ae,
+				setSelecteds: oe,
+				data: P,
 				columns: n,
-				onRowClick: Le,
-				onContextMenu: Re,
-				onMouseEnter: V
+				onRowClick: Re,
+				onContextMenu: V,
+				onMouseEnter: ze
 			}),
-			oe.id && M.editing ? /* @__PURE__ */ G("div", {
+			se.id && N.editing ? /* @__PURE__ */ G("div", {
 				className: "current-menu",
-				style: { transform: `translate(calc(${oe.x}px + ${rD}px - 100%), calc(${oe.y}px - ${rD}px))` },
-				children: Me.map((e) => /* @__PURE__ */ K(mn, {
+				style: { transform: `translate(calc(${se.x}px + ${rD}px - 100%), calc(${se.y}px - ${rD}px))` },
+				children: Ne.map((e) => /* @__PURE__ */ K(mn, {
 					color: e.color,
 					variant: "outlined",
-					disabled: !M.editing,
-					onClick: Ve(e.onClick),
+					disabled: !N.editing,
+					onClick: He(e.onClick),
 					children: [/* @__PURE__ */ G(Y, {
 						active: !0,
 						size: 14,
@@ -21411,60 +21413,60 @@ var { Sider: eD, Content: tD, Footer: nD } = Sn, { gSize: rD } = LE, iD = "calc(
 		className: "aoi-layout-footer",
 		style: { height: c },
 		children: /* @__PURE__ */ G(kn, {
-			spinning: L,
-			children: ie.length > 0 ? y?.current?.(pe.data) : y?.summary?.(pe.statis)
+			spinning: R,
+			children: ae.length > 0 ? b?.current?.(me.data) : b?.summary?.(me.statis)
 		})
 	})] }), /* @__PURE__ */ G(eD, {
 		className: "aoi-sider-right",
 		width: s,
 		children: /* @__PURE__ */ K(kn, {
-			spinning: z,
+			spinning: te,
 			style: { "--aoi-view-bgc": r },
 			children: [
 				/* @__PURE__ */ G(WE, {
-					id: fe.data,
+					id: pe.data,
 					visibleOk: o,
-					defects: j,
-					data: pe.data,
-					tools: je,
-					check: ue,
+					defects: M,
+					data: me.data,
+					tools: Me,
+					check: de,
 					columns: a,
-					toggle: !!x,
-					setCheck: de,
-					footer: x ? b?.tool?.() : null,
-					onButton: Be
+					toggle: !!S,
+					setCheck: fe,
+					footer: S ? x?.tool?.() : null,
+					onButton: Ve
 				}),
 				/* @__PURE__ */ K("div", {
 					className: "defect-view-canvas",
-					ref: T,
+					ref: D,
 					children: [/* @__PURE__ */ G(mE, {
-						...p,
-						ref: D,
-						id: fe.data,
-						data: pe.data,
+						...m,
+						ref: O,
+						id: pe.data,
+						data: me.data,
 						tools: [],
-						depend: ue,
-						children: b?.view?.()
-					}), x ? /* @__PURE__ */ G("div", {
+						depend: de,
+						children: x?.view?.()
+					}), S ? /* @__PURE__ */ G("div", {
 						className: "defect-view-layer",
 						children: /* @__PURE__ */ G(mE, {
-							ref: O,
+							ref: k,
 							tools: [],
-							...m,
-							children: b?.layer?.()
+							...h,
+							children: x?.layer?.()
 						})
 					}) : /* @__PURE__ */ G(Zn, {})]
 				}),
 				/* @__PURE__ */ G($E, {
-					open: ne,
-					vessel: T,
+					open: re,
+					vessel: D,
 					defaultX: 8,
 					defaultY: 0,
-					eqv: ce,
-					disabled: !Te,
-					onEqv: le,
-					onChange: re,
-					onRemove: ze
+					eqv: le,
+					disabled: !Ee,
+					onEqv: ue,
+					onChange: ie,
+					onRemove: Be
 				})
 			]
 		})
@@ -21482,6 +21484,7 @@ sD.propTypes = {
 		width: q.default.number,
 		height: q.default.number
 	}),
+	labelWidths: q.default.number,
 	whereConfig: q.default.array,
 	toolConfig: q.default.array,
 	menuConfig: q.default.array,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aoi-comp",
-  "version": "1.0.17",
+  "version": "1.0.18",
   "private": false,
   "description": "AOI React Component Library",
   "keywords": [