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

package/dist/ProTable.js

@@ -87,6 +87,20 @@ const ForwardProTable = /* @__PURE__ */ defineComponent((props, { attrs, slots,
 		loading: computed(() => props.loading),
 		onChange: (val) => props.onLoadingChange?.(val)
 	});
+	/**
+	* loading 指示器解析：
+	* 优先级 loading(SpinProps).indicator > 全局 configContext.indicator > Spin 默认。
+	* configContext.indicator 可能是函数，需调用取值（与 AppPage 一致）。
+	*/
+	const resolvedIndicator = computed(() => {
+		const loadingProp = props.loading;
+		if (loadingProp && typeof loadingProp === "object") {
+			const indicator = loadingProp.indicator;
+			if (indicator !== void 0) return indicator;
+		}
+		const ctxIndicator = configContext?.indicator?.value;
+		return typeof ctxIndicator === "function" ? ctxIndicator() : ctxIndicator;
+	});
 	const { selectedRowKeys, selectedItems, mergedRowSelection, select: selectRow, selectAll: selectAllRows, remove: removeSelectedKeys, clear: clearSelectedKeys, sync: syncSelectedRows } = useRowSelection({
 		rowKey: computed(() => props.rowKey),
 		rowSelection: computed(() => props.rowSelection),
@@ -249,6 +263,15 @@ const ForwardProTable = /* @__PURE__ */ defineComponent((props, { attrs, slots,
 				};
 				continue;
 			}
+			if (key === "expandable") {
+				const userExpandable = props.expandable;
+				const controlledExpandedRowKeys = props.expandedRowKeys;
+				if (userExpandable !== void 0 || controlledExpandedRowKeys !== void 0) result.expandable = {
+					...userExpandable ?? {},
+					...controlledExpandedRowKeys !== void 0 ? { expandedRowKeys: controlledExpandedRowKeys } : {}
+				};
+				continue;
+			}
 			const val = props[key];
 			if (val !== void 0) result[key] = val;
 		}
@@ -363,7 +386,7 @@ const ForwardProTable = /* @__PURE__ */ defineComponent((props, { attrs, slots,
 			"listToolAfter": slots.listToolAfter?.() ?? props.listToolAfter,
 			"proClasses": props.proClasses ?? {},
 			"proStyles": props.proStyles ?? {}
-		}, null), isCustomRenderMode.value ? createVNode(Spin, { "spinning": !!loadingState.value }, { default: () => [createVNode("div", { "class": classNames(`${prefixCls.value}-list`, props.proClasses?.list) }, [createVNode("div", {
+		}, null), createVNode("div", { "class": `${prefixCls.value}-loading-container` }, [isCustomRenderMode.value ? createVNode("div", { "class": classNames(`${prefixCls.value}-list`, props.proClasses?.list) }, [createVNode("div", {
 			"class": classNames(`${prefixCls.value}-list-content`, props.proClasses?.listContent),
 			"style": props.proStyles?.listContent
 		}, [renderCustomContent()]), paginationInfo.value !== false && dataSource.value?.length > 0 && createVNode(Pagination, mergeProps(paginationInfo.value, {
@@ -371,7 +394,7 @@ const ForwardProTable = /* @__PURE__ */ defineComponent((props, { attrs, slots,
 			"class": classNames(`${prefixCls.value}-pagination`, props.proClasses?.pagination),
 			"style": props.proStyles?.pagination,
 			"onChange": onCustomPaginationChange
-		}), null)])] }) : createVNode(Fragment, null, [createVNode(Table, mergeProps(passThroughProps.value, {
+		}), null)]) : createVNode(Fragment, null, [createVNode(Table, mergeProps(passThroughProps.value, {
 			"scroll": tableScroll.value,
 			"dataSource": dataSource.value,
 			"columns": props.draggable ? resizableColumns.value : tableColumns.value,
@@ -379,7 +402,7 @@ const ForwardProTable = /* @__PURE__ */ defineComponent((props, { attrs, slots,
 			"rowKey": props.rowKey,
 			"size": tableSize.value,
 			"pagination": paginationInfo.value,
-			"loading": loadingState.value,
+			"loading": false,
 			"rowSelection": mergedRowSelection.value,
 			"onChange": onTableChange,
 			"onUpdate:expandedRowKeys": onTableExpandedRowKeysChange,
@@ -391,7 +414,7 @@ const ForwardProTable = /* @__PURE__ */ defineComponent((props, { attrs, slots,
 		}), tableSlots.value), scrollEl.value && createVNode(Teleport, { "to": scrollEl.value }, { default: () => [createVNode(Bar_default, {
 			"ref": barRef,
 			"hasScrollY": !!tableScroll.value.y
-		}, null)] })])])])]);
+		}, null)] })]), loadingState.value && createVNode("div", { "class": classNames(`${prefixCls.value}-loading-mask`, hashId.value) }, [createVNode(Spin, { "indicator": resolvedIndicator.value }, null)])])])])]);
 	};
 }, {
 	props: /* @__PURE__ */ mergeDefaults({

package/dist/components/SearchForm/CollapseToggle.d.ts

@@ -47,9 +47,9 @@ declare const CollapseToggle: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     required: true;
   };
 }>> & Readonly<{}>, {
-  hashId: string;
   collapsed: boolean;
   collapseRender: WithFalse<(collapsed?: boolean) => CustomRender>;
+  hashId: string;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { CollapseToggle };

package/dist/components/SearchForm/FormItemContainer.d.ts

@@ -67,9 +67,9 @@ declare const FormItemContainer: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: any;
   };
 }>> & Readonly<{}>, {
-  loading: boolean;
-  autoRequest: boolean;
   onSubmit: () => void;
+  autoRequest: boolean;
+  loading: boolean;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { FormItemContainer };

package/dist/components/SearchForm/FormItemWrapper.d.ts

@@ -71,10 +71,10 @@ declare const FormItemWrapper: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
   };
 }>> & Readonly<{}>, {
   label: any;
+  hashId: string;
   labelWidth: string | number;
-  labelAlign: "left" | "center" | "right";
+  labelAlign: "left" | "right" | "center";
   colon: boolean;
-  hashId: string;
   formItemStyle: CSSProperties;
   globalLabelGap: number;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;

package/dist/components/SearchForm/SearchForm.d.ts

@@ -111,6 +111,10 @@ declare const ProTableSearchForm: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: any;
   };
 }>> & Readonly<{}>, {
+  onReset: (params: Record<string, any>) => void;
+  proClasses: Record<string, string>;
+  proStyles: Record<string, any>;
+  loading: any;
   formColumns: ProSearchMap<"text", string>[];
   formConfig: FormConfig;
   formAutoRequest: boolean;
@@ -120,11 +124,7 @@ declare const ProTableSearchForm: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     searchText?: string;
     resetText?: string;
   };
-  loading: any;
   cardBordered: boolean;
-  proClasses: Record<string, string>;
-  proStyles: Record<string, any>;
-  onReset: (params: Record<string, any>) => void;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { ProTableSearchForm as default };

package/dist/components/Toolbar/ListToolBar.d.ts

@@ -93,19 +93,19 @@ declare const ListToolBar: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: () => {};
   };
 }>> & Readonly<{}>, {
-  actions: VNode<_$vue.RendererNode, _$vue.RendererElement, {
-    [key: string]: any;
-  }>[];
-  proClasses: Record<string, any>;
-  proStyles: Record<string, any>;
-  titleTipText: string;
-  actionsPlacement: ToolbarPlacement;
   headerTitle: any;
-  listToolAfter: any;
   headerTitleTip: any;
+  titleTipText: string;
   settings: VNode<_$vue.RendererNode, _$vue.RendererElement, {
     [key: string]: any;
   }>[];
+  actions: VNode<_$vue.RendererNode, _$vue.RendererElement, {
+    [key: string]: any;
+  }>[];
+  actionsPlacement: ToolbarPlacement;
+  listToolAfter: any;
+  proClasses: Record<string, any>;
+  proStyles: Record<string, any>;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { ListToolBar, ListToolBarSetting };

package/dist/components/Toolbar/index.d.ts

@@ -87,17 +87,17 @@ declare const Toolbar: _$vue.DefineComponent<_$vue.ExtractPropTypes<{
     default: () => {};
   };
 }>> & Readonly<{}>, {
+  headerTitle: any;
+  headerTitleTip: any;
+  titleTipText: string;
   actions: VNode<_$vue.RendererNode, _$vue.RendererElement, {
     [key: string]: any;
   }>[];
+  actionsPlacement: ToolbarPlacement;
+  listToolAfter: any;
   proClasses: Record<string, any>;
   proStyles: Record<string, any>;
   options: any;
-  titleTipText: string;
-  actionsPlacement: ToolbarPlacement;
-  headerTitle: any;
-  listToolAfter: any;
-  headerTitleTip: any;
 }, {}, {}, {}, string, _$vue.ComponentProvideOptions, true, {}, any>;
 //#endregion
 export { Toolbar, Toolbar as default };

package/dist/hooks/useFetchData.js

@@ -50,7 +50,7 @@ function useFetchData(config, action) {
 	}
 	/** 写入表格数据并同步 sortIndex，无 request 时同步 dataSource total */
 	function setTableDataList(list) {
-		tableDataList.value = getSortIndex(list, toRaw(pageInfo));
+		tableDataList.value = getSortIndex(toRaw(list), toRaw(pageInfo));
 		if (!request || !isFunction(request)) {
 			const total = list.length || 0;
 			if (total !== pageInfo.total) setPagination({ total });

package/dist/hooks/useTable.js

@@ -9,13 +9,15 @@ function useTable(tableRef, options) {
 	});
 	const syncedStateKeys = /* @__PURE__ */ new Set();
 	function syncTableState(state = {}) {
-		const nextState = merge({}, state);
-		for (const key of syncedStateKeys) if (!(key in nextState)) {
+		for (const key of syncedStateKeys) if (!(key in state)) {
 			delete tableState[key];
 			syncedStateKeys.delete(key);
 		}
-		Object.assign(tableState, nextState);
-		for (const key of Object.keys(nextState)) syncedStateKeys.add(key);
+		for (const key of Object.keys(state)) {
+			const nextValue = state[key];
+			if (nextValue !== tableState[key]) tableState[key] = nextValue;
+			syncedStateKeys.add(key);
+		}
 		if (options?.request) tableState.request = options.request;
 	}
 	watch(() => toValue(options?.state), (newState) => {