@gx-design-vue/pro-table 0.2.0-alpha.14 → 0.2.0-alpha.16

package/dist/pro-table.esm.js

@@ -1,21 +1,21 @@
 import { createInjectionState as e, useBreakpoints as t, useDebounceFn as n, useElementSize as r, useEventListener as i, useFullscreen as a, useMutationObserver as o, useResizeObserver as s, useScroll as c, useWindowSize as l } from "@vueuse/core";
 import { Comment as u, Fragment as d, Teleport as f, Text as p, computed as m, createVNode as h, defineComponent as g, getCurrentInstance as _, h as v, isVNode as y, mergeDefaults as b, mergeProps as x, nextTick as S, onActivated as C, onBeforeUnmount as w, onDeactivated as T, onMounted as E, onScopeDispose as D, onUnmounted as O, reactive as k, ref as A, shallowRef as j, toRaw as M, toRef as ee, toValue as N, unref as te, watch as P, watchEffect as ne } from "vue";
 import { proGenStyleHooks as re, unit as F, useProConfigContext as ie } from "@gx-design-vue/pro-provider";
-import { Button as I, Cascader as L, DatePicker as R, Input as z, InputNumber as B, Pagination as V, Select as ae, SpaceCompact as oe, Spin as se, Table as ce, TimePicker as le, Tooltip as ue, TreeSelect as de } from "antdv-next";
-import { useBaseConfig as fe } from "antdv-next/config-provider/context";
-import pe from "antdv-next/config-provider/hooks/useCSSVarCls";
-import { GIcon as H } from "@gx-design-vue/icon";
+import { Button as ae, Cascader as I, DatePicker as L, Input as R, InputNumber as z, Pagination as B, Select as oe, SpaceCompact as se, Spin as ce, Table as le, TimePicker as ue, Tooltip as de, TreeSelect as fe } from "antdv-next";
+import { useBaseConfig as pe } from "antdv-next/config-provider/context";
+import me from "antdv-next/config-provider/hooks/useCSSVarCls";
+import { GIcon as V } from "@gx-design-vue/icon";
 //#region \0rolldown/runtime.js
-var me = Object.create, he = Object.defineProperty, ge = Object.getOwnPropertyDescriptor, _e = Object.getOwnPropertyNames, ve = Object.getPrototypeOf, ye = Object.prototype.hasOwnProperty, be = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports), xe = (e, t, n, r) => {
-	if (t && typeof t == "object" || typeof t == "function") for (var i = _e(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !ye.call(e, s) && s !== n && he(e, s, {
+var he = Object.create, ge = Object.defineProperty, _e = Object.getOwnPropertyDescriptor, ve = Object.getOwnPropertyNames, ye = Object.getPrototypeOf, be = Object.prototype.hasOwnProperty, xe = (e, t) => () => (t || (e((t = { exports: {} }).exports, t), e = null), t.exports), Se = (e, t, n, r) => {
+	if (t && typeof t == "object" || typeof t == "function") for (var i = ve(t), a = 0, o = i.length, s; a < o; a++) s = i[a], !be.call(e, s) && s !== n && ge(e, s, {
 		get: ((e) => t[e]).bind(null, s),
-		enumerable: !(r = ge(t, s)) || r.enumerable
+		enumerable: !(r = _e(t, s)) || r.enumerable
 	});
 	return e;
-}, Se = (e, t, n) => (n = e == null ? {} : me(ve(e)), xe(t || !e || !e.__esModule ? he(n, "default", {
+}, Ce = (e, t, n) => (n = e == null ? {} : he(ye(e)), Se(t || !e || !e.__esModule ? ge(n, "default", {
 	value: e,
 	enumerable: !0
-}) : n, e)), [Ce, we] = e((e) => e), Te = [
+}) : n, e)), [we, H] = e((e) => e), Te = [
 	{
 		breakpoint: "xxl",
 		span: 4
@@ -58,7 +58,7 @@ function De() {
 		xxl: e.isGreaterOrEqual("xxl")
 	})), i = m(() => !r.value.xl);
 	function a(e, t) {
-		return t && typeof t == "object" && Object.keys(t).length > 0 ? U(t, n.value) : Oe(e, r.value);
+		return t && typeof t == "object" && Object.keys(t).length > 0 ? Oe(t, n.value) : U(e, r.value);
 	}
 	return {
 		screens: r,
@@ -67,7 +67,7 @@ function De() {
 		getRowItemsPerBreakpoint: a
 	};
 }
-function U(e, t) {
+function Oe(e, t) {
 	let n = 4, r = Object.keys(e).map(Number).filter((e) => !Number.isNaN(e)).sort((e, t) => t - e);
 	for (let i of r) if (e[i] && t >= i) {
 		n = e[i];
@@ -75,7 +75,7 @@ function U(e, t) {
 	}
 	return n;
 }
-function Oe(e, t) {
+function U(e, t) {
 	let n = 4;
 	for (let r = 0; r < Te.length; r += 1) {
 		let i = Te[r].breakpoint;
@@ -104,10 +104,10 @@ function je(e, t) {
 function Me(e) {
 	return typeof e == "boolean";
 }
-function W(e) {
+function Ne(e) {
 	return typeof e == "number";
 }
-function Ne(e) {
+function W(e) {
 	return Array.isArray === void 0 ? Object.prototype.toString.call(e) === "[object Array]" : Array.isArray(e);
 }
 function G(e) {
@@ -285,7 +285,7 @@ function J(...e) {
 		let r = e[n];
 		if (r) {
 			if (Pe(r)) t.push(r);
-			else if (Ne(r)) for (let e = 0; e < r.length; e++) {
+			else if (W(r)) for (let e = 0; e < r.length; e++) {
 				let n = J(r[e]);
 				n && t.push(n);
 			}
@@ -384,7 +384,7 @@ function bt(e, t) {
 }
 //#endregion
 //#region src/utils/valueFormat.ts
-var Y = /* @__PURE__ */ Se((/* @__PURE__ */ be(((e, t) => {
+var Y = /* @__PURE__ */ Ce((/* @__PURE__ */ xe(((e, t) => {
 	(function(n, r) {
 		typeof e == "object" && t !== void 0 ? t.exports = r() : typeof define == "function" && define.amd ? define(r) : (n = typeof globalThis < "u" ? globalThis : n || self).dayjs = r();
 	})(e, (function() {
@@ -882,32 +882,32 @@ function zt(e, t) {
 	function ie() {
 		F();
 	}
-	function I(e) {
+	function ae(e) {
 		if (ee.value || !i.value) return;
 		let t = Math.max(a.value || 2e3, 2e3);
 		F(), N.value = setTimeout(() => {
-			V({
+			B({
 				...e,
 				isPolling: !0
 			});
 		}, t);
 	}
-	function L() {
+	function I() {
 		te.value?.abort(), te.value = null;
 	}
-	function R(e) {
-		if (j.value = ze(e, M(y)), !o || !Fe(o)) {
+	function L(e) {
+		if (j.value = ze(M(e), M(y)), !o || !Fe(o)) {
 			let t = e.length || 0;
 			t !== y.total && x({ total: t });
 		}
 	}
-	async function z(e = {}) {
+	async function R(e = {}) {
 		let { pagination: t = {}, filters: n = {}, sorter: r = {}, removeKeys: i = [], isPolling: a = !1, extra: l } = e;
 		if (!o || !Fe(o)) return c.value || [];
 		a || (S(!0), re(!0)), t && Object.keys(t).length && x(t);
 		try {
 			i.length && E(i);
-			let t = G(r) && Object.keys(r).length ? [r] : Ne(r) ? r : [];
+			let t = G(r) && Object.keys(r).length ? [r] : W(r) ? r : [];
 			w && k && w(k.value.map((e) => {
 				let n = t.find((t) => (t?.columnKey || t?.field) === e.dataIndex);
 				return {
@@ -946,44 +946,44 @@ function zt(e, t) {
 				let { success: t = !0, data: n = [] } = d;
 				if (!t) return [];
 				let r = typeof s == "function" ? s(n) : n, i = d.total || r.length || 0;
-				return i !== y.total && x({ total: i }), R(r), D(r), I(e), r;
+				return i !== y.total && x({ total: i }), L(r), D(r), ae(e), r;
 			}
 			return [];
 		} catch (e) {
 			if (e.name === "AbortError") return [];
-			if (_) return j.value === void 0 && R([]), _(e), [];
+			if (_) return j.value === void 0 && L([]), _(e), [];
 			throw e;
 		} finally {
 			a || (S(!1), re(!1));
 		}
 	}
-	let B = n((e) => z(e), () => f.value ?? 10);
-	function V(e = {}) {
-		L(), B(e);
+	let z = n((e) => R(e), () => f.value ?? 10);
+	function B(e = {}) {
+		I(), z(e);
 	}
 	C(() => {
 		ee.value = !1;
 	}), O(() => {
-		ee.value = !0, L(), ie();
+		ee.value = !0, I(), ie();
 	}), T(() => {
-		ee.value = !0, L(), ie();
+		ee.value = !0, I(), ie();
 	}), P(() => c.value, (e) => {
-		e && !Fe(o) && R(e);
+		e && !Fe(o) && L(e);
 	}, {
 		deep: !0,
 		immediate: !0
 	}), P(() => p.value, () => {
-		u.value || d.value && (x({ current: 1 }), V({ isPolling: !1 }));
+		u.value || d.value && (x({ current: 1 }), B({ isPolling: !1 }));
 	}, { deep: !0 }), P(() => h.value, (e, t) => {
-		u.value || e !== t && (x({ current: 1 }), V({ isPolling: !1 }));
+		u.value || e !== t && (x({ current: 1 }), B({ isPolling: !1 }));
 	}, { deep: !0 }), P(() => i.value, () => {
-		u.value || (i.value ? V({ isPolling: !0 }) : ie());
+		u.value || (i.value ? B({ isPolling: !0 }) : ie());
 	}), P(() => u.value, (e) => {
-		e ? (S(!0), re(!0)) : l.value && V({ isPolling: !1 });
-	}), !u.value && l.value && V({ isPolling: !1 });
-	let ae = m(() => j.value.some((e) => Ne(e.children) && e.children.length > 0));
-	function oe(e, t = {}, n = {}, r) {
-		V({
+		e ? (S(!0), re(!0)) : l.value && B({ isPolling: !1 });
+	}), !u.value && l.value && B({ isPolling: !1 });
+	let oe = m(() => j.value.some((e) => W(e.children) && e.children.length > 0));
+	function se(e, t = {}, n = {}, r) {
+		B({
 			pagination: e,
 			filters: t,
 			sorter: n,
@@ -991,7 +991,7 @@ function zt(e, t) {
 			isPolling: !1
 		});
 	}
-	function se(e) {
+	function ce(e) {
 		let { key: t, row: n, value: i, type: a = "update" } = e, o = t ?? r.value, s = n?.[o] ?? i;
 		switch (!n && a !== "delete" && console.warn("row is required"), a) {
 			case "update":
@@ -1008,23 +1008,23 @@ function zt(e, t) {
 				break;
 		}
 	}
-	function ce(e) {
-		u.value || (o ? V({
+	function le(e) {
+		u.value || (o ? B({
 			...e,
 			isPolling: !1
-		}) : R(c.value || []));
+		}) : L(c.value || []));
 	}
-	function le(e) {
-		ce(e);
+	function ue(e) {
+		le(e);
 	}
 	return {
 		dataSource: m(() => j.value.length ? j.value : Rt),
-		isTreeDataRef: ae,
-		setTableDataList: R,
-		operateTableDataRow: se,
-		handleTableChange: oe,
-		run: ce,
-		reload: le
+		isTreeDataRef: oe,
+		setTableDataList: L,
+		operateTableDataRow: ce,
+		handleTableChange: se,
+		run: le,
+		reload: ue
 	};
 }
 //#endregion
@@ -1162,7 +1162,7 @@ function Qt({ pagination: e }) {
 		immediate: !0
 	});
 	function r(e) {
-		W(e.current) && (n.current = e.current), W(e.pageSize) && (n.pageSize = e.pageSize), W(e.total) && (n.total = e.total);
+		Ne(e.current) && (n.current = e.current), Ne(e.pageSize) && (n.pageSize = e.pageSize), Ne(e.total) && (n.total = e.total);
 	}
 	function i(e) {
 		t.value !== !1 && (t.value = dt({}, t.value, e), r(e));
@@ -1288,10 +1288,11 @@ function nn(e, t) {
 		searchMap: []
 	}), r = /* @__PURE__ */ new Set();
 	function i(e = {}) {
-		let i = dt({}, e);
-		for (let e of r) e in i || (delete n[e], r.delete(e));
-		Object.assign(n, i);
-		for (let e of Object.keys(i)) r.add(e);
+		for (let t of r) t in e || (delete n[t], r.delete(t));
+		for (let t of Object.keys(e)) {
+			let i = e[t];
+			i !== n[t] && (n[t] = i), r.add(t);
+		}
 		t?.request && (n.request = t.request);
 	}
 	P(() => N(t?.state), (e) => {
@@ -1860,9 +1861,9 @@ var Qn = /* @__PURE__ */ g({
 		}, [e.collapseRender(e.collapsed)]) : h("span", {
 			class: `${e.prefixCls}-search-control-text`,
 			onClick: () => e.onToggle(!e.collapsed)
-		}, [e.collapsed ? "展开" : "收起", e.collapsed ? h(H, { type: "DownOutlined" }, null) : h(H, { type: "UpOutlined" }, null)]);
+		}, [e.collapsed ? "展开" : "收起", e.collapsed ? h(V, { type: "DownOutlined" }, null) : h(V, { type: "UpOutlined" }, null)]);
 	}
-}), { RangePicker: $n } = R, er = /* @__PURE__ */ g({
+}), { RangePicker: $n } = L, er = /* @__PURE__ */ g({
 	name: "ProTableFormItemContainer",
 	props: {
 		prefixCls: {
@@ -1915,15 +1916,15 @@ var Qn = /* @__PURE__ */ g({
 				allowClear: e.record.allowClear ?? !0,
 				...t
 			};
-			return e.autoRequest ? h(z.Search, x(n, {
+			return e.autoRequest ? h(R.Search, x(n, {
 				onSearch: () => e.onSubmit?.(),
 				onChange: (t) => {
 					e.formState[e.record.name] = t.target?.value ?? t;
 				}
-			}), null) : h(z, x(n, { onChange: (e) => i(e.target?.value ?? e) }), null);
+			}), null) : h(R, x(n, { onChange: (e) => i(e.target?.value ?? e) }), null);
 		}
 		function o() {
-			return h(B, x({
+			return h(z, x({
 				style: { width: "100%" },
 				value: e.formState[e.record.name],
 				placeholder: e.record.placeholder || "请输入",
@@ -1932,17 +1933,17 @@ var Qn = /* @__PURE__ */ g({
 		}
 		function s() {
 			let t = e.record.name, n = e.formState[t], a = Array.isArray(e.record.placeholder) ? e.record.placeholder : ["请输入", "请输入"];
-			return h(oe, {
+			return h(se, {
 				class: `${e.prefixCls}-search-input-compact`,
 				style: { width: "100%" }
 			}, { default: () => [
-				h(B, {
+				h(z, {
 					value: n?.[0],
 					placeholder: a[0] || "请输入",
 					onChange: (e) => i(e, { key: 0 }),
 					style: r
 				}, null),
-				h(z, {
+				h(R, {
 					disabled: !0,
 					value: "~",
 					class: `${e.prefixCls}-number-range-separator`,
@@ -1952,7 +1953,7 @@ var Qn = /* @__PURE__ */ g({
 						pointerEvents: "none"
 					}
 				}, null),
-				h(B, {
+				h(z, {
 					value: n?.[1],
 					placeholder: a[1] || "请输入",
 					onChange: (e) => i(e, { key: 1 }),
@@ -1962,7 +1963,7 @@ var Qn = /* @__PURE__ */ g({
 		}
 		function c() {
 			let r = e.record.loading || n.value, a = e.record.request ? t.value : e.record.valueEnum || [], o = e.record.field ?? {};
-			return h(ae, x({
+			return h(oe, x({
 				style: { width: "100%" },
 				value: r ? void 0 : e.formState[e.record.name],
 				optionFilterProp: "label",
@@ -1976,7 +1977,7 @@ var Qn = /* @__PURE__ */ g({
 		}
 		function l() {
 			let r = e.record.field ?? {}, a = e.record.loading || n.value;
-			return h(de, x({
+			return h(fe, x({
 				style: { width: "100%" },
 				value: e.formState[e.record.name],
 				placeholder: e.record.placeholder || "请选择",
@@ -1988,7 +1989,7 @@ var Qn = /* @__PURE__ */ g({
 		}
 		function u() {
 			let r = e.record.field ?? {}, a = e.record.loading || n.value;
-			return h(L, x({
+			return h(I, x({
 				style: { width: "100%" },
 				value: e.formState[e.record.name],
 				placeholder: e.record.placeholder || "请选择",
@@ -2000,7 +2001,7 @@ var Qn = /* @__PURE__ */ g({
 		}
 		function d() {
 			let t = Xn(e.record.valueFormat, e.record.showTime);
-			return h(R, x({
+			return h(L, x({
 				style: { width: "100%" },
 				value: e.formState[e.record.name] ? (0, Y.default)(e.formState[e.record.name]) : void 0,
 				placeholder: e.record.placeholder || "请选择",
@@ -2012,7 +2013,7 @@ var Qn = /* @__PURE__ */ g({
 		}
 		function f(t, n, r) {
 			let a = e.formState[e.record.name];
-			return h(R, x({
+			return h(L, x({
 				style: { width: "100%" },
 				picker: t,
 				value: a ? (0, Y.default)(a, n) : void 0,
@@ -2036,7 +2037,7 @@ var Qn = /* @__PURE__ */ g({
 		}
 		function m() {
 			let t = e.record.valueFormat || "HH:mm:ss";
-			return h(le, x({
+			return h(ue, x({
 				style: { width: "100%" },
 				value: e.formState[e.record.name] ? (0, Y.default)(e.formState[e.record.name], t) : void 0,
 				placeholder: e.record.placeholder || "请选择",
@@ -2235,7 +2236,7 @@ var rr = /* @__PURE__ */ g({
 					break;
 				case "dateRange": {
 					let e = Xn(n.valueFormat, n.showTime);
-					o = t && Ne(t) && t.length === 2 ? Zn(t, e, "string") : null;
+					o = t && W(t) && t.length === 2 ? Zn(t, e, "string") : null;
 					break;
 				}
 				case "time":
@@ -2269,7 +2270,7 @@ var rr = /* @__PURE__ */ g({
 				}
 				if (r === "numberRange") {
 					let e = t[i];
-					t[i] = Array.isArray(e) && e.some((e) => W(e)) ? e : void 0;
+					t[i] = Array.isArray(e) && e.some((e) => Ne(e)) ? e : void 0;
 				}
 			}
 			return t;
@@ -2338,10 +2339,10 @@ var rr = /* @__PURE__ */ g({
 			}, D = () => !f.value && o.value ? null : h("div", {
 				class: [`${e.prefixCls}-search-buttons`, e.proClasses.searchButtons],
 				style: e.proStyles.searchButtons
-			}, [f.value && h(I, {
+			}, [f.value && h(ae, {
 				key: "reset",
 				onClick: x
-			}, { default: () => [s.value?.resetText || "重置"] }), !o.value && h(I, {
+			}, { default: () => [s.value?.resetText || "重置"] }), !o.value && h(ae, {
 				key: "submit",
 				type: "primary",
 				loading: typeof e.loading == "boolean" ? e.loading : !1,
@@ -2392,7 +2393,7 @@ var ar = /* @__PURE__ */ g({
 		}
 	},
 	setup(e) {
-		return () => h(ue, { title: e.isFullscreen ? "退出全屏" : "全屏" }, { default: () => [h("span", { onClick: e.onToggle }, [e.isFullscreen ? h(H, { type: "FullscreenExitOutlined" }, null) : h(H, { type: "FullscreenOutlined" }, null)])] });
+		return () => h(de, { title: e.isFullscreen ? "退出全屏" : "全屏" }, { default: () => [h("span", { onClick: e.onToggle }, [e.isFullscreen ? h(V, { type: "FullscreenExitOutlined" }, null) : h(V, { type: "FullscreenOutlined" }, null)])] });
 	}
 });
 //#endregion
@@ -2401,7 +2402,7 @@ function or(e) {
 	if (y(e)) return e;
 	if (!e) return null;
 	let { icon: t, tooltip: n, onClick: r, key: i } = e;
-	return t && n ? h(ue, {
+	return t && n ? h(de, {
 		title: n,
 		key: i
 	}, { default: () => [h("span", {
@@ -2465,7 +2466,7 @@ var sr = /* @__PURE__ */ g({
 			}, [t.value && h("div", {
 				class: [`${o}-list-toolbar-title`, e.proClasses.toolbarTitle],
 				style: e.proStyles.toolbarTitle
-			}, [e.headerTitle, e.headerTitleTip && h(ue, { title: e.titleTipText }, { default: () => [typeof e.headerTitleTip == "boolean" ? h(H, { type: "InfoCircleOutlined" }, null) : e.headerTitleTip] })]), n.value.length > 0 && h("div", { class: `${o}-list-toolbar-actions` }, [n.value])]) : a.value ? h("div", {
+			}, [e.headerTitle, e.headerTitleTip && h(de, { title: e.titleTipText }, { default: () => [typeof e.headerTitleTip == "boolean" ? h(V, { type: "InfoCircleOutlined" }, null) : e.headerTitleTip] })]), n.value.length > 0 && h("div", { class: `${o}-list-toolbar-actions` }, [n.value])]) : a.value ? h("div", {
 				class: `${o}-list-toolbar-left`,
 				style: e.proStyles.toolbarLeft
 			}, null) : null, c = a.value ? h("div", {
@@ -2535,7 +2536,7 @@ var lr = /* @__PURE__ */ g({
 		}
 	},
 	setup(e) {
-		let t = we(), n = m(() => {
+		let t = H(), n = m(() => {
 			if (e.options === !1) return [];
 			let n = cr(e.options) ? e.options : {}, r = [];
 			if (n.reload !== !1) {
@@ -2543,10 +2544,10 @@ var lr = /* @__PURE__ */ g({
 				if (typeof n.reload == "function") {
 					let t = n.reload(e);
 					t && r.push(t);
-				} else r.push(h(ue, {
+				} else r.push(h(de, {
 					title: "刷新",
 					key: "reload"
-				}, { default: () => [h("span", { onClick: e }, [h(H, { type: "ReloadOutlined" }, null)])] }));
+				}, { default: () => [h("span", { onClick: e }, [h(V, { type: "ReloadOutlined" }, null)])] }));
 			}
 			return n.fullScreen !== !1 && (typeof n.fullScreen == "function" ? r.push(h(ar, {
 				key: "fullscreen",
@@ -2870,6 +2871,16 @@ var gr = (e) => {
 		justifyContent: "center",
 		marginBlock: e.marginXL
 	},
+	"&-loading-container": { position: "relative" },
+	"&-loading-mask": {
+		position: "absolute",
+		inset: 0,
+		display: "flex",
+		alignItems: "center",
+		justifyContent: "center",
+		backgroundColor: `color-mix(in srgb, ${e.colorBgContainer} 50%, transparent)`,
+		zIndex: 10
+	},
 	"&-full-screen": { [`${e.componentCls}-content`]: {
 		height: "100% !important",
 		padding: 24,
@@ -2941,45 +2952,53 @@ var gr = (e) => {
 	"classes",
 	"styles"
 ], Sr = /* @__PURE__ */ g((e, { attrs: t, slots: n, emit: r, expose: i }) => {
-	let { prefixCls: o } = fe("pro-table", e), s = pe(o), [c, l] = yr(o, s), u = ie(), p = A(), { toggle: g, isFullscreen: _ } = a(p);
+	let { prefixCls: o } = pe("pro-table", e), s = me(o), [c, l] = yr(o, s), u = ie(), p = A(), { toggle: g, isFullscreen: _ } = a(p);
 	P(_, (e) => {
 		r("fullscreenChange", e);
 	});
-	let v = m(() => J(o.value, c.value, l.value, s.value, t.class, e.proClasses?.root, Me.value)), y = m(() => [e.proStyles?.root, t.style]), { isMobile: b, screenWidth: S, screens: C } = De(), { paginationInfo: w, paginationAlign: T, requestPagination: E, setPagination: D } = Qt({ pagination: ee(e, "pagination") }), { tableSize: O, setTableSize: k } = _n({
+	let v = m(() => J(o.value, c.value, l.value, s.value, t.class, e.proClasses?.root, Ne.value)), y = m(() => [e.proStyles?.root, t.style]), { isMobile: b, screenWidth: S, screens: C } = De(), { paginationInfo: w, paginationAlign: T, requestPagination: E, setPagination: D } = Qt({ pagination: ee(e, "pagination") }), { tableSize: O, setTableSize: k } = _n({
 		size: m(() => e.size),
 		onChange: (e) => r("sizeChange", e)
 	}), { loading: j, setLoading: M } = Xt({
 		loading: m(() => e.loading),
 		onChange: (t) => e.onLoadingChange?.(t)
-	}), { selectedRowKeys: N, selectedItems: te, mergedRowSelection: ne, select: re, selectAll: F, remove: I, clear: L, sync: R } = en({
+	}), N = m(() => {
+		let t = e.loading;
+		if (t && typeof t == "object") {
+			let e = t.indicator;
+			if (e !== void 0) return e;
+		}
+		let n = u?.indicator?.value;
+		return typeof n == "function" ? n() : n;
+	}), { selectedRowKeys: te, selectedItems: ne, mergedRowSelection: re, select: F, selectAll: ae, remove: I, clear: L, sync: R } = en({
 		rowKey: m(() => e.rowKey),
 		rowSelection: m(() => e.rowSelection),
 		dataSource: m(() => e.dataSource ?? [])
-	}), z = m(() => At(e.columns ?? [], e.indexColumn, e.align ?? "left")), { tableScroll: B, shouldFixActionColumn: ae } = mn({
+	}), z = m(() => At(e.columns ?? [], e.indexColumn, e.align ?? "left")), { tableScroll: oe, shouldFixActionColumn: se } = mn({
 		scroll: m(() => e.scroll),
 		columns: z,
 		rowSelection: m(() => e.rowSelection),
 		screens: C,
 		screenWidth: S,
 		scrollPolicy: m(() => e.scrollPolicy)
-	}), { tableColumns: oe, cacheColumns: le, setColumns: ue } = Pt({
+	}), { tableColumns: ue, cacheColumns: de, setColumns: fe } = Pt({
 		columns: m(() => e.columns ?? []),
 		align: m(() => e.align ?? "left"),
 		indexColumn: m(() => e.indexColumn),
-		shouldFixActionColumn: ae,
+		shouldFixActionColumn: se,
 		wrapColumnRender: Ct({
 			columnEmptyText: m(() => e.columnEmptyText),
 			prefixCls: o
 		}).wrapColumnRender
-	}), { resizableColumns: de, resizableComponents: H } = Lt({
-		columns: oe,
+	}), { resizableColumns: V, resizableComponents: he } = Lt({
+		columns: ue,
 		onResize: (e, t) => r("resizeColumn", e, t)
-	}), me = m(() => e.form === !1 ? void 0 : e.form), he = m(() => e.form === !1 ? e.autoRequest ?? !0 : e.form?.autoRequest ?? e.autoRequest ?? !0), ge = m(() => {
+	}), ge = m(() => e.form === !1 ? void 0 : e.form), _e = m(() => e.form === !1 ? e.autoRequest ?? !0 : e.form?.autoRequest ?? e.autoRequest ?? !0), ve = m(() => {
 		if (e.form !== !1) return e.form?.actions;
-	}), { formColumns: _e, defaultFormSearch: ve, formState: ye, getFormSearch: be, resetFormState: xe } = on({
+	}), { formColumns: ye, defaultFormSearch: be, formState: xe, getFormSearch: Se, resetFormState: Ce } = on({
 		searchMap: m(() => e.searchMap ?? []),
 		columns: m(() => e.columns ?? [])
-	}), { dataSource: Se, setTableDataList: we, operateTableDataRow: Te, handleTableChange: Ee, reload: U, run: Oe } = zt({
+	}), { dataSource: H, setTableDataList: Te, operateTableDataRow: Ee, handleTableChange: Oe, reload: U, run: ke } = zt({
 		rowKey: m(() => e.rowKey),
 		polling: m(() => e.polling ?? !1),
 		pollingTime: m(() => e.pollingTime ?? 2e3),
@@ -2991,7 +3010,7 @@ var gr = (e) => {
 		autoRequest: m(() => e.autoRequest ?? !0),
 		debounceTime: m(() => e.debounceTime ?? 10),
 		params: m(() => e.params),
-		defaultFormSearch: ve,
+		defaultFormSearch: be,
 		onLoadingChange: e.onLoadingChange,
 		onRequestError: e.onRequestError,
 		onBeforeSearchSubmit: e.onBeforeSearchSubmit
@@ -3000,60 +3019,60 @@ var gr = (e) => {
 		paginationInfo: w,
 		setPagination: D,
 		setLoading: M,
-		setColumns: ue,
+		setColumns: fe,
 		removeRowKeys: I,
 		syncSelectedRows: R,
-		columns: le
+		columns: de
 	});
 	Jt({
 		enabled: m(() => e.keepAliveReload ?? !1),
 		reload: U
 	});
-	let ke = A(), { scrollY: Ae, overflowHidden: je, fullPageClass: Me, scrollEl: W, barRef: Ne } = Kt({
-		fitPage: m(() => !B.value?.y && !!e.fitPage),
-		cardEl: ke,
+	let Ae = A(), { scrollY: je, overflowHidden: Me, fullPageClass: Ne, scrollEl: W, barRef: G } = Kt({
+		fitPage: m(() => !oe.value?.y && !!e.fitPage),
+		cardEl: Ae,
 		prefixCls: o
-	}), G = m(() => ({
-		...B.value ?? {},
-		...Ae.value > 0 ? { y: Ae.value } : {}
+	}), Pe = m(() => ({
+		...oe.value ?? {},
+		...je.value > 0 ? { y: je.value } : {}
 	}));
-	Ce({
+	we({
 		reload: U,
 		setPagination: D,
 		tableSize: O,
 		setTableSize: k,
-		formAutoRequest: he,
-		formConfig: me,
-		formActions: ge,
+		formAutoRequest: _e,
+		formConfig: ge,
+		formActions: ve,
 		isMobile: b,
 		screenWidth: S,
 		toggleFullscreen: g,
 		isFullscreen: _
 	});
-	let Pe = m(() => !!(e.customRender || n.customRender)), Fe = m(() => e.form === !1 ? !1 : _e.value.length > 0 || !!n.form);
-	function Ie(t, n) {
-		if (he.value) {
+	let Fe = m(() => !!(e.customRender || n.customRender)), Ie = m(() => e.form === !1 ? !1 : ye.value.length > 0 || !!n.form);
+	function Le(t, n) {
+		if (_e.value) {
 			U({ params: t });
 			return;
 		}
-		n === "reset" ? (r("reset", t), e.request && ge.value?.resetReload && U({ params: t })) : e.request && (r("submit", t), U({ params: t }));
+		n === "reset" ? (r("reset", t), e.request && ve.value?.resetReload && U({ params: t })) : e.request && (r("submit", t), U({ params: t }));
 	}
-	function Le(e) {
+	function Re(e) {
 		let t = w.value;
 		if (!t) return e;
 		let { current: n = 1, pageSize: r = 10 } = t;
 		return e.filter((e, t) => t >= (n - 1) * r && t < n * r);
 	}
-	function Re() {
+	function ze() {
 		let t = e.customRender || n.customRender;
 		if (!t) return null;
-		let r = Se.value;
+		let r = H.value;
 		return r?.length ? typeof t == "function" ? t({
 			dataSource: r,
-			currentData: Le(r)
-		}) : null : ze();
+			currentData: Re(r)
+		}) : null : Be();
 	}
-	function ze() {
+	function Be() {
 		let t = gt({
 			slots: n,
 			props: e,
@@ -3061,13 +3080,13 @@ var gr = (e) => {
 		});
 		return t && u?.renderEmpty?.value ? t || u?.renderEmpty?.value?.() : null;
 	}
-	function Be(e, t) {
-		Ue({
+	function Ve(e, t) {
+		We({
 			current: e,
 			pageSize: t
 		}, {}, {}, {});
 	}
-	let Ve = m(() => e.showLoading === !1 ? !1 : j.value), He = m(() => {
+	let He = m(() => e.showLoading === !1 ? !1 : j.value), Ue = m(() => {
 		let t = {};
 		for (let n of xr) {
 			if (n === "classes") {
@@ -3078,21 +3097,29 @@ var gr = (e) => {
 				});
 				continue;
 			}
+			if (n === "expandable") {
+				let n = e.expandable, r = e.expandedRowKeys;
+				(n !== void 0 || r !== void 0) && (t.expandable = {
+					...n ?? {},
+					...r === void 0 ? {} : { expandedRowKeys: r }
+				});
+				continue;
+			}
 			let r = e[n];
 			r !== void 0 && (t[n] = r);
 		}
 		return t;
 	});
-	function Ue(t, n, r, i) {
-		Ee(t, n, r, i), e.onChange?.(t, n, r, i);
+	function We(t, n, r, i) {
+		Oe(t, n, r, i), e.onChange?.(t, n, r, i);
 	}
-	function We(e) {
+	function Ge(e) {
 		r("update:expandedRowKeys", e);
 	}
-	function Ge(e) {
+	function Ke(e) {
 		r("scroll", e);
 	}
-	let Ke = [
+	let qe = [
 		"title",
 		"footer",
 		"summary",
@@ -3100,9 +3127,9 @@ var gr = (e) => {
 		"expandedRowRender",
 		"filterDropdown",
 		"filterIcon"
-	], qe = m(() => {
+	], Je = m(() => {
 		let t = {};
-		for (let e of Ke) n[e] && (t[e] = n[e]);
+		for (let e of qe) n[e] && (t[e] = n[e]);
 		n.bodyCell && (t.bodyCell = (e) => n.bodyCell(e)), n.headerCell && (t.headerCell = (e) => n.headerCell(e));
 		let r = gt({
 			slots: n,
@@ -3114,34 +3141,34 @@ var gr = (e) => {
 	return i({
 		actionRef: () => ({
 			loading: j,
-			dataSource: Se,
+			dataSource: H,
 			pageInfo: E,
 			reload: U,
 			reloadAndReset: (e) => {
-				D({ current: 1 }), xe(), Oe(), e?.callBack?.();
+				D({ current: 1 }), Ce(), ke(), e?.callBack?.();
 			},
 			setPagination: D,
 			setPageInfo: (e, t, n, r) => {
-				D(e), Ee(e, t ?? {}, n ?? {}, r ?? {});
+				D(e), Oe(e, t ?? {}, n ?? {}, r ?? {});
 			},
-			setTableDataList: we,
-			operateTableDataRow: Te,
+			setTableDataList: Te,
+			operateTableDataRow: Ee,
 			setLoading: M,
-			selectedKeys: N,
-			selectedItems: te,
+			selectedKeys: te,
+			selectedItems: ne,
 			rowsSelection: {
 				clear: L,
-				select: re,
-				selectAll: F,
+				select: F,
+				selectAll: ae,
 				remove: I,
 				sync: R
 			}
 		}),
 		formRef: () => ({
-			getFormSearch: be,
-			getFormInnerState: () => ye.value,
+			getFormSearch: Se,
+			getFormInnerState: () => xe.value,
 			restFormState: (e) => {
-				xe(), e?.();
+				Ce(), e?.();
 			}
 		})
 	}), () => {
@@ -3153,22 +3180,22 @@ var gr = (e) => {
 		}, [h("div", {
 			class: J(e.proClasses?.content, `${o.value}-content`),
 			style: e.proStyles?.content
-		}, [Fe.value && h(rr, {
+		}, [Ie.value && h(rr, {
 			prefixCls: o.value,
-			formColumns: _e.value,
-			formState: ye.value,
-			defaultFormSearch: ve.value,
-			formConfig: me.value,
-			formAutoRequest: he.value,
-			formActions: ge.value,
-			loading: Ve.value,
+			formColumns: ye.value,
+			formState: xe.value,
+			defaultFormSearch: be.value,
+			formConfig: ge.value,
+			formAutoRequest: _e.value,
+			formActions: ve.value,
+			loading: He.value,
 			cardBordered: e.cardBordered,
 			proClasses: e.proClasses ?? {},
 			proStyles: e.proStyles ?? {},
-			onSearch: Ie,
+			onSearch: Le,
 			onReset: (e) => r("reset", e)
 		}, { default: () => [n.form?.()] }), h("div", {
-			ref: ke,
+			ref: Ae,
 			class: J(e.proClasses?.card, `${o.value}-card`, e.cardBordered && `${o.value}-card-border`),
 			style: e.proStyles?.card
 		}, [h(lr, {
@@ -3182,35 +3209,35 @@ var gr = (e) => {
 			listToolAfter: n.listToolAfter?.() ?? e.listToolAfter,
 			proClasses: e.proClasses ?? {},
 			proStyles: e.proStyles ?? {}
-		}, null), Pe.value ? h(se, { spinning: !!Ve.value }, { default: () => [h("div", { class: J(`${o.value}-list`, e.proClasses?.list) }, [h("div", {
+		}, null), h("div", { class: `${o.value}-loading-container` }, [Fe.value ? h("div", { class: J(`${o.value}-list`, e.proClasses?.list) }, [h("div", {
 			class: J(`${o.value}-list-content`, e.proClasses?.listContent),
 			style: e.proStyles?.listContent
-		}, [Re()]), w.value !== !1 && Se.value?.length > 0 && h(V, x(w.value, {
+		}, [ze()]), w.value !== !1 && H.value?.length > 0 && h(B, x(w.value, {
 			align: T.value,
 			class: J(`${o.value}-pagination`, e.proClasses?.pagination),
 			style: e.proStyles?.pagination,
-			onChange: Be
-		}), null)])] }) : h(d, null, [h(ce, x(He.value, {
-			scroll: G.value,
-			dataSource: Se.value,
-			columns: e.draggable ? de.value : oe.value,
-			components: e.draggable ? H.value : He.value.components,
+			onChange: Ve
+		}), null)]) : h(d, null, [h(le, x(Ue.value, {
+			scroll: Pe.value,
+			dataSource: H.value,
+			columns: e.draggable ? V.value : ue.value,
+			components: e.draggable ? he.value : Ue.value.components,
 			rowKey: e.rowKey,
 			size: O.value,
 			pagination: w.value,
-			loading: Ve.value,
-			rowSelection: ne.value,
-			onChange: Ue,
-			"onUpdate:expandedRowKeys": We,
-			onScroll: Ge,
+			loading: !1,
+			rowSelection: re.value,
+			onChange: We,
+			"onUpdate:expandedRowKeys": Ge,
+			onScroll: Ke,
 			classes: {
-				...He.value.classes,
-				...je.value ? { root: `${o.value}-overflow-hidden` } : {}
+				...Ue.value.classes,
+				...Me.value ? { root: `${o.value}-overflow-hidden` } : {}
 			}
-		}), qe.value), W.value && h(f, { to: W.value }, { default: () => [h(xn, {
-			ref: Ne,
-			hasScrollY: !!G.value.y
-		}, null)] })])])])]);
+		}), Je.value), W.value && h(f, { to: W.value }, { default: () => [h(xn, {
+			ref: G,
+			hasScrollY: !!Pe.value.y
+		}, null)] })]), He.value && h("div", { class: J(`${o.value}-loading-mask`, c.value) }, [h(ce, { indicator: N.value }, null)])])])])]);
 	};
 }, {
 	props: /*@__PURE__*/ b({
@@ -3651,4 +3678,4 @@ var gr = (e) => {
 	inheritAttrs: !1
 });
 //#endregion
-export { Sr as GProTable, zt as useFetchData, we as useInjectTableContext, Qt as usePagination, De as useProBreakpoints, $t as useRequestOptions, nn as useTable, on as useTableForm };
+export { Sr as GProTable, zt as useFetchData, H as useInjectTableContext, Qt as usePagination, De as useProBreakpoints, $t as useRequestOptions, nn as useTable, on as useTableForm };