@gx-design-vue/pro-table 0.2.0-alpha.2 → 0.2.0-alpha.21

package/dist/hooks/useDragHandleColumn.js

@@ -0,0 +1,52 @@
+import { DragHandle } from "../components/Drag/Handle.js";
+import { computed, createVNode } from "vue";
+import { createUUIDFactory } from "@gx-design-vue/pro-utils";
+//#region src/hooks/useDragHandleColumn.tsx
+/** 把手列内部标记 key */
+const DRAG_HANDLE_COLUMN_KEY = "__drag_handle__";
+/**
+* 创建行拖拽把手列配置。
+*
+* 把手列固定在最前面（比 indexColumn 序号列更靠前），包含 DragHandle 组件。
+* 通过 `disabled(record)` 判断每行是否禁用拖拽。
+*/
+function createDragHandleColumn(options, prefixCls, cssVarCls) {
+	return {
+		key: DRAG_HANDLE_COLUMN_KEY,
+		dataIndex: DRAG_HANDLE_COLUMN_KEY,
+		title: "排序",
+		width: options.width ?? 40,
+		align: options.align ?? "center",
+		fixed: options.fixed ?? "start",
+		uuid: createUUIDFactory().uuid(15),
+		render: (_value, record, index) => {
+			const disabled = options.disabled?.(record) ?? false;
+			return createVNode(DragHandle, {
+				"handleRender": options.handleRender,
+				"record": record,
+				"index": index,
+				"disabled": disabled,
+				"cssVarCls": cssVarCls,
+				"prefixCls": prefixCls
+			}, null);
+		}
+	};
+}
+/**
+* 在列首注入行拖拽把手列。
+*
+* 纯函数实现（对标 `applyIndexColumn`），在 `useColumns` 的 `cacheColumns` computed 中、
+* `applyIndexColumn` 之前调用，确保把手列比序号列更靠前。
+*/
+function applyDragHandleColumn(columns, rowDraggable, prefixCls, cssVarCls) {
+	if (!rowDraggable || columns.length === 0) return columns;
+	if (columns.some((column) => column.dataIndex === "__drag_handle__")) return columns;
+	return [createDragHandleColumn(typeof rowDraggable === "object" ? rowDraggable : {}, prefixCls, cssVarCls), ...columns];
+}
+function useDragHandleColumn(options) {
+	return { dragColumns: computed(() => {
+		return applyDragHandleColumn(options.columns.value, options.rowDraggable.value, options.prefixCls.value, options.cssVarCls.value);
+	}) };
+}
+//#endregion
+export { DRAG_HANDLE_COLUMN_KEY, applyDragHandleColumn, useDragHandleColumn };

package/dist/hooks/useEllipsis.d.ts

@@ -0,0 +1,20 @@
+import { Ref } from "vue";
+
+//#region src/hooks/useEllipsis.d.ts
+interface UseEllipsisReturn {
+  /** 当前文本在给定宽度/行数下是否溢出 */
+  isOverflow: Ref<boolean>;
+}
+/**
+ * 基于 @chenglou/pretext 的溢出判断。
+ *
+ * - prepare(text, font) 一次性预处理（命中 pretext 内部缓存），仅随 text/font 变化重跑；
+ * - layout(prepared, width, lineHeight) 纯算力预算行数，随列宽/行数变化重算（符合 pretext 性能模型）；
+ * - 宽度取自 ResizeObserver 的 contentRect.width（已扣除 padding）；
+ * - font/lineHeight 于 mount 时通过 getComputedStyle 读取，保证与实际 CSS 渲染一致。
+ *
+ * lineCount > 期望行数 即判定为溢出。
+ */
+declare function useEllipsis(textRef: Ref<string>, linesRef: Ref<number>, cellElRef: Ref<HTMLElement | undefined>): UseEllipsisReturn;
+//#endregion
+export { UseEllipsisReturn, useEllipsis };

package/dist/hooks/useEllipsis.js

@@ -0,0 +1,51 @@
+import { computed, onMounted, ref } from "vue";
+import { useResizeObserver } from "@vueuse/core";
+import { layout, prepare } from "@chenglou/pretext";
+//#region src/hooks/useEllipsis.ts
+/**
+* 基于 @chenglou/pretext 的溢出判断。
+*
+* - prepare(text, font) 一次性预处理（命中 pretext 内部缓存），仅随 text/font 变化重跑；
+* - layout(prepared, width, lineHeight) 纯算力预算行数，随列宽/行数变化重算（符合 pretext 性能模型）；
+* - 宽度取自 ResizeObserver 的 contentRect.width（已扣除 padding）；
+* - font/lineHeight 于 mount 时通过 getComputedStyle 读取，保证与实际 CSS 渲染一致。
+*
+* lineCount > 期望行数 即判定为溢出。
+*/
+function useEllipsis(textRef, linesRef, cellElRef) {
+	const contentWidth = ref(0);
+	const fontInfo = ref({
+		font: "14px sans-serif",
+		lineHeight: 22
+	});
+	useResizeObserver(cellElRef, (entries) => {
+		const entry = entries[0];
+		if (entry) contentWidth.value = entry.contentRect.width;
+	});
+	onMounted(() => {
+		const el = cellElRef.value;
+		if (!el) return;
+		const computedStyle = getComputedStyle(el);
+		const fontSize = Number.parseFloat(computedStyle.fontSize) || 14;
+		let lineHeight = Number.parseFloat(computedStyle.lineHeight);
+		if (!lineHeight || Number.isNaN(lineHeight)) lineHeight = fontSize * 1.5715;
+		fontInfo.value = {
+			font: `${fontSize}px ${computedStyle.fontFamily}`,
+			lineHeight
+		};
+	});
+	const prepared = computed(() => {
+		const text = textRef.value;
+		if (!text) return null;
+		return prepare(text, fontInfo.value.font);
+	});
+	return { isOverflow: computed(() => {
+		const preparedText = prepared.value;
+		const width = contentWidth.value;
+		if (!preparedText || width <= 0) return false;
+		const { lineCount } = layout(preparedText, width, fontInfo.value.lineHeight);
+		return lineCount > linesRef.value;
+	}) };
+}
+//#endregion
+export { useEllipsis };

package/dist/hooks/useFetchData.d.ts

@@ -1,77 +1,54 @@
-import { ProColumnsType } from "../types/ColumnTypings.js";
-import { PageState, ProTableFetchParams, ProTablePagination, ProTablePaginationConfig, ProTableProps } from "../types/TableTypings.js";
+import { BeforeSearchSubmit, OperateRowProps, PageState, ProColumnType, ProTableFetchParams, ProTablePagination, ProTablePaginationConfig, RequestFunction } from "../interface.js";
 import { ComputedRef, Reactive, Ref } from "vue";
-import { RecordType } from "@gx-design-vue/pro-utils";
-import { FilterValue, SorterResult, TableCurrentDataSource } from "ant-design-vue/es/table/interface";
+import { FilterValue, SorterResult, TableCurrentDataSource } from "antdv-next/dist/table/interface";
 
 //#region src/hooks/useFetchData.d.ts
-interface ActionType {
-  loading: Ref<boolean>;
+interface FetchDataConfig<T = any, R = any> {
+  rowKey: ComputedRef<string>;
+  polling: ComputedRef<boolean>;
+  pollingTime: ComputedRef<number>;
+  request: RequestFunction<T, R> | undefined;
+  postData: ((data: T[]) => T[]) | undefined;
+  dataSource: ComputedRef<T[] | undefined>;
+  immediate: ComputedRef<boolean>;
+  waitRequest: ComputedRef<boolean>;
+  autoRequest: ComputedRef<boolean>;
+  debounceTime: ComputedRef<number>;
+  params: ComputedRef<R | undefined>;
+  defaultFormSearch: Ref<Record<string, any>>;
+  formParamKeys: ComputedRef<string[]>;
+  getFormSearch: () => Record<string, any>;
+  onLoadingChange: ((loading: boolean) => any) | undefined;
+  onRequestError: ((e: Error) => void) | undefined;
+  onBeforeSearchSubmit: BeforeSearchSubmit<R> | undefined;
+}
+interface FetchDataAction<T = any> {
   pageInfo: Reactive<PageState>;
   paginationInfo: Ref<ProTablePagination | false>;
-  setPagination: (info: Partial<ProTablePagination>) => void;
+  setPagination: (info: Partial<ProTablePaginationConfig>) => void;
   setLoading: (loading: boolean) => void;
-  setColumns: (columnList: ProColumnsType) => void;
-  removeRowKeys: (keyList: (string | number)[]) => void;
+  setColumns: (columns: ProColumnType<any>[]) => void;
+  removeRowKeys: (keys: (string | number)[]) => void;
   syncSelectedRows: (dataList: any[]) => void;
-  columns: ComputedRef<ProColumnsType>;
-  defaultFormSearch: Ref<RecordType>;
-  params: Ref<ProTableProps['params']>;
-  onRequestError: ProTableProps['onRequestError'];
-  onBeforeSearchSubmit: ProTableProps['onBeforeSearchSubmit'];
-  hasCustomRender: ComputedRef<boolean>;
-}
-interface ConfigFetchData {
-  rowKey: ComputedRef<ProTableProps['rowKey']>;
-  polling: ComputedRef<ProTableProps['polling']>;
-  request: ProTableProps['request'];
-  postData: ProTableProps['postData'];
-  waitRequest: Ref<ProTableProps['waitRequest']>;
-  debounceTime: ComputedRef<ProTableProps['debounceTime']>;
-  dataSource: ComputedRef<ProTableProps['dataSource']>;
-  autoRequest: ComputedRef<ProTableProps['autoRequest']>;
+  columns: ComputedRef<ProColumnType<T>[]>;
 }
-declare function useConfigFetchData(props: ProTableProps): Omit<ConfigFetchData, 'waitRequest'>;
-declare function useFetchData({
-  rowKey,
-  autoRequest,
-  polling,
-  request,
-  postData,
-  dataSource,
-  waitRequest,
-  debounceTime
-}: ConfigFetchData, {
-  params,
-  columns,
-  setLoading,
-  setColumns,
-  removeRowKeys,
-  syncSelectedRows,
-  defaultFormSearch,
-  setPagination,
-  pageInfo,
-  paginationInfo,
-  onRequestError,
-  onBeforeSearchSubmit,
-  hasCustomRender
-}: ActionType, emit: any): {
+/**
+ * 核心请求引擎。
+ * 负责数据请求调度、分页状态、轮询、AbortController 中断、
+ * loading 管理、数据转换、行操作、排序/筛选变更。
+ *
+ * 调度模型：所有请求入口（run/reload/handleTableChange/params 变化等）
+ * 统一进入 dispatchFetch → debouncedFetch → fetchList。
+ * 通过 requestId + AbortController 双重保证旧响应不回写。
+ */
+declare function useFetchData(config: FetchDataConfig, action: FetchDataAction): {
   dataSource: ComputedRef<any[]>;
   isTreeDataRef: ComputedRef<boolean>;
-  setTableDataList: (list: RecordType[]) => void;
-  operateTableDataRow: ({
-    key,
-    type,
-    row,
-    value
-  }: {
-    row?: Partial<RecordType>;
-    key?: string;
-    value?: any;
-    type?: "update" | "push" | "delete" | "unshift";
-  }) => void;
-  handleTableChange: (pagination: ProTablePaginationConfig, filters?: Record<string, FilterValue | null>, sorter?: SorterResult | SorterResult[], extra?: TableCurrentDataSource) => void;
-  run: (info?: ProTableFetchParams) => Promise<void>;
+  setTableDataList: (list: any[]) => void;
+  operateTableDataRow: (props: OperateRowProps) => void;
+  handleTableChange: (paginationConfig: ProTablePaginationConfig, filters?: Record<string, FilterValue | null>, sorter?: SorterResult | SorterResult[], extra?: TableCurrentDataSource) => void;
+  run: (info?: ProTableFetchParams) => void;
+  reload: (info?: ProTableFetchParams) => void;
 };
 //#endregion
-export { ConfigFetchData, useConfigFetchData, useFetchData };
+export { FetchDataAction, FetchDataConfig, useFetchData };

package/dist/hooks/useFetchData.js

@@ -1,50 +1,85 @@
-import useDebounceFn_default from "./useDebounceFn.js";
-import { computed, onActivated, onDeactivated, onMounted, onUnmounted, ref, toRaw, unref, watch } from "vue";
-import { cloneDeep, deepMerge, getRandomNumber, getSortIndex, handleCurrentPage, isArray, isDeepEqualReact, isFunction, isObject, runFunction } from "@gx-design-vue/pro-utils";
-import { omit } from "es-toolkit";
-
+import { computed, onActivated, onDeactivated, onUnmounted, ref, toRaw, watch } from "vue";
+import { createUUIDFactory, getSortIndex, handleCurrentPage, isArray, isFunction, isObject, merge } from "@gx-design-vue/pro-utils";
+import { useDebounceFn } from "@vueuse/core";
 //#region src/hooks/useFetchData.ts
-function useConfigFetchData(props) {
-	const rowKey = computed(() => props.rowKey);
-	const polling = computed(() => props.polling);
-	const debounceTime = computed(() => props.debounceTime);
-	const dataSource = computed(() => props.dataSource);
-	const autoRequest = computed(() => props.autoRequest);
-	return {
-		rowKey,
-		polling,
-		request: props.request,
-		postData: props.postData,
-		debounceTime,
-		dataSource,
-		autoRequest
-	};
-}
-function useFetchData({ rowKey, autoRequest, polling, request, postData, dataSource, waitRequest, debounceTime }, { params, columns, setLoading, setColumns, removeRowKeys, syncSelectedRows, defaultFormSearch, setPagination, pageInfo, paginationInfo, onRequestError, onBeforeSearchSubmit, hasCustomRender }, emit) {
-	const updateKey = ref("");
-	const umountRef = ref(false);
-	const pollingLoading = ref(false);
+const EMPTY_ARRAY = [];
+/**
+* 核心请求引擎。
+* 负责数据请求调度、分页状态、轮询、AbortController 中断、
+* loading 管理、数据转换、行操作、排序/筛选变更。
+*
+* 调度模型：所有请求入口（run/reload/handleTableChange/params 变化等）
+* 统一进入 dispatchFetch → debouncedFetch → fetchList。
+* 通过 requestId + AbortController 双重保证旧响应不回写。
+*/
+function useFetchData(config, action) {
+	const { rowKey, polling, pollingTime, request, postData, dataSource, immediate, waitRequest, autoRequest, debounceTime, params, defaultFormSearch, formParamKeys, getFormSearch, onLoadingChange, onRequestError, onBeforeSearchSubmit } = config;
+	const { pageInfo, paginationInfo, setPagination, setLoading, setColumns, removeRowKeys, syncSelectedRows, columns } = action;
 	const tableDataList = ref([]);
-	const pollingSetTimeRef = ref();
-	const abortRef = ref(null);
-	const requestFinally = (clear = false) => {
-		if (umountRef.value || clear) setLoading(false);
-		setPollingLoading(false);
-	};
-	const fetchList = async (props = {}) => {
-		const { pagination = {}, filters = {}, sorter = {}, removeKeys = [], isPolling = false, extra } = props;
+	const unmounted = ref(false);
+	const pollingTimer = ref(null);
+	const abortController = ref(null);
+	const requestId = ref("");
+	/** 通知外部 loading 状态变化（通过 onLoadingChange 回调） */
+	function notifyLoading(loadingState) {
+		if (onLoadingChange) onLoadingChange(loadingState);
+	}
+	function clearPollingTimer() {
+		if (pollingTimer.value != null) {
+			clearTimeout(pollingTimer.value);
+			pollingTimer.value = null;
+		}
+	}
+	function stopPolling() {
+		clearPollingTimer();
+	}
+	function schedulePolling(fetchParams) {
+		if (unmounted.value || !polling.value) return;
+		const interval = Math.max(pollingTime.value || 2e3, 2e3);
+		clearPollingTimer();
+		pollingTimer.value = setTimeout(() => {
+			dispatchFetch({
+				...fetchParams,
+				isPolling: true
+			});
+		}, interval);
+	}
+	function abortCurrent() {
+		abortController.value?.abort();
+		abortController.value = null;
+	}
+	function omitFormParams(source) {
+		if (!source) return {};
+		const omittedKeys = new Set(formParamKeys.value);
+		const result = {};
+		for (const key of Object.keys(source)) if (!omittedKeys.has(key)) result[key] = source[key];
+		return result;
+	}
+	/** 写入表格数据并同步 sortIndex，无 request 时同步 dataSource total */
+	function setTableDataList(list) {
+		tableDataList.value = getSortIndex(toRaw(list), toRaw(pageInfo));
+		if (!request || !isFunction(request)) {
+			const total = list.length || 0;
+			if (total !== pageInfo.total) setPagination({ total });
+		}
+	}
+	/** 执行单次请求，处理参数合并、AbortController、轮询调度、错误处理 */
+	async function fetchList(fetchParams = {}) {
+		const { pagination: fetchPagination = {}, filters = {}, sorter = {}, removeKeys = [], isPolling = false, extra } = fetchParams;
 		if (!request || !isFunction(request)) return dataSource.value || [];
-		if (!isPolling) setLoading(true);
-		else setPollingLoading(true);
-		if (pagination && Object.keys(pagination).length) setPagination(pagination);
+		if (!isPolling) {
+			setLoading(true);
+			notifyLoading(true);
+		}
+		if (fetchPagination && Object.keys(fetchPagination).length) setPagination(fetchPagination);
 		try {
 			if (removeKeys.length) removeRowKeys(removeKeys);
-			const sorterList = isObject(sorter) ? Object.keys(sorter).length ? [sorter] : [] : sorter;
-			setColumns(unref(columns).map((item) => {
-				const row = sorterList.find((el) => (el?.columnKey || el?.field) === item.dataIndex);
+			const sorterList = isObject(sorter) && Object.keys(sorter).length ? [sorter] : isArray(sorter) ? sorter : [];
+			if (setColumns && columns) setColumns(columns.value.map((columnItem) => {
+				const matchedSorter = sorterList.find((sorterItem) => (sorterItem?.columnKey || sorterItem?.field) === columnItem.dataIndex);
 				return {
-					...item,
-					sortOrder: row?.order
+					...columnItem,
+					sortOrder: matchedSorter?.order
 				};
 			}));
 			let actionParams = {
@@ -52,9 +87,10 @@ function useFetchData({ rowKey, autoRequest, polling, request, postData, dataSou
 					pageSize: pageInfo.pageSize,
 					current: handleCurrentPage(toRaw(pageInfo), removeKeys.length)
 				},
-				...unref(defaultFormSearch),
-				...unref(params),
-				...props.params
+				...toRaw(defaultFormSearch.value),
+				...getFormSearch(),
+				...omitFormParams(toRaw(params.value)),
+				...fetchParams.params || {}
 			};
 			if (onBeforeSearchSubmit && isFunction(onBeforeSearchSubmit)) actionParams = await onBeforeSearchSubmit({
 				params: actionParams,
@@ -62,98 +98,66 @@ function useFetchData({ rowKey, autoRequest, polling, request, postData, dataSou
 				filter: filters,
 				extra
 			});
-			let responseData = [];
-			const requestKey = `table_request_${getRandomNumber().uuid(10)}`;
-			updateKey.value = requestKey;
-			const response = await request?.({
-				params: cloneDeep(toRaw(actionParams)),
+			const currentRequestId = `table_request_${createUUIDFactory().uuid(10)}`;
+			requestId.value = currentRequestId;
+			const controller = new AbortController();
+			abortController.value = controller;
+			const response = await request({
+				params: { ...actionParams },
 				sorter: sorterList,
 				filter: filters,
-				extra
+				extra,
+				signal: controller.signal
 			});
-			if (updateKey.value !== requestKey) return [];
+			if (requestId.value !== currentRequestId || controller.signal.aborted) return [];
 			if (response) {
 				const { success = true, data = [] } = response;
 				if (!success) return [];
-				responseData = typeof postData === "function" ? await postData?.(data) : data;
-				syncSelectedRows(responseData);
-				const total = response.total || responseData?.length || 0;
+				const responseData = typeof postData === "function" ? postData(data) : data;
+				const total = response.total || responseData.length || 0;
 				if (total !== pageInfo.total) setPagination({ total });
-				const preTableDataList = unref(tableDataList).map((item) => omit(item, ["sortIndex"]));
-				if (!isDeepEqualReact(responseData, preTableDataList)) {
-					setTableDataList(responseData);
-					return responseData;
-				}
-				return unref(tableDataList);
-			} else return [];
+				setTableDataList(responseData);
+				syncSelectedRows(responseData);
+				schedulePolling(fetchParams);
+				return responseData;
+			}
+			return [];
 		} catch (e) {
-			if (onRequestError === void 0) throw new Error(e);
-			if (tableDataList.value === void 0) setTableDataList([]);
-			onRequestError(e);
+			if (e.name === "AbortError") return [];
+			if (onRequestError) {
+				if (tableDataList.value === void 0) setTableDataList([]);
+				onRequestError(e);
+				return [];
+			}
+			throw e;
 		} finally {
-			requestFinally(true);
-		}
-		return [];
-	};
-	const fetchListDebounce = useDebounceFn_default(async (props = {}) => {
-		if (pollingSetTimeRef.value) clearTimeout(pollingSetTimeRef.value);
-		if (!request) return;
-		const abort = new AbortController();
-		abortRef.value = abort;
-		try {
-			const msg = await Promise.race([fetchList(props), new Promise((_, reject) => {
-				abortRef.value?.signal?.addEventListener?.("abort", () => {
-					reject("aborted");
-					fetchListDebounce.cancel();
-					requestFinally();
-				});
-			})]);
-			if (abort.signal.aborted) return;
-			const needPolling = runFunction(polling.value, msg);
-			if (needPolling && !umountRef.value) pollingSetTimeRef.value = setTimeout(() => {
-				fetchListDebounce.run({
-					...props,
-					isPolling: needPolling
-				});
-			}, Math.max(needPolling, 2e3));
-			return msg;
-		} catch (error) {
-			if (error === "aborted") return;
-			throw error;
+			if (!isPolling) {
+				setLoading(false);
+				notifyLoading(false);
+			}
 		}
-	}, debounceTime.value || 30);
-	const abortFetch = () => {
-		abortRef.value?.abort();
-		fetchListDebounce.cancel();
-		requestFinally();
-	};
-	onMounted(() => {
-		umountRef.value = false;
-	});
+	}
+	const debouncedFetch = useDebounceFn((fetchParams) => fetchList(fetchParams), () => debounceTime.value ?? 10);
+	/** 统一请求调度入口：先 abort 上一个请求，再 debounce 执行 */
+	function dispatchFetch(fetchParams = {}) {
+		abortCurrent();
+		debouncedFetch(fetchParams);
+	}
 	onActivated(() => {
-		umountRef.value = false;
+		unmounted.value = false;
 	});
 	onUnmounted(() => {
-		abortFetch();
-		umountRef.value = true;
-		clearTimeout(pollingSetTimeRef.value);
+		unmounted.value = true;
+		abortCurrent();
+		stopPolling();
 	});
 	onDeactivated(() => {
-		abortFetch();
-		umountRef.value = true;
-		clearTimeout(pollingSetTimeRef.value);
+		unmounted.value = true;
+		abortCurrent();
+		stopPolling();
 	});
-	watch(() => polling.value, () => {
-		if (waitRequest.value) return;
-		if (!polling.value) clearTimeout(pollingSetTimeRef.value);
-		else fetchListDebounce.run({ isPolling: true });
-	}, { immediate: true });
-	watch(() => waitRequest.value, () => {
-		if (waitRequest.value) setLoading(true);
-		else fetchListDebounce.run({ isPolling: false });
-	}, { immediate: true });
-	watch(() => dataSource.value, () => {
-		if (dataSource.value) setTableDataList(dataSource.value || []);
+	watch(() => dataSource.value, (source) => {
+		if (source && !isFunction(request)) setTableDataList(source);
 	}, {
 		deep: true,
 		immediate: true
@@ -162,59 +166,33 @@ function useFetchData({ rowKey, autoRequest, polling, request, postData, dataSou
 		if (waitRequest.value) return;
 		if (autoRequest.value) {
 			setPagination({ current: 1 });
-			fetchRunData();
+			dispatchFetch({ isPolling: false });
 		}
-	}, {
-		deep: true,
-		immediate: true
-	});
-	watch(() => defaultFormSearch.value, (val, old) => {
+	}, { deep: true });
+	watch(() => polling.value, () => {
 		if (waitRequest.value) return;
-		if (!isDeepEqualReact(val, old)) {
-			setPagination({ current: 1 });
-			fetchRunData();
-		}
-	}, {
-		deep: true,
-		immediate: true
+		if (!polling.value) stopPolling();
+		else dispatchFetch({ isPolling: true });
 	});
-	function fetchRunData() {
-		if (request) {
-			if (!polling.value) {
-				abortFetch();
-				fetchListDebounce.run({ isPolling: false });
-			}
-		} else setTableDataList(dataSource.value || []);
-	}
-	const getDataSourceRef = computed(() => {
-		if (hasCustomRender.value) return unref(tableDataList);
-		const viewColumns = columns.value.filter((column) => column.show || column.show === void 0);
-		if (!unref(tableDataList) || !viewColumns || viewColumns.length === 0) return [];
-		return unref(tableDataList);
+	watch(() => waitRequest.value, (waiting) => {
+		if (waiting) {
+			setLoading(true);
+			notifyLoading(true);
+		} else if (immediate.value) dispatchFetch({ isPolling: false });
 	});
-	const isTreeDataRef = computed(() => unref(tableDataList).some((item) => isArray(item.children) && item.children.length > 0));
-	function setPollingLoading(loading) {
-		pollingLoading.value = loading;
-	}
-	function handleTableChange(pagination, filters = {}, sorter = {}, extra) {
-		abortFetch();
-		fetchListDebounce.run({
-			pagination,
+	if (!waitRequest.value && immediate.value) dispatchFetch({ isPolling: false });
+	const isTreeDataRef = computed(() => tableDataList.value.some((item) => isArray(item.children) && item.children.length > 0));
+	function handleTableChange(paginationConfig, filters = {}, sorter = {}, extra) {
+		dispatchFetch({
+			pagination: paginationConfig,
 			filters,
 			sorter,
 			extra,
 			isPolling: false
 		});
 	}
-	function setTableDataList(list) {
-		const newData = getSortIndex(cloneDeep(list), toRaw(pageInfo));
-		tableDataList.value = newData;
-		if (!request || !isFunction(request)) {
-			const total = newData.length || 0;
-			if (total !== pageInfo.total) setPagination({ total });
-		}
-	}
-	const operateTableDataRow = (props) => {
+	/** 对表格数据行执行增删改操作（update/push/unshift/delete） */
+	function operateTableDataRow(props) {
 		const { key, row, value, type = "update" } = props;
 		const dataIndex = key ?? rowKey.value;
 		const recordValue = row?.[dataIndex] ?? value;
@@ -222,7 +200,7 @@ function useFetchData({ rowKey, autoRequest, polling, request, postData, dataSou
 		switch (type) {
 			case "update":
 				if (dataIndex && recordValue && row) tableDataList.value = tableDataList.value.map((item) => {
-					if (recordValue === item[dataIndex]) return deepMerge(item, row);
+					if (recordValue === item[dataIndex]) return merge({}, item, row);
 					return item;
 				});
 				break;
@@ -236,23 +214,29 @@ function useFetchData({ rowKey, autoRequest, polling, request, postData, dataSou
 				if (dataIndex) tableDataList.value = tableDataList.value.filter((item) => value !== item[dataIndex]);
 				break;
 		}
-	};
+	}
+	/** 手动触发请求，waitRequest=true 时跳过 */
+	function run(info) {
+		if (waitRequest.value) return;
+		if (request) dispatchFetch({
+			...info,
+			isPolling: false
+		});
+		else setTableDataList(dataSource.value || []);
+	}
+	/** reload 是 run 的别名 */
+	function reload(info) {
+		run(info);
+	}
 	return {
-		dataSource: getDataSourceRef,
+		dataSource: computed(() => tableDataList.value.length ? tableDataList.value : EMPTY_ARRAY),
 		isTreeDataRef,
 		setTableDataList,
 		operateTableDataRow,
 		handleTableChange,
-		run: async (info) => {
-			if (waitRequest.value) return;
-			if (request) await fetchListDebounce.run({
-				...info,
-				isPolling: false
-			});
-			else emit("reload");
-		}
+		run,
+		reload
 	};
 }
-
 //#endregion
-export { useConfigFetchData, useFetchData };
+export { useFetchData };