@wordrhyme/auto-crud 1.3.6 → 1.3.9

package/dist/index.cjs

@@ -4207,6 +4207,15 @@ function FormModal({ open, onOpenChange, title, description, children, variant =
 
 //#endregion
 //#region src/lib/schema-bridge/zod-to-formily.ts
+const DEFAULT_FORM_MANAGED_FIELDS = [
+	"id",
+	"createdAt",
+	"updatedAt",
+	"createdBy",
+	"createdByType",
+	"updatedBy",
+	"updatedByType"
+];
 /**
 * 将字符串转为人类可读格式
 */
@@ -4289,16 +4298,12 @@ function createFormSchema(schema, options) {
 	};
 }
 /**
-* 为编辑模式创建 Form Schema（排除 id, createdAt, updatedAt）
+* 为编辑模式创建 Form Schema（排除平台托管字段）
 */
 function createEditFormSchema(schema, options) {
 	return createFormSchema(schema, {
 		...options,
-		exclude: [
-			"id",
-			"createdAt",
-			"updatedAt"
-		]
+		exclude: [...DEFAULT_FORM_MANAGED_FIELDS]
 	});
 }
 
@@ -4360,6 +4365,7 @@ function normalizeDataSourceRegistration(registration) {
 		debounceMs: typeof registration.debounceMs === "number" && registration.debounceMs >= 0 ? registration.debounceMs : 300,
 		loadMore: registration.loadMore === true,
 		pageSize: typeof registration.pageSize === "number" && registration.pageSize > 0 ? registration.pageSize : 20,
+		resolveFields: registration.resolveFields,
 		load: registration.load
 	};
 }
@@ -4594,8 +4600,10 @@ function loadAutoCrudDataSource({ entry, field, registryVersion, search, sourceK
 	}
 	Promise.resolve(entry.load({
 		field: field.path.toString(),
+		type: "form",
 		page,
 		pageSize: entry.loadMore ? entry.pageSize : void 0,
+		query: searchValue,
 		search: searchValue,
 		values,
 		signal: controller?.signal
@@ -5632,6 +5640,15 @@ function ImportDialog({ open, onOpenChange, onImport, columns = [], title, local
 	});
 }
 
+//#endregion
+//#region src/lib/default-sorting.ts
+function getDefaultSortingForSchema(schema) {
+	return Object.prototype.hasOwnProperty.call(schema.shape, "createdAt") ? [{
+		id: "createdAt",
+		desc: true
+	}] : [];
+}
+
 //#endregion
 //#region src/lib/crud-actions.ts
 const entries = /* @__PURE__ */ new Map();
@@ -5781,6 +5798,29 @@ const crudActions = {
 
 //#endregion
 //#region src/components/auto-crud/auto-crud-table.tsx
+const DEFAULT_IMPORT_MANAGED_FIELDS = [
+	"createdAt",
+	"updatedAt",
+	"createdBy",
+	"createdByType",
+	"updatedBy",
+	"updatedByType"
+];
+const DEFAULT_HIDDEN_AUDIT_FIELDS = [
+	"createdBy",
+	"createdByType",
+	"updatedBy",
+	"updatedByType"
+];
+function isDefaultHiddenAuditField(key) {
+	return DEFAULT_HIDDEN_AUDIT_FIELDS.includes(key);
+}
+function isFieldTableExplicitlyVisible(config) {
+	return config?.hidden === false || config?.table !== false && typeof config?.table === "object" && config.table.hidden === false;
+}
+function isTableOverrideExplicitlyVisible(config) {
+	return config?.hidden === false;
+}
 let autoCrudToolbarResolver = null;
 function setToolbarResolver(resolver) {
 	autoCrudToolbarResolver = resolver;
@@ -5852,8 +5892,8 @@ function haveSameRowSelection(left, right, idKey) {
 	if (leftIds.length === left.length && rightIds.length === right.length) return areStringArraysEqual(leftIds, rightIds);
 	return left.every((row, index$1) => row === right[index$1]);
 }
-function readCreateAction(actions) {
-	return actions.find((action$1) => action$1.type === "create");
+function readToolbarAction(actions, type) {
+	return actions.find((action$1) => action$1.type === type);
 }
 function resolveToolbarActionsWithResolver(targetId, ownerActions, context) {
 	const resolver = autoCrudToolbarResolver;
@@ -5927,6 +5967,47 @@ function shouldLoadDynamicFilterOptions(config) {
 	}
 	return normalizeDataSourceConfig(getFilterDataSource(config)) !== void 0;
 }
+function isResolveValuePresent(value) {
+	return value !== null && value !== void 0 && String(value).length > 0;
+}
+function getResolveValues(rows, field) {
+	const values = /* @__PURE__ */ new Set();
+	for (const row of rows) {
+		const value = row[field];
+		const items = Array.isArray(value) ? value : [value];
+		for (const item of items) if (isResolveValuePresent(item)) values.add(String(item));
+	}
+	return Array.from(values);
+}
+function normalizeResolveCacheValue(value) {
+	if (value instanceof Date) return value.toISOString();
+	if (Array.isArray(value)) return value.map(normalizeResolveCacheValue);
+	if (value && typeof value === "object") return Object.fromEntries(Object.keys(value).sort().map((key) => [key, normalizeResolveCacheValue(value[key])]));
+	return value === void 0 ? { __autoCrudUndefined: true } : value;
+}
+function resolveRecordSignature(record) {
+	return JSON.stringify(Object.keys(record).sort().map((key) => [key, normalizeResolveCacheValue(record[key])]));
+}
+function resolveRecordCacheKey(sourceKey, field, record) {
+	return `${sourceKey}\u0000${field}\u0000${String(record[field])}\u0000${resolveRecordSignature(record)}`;
+}
+function mergeFieldOptions(current, incoming) {
+	if ((!current || current.length === 0) && (!incoming || incoming.length === 0)) return;
+	return mergeFilterOptions(current, incoming ?? []);
+}
+function mergeOptionsByField(left, right) {
+	const keys = new Set([...Object.keys(left ?? {}), ...Object.keys(right ?? {})]);
+	return Object.fromEntries(Array.from(keys).flatMap((key) => {
+		const options = mergeFieldOptions(left?.[key], right?.[key]);
+		return options ? [[key, options]] : [];
+	}));
+}
+function shouldResolveOptions(field, config, hiddenColumns) {
+	if (!config) return false;
+	if (hiddenColumns.has(field)) return false;
+	if (normalizeFieldOptions(config.enum)) return false;
+	return normalizeDataSourceConfig(config.dataSource) !== void 0;
+}
 function useRegistryVersion(subscribe) {
 	const [version$1, setVersion] = react.useState(0);
 	react.useEffect(() => subscribe(() => setVersion((current) => current + 1)), [subscribe]);
@@ -6048,8 +6129,10 @@ function useDynamicFilterOptions(fields) {
 		const timer = setTimeout(() => {
 			Promise.resolve(entry.load({
 				field,
+				type: "filter",
 				page,
 				pageSize: entry.loadMore ? entry.pageSize : void 0,
+				query: search,
 				search,
 				values: {},
 				signal: controller?.signal
@@ -6142,6 +6225,117 @@ function useDynamicFilterOptions(fields) {
 		setSearchValue
 	};
 }
+function rowHasResolveValue(row, field, value) {
+	const rowValue = row[field];
+	return (Array.isArray(rowValue) ? rowValue : [rowValue]).some((item) => item !== null && item !== void 0 && String(item) === value);
+}
+function resolveExtraFields(entry, field) {
+	const configured = typeof entry.resolveFields === "function" ? entry.resolveFields({ field }) : entry.resolveFields;
+	return Array.from(new Set((configured ?? []).filter((key) => typeof key === "string" && key.length > 0)));
+}
+function buildResolveRecords(rows, field, values, extraFields) {
+	return values.map((value) => {
+		const row = rows.find((candidate) => rowHasResolveValue(candidate, field, value));
+		const record = { [field]: value };
+		for (const extraField of extraFields) if (row && Object.prototype.hasOwnProperty.call(row, extraField)) record[extraField] = row[extraField];
+		return record;
+	});
+}
+function useDynamicResolveOptions(fields, rows, hiddenColumns) {
+	const registryVersion = useRegistryVersion(dataSources.subscribe);
+	const [optionsByField, setOptionsByField] = react.useState({});
+	const cacheRef = react.useRef(/* @__PURE__ */ new Map());
+	const requestVersionRef = react.useRef(0);
+	const sourceEntries = react.useMemo(() => {
+		if (!fields || rows.length === 0) return [];
+		const hiddenSet = new Set(hiddenColumns);
+		return Object.entries(fields).flatMap(([field, config]) => {
+			if (!shouldResolveOptions(field, config, hiddenSet)) return [];
+			const source = normalizeDataSourceConfig(config.dataSource);
+			const values = getResolveValues(rows, field);
+			return source && values.length > 0 ? [{
+				field,
+				values,
+				source
+			}] : [];
+		});
+	}, [
+		fields,
+		hiddenColumns,
+		rows
+	]);
+	react.useEffect(() => {
+		const requestVersion = requestVersionRef.current + 1;
+		requestVersionRef.current = requestVersion;
+		if (sourceEntries.length === 0) {
+			setOptionsByField({});
+			return;
+		}
+		let cancelled = false;
+		const activeFields = new Set(sourceEntries.map(({ field }) => field));
+		const readCachedOptions = (entry, records) => mergeFilterOptions(void 0, records.flatMap((record) => {
+			const option = cacheRef.current.get(resolveRecordCacheKey(entry.source.key, entry.field, record));
+			return option ? [option] : [];
+		}));
+		const recordsByField = new Map(sourceEntries.flatMap((sourceEntry) => {
+			const entry = dataSources.get(sourceEntry.source.key);
+			if (!entry) return [];
+			return [[sourceEntry.field, buildResolveRecords(rows, sourceEntry.field, sourceEntry.values, resolveExtraFields(entry, sourceEntry.field))]];
+		}));
+		const readSourceEntryCachedOptions = (entry) => {
+			return readCachedOptions(entry, recordsByField.get(entry.field) ?? []);
+		};
+		const findOptionForRecord = (options, field, record) => {
+			const value = String(record[field]);
+			return options.find((option) => option.value === value);
+		};
+		const missingRecordsFor = (entry, records) => records.filter((record) => !cacheRef.current.has(resolveRecordCacheKey(entry.source.key, entry.field, record)));
+		setOptionsByField((current) => {
+			const next = {};
+			for (const entry of sourceEntries) {
+				const cached = readSourceEntryCachedOptions(entry);
+				if (cached.length > 0) next[entry.field] = cached;
+			}
+			for (const [field, options] of Object.entries(current)) if (activeFields.has(field) && !next[field]) next[field] = options;
+			return next;
+		});
+		for (const sourceEntry of sourceEntries) {
+			const entry = dataSources.get(sourceEntry.source.key);
+			if (!entry) continue;
+			const missingRecords = missingRecordsFor(sourceEntry, recordsByField.get(sourceEntry.field) ?? []);
+			if (missingRecords.length === 0) continue;
+			Promise.resolve(entry.load({
+				field: sourceEntry.field,
+				type: "resolve",
+				values: missingRecords
+			})).then((result) => {
+				if (cancelled || requestVersionRef.current !== requestVersion) return;
+				const options = normalizeOptions(result);
+				for (const record of missingRecords) {
+					const option = findOptionForRecord(options, sourceEntry.field, record);
+					if (!option) continue;
+					cacheRef.current.set(resolveRecordCacheKey(sourceEntry.source.key, sourceEntry.field, record), option);
+				}
+				const cached = readSourceEntryCachedOptions(sourceEntry);
+				setOptionsByField((current) => ({
+					...current,
+					[sourceEntry.field]: cached
+				}));
+			}, (error) => {
+				if (cancelled || requestVersionRef.current !== requestVersion) return;
+				console.warn(`[AutoCrud] Failed to resolve data source "${sourceEntry.source.key}".`, error);
+			});
+		}
+		return () => {
+			cancelled = true;
+		};
+	}, [
+		registryVersion,
+		rows,
+		sourceEntries
+	]);
+	return { optionsByField };
+}
 function getOptionLabel(value, options) {
 	const stringValue = String(value);
 	return options?.find((option) => option.value === stringValue)?.label ?? stringValue;
@@ -6150,7 +6344,7 @@ function getOptionLabel(value, options) {
 * 从统一配置生成表格 overrides
 * 当 filter 配置存在时，合并到 meta 中（不影响列隐藏）
 */
-function buildTableOverrides(fields, legacyOverrides, dynamicFilterState) {
+function buildTableOverrides(fields, legacyOverrides, dynamicFilterState, dynamicResolveState) {
 	const result = { ...legacyOverrides };
 	if (fields) for (const [key, config] of Object.entries(fields)) {
 		const fieldOptions = normalizeFieldOptions(config.enum);
@@ -6158,7 +6352,8 @@ function buildTableOverrides(fields, legacyOverrides, dynamicFilterState) {
 		const filterDataSourceRegistered = dynamicFilterState?.registeredByField[key];
 		const filterDataSourceSearchable = dynamicFilterState?.searchableByField[key];
 		const currentDynamicOptions = !fieldOptions && filterDataSourceRegistered ? toTableOptions(dynamicFilterState?.optionsByField[key] ?? []) : void 0;
-		const dynamicOptions = !fieldOptions && filterDataSourceRegistered ? toTableOptions(dynamicFilterState?.labelOptionsByField[key] ?? dynamicFilterState?.optionsByField[key] ?? []) : void 0;
+		const mergedDynamicOptions = mergeFieldOptions(!fieldOptions && filterDataSourceRegistered ? dynamicFilterState?.labelOptionsByField[key] ?? dynamicFilterState?.optionsByField[key] ?? [] : void 0, !fieldOptions ? dynamicResolveState?.optionsByField[key] : void 0);
+		const dynamicOptions = !fieldOptions && mergedDynamicOptions ? toTableOptions(mergedDynamicOptions) : void 0;
 		const tableMeta = config.table !== false && typeof config.table === "object" ? config.table.meta : void 0;
 		const fieldEnumMeta = tableOptions ? {
 			options: tableOptions,
@@ -6166,18 +6361,20 @@ function buildTableOverrides(fields, legacyOverrides, dynamicFilterState) {
 		} : void 0;
 		const fieldDataSourceMeta = dynamicOptions ? {
 			options: dynamicOptions,
-			autoCrudFilterOptions: currentDynamicOptions ?? dynamicOptions,
-			autoCrudFilterHasMore: dynamicFilterState?.hasMoreByField[key] ?? false,
-			autoCrudFilterLoading: dynamicFilterState?.loadingByField[key] ?? false,
-			autoCrudFilterOnPopupScroll: (event) => {
-				if (!isNearPopupScrollBottom(event.currentTarget)) return;
-				dynamicFilterState?.loadMore(key);
-			},
-			variant: "multiSelect",
-			...filterDataSourceSearchable ? {
-				autoCrudFilterSearchValue: dynamicFilterState?.searchValues[key] ?? "",
-				autoCrudFilterOnSearch: (value) => dynamicFilterState?.setSearchValue(key, value),
-				autoCrudFilterShouldFilter: false
+			...filterDataSourceRegistered ? {
+				autoCrudFilterOptions: currentDynamicOptions ?? dynamicOptions,
+				autoCrudFilterHasMore: dynamicFilterState?.hasMoreByField[key] ?? false,
+				autoCrudFilterLoading: dynamicFilterState?.loadingByField[key] ?? false,
+				autoCrudFilterOnPopupScroll: (event) => {
+					if (!isNearPopupScrollBottom(event.currentTarget)) return;
+					dynamicFilterState?.loadMore(key);
+				},
+				variant: "multiSelect",
+				...filterDataSourceSearchable ? {
+					autoCrudFilterSearchValue: dynamicFilterState?.searchValues[key] ?? "",
+					autoCrudFilterOnSearch: (value) => dynamicFilterState?.setSearchValue(key, value),
+					autoCrudFilterShouldFilter: false
+				} : void 0
 			} : void 0
 		} : void 0;
 		let filterMeta;
@@ -6232,10 +6429,18 @@ function buildTableOverrides(fields, legacyOverrides, dynamicFilterState) {
 /**
 * 从统一配置生成隐藏列列表
 */
-function buildHiddenColumns(fields, legacyHidden, denyFields) {
-	const hidden = new Set([...legacyHidden ?? [], ...denyFields ?? []]);
-	if (fields) {
-		for (const [key, config] of Object.entries(fields)) if (config.hidden) hidden.add(key);
+function buildHiddenColumns(fields, legacyHidden, denyFields, legacyOverrides) {
+	const legacyHiddenSet = new Set(legacyHidden ?? []);
+	const denySet = new Set(denyFields ?? []);
+	const hidden = new Set([
+		...DEFAULT_HIDDEN_AUDIT_FIELDS,
+		...legacyHiddenSet,
+		...denySet
+	]);
+	for (const key of DEFAULT_HIDDEN_AUDIT_FIELDS) if (!legacyHiddenSet.has(key) && !denySet.has(key) && isTableOverrideExplicitlyVisible(legacyOverrides?.[key])) hidden.delete(key);
+	if (fields) for (const [key, config] of Object.entries(fields)) {
+		if (isDefaultHiddenAuditField(key) && !legacyHiddenSet.has(key) && !denySet.has(key) && isFieldTableExplicitlyVisible(config)) hidden.delete(key);
+		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);
 	}
@@ -6339,7 +6544,10 @@ function ViewModal({ open, onOpenChange, variant, data, schema, fields: fieldCon
 		className: "grid gap-4 py-4",
 		children: Object.entries(shape).filter(([key]) => {
 			if (denySet.has(key)) return false;
-			return !(fieldConfig?.[key])?.hidden;
+			const config = fieldConfig?.[key];
+			if (config?.hidden) return false;
+			if (isDefaultHiddenAuditField(key) && !isFieldTableExplicitlyVisible(config)) return false;
+			return true;
 		}).map(([key, fieldSchema]) => {
 			const parsed = parseZodField(fieldSchema);
 			const label = fieldConfig?.[key]?.label ?? humanize(key);
@@ -6495,6 +6703,14 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 	const [exporting, setExporting] = react.useState(false);
 	const getSelectedRowsRef = react.useRef(null);
 	const dynamicFilterOptions = useDynamicFilterOptions(resolvedFields);
+	const hiddenColumns = react.useMemo(() => buildHiddenColumns(resolvedFields, tableConfig?.hidden, denyFields, tableConfig?.overrides), [
+		resolvedFields,
+		tableConfig?.hidden,
+		denyFields,
+		tableConfig?.overrides
+	]);
+	const dynamicResolveOptions = useDynamicResolveOptions(resolvedFields, resource.tableData.data, hiddenColumns);
+	const dynamicOptionsByField = react.useMemo(() => mergeOptionsByField(dynamicFilterOptions.labelOptionsByField, dynamicResolveOptions.optionsByField), [dynamicFilterOptions.labelOptionsByField, dynamicResolveOptions.optionsByField]);
 	const resourceIdKey = resource.idKey ?? "id";
 	const actionRegistryVersion = useCrudActionsVersion();
 	const unifiedActions = react.useMemo(() => {
@@ -6528,31 +6744,13 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 	const handleSelectedRowsChange = react.useCallback((rows) => {
 		setSelectedRows((currentRows) => haveSameRowSelection(currentRows, rows, resourceIdKey) ? currentRows : rows);
 	}, [resourceIdKey]);
-	const ownerCreateAction = react.useMemo(() => readCreateAction(ownerToolbarActions), [ownerToolbarActions]);
-	const toolbarOpenCreate = can.create ? ownerCreateAction?.onClick ?? onCreate ?? resource.handlers.openCreate : void 0;
-	const toolbarContext = react.useMemo(() => ({
-		crudId: id ?? "",
-		idKey: resourceIdKey,
-		rowIds,
-		selectedRowIds,
-		selectedCount,
-		isRefreshing: resource.tableData.isFetching,
-		...resource.handlers.refresh ? { refresh: resource.handlers.refresh } : {},
-		...toolbarOpenCreate ? { openCreate: toolbarOpenCreate } : {}
-	}), [
-		id,
-		resourceIdKey,
-		rowIds,
-		selectedRowIds,
-		selectedCount,
-		resource.handlers.refresh,
-		resource.tableData.isFetching,
-		toolbarOpenCreate
-	]);
-	const resolvedToolbarActions = resolveToolbarActionsWithResolver(id, registryToolbarActions, toolbarContext);
+	const ownerRefreshAction = react.useMemo(() => readToolbarAction(ownerToolbarActions, "refresh"), [ownerToolbarActions]);
+	const ownerImportAction = react.useMemo(() => readToolbarAction(ownerToolbarActions, "import"), [ownerToolbarActions]);
+	const ownerExportAction = react.useMemo(() => readToolbarAction(ownerToolbarActions, "export"), [ownerToolbarActions]);
+	const ownerCreateAction = react.useMemo(() => readToolbarAction(ownerToolbarActions, "create"), [ownerToolbarActions]);
 	const importColumns = react.useMemo(() => {
 		const shape = resolvedSchema.shape;
-		const denySet = new Set(denyFields ?? []);
+		const denySet = new Set([...DEFAULT_IMPORT_MANAGED_FIELDS, ...denyFields ?? []]);
 		return Object.keys(shape).filter((key) => !denySet.has(key));
 	}, [resolvedSchema, denyFields]);
 	const handleExport = react.useCallback(async (mode) => {
@@ -6586,21 +6784,75 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 			setExporting(false);
 		}
 	}, [selectedCount, handleExport]);
-	const tableOverrides = react.useMemo(() => buildTableOverrides(resolvedFields, tableConfig?.overrides, dynamicFilterOptions), [
+	const toolbarRefresh = react.useMemo(() => {
+		const refresh = ownerRefreshAction?.onClick ?? resource.handlers.refresh;
+		if (!refresh) return void 0;
+		return async () => refresh();
+	}, [ownerRefreshAction?.onClick, resource.handlers.refresh]);
+	const toolbarOpenImport = react.useMemo(() => {
+		if (!canImport) return void 0;
+		return ownerImportAction?.onClick ?? (() => setImportOpen(true));
+	}, [canImport, ownerImportAction?.onClick]);
+	const toolbarExportData = react.useMemo(() => {
+		if (!canExport) return void 0;
+		const exportData = ownerExportAction?.onClick ?? handleExportClick;
+		return async () => exportData();
+	}, [
+		canExport,
+		handleExportClick,
+		ownerExportAction?.onClick
+	]);
+	const toolbarOpenCreate = react.useMemo(() => {
+		if (!can.create) return void 0;
+		return ownerCreateAction?.onClick ?? onCreate ?? resource.handlers.openCreate;
+	}, [
+		can.create,
+		onCreate,
+		ownerCreateAction?.onClick,
+		resource.handlers.openCreate
+	]);
+	const toolbarContext = react.useMemo(() => ({
+		crudId: id ?? "",
+		idKey: resourceIdKey,
+		rowIds,
+		selectedRowIds,
+		selectedCount,
+		isRefreshing: resource.tableData.isFetching,
+		isExporting: exporting,
+		...toolbarRefresh ? { refresh: toolbarRefresh } : {},
+		...toolbarOpenImport ? { openImport: toolbarOpenImport } : {},
+		...toolbarExportData ? { exportData: toolbarExportData } : {},
+		...toolbarOpenCreate ? { openCreate: toolbarOpenCreate } : {}
+	}), [
+		id,
+		resourceIdKey,
+		rowIds,
+		selectedRowIds,
+		selectedCount,
+		resource.tableData.isFetching,
+		exporting,
+		toolbarRefresh,
+		toolbarOpenImport,
+		toolbarExportData,
+		toolbarOpenCreate
+	]);
+	const resolvedToolbarActions = resolveToolbarActionsWithResolver(id, registryToolbarActions, toolbarContext);
+	const tableOverrides = react.useMemo(() => buildTableOverrides(resolvedFields, tableConfig?.overrides, dynamicFilterOptions, dynamicResolveOptions), [
 		resolvedFields,
 		tableConfig?.overrides,
-		dynamicFilterOptions
+		dynamicFilterOptions,
+		dynamicResolveOptions
+	]);
+	const defaultSort = react.useMemo(() => resource.defaultSort ?? tableConfig?.defaultSort ?? getDefaultSortingForSchema(resolvedSchema), [
+		resource.defaultSort,
+		resolvedSchema,
+		tableConfig?.defaultSort
 	]);
 	const formOverrides = react.useMemo(() => buildFormOverrides(resolvedFields, formConfig?.overrides, denyFields), [
 		resolvedFields,
 		formConfig?.overrides,
 		denyFields
 	]);
-	const hiddenColumns = react.useMemo(() => buildHiddenColumns(resolvedFields, tableConfig?.hidden, denyFields), [
-		resolvedFields,
-		tableConfig?.hidden,
-		denyFields
-	]);
 	const searchConfig = react.useMemo(() => {
 		const tableSearch = tableConfig?.search;
 		if (tableSearch === false) return false;
@@ -6661,7 +6913,7 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 				children: (() => {
 					const renderBuiltinButton = (type, overrides) => {
 						if (type === "refresh") {
-							const onRefresh = overrides?.onClick ?? resource.handlers.refresh;
+							const onRefresh = overrides?.onClick ?? toolbarRefresh;
 							const label = overrides?.label ?? locale.toolbar.refresh;
 							if (!onRefresh) return null;
 							return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Button, {
@@ -6677,18 +6929,18 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 						if (type === "import" && canImport) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__wordrhyme_shadcn.Button, {
 							variant: "outline",
 							size: "sm",
-							onClick: overrides?.onClick ?? (() => setImportOpen(true)),
+							onClick: overrides?.onClick ?? toolbarOpenImport,
 							children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Download, { className: "mr-2 h-4 w-4" }), overrides?.label ?? locale.toolbar.import]
 						}, "import");
 						if (type === "export" && canExport) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__wordrhyme_shadcn.Button, {
 							variant: "outline",
 							size: "sm",
-							onClick: overrides?.onClick ?? handleExportClick,
+							onClick: overrides?.onClick ?? toolbarExportData,
 							disabled: exporting || selectedCount === 0 && !resource.handlers.export,
 							children: [exporting ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Loader2, { className: "mr-2 h-4 w-4 animate-spin" }) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Upload, { className: "mr-2 h-4 w-4" }), overrides?.label ?? (selectedCount > 0 ? locale.toolbar.exportSelected(selectedCount) : locale.toolbar.export)]
 						}, "export");
 						if (type === "create" && can.create) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Button, {
-							onClick: overrides?.onClick ?? onCreate ?? resource.handlers.openCreate,
+							onClick: overrides?.onClick ?? toolbarOpenCreate,
 							children: overrides?.label ?? locale.toolbar.create
 						}, "create");
 						return null;
@@ -6747,7 +6999,7 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 				deleteConfirmation: locale.bulkDeleteModal,
 				enableExport: canExport,
 				showDefaultExport: false,
-				initialSorting: tableConfig?.defaultSort,
+				initialSorting: defaultSort,
 				onSelectedRowsChange: handleSelectedRowsChange,
 				getSelectedRows: getSelectedRowsRef
 			}),
@@ -6776,7 +7028,7 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 				data: resource.modal.selected,
 				schema: resolvedSchema,
 				fields: resolvedFields,
-				dynamicOptions: dynamicFilterOptions.optionsByField,
+				dynamicOptions: dynamicOptionsByField,
 				denyFields,
 				locale
 			}),
@@ -7549,7 +7801,7 @@ function modalReducer(state, action$1) {
 * Hook 主函数
 */
 function useAutoCrudResource({ router, schema, query: queryTransform, options = {} }) {
-	const { idKey = "id", defaultVariant = "dialog", hooks, toast: toastAdapter, exportFetcher } = options;
+	const { idKey = "id", defaultVariant = "dialog", hooks, toast: toastAdapter, exportFetcher, defaultSort: defaultSortOption } = options;
 	const toast = (0, react.useMemo)(() => toastAdapter === false ? noopToastAdapter : toastAdapter ?? defaultToastAdapter, [toastAdapter]);
 	const hooksRef = (0, react.useRef)(hooks);
 	(0, react.useEffect)(() => {
@@ -7557,12 +7809,13 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 	}, [hooks]);
 	const metadata = (router.meta?.useQuery(void 0, { staleTime: 3e4 }))?.data;
 	const resolvedSchema = (0, react.useMemo)(() => mergeMetadataSchema(schema, metadata?.schema), [schema, metadata?.schema]);
+	const defaultSorting = (0, react.useMemo)(() => defaultSortOption === false ? [] : defaultSortOption ?? getDefaultSortingForSchema(resolvedSchema), [defaultSortOption, resolvedSchema]);
 	const metadataFields = (0, react.useMemo)(() => readMetadataFields(metadata?.fields), [metadata?.fields]);
 	const columns = (0, react.useMemo)(() => createTableSchema(resolvedSchema), [resolvedSchema]);
 	const [urlParams] = useQueryStates({
 		page: parseAsInteger.withDefault(1),
 		perPage: parseAsInteger.withDefault(10),
-		sort: getSortingStateParser().withDefault([]),
+		sort: getSortingStateParser().withDefault(defaultSorting),
 		joinOperator: parseAsStringEnum(["and", "or"]).withDefault("and"),
 		search: parseAsString.withDefault("")
 	}, { shallow: false });
@@ -7850,6 +8103,7 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 		},
 		schema: resolvedSchema,
 		fields: metadataFields,
+		defaultSort: defaultSorting,
 		modal,
 		mutations: {
 			isCreating: createMutation.isPending,