@gx-design-vue/pro-table 0.2.0-alpha.8 → 0.2.0-alpha.9

package/dist/hooks/useColumns.js

@@ -1,64 +1,97 @@
-import { computed, ref, toRaw, unref, watch } from "vue";
-import { cloneDeep, compareArray, isBoolean, isDeepEqualReact, isNumber } from "@gx-design-vue/pro-utils";
+import { computed, onScopeDispose, shallowRef, watch } from "vue";
+import { getRandomNumber } from "@gx-design-vue/pro-utils";
 //#region src/hooks/useColumns.ts
-function useColumns({ scroll, columns, breakpoint, draggable, autoScroll, neverScroll }) {
-	const proColumnsRef = ref([]);
-	watch([
-		() => scroll.value,
-		() => columns.value,
-		() => breakpoint.value,
-		() => draggable.value,
-		() => breakpoint.value,
-		() => autoScroll.value,
-		() => neverScroll.value
-	], () => {
-		const columnsList = handleColumns(toRaw(columns.value));
-		if (!isDeepEqualReact(columnsList, toRaw(proColumnsRef.value))) proColumnsRef.value = cloneDeep(columnsList);
-	}, {
-		deep: true,
-		immediate: true
+/** 获取列唯一标识，优先 key，回退 dataIndex */
+function getColumnKey(col) {
+	return col.key ?? col.dataIndex;
+}
+function isActionColumn(column) {
+	return getColumnKey(column) === "action" || column.dataIndex === "action";
+}
+function normalizeFixedValue(fixed) {
+	if (fixed === "left") return "start";
+	if (fixed === "right") return "end";
+	return fixed;
+}
+/** 规范化单列：补齐 key/dataIndex/align/order，递归处理 children */
+function normalizeColumn(col, index, defaultAlign) {
+	const key = getColumnKey(col);
+	const normalized = {
+		...col,
+		key,
+		dataIndex: col.dataIndex ?? key,
+		order: col.order ?? index,
+		align: col.align ?? defaultAlign
+	};
+	if (col.children?.length) normalized.children = col.children.map((child, childIndex) => normalizeColumn(child, childIndex, defaultAlign));
+	return normalized;
+}
+/** 批量规范化列配置 */
+function normalizeColumns(columns, defaultAlign) {
+	return columns.map((col, index) => normalizeColumn(col, index, defaultAlign));
+}
+function createIndexColumn(indexColumn, defaultAlign, firstColumn) {
+	const config = typeof indexColumn === "object" ? indexColumn : {};
+	return {
+		title: config.title ?? "序号",
+		align: config.align ?? defaultAlign,
+		fixed: normalizeFixedValue(config.fixed ?? firstColumn?.fixed),
+		width: config.width ?? 60,
+		uuid: getRandomNumber().uuid(15),
+		dataIndex: "sortIndex",
+		key: "sortIndex"
+	};
+}
+function applyIndexColumn(columns, indexColumn, defaultAlign) {
+	if (!indexColumn || columns.length === 0 || columns.some((column) => column.dataIndex === "sortIndex" || getColumnKey(column) === "sortIndex")) return columns;
+	return [createIndexColumn(indexColumn === true ? true : indexColumn, defaultAlign, columns[0]), ...columns];
+}
+function applyActionColumnFixed(columns, shouldFixActionColumn) {
+	if (!shouldFixActionColumn) return columns;
+	return columns.map((column) => {
+		if (!isActionColumn(column) || column.fixed !== void 0) return column;
+		return {
+			...column,
+			fixed: "end"
+		};
 	});
-	const proColumns = computed(() => {
-		return handleTableSort(unref(proColumnsRef));
+}
+/** 过滤掉 show=false 的列 */
+function filterVisible(columns) {
+	return columns.filter((col) => col.show !== false);
+}
+/** 按 order 字段升序排列 */
+function sortByOrder(columns) {
+	return [...columns].sort((columnA, columnB) => (columnA.order ?? 0) - (columnB.order ?? 0));
+}
+/**
+* 列配置管理。
+* 纯函数 + computed 实现，无 watcher/ref 链。
+* - tableColumns: 仅可见列，按 order 排序
+* - cacheColumns: 全量规范化列（含隐藏列）
+* - setColumns: 外部覆写列（用于 sortOrder 同步等），props 变化时自动重置
+*/
+function useColumns(options) {
+	const overrideColumns = shallowRef(null);
+	const stopWatch = watch(() => options.columns.value, () => {
+		overrideColumns.value = null;
 	});
-	function handleTableSort(data) {
-		return data.sort((a, b) => compareArray(a, b, "order", 0));
-	}
-	function handleColumns(columnsList) {
-		return cloneDeep(columnsList).map((item, index) => {
-			if (item.dataIndex === "action" || index === columnsList.length - 1) item.resizable = false;
-			else item.resizable = isBoolean(item.resizable) ? item.resizable : !!(isNumber(item.width) && unref(draggable));
-			if (!item.width || unref(neverScroll)) return item;
-			if (item.dataIndex === "action" && unref(autoScroll)) if (scroll.value?.x || !unref(breakpoint)) {
-				item.width = item.width || 100;
-				item.fixed = "right";
-			} else {
-				const originCol = unref(columns).find((col) => col.dataIndex === item.dataIndex);
-				item.width = originCol?.width || "";
-				item.fixed = originCol?.fixed;
-			}
-			return item;
-		});
-	}
-	function resizeColumnWidth(width, col) {
-		proColumnsRef.value = proColumnsRef.value.map((item) => {
-			if (item.uuid === col.uuid) item.width = width;
-			return item;
-		});
-	}
-	function setColumns(columnList) {
-		if (columnList.length <= 0) {
-			proColumnsRef.value = [];
-			return;
-		}
-		if (!isDeepEqualReact(handleColumns(columnList), toRaw(proColumnsRef.value))) proColumnsRef.value = handleColumns(columnList);
+	onScopeDispose(() => stopWatch());
+	const cacheColumns = computed(() => {
+		return applyActionColumnFixed(normalizeColumns(applyIndexColumn(overrideColumns.value ?? options.columns.value, options.indexColumn?.value, options.align.value), options.align.value), !!options.shouldFixActionColumn?.value);
+	});
+	const tableColumns = computed(() => {
+		const visible = sortByOrder(filterVisible(cacheColumns.value));
+		return options.wrapColumnRender ? visible.map((col) => options.wrapColumnRender(col)) : visible;
+	});
+	function setColumns(columns) {
+		overrideColumns.value = columns;
 	}
 	return {
-		breakpoint,
-		proColumns,
-		setColumns,
-		resizeColumnWidth
+		tableColumns,
+		cacheColumns,
+		setColumns
 	};
 }
 //#endregion
-export { useColumns };
+export { applyActionColumnFixed, applyIndexColumn, filterVisible, getColumnKey, normalizeColumn, normalizeColumns, sortByOrder, useColumns };

package/dist/hooks/useFetchData.d.ts

@@ -1,77 +1,52 @@
-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>>;
+  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 };