@wordrhyme/auto-crud 1.0.0 → 1.0.1

package/dist/index.cjs

@@ -1450,7 +1450,12 @@ function DataTableFilterList({ table, debounceMs = DEBOUNCE_MS$2, throttleMs = T
 	const [open, setOpen] = react.useState(false);
 	const addButtonRef = react.useRef(null);
 	const columns = react.useMemo(() => {
-		return table.getAllColumns().filter((column) => column.columnDef.enableColumnFilter);
+		return table.getAllColumns().filter((column) => {
+			if (!column.getCanFilter()) return false;
+			const modes = column.columnDef.meta?.modes;
+			if (modes && !modes.includes("advanced")) return false;
+			return true;
+		});
 	}, [table]);
 	const [filters, setFilters] = useReadableFilters(columns, { debounceMs });
 	const debouncedSetFilters = useDebouncedCallback(setFilters, debounceMs);
@@ -1932,7 +1937,12 @@ const REMOVE_FILTER_SHORTCUTS = ["backspace", "delete"];
 function DataTableFilterMenu({ table, debounceMs = DEBOUNCE_MS$1, throttleMs = THROTTLE_MS$1, shallow = true, disabled,...props }) {
 	const id = react.useId();
 	const columns = react.useMemo(() => {
-		return table.getAllColumns().filter((column) => column.columnDef.enableColumnFilter);
+		return table.getAllColumns().filter((column) => {
+			if (!column.columnDef.enableColumnFilter) return false;
+			const modes = column.columnDef.meta?.modes;
+			if (modes && !modes.includes("command")) return false;
+			return true;
+		});
 	}, [table]);
 	const [open, setOpen] = react.useState(false);
 	const [selectedColumn, setSelectedColumn] = react.useState(null);
@@ -2689,7 +2699,7 @@ function DataTableViewOptions({ table, disabled,...props }) {
 //#endregion
 //#region src/components/auto-crud/auto-table-simple-filters.tsx
 function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilters, onFiltersChange }) {
-	const columns = react.useMemo(() => table.getAllColumns().filter((col) => col.columnDef.enableColumnFilter), [table]);
+	const columns = react.useMemo(() => table.getAllColumns().filter((col) => col.getCanFilter()), [table]);
 	const queryStateOptions = table.options.meta?.queryStateOptions;
 	const [queryFilters, setQueryFilters] = useReadableFilters(columns, {
 		...queryStateOptions,
@@ -2709,9 +2719,10 @@ function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilte
 	react.useEffect(() => {
 		setMounted(true);
 	}, []);
-	const getFilterValue = (columnId) => {
-		return filters.find((f) => f.id === columnId)?.value;
-	};
+	const filterMap = react.useMemo(() => new Map(filters.map((f) => [f.id, f])), [filters]);
+	const getFilterValue = react.useCallback((columnId) => {
+		return filterMap.get(columnId)?.value;
+	}, [filterMap]);
 	const updateFilter = react.useCallback((columnId, value) => {
 		const column = columns.find((c) => c.id === columnId);
 		if (!column) return;
@@ -2734,7 +2745,14 @@ function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilte
 		setFilters
 	]);
 	const hasFilters = filters.length > 0;
-	const filterColumns = react.useMemo(() => columns.filter((col) => col.columnDef.meta?.variant && col.columnDef.enableColumnFilter !== false), [columns]);
+	const filterColumns = react.useMemo(() => columns.filter((col) => {
+		const meta = col.columnDef.meta;
+		const enableFilter = col.columnDef.enableColumnFilter !== false;
+		if (!meta?.variant || !enableFilter) return false;
+		const modes = meta.modes;
+		if (modes && !modes.includes("simple")) return false;
+		return true;
+	}), [columns]);
 	const [expanded, setExpanded] = react.useState(false);
 	const [visibleCount, setVisibleCount] = react.useState(null);
 	const containerRef = react.useRef(null);
@@ -2874,7 +2892,7 @@ function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilte
 }
 function SimpleFacetedFilter({ title, options, multiple, value, onChange }) {
 	const [open, setOpen] = react.useState(false);
-	const selectedValues = new Set(value);
+	const selectedValues = react.useMemo(() => new Set(value), [value]);
 	const onItemSelect = (option, isSelected) => {
 		if (multiple) {
 			const newValues = new Set(selectedValues);
@@ -2905,6 +2923,12 @@ function SimpleFacetedFilter({ title, options, multiple, value, onChange }) {
 						tabIndex: 0,
 						className: "rounded-sm opacity-70 hover:opacity-100",
 						onClick: onReset,
+						onKeyDown: (e) => {
+							if (e.key === "Enter" || e.key === " ") {
+								e.preventDefault();
+								onReset(e);
+							}
+						},
 						children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.XCircle, {})
 					}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.PlusCircle, {}),
 					title,
@@ -3012,6 +3036,12 @@ function SimpleSliderFilter({ title, range, unit, value, onChange }) {
 					tabIndex: 0,
 					className: "rounded-sm opacity-70 hover:opacity-100",
 					onClick: onReset,
+					onKeyDown: (e) => {
+						if (e.key === "Enter" || e.key === " ") {
+							e.preventDefault();
+							onReset(e);
+						}
+					},
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.XCircle, {})
 				}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.PlusCircle, {}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: title }),
@@ -3135,6 +3165,12 @@ function SimpleDateFilter({ title, multiple, value, onChange }) {
 					tabIndex: 0,
 					className: "rounded-sm opacity-70 hover:opacity-100",
 					onClick: onReset,
+					onKeyDown: (e) => {
+						if (e.key === "Enter" || e.key === " ") {
+							e.preventDefault();
+							onReset(e);
+						}
+					},
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.XCircle, {})
 				}) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.CalendarIcon, {}),
 				/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: title }),
@@ -3747,33 +3783,47 @@ function inferFilterVariantByFieldName(fieldName) {
 
 //#endregion
 //#region src/lib/schema-bridge/zod-to-columns.tsx
+const parsedFieldCache = /* @__PURE__ */ new WeakMap();
+const baseTableSchemaCache = /* @__PURE__ */ new WeakMap();
 /**
 * 解析 Zod 字段类型
 */
 function parseZodField(schema) {
+	const cached = parsedFieldCache.get(schema);
+	if (cached) return cached;
+	const finalize = (result) => {
+		parsedFieldCache.set(schema, result);
+		return result;
+	};
 	const def = schema._zod?.def ?? schema._def;
-	const testNull = schema.safeParse(null);
-	const required = !schema.safeParse(void 0).success && !testNull.success;
 	const typeName = def?.typeName;
-	if (def?.type === "nullable" || def?.type === "optional" || typeName === "ZodNullable" || typeName === "ZodOptional") {
+	const isOptional = def?.type === "optional" || typeName === "ZodOptional";
+	const isNullable = def?.type === "nullable" || typeName === "ZodNullable";
+	if (isOptional || isNullable) {
 		const innerType = def?.innerType;
-		if (innerType) return {
+		if (innerType) return finalize({
 			...parseZodField(innerType),
 			required: false
-		};
+		});
+	}
+	let required;
+	if (isOptional || isNullable) required = false;
+	else {
+		const testNull = schema.safeParse(null);
+		required = !schema.safeParse(void 0).success && !testNull.success;
 	}
-	if (def?.type === "boolean") return {
+	if (def?.type === "boolean") return finalize({
 		type: "boolean",
 		required
-	};
-	if (def?.type === "number") return {
+	});
+	if (def?.type === "number") return finalize({
 		type: "number",
 		required
-	};
-	if (def?.type === "date") return {
+	});
+	if (def?.type === "date") return finalize({
 		type: "date",
 		required
-	};
+	});
 	if (def?.type === "enum") {
 		let enumValues$1;
 		if (def?.entries) {
@@ -3784,20 +3834,20 @@ function parseZodField(schema) {
 			const values = def.values;
 			if (Array.isArray(values)) enumValues$1 = values.map(String);
 		}
-		if (enumValues$1 && enumValues$1.length > 0) return {
+		if (enumValues$1 && enumValues$1.length > 0) return finalize({
 			type: "enum",
 			required,
 			enumValues: enumValues$1
-		};
+		});
 	}
-	if (def?.type === "string") return {
+	if (def?.type === "string") return finalize({
 		type: "string",
 		required
-	};
-	if (typeName === "ZodBoolean") return {
+	});
+	if (typeName === "ZodBoolean") return finalize({
 		type: "boolean",
 		required
-	};
+	});
 	let enumValues;
 	if (def?.entries) {
 		const entries = def.entries;
@@ -3807,51 +3857,51 @@ function parseZodField(schema) {
 		const values = def.values;
 		if (Array.isArray(values)) enumValues = values.map(String);
 	}
-	if (enumValues && Array.isArray(enumValues) && enumValues.length > 0) return {
+	if (enumValues && Array.isArray(enumValues) && enumValues.length > 0) return finalize({
 		type: "enum",
 		required,
 		enumValues
-	};
-	if (typeName === "ZodNumber") return {
+	});
+	if (typeName === "ZodNumber") return finalize({
 		type: "number",
 		required
-	};
-	if (typeName === "ZodDate") return {
+	});
+	if (typeName === "ZodDate") return finalize({
 		type: "date",
 		required
-	};
-	if (typeName === "ZodArray") return {
+	});
+	if (typeName === "ZodArray") return finalize({
 		type: "array",
 		required
-	};
-	if (typeName === "ZodObject") return {
+	});
+	if (typeName === "ZodObject") return finalize({
 		type: "object",
 		required
-	};
+	});
 	const testString = schema.safeParse("test");
 	const testNumber = schema.safeParse(123);
 	const testBoolean = schema.safeParse(true);
 	const testDate = schema.safeParse(17040672e5);
-	if (testBoolean.success && !testString.success && !testNumber.success) return {
+	if (testBoolean.success && !testString.success && !testNumber.success) return finalize({
 		type: "boolean",
 		required
-	};
-	if (testDate.success && !testString.success) return {
+	});
+	if (testDate.success && !testString.success) return finalize({
 		type: "date",
 		required
-	};
-	if (testNumber.success && !testString.success) return {
+	});
+	if (testNumber.success && !testString.success) return finalize({
 		type: "number",
 		required
-	};
-	if (schema.safeParse([]).success && !testString.success) return {
+	});
+	if (schema.safeParse([]).success && !testString.success) return finalize({
 		type: "array",
 		required
-	};
-	return {
+	});
+	return finalize({
 		type: "string",
 		required
-	};
+	});
 }
 /**
 * 渲染单元格内容
@@ -3893,9 +3943,14 @@ function renderCell(value, type) {
 * 从 Zod Schema 创建 Table Schema (ColumnDef 数组)
 */
 function createTableSchema(schema, options) {
+	const { overrides, exclude = [] } = options ?? {};
+	const canCache = !(!!overrides && Object.keys(overrides).length > 0) && exclude.length === 0;
+	if (canCache) {
+		const cached = baseTableSchemaCache.get(schema);
+		if (cached) return [...cached];
+	}
 	const shape = schema.shape;
 	const columns = [];
-	const { overrides, exclude = [] } = options ?? {};
 	for (const [key, fieldSchema] of Object.entries(shape)) {
 		if (exclude.includes(key)) continue;
 		const override = overrides?.[key];
@@ -3930,6 +3985,7 @@ function createTableSchema(schema, options) {
 			...restOverride
 		});
 	}
+	if (canCache) baseTableSchemaCache.set(schema, columns);
 	return columns;
 }
 /**
@@ -4446,6 +4502,13 @@ function useDataTable(props) {
 		filterableColumns,
 		enableAdvancedFilter
 	]);
+	const getCoreRowModelFn = react.useMemo(() => (0, __tanstack_react_table.getCoreRowModel)(), []);
+	const getFilteredRowModelFn = react.useMemo(() => (0, __tanstack_react_table.getFilteredRowModel)(), []);
+	const getPaginationRowModelFn = react.useMemo(() => (0, __tanstack_react_table.getPaginationRowModel)(), []);
+	const getSortedRowModelFn = react.useMemo(() => (0, __tanstack_react_table.getSortedRowModel)(), []);
+	const getFacetedRowModelFn = react.useMemo(() => (0, __tanstack_react_table.getFacetedRowModel)(), []);
+	const getFacetedUniqueValuesFn = react.useMemo(() => (0, __tanstack_react_table.getFacetedUniqueValues)(), []);
+	const getFacetedMinMaxValuesFn = react.useMemo(() => (0, __tanstack_react_table.getFacetedMinMaxValues)(), []);
 	const table = (0, __tanstack_react_table.useReactTable)({
 		...tableProps,
 		columns,
@@ -4468,13 +4531,13 @@ function useDataTable(props) {
 		onSortingChange,
 		onColumnFiltersChange,
 		onColumnVisibilityChange: setColumnVisibility,
-		getCoreRowModel: (0, __tanstack_react_table.getCoreRowModel)(),
-		getFilteredRowModel: (0, __tanstack_react_table.getFilteredRowModel)(),
-		getPaginationRowModel: (0, __tanstack_react_table.getPaginationRowModel)(),
-		getSortedRowModel: (0, __tanstack_react_table.getSortedRowModel)(),
-		getFacetedRowModel: (0, __tanstack_react_table.getFacetedRowModel)(),
-		getFacetedUniqueValues: (0, __tanstack_react_table.getFacetedUniqueValues)(),
-		getFacetedMinMaxValues: (0, __tanstack_react_table.getFacetedMinMaxValues)(),
+		getCoreRowModel: getCoreRowModelFn,
+		getFilteredRowModel: getFilteredRowModelFn,
+		getPaginationRowModel: getPaginationRowModelFn,
+		getSortedRowModel: getSortedRowModelFn,
+		getFacetedRowModel: getFacetedRowModelFn,
+		getFacetedUniqueValues: getFacetedUniqueValuesFn,
+		getFacetedMinMaxValues: getFacetedMinMaxValuesFn,
 		manualPagination: true,
 		manualSorting: true,
 		manualFiltering: true,
@@ -4505,6 +4568,11 @@ function useDataTable(props) {
 
 //#endregion
 //#region src/components/auto-crud/auto-table.tsx
+const DEFAULT_MODES = [
+	"simple",
+	"advanced",
+	"command"
+];
 /** 过滤模式配置 */
 const filterModeConfig = {
 	simple: {
@@ -4524,11 +4592,7 @@ const filterModeConfig = {
 	}
 };
 function AutoTable({ schema, data, pageCount = 1, overrides, enableRowSelection = true, exclude, actions, pinnedColumns, filterMode = "simple", onDeleteSelected, onUpdateSelected, batchUpdateFields, actionBarExtra, initialSorting, enableExport = true, onSelectedCountChange, getSelectedRows }) {
-	const modes = filterMode ? Array.isArray(filterMode) ? filterMode : [filterMode] : [
-		"simple",
-		"advanced",
-		"command"
-	];
+	const modes = filterMode ? Array.isArray(filterMode) ? filterMode : [filterMode] : DEFAULT_MODES;
 	const [currentMode, setCurrentMode] = useQueryState("filterMode", parseAsStringEnum(modes).withDefault(modes[0] ?? "simple"));
 	const showToggle = modes.length > 1;
 	const { table, shallow, debounceMs, throttleMs } = useDataTable({
@@ -4550,13 +4614,18 @@ function AutoTable({ schema, data, pageCount = 1, overrides, enableRowSelection
 		]),
 		pageCount,
 		enableAdvancedFilter: true,
-		initialState: {
+		initialState: (0, react.useMemo)(() => ({
 			sorting: initialSorting,
 			columnPinning: pinnedColumns ?? {
 				left: enableRowSelection ? ["select"] : [],
 				right: actions ? ["actions"] : []
 			}
-		},
+		}), [
+			initialSorting,
+			pinnedColumns,
+			enableRowSelection,
+			actions
+		]),
 		shallow: false,
 		clearOnDefault: true
 	});
@@ -4597,7 +4666,7 @@ function AutoTable({ schema, data, pageCount = 1, overrides, enableRowSelection
 			})
 		})
 	})] }) : null;
-	const renderFilters = () => {
+	const filtersContent = (0, react.useMemo)(() => {
 		switch (currentMode) {
 			case "simple": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(AutoTableSimpleFilters, {
 				table,
@@ -4617,7 +4686,13 @@ function AutoTable({ schema, data, pageCount = 1, overrides, enableRowSelection
 				align: "start"
 			});
 		}
-	};
+	}, [
+		currentMode,
+		table,
+		shallow,
+		debounceMs,
+		throttleMs
+	]);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: "space-y-4",
 		children: [
@@ -4629,7 +4704,7 @@ function AutoTable({ schema, data, pageCount = 1, overrides, enableRowSelection
 					children: [currentMode !== "simple" && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(DataTableSortList, {
 						table,
 						align: "start"
-					}), renderFilters()]
+					}), filtersContent]
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 					className: "flex items-center gap-2",
 					children: [
@@ -5218,26 +5293,51 @@ function ImportDialog({ open, onOpenChange, onImport, columns = [], title = "导
 function buildTableOverrides(fields, legacyOverrides) {
 	const result = { ...legacyOverrides };
 	if (fields) for (const [key, config] of Object.entries(fields)) {
+		const tableMeta = config.table !== false && typeof config.table === "object" ? config.table.meta : void 0;
 		let filterMeta;
-		if (config.filter && config.filter.enabled !== false && !config.filter.hidden) {
-			const { enabled: _, hidden: __,...filterProps } = config.filter;
-			if (Object.keys(filterProps).length > 0) filterMeta = filterProps;
+		if (config.filter && typeof config.filter === "object") {
+			if (config.filter.enabled !== false && config.filter.hidden !== true) {
+				const { enabled: _, hidden: __,...filterProps } = config.filter;
+				if (Object.keys(filterProps).length > 0) filterMeta = filterProps;
+			}
+		}
+		if (config.filter === false) result[key] = {
+			...result[key],
+			enableColumnFilter: false
+		};
+		else if (config.filter && typeof config.filter === "object") {
+			if (config.filter.enabled === false || config.filter.hidden === true) result[key] = {
+				...result[key],
+				enableColumnFilter: false
+			};
 		}
-		result[key] = {
+		if (tableMeta || filterMeta) result[key] = {
 			...result[key],
-			...config.label && { label: config.label },
-			...config.hidden && { hidden: true },
-			...config.table,
-			...filterMeta && { meta: {
+			meta: {
 				...result[key]?.meta ?? {},
-				...config.table?.meta ?? {},
-				...filterMeta
-			} }
+				...tableMeta ?? {},
+				...filterMeta ?? {}
+			}
 		};
-		if (config.filter?.enabled === false || config.filter?.hidden === true) result[key] = {
+		if (config.label) result[key] = {
 			...result[key],
-			enableColumnFilter: false
+			label: config.label
+		};
+		if (config.hidden) result[key] = {
+			...result[key],
+			hidden: true
+		};
+		if (config.table === false) result[key] = {
+			...result[key],
+			hidden: true
 		};
+		else if (config.table && typeof config.table === "object") {
+			const { meta,...tableProps } = config.table;
+			result[key] = {
+				...result[key],
+				...tableProps
+			};
+		}
 	}
 	return result;
 }
@@ -5251,12 +5351,24 @@ function buildFormOverrides(fields, legacyOverrides, denyFields) {
 		...result[field],
 		"x-hidden": true
 	};
-	if (fields) for (const [key, config] of Object.entries(fields)) result[key] = {
-		...result[key],
-		...config.label && { title: config.label },
-		...config.hidden && { "x-hidden": true },
-		...config.form
-	};
+	if (fields) for (const [key, config] of Object.entries(fields)) {
+		if (config.label) result[key] = {
+			...result[key],
+			title: config.label
+		};
+		if (config.hidden) result[key] = {
+			...result[key],
+			"x-hidden": true
+		};
+		if (config.form === false) result[key] = {
+			...result[key],
+			"x-hidden": true
+		};
+		else if (config.form && typeof config.form === "object") result[key] = {
+			...result[key],
+			...config.form
+		};
+	}
 	return result;
 }
 /**
@@ -5265,7 +5377,9 @@ function buildFormOverrides(fields, legacyOverrides, denyFields) {
 function buildHiddenColumns(fields, legacyHidden, denyFields) {
 	const hidden = new Set([...legacyHidden ?? [], ...denyFields ?? []]);
 	if (fields) {
-		for (const [key, config] of Object.entries(fields)) if (config.hidden || config.table?.hidden) hidden.add(key);
+		for (const [key, config] of Object.entries(fields)) if (config.hidden) hidden.add(key);
+		else if (config.table === false) hidden.add(key);
+		else if (config.table && typeof config.table === "object" && config.table.hidden) hidden.add(key);
 	}
 	return Array.from(hidden);
 }
@@ -5431,10 +5545,22 @@ function AutoCrudTable({ title, description, schema, resource, fields, table: ta
 			setExporting(false);
 		}
 	}, [selectedCount, handleExport]);
-	const tableOverrides = buildTableOverrides(fields, tableConfig?.overrides);
-	const formOverrides = buildFormOverrides(fields, formConfig?.overrides, denyFields);
-	const hiddenColumns = buildHiddenColumns(fields, tableConfig?.hidden, denyFields);
-	const batchFields = buildBatchUpdateFields(schema, tableConfig?.batchFields, fields);
+	const tableOverrides = react.useMemo(() => buildTableOverrides(fields, tableConfig?.overrides), [fields, tableConfig?.overrides]);
+	const formOverrides = react.useMemo(() => buildFormOverrides(fields, formConfig?.overrides, denyFields), [
+		fields,
+		formConfig?.overrides,
+		denyFields
+	]);
+	const hiddenColumns = react.useMemo(() => buildHiddenColumns(fields, tableConfig?.hidden, denyFields), [
+		fields,
+		tableConfig?.hidden,
+		denyFields
+	]);
+	const batchFields = react.useMemo(() => buildBatchUpdateFields(schema, tableConfig?.batchFields, fields), [
+		schema,
+		tableConfig?.batchFields,
+		fields
+	]);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: "space-y-4",
 		children: [
@@ -6166,6 +6292,8 @@ function DataTableToolbarFilter({ column }) {
 		const columnMeta = column.columnDef.meta;
 		return react.useCallback(() => {
 			if (!columnMeta?.variant) return null;
+			const modes = columnMeta.modes;
+			if (modes && !modes.includes("advanced")) return null;
 			switch (columnMeta.variant) {
 				case "text": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.Input, {
 					placeholder: columnMeta.placeholder ?? columnMeta.label,
@@ -6287,6 +6415,10 @@ function modalReducer(state, action) {
 function useAutoCrudResource({ router, schema, query: queryTransform, options = {} }) {
 	const { idKey = "id", defaultVariant = "dialog", hooks, toast: toastAdapter, exportFetcher } = options;
 	const toast = (0, react.useMemo)(() => toastAdapter === false ? noopToastAdapter : toastAdapter ?? defaultToastAdapter, [toastAdapter]);
+	const hooksRef = (0, react.useRef)(hooks);
+	(0, react.useEffect)(() => {
+		hooksRef.current = hooks;
+	}, [hooks]);
 	const columns = (0, react.useMemo)(() => createTableSchema(schema), [schema]);
 	const [urlParams] = useQueryStates({
 		page: parseAsInteger.withDefault(1),
@@ -6350,15 +6482,16 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 		payload: variant
 	}), []);
 	const submitCreate = (0, react.useCallback)(async (values) => {
+		const currentHooks = hooksRef.current;
 		try {
-			if (hooks?.beforeCreate) {
-				const result = await hooks.beforeCreate(values);
+			if (currentHooks?.beforeCreate) {
+				const result = await currentHooks.beforeCreate(values);
 				if (typeof result === "boolean") {
 					if (result) {
 						toast.success("创建成功");
 						closeModals();
 						listQuery.refetch();
-						hooks?.onSuccess?.("create", values);
+						currentHooks?.onSuccess?.("create", values);
 					}
 					return;
 				}
@@ -6369,36 +6502,36 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 					toast.success("创建成功");
 					closeModals();
 					listQuery.refetch();
-					hooks?.onSuccess?.("create", data);
+					currentHooks?.onSuccess?.("create", data);
 				},
 				onError: (error) => {
 					const err = error;
 					toast.error(`创建失败: ${err.message}`);
-					hooks?.onError?.("create", err);
+					currentHooks?.onError?.("create", err);
 				}
 			});
 		} catch (error) {
 			const err = error;
 			toast.error(`创建失败: ${err.message}`);
-			hooks?.onError?.("create", err);
+			currentHooks?.onError?.("create", err);
 		}
 	}, [
 		createMutation,
 		closeModals,
-		listQuery,
-		hooks
+		listQuery
 	]);
 	const submitUpdate = (0, react.useCallback)(async (values) => {
+		const currentHooks = hooksRef.current;
 		if (!modal.selected) return;
 		try {
-			if (hooks?.beforeUpdate) {
-				const result = await hooks.beforeUpdate(values, modal.selected);
+			if (currentHooks?.beforeUpdate) {
+				const result = await currentHooks.beforeUpdate(values, modal.selected);
 				if (typeof result === "boolean") {
 					if (result) {
 						toast.success("更新成功");
 						closeModals();
 						listQuery.refetch();
-						hooks?.onSuccess?.("update", values);
+						currentHooks?.onSuccess?.("update", values);
 					}
 					return;
 				}
@@ -6413,38 +6546,38 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 					toast.success("更新成功");
 					closeModals();
 					listQuery.refetch();
-					hooks?.onSuccess?.("update", data);
+					currentHooks?.onSuccess?.("update", data);
 				},
 				onError: (error) => {
 					const err = error;
 					toast.error(`更新失败: ${err.message}`);
-					hooks?.onError?.("update", err);
+					currentHooks?.onError?.("update", err);
 				}
 			});
 		} catch (error) {
 			const err = error;
 			toast.error(`更新失败: ${err.message}`);
-			hooks?.onError?.("update", err);
+			currentHooks?.onError?.("update", err);
 		}
 	}, [
 		modal.selected,
 		idKey,
 		updateMutation,
 		closeModals,
-		listQuery,
-		hooks
+		listQuery
 	]);
 	const confirmDelete = (0, react.useCallback)(async () => {
+		const currentHooks = hooksRef.current;
 		if (!modal.selected) return;
 		try {
-			if (hooks?.beforeDelete) {
-				const result = await hooks.beforeDelete(modal.selected);
+			if (currentHooks?.beforeDelete) {
+				const result = await currentHooks.beforeDelete(modal.selected);
 				if (typeof result === "boolean") {
 					if (result) {
 						toast.success("删除成功");
 						closeModals();
 						listQuery.refetch();
-						hooks?.onSuccess?.("delete", modal.selected);
+						currentHooks?.onSuccess?.("delete", modal.selected);
 					}
 					return;
 				}
@@ -6455,28 +6588,28 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 					toast.success("删除成功");
 					closeModals();
 					listQuery.refetch();
-					hooks?.onSuccess?.("delete", data);
+					currentHooks?.onSuccess?.("delete", data);
 				},
 				onError: (error) => {
 					const err = error;
 					toast.error(`删除失败: ${err.message}`);
-					hooks?.onError?.("delete", err);
+					currentHooks?.onError?.("delete", err);
 				}
 			});
 		} catch (error) {
 			const err = error;
 			toast.error(`删除失败: ${err.message}`);
-			hooks?.onError?.("delete", err);
+			currentHooks?.onError?.("delete", err);
 		}
 	}, [
 		modal.selected,
 		idKey,
 		deleteMutation,
 		closeModals,
-		listQuery,
-		hooks
+		listQuery
 	]);
 	const deleteMany = (0, react.useCallback)((rows) => {
+		const currentHooks = hooksRef.current;
 		if (!deleteManyMutation) {
 			toast.error("批量删除功能未启用");
 			return;
@@ -6486,21 +6619,21 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 			onSuccess: (data) => {
 				toast.success(`成功删除 ${ids.length} 条记录`);
 				listQuery.refetch();
-				hooks?.onSuccess?.("delete", data);
+				currentHooks?.onSuccess?.("delete", data);
 			},
 			onError: (error) => {
 				const err = error;
 				toast.error(`批量删除失败: ${err.message}`);
-				hooks?.onError?.("delete", err);
+				currentHooks?.onError?.("delete", err);
 			}
 		});
 	}, [
 		deleteManyMutation,
 		idKey,
-		listQuery,
-		hooks
+		listQuery
 	]);
 	const updateMany = (0, react.useCallback)((rows, data) => {
+		const currentHooks = hooksRef.current;
 		if (!updateManyMutation) {
 			toast.error("批量更新功能未启用");
 			return;
@@ -6513,19 +6646,18 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 			onSuccess: (result) => {
 				toast.success(`成功更新 ${ids.length} 条记录`);
 				listQuery.refetch();
-				hooks?.onSuccess?.("update", result);
+				currentHooks?.onSuccess?.("update", result);
 			},
 			onError: (error) => {
 				const err = error;
 				toast.error(`批量更新失败: ${err.message}`);
-				hooks?.onError?.("update", err);
+				currentHooks?.onError?.("update", err);
 			}
 		});
 	}, [
 		updateManyMutation,
 		idKey,
-		listQuery,
-		hooks
+		listQuery
 	]);
 	const copyRow = (0, react.useCallback)((row) => {
 		dispatch({