@vue-ui-kit/ant 2.4.4 → 2.4.6

package/dist/es/index.js

@@ -2382,7 +2382,8 @@ var Q = Vi(), Xi = (e) => e == null || e === "", $ = (e) => !Xi(e), Zi = (e) =>
 		DISABLED: !0,
 		ENABLE_FINDER: !0,
 		AUTO_ROW_HEIGHT: !0
-	}
+	},
+	icon: {}
 }, ra = (0, Q.clone)(na, !0);
 function ia(e) {
 	ra = {
@@ -2398,7 +2399,11 @@ function ia(e) {
 			...ra.canvasTable,
 			...e.canvasTable
 		},
-		renderTooltip: e.renderTooltip ?? ra.renderTooltip
+		renderTooltip: e.renderTooltip ?? ra.renderTooltip,
+		icon: {
+			...ra.icon,
+			...e.icon
+		}
 	};
 }
 function aa() {
@@ -2717,8 +2722,13 @@ var ya = "-", ba = {
 		};
 	}
 }), Da = (e) => {
-	let { icon: t } = e, n = De;
-	return n[t] ? c(n[t]) : n[t];
+	let { icon: t } = e, n = oa().icon?.render;
+	if (n) {
+		let e = n(t);
+		if (e) return e;
+	}
+	let r = De;
+	return r[t] ? c(r[t]) : null;
 }, Oa = {
 	AInput: { autocomplete: "off" },
 	$input: {
@@ -3452,7 +3462,7 @@ function Xa(e, t) {
 	let n = e.getBoundingClientRect(), r = window.innerWidth, i = window.innerHeight, a = Math.max(0, r - n.left - t.right), o = Math.max(0, i - n.top - t.bottom), s = e.parentElement;
 	if (s) {
 		let e = s.getBoundingClientRect();
-		e.width > 0 && (a = Math.min(a, e.width)), e.height > 0 && (o = Math.min(o, e.height));
+		e.width > 0 && (a = Math.min(a, e.width));
 	}
 	e.style.width = `${a}px`, e.style.height = `${o}px`;
 }
@@ -3488,13 +3498,13 @@ function Qa(e, t, n) {
 var $a = { key: 0 }, eo = {
 	key: 1,
 	class: "p-toolbar-wrapper flex items-center w-full justify-between p-theme-bg pt-8px px-16px"
-}, to = { class: "flex items-center flex-1 gap-4px" }, no = { key: 2 }, ro = { class: "flex items-center gap-4px" }, io = { class: "p-grid-table-body flex-1 min-h-0 overflow-hidden" }, ao = {
+}, to = { class: "flex items-center flex-1 gap-4px" }, no = { class: "flex items-center gap-4px" }, ro = { class: "flex items-center gap-4px" }, io = { key: 2 }, ao = { class: "flex items-center gap-4px" }, oo = { class: "flex items-center gap-4px" }, so = {
 	key: 0,
 	class: "w-full pt-8px px-16px text-slate-5"
-}, oo = {
+}, co = {
 	key: 1,
 	class: "flex w-full items-center gap-12px pt-8px px-16px"
-}, so = { class: "flex-1 min-w-0 text-slate-5 flex items-center" }, co = /* @__PURE__ */ l({
+}, lo = { class: "flex-1 min-w-0 text-slate-5 flex items-center" }, uo = /* @__PURE__ */ l({
 	__name: "PGrid",
 	props: {
 		selectConfig: {},
@@ -3523,7 +3533,11 @@ var $a = { key: 0 }, eo = {
 		},
 		fitHeight: { default: () => ca().fitHeight ?? 30 },
 		fitCanvasHeight: {},
-		renderY: {}
+		renderY: {},
+		fitContent: {
+			type: Boolean,
+			default: !1
+		}
 	},
 	emits: [
 		"toolbarButtonClick",
@@ -3681,6 +3695,11 @@ var $a = { key: 0 }, eo = {
 					le.value = f.renderY;
 					return;
 				}
+				if (f.fitContent) {
+					let e = typeof window < "u" ? window.innerHeight : 800, t = f.fitHeight ?? 30;
+					le.value = Math.max(Math.floor(e * .6) - t, 160);
+					return;
+				}
 				let e = se.value.clientHeight, t = ce.value?.offsetHeight ?? 0, n = Ge(se.value)?.getBoundingClientRect().height ?? 0, r = f.fitHeight ?? 30;
 				le.value = Math.max(e - t - n - r, 100);
 			});
@@ -3736,7 +3755,7 @@ var $a = { key: 0 }, eo = {
 			return b(), i("div", p({
 				ref_key: "boxEl",
 				ref: ie,
-				class: ["p-wrapper flex flex-col gap-8px overflow-y-auto", l.autoBoxSize ? "min-h-0 min-w-0 flex-1 w-full" : "h-full"]
+				class: ["p-wrapper flex flex-col gap-8px", l.fitContent ? "w-full h-auto" : l.autoBoxSize ? "overflow-y-auto min-h-0 min-w-0 flex-1 w-full" : "overflow-y-auto h-full"]
 			}, A(ke)), [Te.value === "bad" ? (b(), i("div", $a, "请检查配置")) : (b(), i(e, { key: 1 }, [
 				A(g)?.items?.some((e) => e.field && e.itemRender) ? (b(), i("div", {
 					key: 0,
@@ -3764,7 +3783,7 @@ var $a = { key: 0 }, eo = {
 					}, 16, ["name", "model"]))]),
 					_: 1
 				}, 8, ["spinning"])], 512)) : r("", !0),
-				A(k) ? (b(), i("div", eo, [a("div", to, [A(k).buttons && A(k).buttons.length > 0 ? (b(!0), i(e, { key: 0 }, C(A(k).buttons, (t, a) => (b(), i(e, { key: a }, [t.dropdowns && t.dropdowns.length ? (b(), n(_, { key: 0 }, {
+				A(k) ? (b(), i("div", eo, [a("div", to, [A(k).buttons && A(k).buttons.length > 0 ? (b(!0), i(e, { key: 0 }, C(A(k).buttons, (t, o) => (b(), i(e, { key: o }, [t.dropdowns && t.dropdowns.length ? (b(), n(_, { key: 0 }, {
 					overlay: F(() => [c(m, { onClick: Ne }, {
 						default: F(() => [(b(!0), i(e, null, C(t.dropdowns, (t) => (b(), n(d, { key: t.code }, {
 							default: F(() => [t.content && Qe(Ze(t.content)) ? (b(), i(e, { key: 0 }, [s(D(Ze(t.content)), 1)], 64)) : t.content ? (b(), n(E(Ze(t.content)), { key: 1 })) : r("", !0)]),
@@ -3782,14 +3801,14 @@ var $a = { key: 0 }, eo = {
 						ghost: t.ghost,
 						block: t.block
 					}, {
-						default: F(() => [
+						default: F(() => [a("div", no, [
 							t.icon ? (b(), n(A(Da), {
 								key: 0,
 								icon: t.icon
 							}, null, 8, ["icon"])) : r("", !0),
 							t.content && Qe(Ze(t.content)) ? (b(), i(e, { key: 1 }, [s(D(Ze(t.content)), 1)], 64)) : t.content ? (b(), n(E(Ze(t.content)), { key: 2 })) : r("", !0),
 							c(A(Oe))
-						]),
+						])]),
 						_: 2
 					}, 1032, [
 						"type",
@@ -3814,10 +3833,10 @@ var $a = { key: 0 }, eo = {
 					block: t.block,
 					onClick: (e) => A(Me)(t.code)
 				}, {
-					default: F(() => [t.icon ? (b(), n(A(Da), {
+					default: F(() => [a("div", ro, [t.icon ? (b(), n(A(Da), {
 						key: 0,
 						icon: t.icon
-					}, null, 8, ["icon"])) : r("", !0), t.content && Qe(Ze(t.content)) ? (b(), i(e, { key: 1 }, [s(D(Ze(t.content)), 1)], 64)) : t.content ? (b(), n(E(Ze(t.content)), { key: 2 })) : r("", !0)]),
+					}, null, 8, ["icon"])) : r("", !0), t.content && Qe(Ze(t.content)) ? (b(), i(e, { key: 1 }, [s(D(Ze(t.content)), 1)], 64)) : t.content ? (b(), n(E(Ze(t.content)), { key: 2 })) : r("", !0)])]),
 					_: 2
 				}, 1032, [
 					"type",
@@ -3829,8 +3848,8 @@ var $a = { key: 0 }, eo = {
 					"ghost",
 					"block",
 					"onClick"
-				])) : (b(), i("div", no))], 64))), 128)) : r("", !0)]), a("span", ro, [A(k).tools && A(k).tools.length > 0 ? (b(!0), i(e, { key: 0 }, C(A(k).tools, (t, a) => (b(), n(A(I), {
-					key: a,
+				])) : (b(), i("div", io))], 64))), 128)) : r("", !0)]), a("span", ao, [A(k).tools && A(k).tools.length > 0 ? (b(!0), i(e, { key: 0 }, C(A(k).tools, (t, o) => (b(), n(A(I), {
+					key: o,
 					type: t.type,
 					size: t.size ?? "middle",
 					disabled: A(k).disabled || t.disabled,
@@ -3841,10 +3860,10 @@ var $a = { key: 0 }, eo = {
 					onClick: (e) => A(Pe)(t.code),
 					loading: L.toolbar || !!t.code && _e[t.code]
 				}, {
-					default: F(() => [t.icon ? (b(), n(A(Da), {
+					default: F(() => [a("div", oo, [t.icon ? (b(), n(A(Da), {
 						key: 0,
 						icon: t.icon
-					}, null, 8, ["icon"])) : r("", !0), t.content && Qe(Ze(t.content)) ? (b(), i(e, { key: 1 }, [s(D(Ze(t.content)), 1)], 64)) : t.content ? (b(), n(E(Ze(t.content)), { key: 2 })) : r("", !0)]),
+					}, null, 8, ["icon"])) : r("", !0), t.content && Qe(Ze(t.content)) ? (b(), i(e, { key: 1 }, [s(D(Ze(t.content)), 1)], 64)) : t.content ? (b(), n(E(Ze(t.content)), { key: 2 })) : r("", !0)])]),
 					_: 2
 				}, 1032, [
 					"type",
@@ -3860,8 +3879,8 @@ var $a = { key: 0 }, eo = {
 				a("div", {
 					ref_key: "tableWrapperEl",
 					ref: se,
-					class: h(`p-pane flex-1 h-0 min-h-0 flex flex-col p-${A(te) ?? "inner"}-scroll`)
-				}, [a("div", io, [(b(), n(A(xe), p({
+					class: h(l.fitContent ? "p-pane" : `p-pane flex-1 h-0 min-h-0 flex flex-col p-${A(te) ?? "inner"}-scroll`)
+				}, [a("div", { class: h(l.fitContent ? "p-grid-table-body" : "p-grid-table-body flex-1 min-h-0 overflow-hidden") }, [(b(), n(A(xe), p({
 					key: ge.value + "_table",
 					"row-key": l.rowKey ?? "id",
 					ref_key: "tableEl",
@@ -3908,11 +3927,11 @@ var $a = { key: 0 }, eo = {
 					"data-source",
 					"loading",
 					"scroll"
-				]))]), a("div", {
+				]))], 2), a("div", {
 					ref_key: "tableFooterEl",
 					ref: ce,
 					class: "flex-shrink-0"
-				}, [Te.value !== "pagination" && De.value ? (b(), i("div", ao, " 已选：" + D(R.value.length), 1)) : Te.value === "pagination" ? (b(), i("div", oo, [a("div", so, [De.value ? (b(), i(e, { key: 0 }, [s(" 已选：" + D(R.value.length), 1)], 64)) : r("", !0)]), c(v, {
+				}, [Te.value !== "pagination" && De.value ? (b(), i("div", so, " 已选：" + D(R.value.length), 1)) : Te.value === "pagination" ? (b(), i("div", co, [a("div", lo, [De.value ? (b(), i(e, { key: 0 }, [s(" 已选：" + D(R.value.length), 1)], 64)) : r("", !0)]), c(v, {
 					size: "small",
 					responsive: !1,
 					"show-size-changer": !0,
@@ -3930,7 +3949,7 @@ var $a = { key: 0 }, eo = {
 			], 64))], 16);
 		};
 	}
-}), lo = /* @__PURE__ */ Re((/* @__PURE__ */ H(((e, t) => {
+}), fo = /* @__PURE__ */ Re((/* @__PURE__ */ H(((e, t) => {
 	(function() {
 		try {
 			if (typeof document < "u") {
@@ -10142,7 +10161,7 @@ var $a = { key: 0 }, eo = {
 		}
 		return $t;
 	});
-})))(), 1), uo = /* @__PURE__ */ l((e, { emit: t }) => {
+})))(), 1), po = /* @__PURE__ */ l((e, { emit: t }) => {
 	let { cellRender: n, renderTableParams: r } = e, { row: i, field: a } = r;
 	if (a) {
 		let e = S(i[a]);
@@ -10152,7 +10171,7 @@ var $a = { key: 0 }, eo = {
 	name: "RenderEditCell",
 	props: ["cellRender", "renderTableParams"],
 	emits: ["blur"]
-}), fo = /* @__PURE__ */ l({
+}), mo = /* @__PURE__ */ l({
 	__name: "PCanvasTable",
 	props: {
 		columns: {},
@@ -10211,7 +10230,7 @@ var $a = { key: 0 }, eo = {
 			children: e.children?.map((e) => ce(e))
 		});
 		y(() => {
-			D.value && (v = new lo.default(D.value, {
+			D.value && (v = new fo.default(D.value, {
 				config: g.value.config,
 				columns: f.columns.map((e) => ce(e)),
 				data: f.data,
@@ -10287,7 +10306,7 @@ var $a = { key: 0 }, eo = {
 						"style",
 						"value",
 						"cell"
-					])) : A(Fa).renders[P.value]?.renderEdit ? (b(), n(A(uo), {
+					])) : A(Fa).renders[P.value]?.renderEdit ? (b(), n(A(po), {
 						key: 1,
 						"cell-render": ne[M.value.key],
 						class: "ev-editor-wrapper",
@@ -10337,13 +10356,13 @@ var $a = { key: 0 }, eo = {
 			}, 8, ["spinning"]);
 		};
 	}
-}), po = { key: 0 }, mo = {
+}), ho = { key: 0 }, go = {
 	key: 1,
 	class: "p-canvas-toolbar-wrapper flex items-center w-full justify-between p-theme-bg pt-8px px-16px"
-}, ho = { class: "flex items-center flex-1 gap-4px" }, go = { key: 2 }, _o = { class: "flex items-center gap-4px" }, vo = {
+}, _o = { class: "flex items-center flex-1 gap-4px" }, vo = { key: 2 }, yo = { class: "flex items-center gap-4px" }, bo = {
 	key: 0,
 	class: "w-full text-slate-5 pl-4"
-}, yo = /* @__PURE__ */ l({
+}, xo = /* @__PURE__ */ l({
 	__name: "PCanvasGrid",
 	props: {
 		staticConfig: {},
@@ -10549,7 +10568,7 @@ var $a = { key: 0 }, eo = {
 				ref_key: "boxEl",
 				ref: _e,
 				class: "h-full p-wrapper flex flex-col gap-8px overflow-y-auto"
-			}, A(_)), [ce.value === "bad" ? (b(), i("div", po, "请检查配置")) : (b(), i(e, { key: 1 }, [
+			}, A(_)), [ce.value === "bad" ? (b(), i("div", ho, "请检查配置")) : (b(), i(e, { key: 1 }, [
 				A(k)?.items?.some((e) => e.field && e.itemRender) ? (b(), i("div", {
 					key: 0,
 					class: "p-pane p-form-wrapper",
@@ -10575,7 +10594,7 @@ var $a = { key: 0 }, eo = {
 					}, 16, ["model"]))]),
 					_: 1
 				}, 8, ["spinning"])], 512)) : r("", !0),
-				A(P) ? (b(), i("div", mo, [a("div", ho, [A(P).buttons && A(P).buttons.length > 0 ? (b(!0), i(e, { key: 0 }, C(A(P).buttons, (t, a) => (b(), i(e, { key: a }, [t.dropdowns && t.dropdowns.length ? (b(), n(v, { key: 0 }, {
+				A(P) ? (b(), i("div", go, [a("div", _o, [A(P).buttons && A(P).buttons.length > 0 ? (b(!0), i(e, { key: 0 }, C(A(P).buttons, (t, a) => (b(), i(e, { key: a }, [t.dropdowns && t.dropdowns.length ? (b(), n(v, { key: 0 }, {
 					overlay: F(() => [c(f, { onClick: je }, {
 						default: F(() => [(b(!0), i(e, null, C(t.dropdowns, (e) => (b(), n(d, { key: e.code }, {
 							default: F(() => [s(D(e.content), 1)]),
@@ -10640,7 +10659,7 @@ var $a = { key: 0 }, eo = {
 					"ghost",
 					"block",
 					"onClick"
-				])) : (b(), i("div", go))], 64))), 128)) : r("", !0)]), a("span", _o, [A(P).tools && A(P).tools.length > 0 ? (b(!0), i(e, { key: 0 }, C(A(P).tools, (e, t) => (b(), n(A(I), {
+				])) : (b(), i("div", vo))], 64))), 128)) : r("", !0)]), a("span", yo, [A(P).tools && A(P).tools.length > 0 ? (b(!0), i(e, { key: 0 }, C(A(P).tools, (e, t) => (b(), n(A(I), {
 					key: t,
 					type: e.type,
 					size: e.size ?? "middle",
@@ -10673,8 +10692,8 @@ var $a = { key: 0 }, eo = {
 					ref: be,
 					class: h("p-pane flex-1 h-0 p-inner-scroll")
 				}, [
-					A(L)?.selectable && A(L).showCount ? (b(), i("div", vo, " 已选：" + D(De.value.length), 1)) : r("", !0),
-					c(fo, {
+					A(L)?.selectable && A(L).showCount ? (b(), i("div", bo, " 已选：" + D(De.value.length), 1)) : r("", !0),
+					c(mo, {
 						ref_key: "canvasTableRef",
 						ref: ge,
 						columns: ze.value,
@@ -10711,7 +10730,7 @@ var $a = { key: 0 }, eo = {
 			], 64))], 16);
 		};
 	}
-}), bo = /* @__PURE__ */ l({
+}), So = /* @__PURE__ */ l({
 	__name: "PGroupBlock",
 	props: {
 		name: {},
@@ -10726,7 +10745,7 @@ var $a = { key: 0 }, eo = {
 			ref: a
 		}, c.value, { data: A(o) }), null, 16, ["name", "data"]));
 	}
-}), xo = /* @__PURE__ */ l({
+}), Co = /* @__PURE__ */ l({
 	__name: "CollapseCard",
 	props: {
 		defaultCollapsed: {
@@ -10775,7 +10794,7 @@ var $a = { key: 0 }, eo = {
 			}))]), 1032, ["title"]));
 		};
 	}
-}), So = /* @__PURE__ */ l({
+}), wo = /* @__PURE__ */ l({
 	__name: "PFormGroup",
 	props: /* @__PURE__ */ f({
 		name: {},
@@ -10913,7 +10932,7 @@ var $a = { key: 0 }, eo = {
 		})));
 		return (t, u) => {
 			let d = T("a-spin");
-			return b(), n(xo, {
+			return b(), n(Co, {
 				ref_key: "rootRef",
 				ref: h,
 				title: l.title,
@@ -10964,7 +10983,7 @@ var $a = { key: 0 }, eo = {
 							default: F(() => [c(A(Ae))]),
 							_: 2
 						}, 1024)) : r("", !0)]),
-						default: F(() => [(b(), n(bo, {
+						default: F(() => [(b(), n(So, {
 							ref_for: !0,
 							ref_key: "blockInstance",
 							ref: y,
@@ -10996,7 +11015,7 @@ var $a = { key: 0 }, eo = {
 			]);
 		};
 	}
-}), Co = { class: "w-full text-right p-2" }, wo = /* @__PURE__ */ l({
+}), To = { class: "w-full text-right p-2" }, Eo = /* @__PURE__ */ l({
 	__name: "PromisePicker",
 	props: {
 		gridSetting: {},
@@ -11013,65 +11032,70 @@ var $a = { key: 0 }, eo = {
 		}
 	},
 	setup(e, { expose: r }) {
-		let i = S(), l = S(!1), u = e, d = t(() => u.gridSetting.selectConfig?.multiple), f, h, g, v = x({ modal: !1 }), C = () => {
+		let i = S(), l = e, u = t(() => l.gridSetting.selectConfig?.multiple), d = t(() => ({
+			fitContent: !0,
+			...l.gridSetting
+		})), f = {
+			display: "flex",
+			flexDirection: "column",
+			minHeight: 0,
+			maxHeight: "min(80dvh, calc(100dvh - 200px))",
+			overflow: "hidden"
+		}, m, h, g, _ = x({ modal: !1 }), v = () => {
 			g && g();
-		}, w = () => {
-			v.modal = !1, g && g();
-		}, T = ({ row: e, field: t }) => {
-			f && !d.value && u.beforePick(e).then(() => {
-				v.modal = !1, f({
+		}, y = () => {
+			_.modal = !1, g && g();
+		}, C = ({ row: e, field: t }) => {
+			m && !u.value && l.beforePick(e).then(() => {
+				_.modal = !1, m({
 					row: e,
 					field: t
 				});
 			});
-		}, E = () => {
+		}, w = () => {
 			let e = i.value?.selectedRecords ?? [];
-			e.length === 0 && !u.multipleAllowEmpty ? Ka("请选择数据") : u.beforePick(e).then(() => {
-				v.modal = !1, h(e);
+			e.length === 0 && !l.multipleAllowEmpty ? Ka("请选择数据") : l.beforePick(e).then(() => {
+				_.modal = !1, h(e);
 			});
 		};
-		return y(() => {}), r({
+		return r({
 			pick: () => new Promise((e, t) => {
-				f = e, g = t, l.value = !1, v.modal = !0, m(() => {
-					l.value = !0;
-				});
+				m = e, g = t, _.modal = !0;
 			}),
 			pickMultiple: () => new Promise((e, t) => {
-				h = e, g = t, l.value = !1, v.modal = !0, m(() => {
-					l.value = !0;
-				});
+				h = e, g = t, _.modal = !0;
 			}),
 			grid: i,
 			hide: () => {
-				v.modal = !1;
+				_.modal = !1;
 			}
 		}), (t, r) => (b(), n(A(ue), {
-			open: v.modal,
-			"onUpdate:open": r[0] ||= (e) => v.modal = e,
+			open: _.modal,
+			"onUpdate:open": r[0] ||= (e) => _.modal = e,
 			"destroy-on-close": "",
 			title: e.title,
 			width: e.width,
-			footer: d.value ? void 0 : null,
-			onCancel: C,
+			footer: u.value ? void 0 : null,
+			onCancel: v,
 			"body-style": e.bodyStyle
 		}, o({
-			default: F(() => [a("div", { style: _({ minHeight: l.value ? "unset" : "642px" }) }, [c(co, p(e.gridSetting, {
+			default: F(() => [a("div", { style: f }, [c(uo, p(d.value, {
 				ref_key: "gridEl",
 				ref: i,
-				onPick: T
-			}), null, 16)], 4)]),
+				onPick: C
+			}), null, 16)])]),
 			_: 2
-		}, [d.value ? {
+		}, [u.value ? {
 			name: "footer",
-			fn: F(() => [a("div", Co, [a("span", null, [c(A(I), {
+			fn: F(() => [a("div", To, [a("span", null, [c(A(I), {
 				class: "mr-4",
-				onClick: w
+				onClick: y
 			}, {
 				default: F(() => [...r[1] ||= [s(" 取消 ", -1)]]),
 				_: 1
 			}), c(A(I), {
 				type: "primary",
-				onClick: E
+				onClick: w
 			}, {
 				default: F(() => [...r[2] ||= [s(" 确定 ", -1)]]),
 				_: 1
@@ -11088,16 +11112,16 @@ var $a = { key: 0 }, eo = {
 });
 //#endregion
 //#region src/index.ts
-function To(e) {
+function Do(e) {
 	e && ia(e);
 }
-var Eo = {
+var Oo = {
 	install(e) {
-		e.component("PForm", Va), e.component("PGrid", co), e.component("PCanvasTable", fo), e.component("PCanvasGrid", yo), e.component("PFormGroup", So), e.component("PGroupBlock", bo), e.component("PromisePicker", wo);
+		e.component("PForm", Va), e.component("PGrid", uo), e.component("PCanvasTable", mo), e.component("PCanvasGrid", xo), e.component("PFormGroup", wo), e.component("PGroupBlock", So), e.component("PromisePicker", Eo);
 	},
 	addFormatter: Sa,
 	addRender: Pa,
-	setup: To
+	setup: Do
 };
 //#endregion
-export { yo as PCanvasGrid, fo as PCanvasTable, Va as PForm, So as PFormGroup, co as PGrid, bo as PGroupBlock, wo as PromisePicker, Sa as addFormatter, Pa as addRender, Xa as applyViewportRestSize, da as cleanCol, Qa as createAutoViewportBoxController, Eo as default, fa as defaultItemResponsive, pa as defaultLabelCol, ha as get24rest, _a as getButtonResponsive, aa as getTooltipRenderer, oa as getUIKitConfig, ma as labelColDict, Ja as parseAutoViewportBoxOffset, ua as resetUIKitConfig, ia as setUIKitConfig, To as setup, va as watchPreviousDeep };
+export { xo as PCanvasGrid, mo as PCanvasTable, Va as PForm, wo as PFormGroup, uo as PGrid, So as PGroupBlock, Eo as PromisePicker, Sa as addFormatter, Pa as addRender, Xa as applyViewportRestSize, da as cleanCol, Qa as createAutoViewportBoxController, Oo as default, fa as defaultItemResponsive, pa as defaultLabelCol, ha as get24rest, _a as getButtonResponsive, aa as getTooltipRenderer, oa as getUIKitConfig, ma as labelColDict, Ja as parseAutoViewportBoxOffset, ua as resetUIKitConfig, ia as setUIKitConfig, Do as setup, va as watchPreviousDeep };

package/dist/index.d.ts

@@ -59,8 +59,15 @@ export declare interface AjaxConfig<F extends Recordable = Recordable> {
 declare type Align = 'left' | 'center' | 'right';
 
 /**
- * 宽/高先按「视口内从元素左上角到右/下边缘」计算，再与**直接父元素**布局框取较小值，
- * 避免嵌套在侧栏 + flex 列等窄容器里仍按整屏宽度赋值，从而撑出页面级横向滚动条。
+ * 宽/高先按「视口内从元素左上角到右/下边缘」计算。
+ *
+ * 宽度会再与**直接父元素**布局框取较小值，避免嵌套在侧栏 + flex 列等窄容器里仍按整屏宽度赋值，
+ * 从而撑出页面级横向滚动条。
+ *
+ * 高度不做 parent 截断：autoBoxSize 的语义就是「一直撑到视口底」。若对 parent 取 min，
+ * 遇到「父容器没有明确高度、靠子元素内容撑开」的常见布局（外层未写死高度，p-grid 根节点
+ * 自身决定可视高度），会形成循环依赖（子依赖父、父又靠子撑开），导致高度被截成极小值，
+ * 反映到 PGrid 上就是表体下方出现大面积空白。
  */
 export declare function applyViewportRestSize(el: HTMLElement, offset: AutoViewportBoxOffset): void;
 
@@ -2574,6 +2581,15 @@ export declare type PGridProps<D extends Recordable = Recordable, F extends Reco
      * 虚拟列表 Y区计算高度
      */
     renderY?: number;
+    /**
+     * 适应「外层高度由内容撑开」的布局（典型如弹窗 `PromisePicker`）。
+     *
+     * 开启后：
+     * - 根容器/表体宿主不再 `flex:1` 强行撑满（避免父无固定高度时塌陷到 0）；
+     * - `a-table` 的纵向 `scroll.y` 作为「最多滚动到多少」的上限，由 `renderY` 显式指定；
+     *   若不传 `renderY`，使用基于视口的默认值。内容少时不会出现行区域下方的大片空白。
+     */
+    fitContent?: boolean;
 };
 
 export declare const PGroupBlock: <F extends Recordable = Recordable>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal_4<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_expose?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
@@ -2961,6 +2977,12 @@ export declare interface UIKitConfig {
      * @param content tooltip 内容，字符串或返回 VNode 的函数
      */
     renderTooltip?: (defaultSlot: () => VNode, content: string | (() => VNode)) => VNode;
+    /**
+     * 自定义图标：按 `icon` 名字渲染；返回值为真时优先于 `@ant-design/icons-vue` 同名组件。
+     */
+    icon?: {
+        render?: (name: string) => unknown;
+    };
 }
 
 declare interface ValidateErrorEntity<Values = any> {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-ui-kit/ant",
-  "version": "2.4.4",
+  "version": "2.4.6",
   "description": "Vue3 UI Kit based on Ant Design",
   "type": "module",
   "main": "./dist/cjs/index.js",

package/src/declarations/antProxy.ts

@@ -256,6 +256,15 @@ export type PGridProps<D extends Recordable = Recordable, F extends Recordable =
    * 虚拟列表 Y区计算高度
    */
   renderY?: number;
+  /**
+   * 适应「外层高度由内容撑开」的布局（典型如弹窗 `PromisePicker`）。
+   *
+   * 开启后：
+   * - 根容器/表体宿主不再 `flex:1` 强行撑满（避免父无固定高度时塌陷到 0）；
+   * - `a-table` 的纵向 `scroll.y` 作为「最多滚动到多少」的上限，由 `renderY` 显式指定；
+   *   若不传 `renderY`，使用基于视口的默认值。内容少时不会出现行区域下方的大片空白。
+   */
+  fitContent?: boolean;
 };
 
 export interface RenderOptions {

package/src/packages/components/PGrid.vue

@@ -10,13 +10,13 @@
   import RenderTitleSlots from '@/components/RenderTitleSlots';
   import { $confirm } from '@/hooks/useMessage';
   import Icon from '@/renders/Icon';
-  import { getGridDefaults } from '@/utils/config';
   import {
     createAutoViewportBoxController,
     parseAutoViewportBoxOffset,
     type AutoViewportBoxController,
     type AutoViewportBoxOffsetInput,
   } from '@/utils/autoViewportBox';
+  import { getGridDefaults } from '@/utils/config';
   import { cleanCol, defaultLabelCol } from '@/utils/core';
   import { isGoodValue } from '@/utils/is';
   import { eachTree } from '@/utils/treeHelper';
@@ -62,6 +62,7 @@
     fitHeight: () => getGridDefaults().fitHeight ?? 30,
     striped: () => getGridDefaults().striped ?? false,
     autoBoxSize: false,
+    fitContent: false,
   });
 
   const {
@@ -484,6 +485,13 @@
         renderHeight.value = props.renderY as number;
         return;
       }
+      // 内容撑开模式（弹窗等）：scroll.y 作为上限，内容不足时 a-table-body 按自然高度展示。
+      if (props.fitContent) {
+        const vh = typeof window !== 'undefined' ? window.innerHeight : 800;
+        const reserve = props.fitHeight ?? 30;
+        renderHeight.value = Math.max(Math.floor(vh * 0.6) - reserve, 160);
+        return;
+      }
       const wrapperH = tableWrapperEl.value.clientHeight;
       const footerH = tableFooterEl.value?.offsetHeight ?? 0;
       const tableHeaderEl = resolveTableHeaderEl(tableWrapperEl.value);
@@ -605,8 +613,12 @@
   <div
     ref="boxEl"
     :class="[
-      'p-wrapper flex flex-col gap-8px overflow-y-auto',
-      autoBoxSize ? 'min-h-0 min-w-0 flex-1 w-full' : 'h-full',
+      'p-wrapper flex flex-col gap-8px',
+      fitContent
+        ? 'w-full h-auto'
+        : autoBoxSize
+          ? 'overflow-y-auto min-h-0 min-w-0 flex-1 w-full'
+          : 'overflow-y-auto h-full',
     ]"
     v-bind="attrs"
   >
@@ -666,12 +678,14 @@
                   :ghost="btn.ghost"
                   :block="btn.block"
                 >
-                  <Icon v-if="btn.icon" :icon="btn.icon" />
-                  <template v-if="btn.content && isStringContent(renderContent(btn.content))">
-                    {{ renderContent(btn.content) }}
-                  </template>
-                  <component v-else-if="btn.content" :is="renderContent(btn.content)" />
-                  <DownOutlined />
+                  <div class="flex items-center gap-4px">
+                    <Icon v-if="btn.icon" :icon="btn.icon" />
+                    <template v-if="btn.content && isStringContent(renderContent(btn.content))">
+                      {{ renderContent(btn.content) }}
+                    </template>
+                    <component v-else-if="btn.content" :is="renderContent(btn.content)" />
+                    <DownOutlined />
+                  </div>
                 </a-button>
               </a-dropdown>
               <a-button
@@ -686,11 +700,13 @@
                 :block="btn.block"
                 @click="debounceToolBtnClick(btn.code)"
               >
-                <Icon v-if="btn.icon" :icon="btn.icon" />
-                <template v-if="btn.content && isStringContent(renderContent(btn.content))">
-                  {{ renderContent(btn.content) }}
-                </template>
-                <component v-else-if="btn.content" :is="renderContent(btn.content)" />
+                <div class="flex items-center gap-4px">
+                  <Icon v-if="btn.icon" :icon="btn.icon" />
+                  <template v-if="btn.content && isStringContent(renderContent(btn.content))">
+                    {{ renderContent(btn.content) }}
+                  </template>
+                  <component v-else-if="btn.content" :is="renderContent(btn.content)" />
+                </div>
               </a-button>
               <div v-else></div>
             </template>
@@ -711,20 +727,30 @@
               @click="debounceToolToolClick(tool.code)"
               :loading="loading.toolbar || (!!tool.code && codeLoadings[tool.code])"
             >
-              <Icon v-if="tool.icon" :icon="tool.icon" />
-              <template v-if="tool.content && isStringContent(renderContent(tool.content))">
-                {{ renderContent(tool.content) }}
-              </template>
-              <component v-else-if="tool.content" :is="renderContent(tool.content)" />
+              <div class="flex items-center gap-4px">
+                <Icon v-if="tool.icon" :icon="tool.icon" />
+                <template v-if="tool.content && isStringContent(renderContent(tool.content))">
+                  {{ renderContent(tool.content) }}
+                </template>
+                <component v-else-if="tool.content" :is="renderContent(tool.content)" />
+              </div>
             </a-button>
           </template>
         </span>
       </div>
       <div
         ref="tableWrapperEl"
-        :class="`p-pane flex-1 h-0 min-h-0 flex flex-col p-${scrollMode ?? 'inner'}-scroll`"
+        :class="
+          fitContent
+            ? 'p-pane'
+            : `p-pane flex-1 h-0 min-h-0 flex flex-col p-${scrollMode ?? 'inner'}-scroll`
+        "
       >
-        <div class="p-grid-table-body flex-1 min-h-0 overflow-hidden">
+        <div
+          :class="
+            fitContent ? 'p-grid-table-body' : 'p-grid-table-body flex-1 min-h-0 overflow-hidden'
+          "
+        >
           <a-table
             :key="renderTableKey + '_table'"
             :row-key="rowKey ?? 'id'"