@wordrhyme/auto-crud 1.3.8 → 1.3.9

package/README.md

@@ -546,11 +546,11 @@ table={{
 
 `toolbar` 数组控制页面顶部右侧工具栏的按钮，设计思路完全对齐行操作 `actions`。旧 prop `toolbarActions` 仍兼容读取，但新代码请使用 `toolbar`。
 
-内置操作类型：`create`（新建）、`import`（导入）、`export`（导出）。
+内置操作类型：`refresh`（刷新）、`create`（新建）、`import`（导入）、`export`（导出）。
 
 ### 只添加自定义按钮（内置保持默认）
 
-只传 `type: "custom"` 项时，所有内置按钮（导入、导出、新建）保持原样，custom 项按 `position` 插入首部或尾部。
+只传 `type: "custom"` 项时，所有内置按钮（刷新、导入、导出、新建）保持原样，custom 项按 `position` 插入首部或尾部。
 
 ```tsx
 <AutoCrudTable
@@ -563,7 +563,7 @@ table={{
     { type: 'custom', component: <Button variant="outline">批量标签</Button> }, // 默认 position: "end"
   ]}
 />
-// 渲染顺序: 分类管理 · [导入] · [导出] · [新建] · 批量标签
+// 渲染顺序: 分类管理 · [刷新] · [导入] · [导出] · [新建] · 批量标签
 ```
 
 ### 调整内置按钮顺序
@@ -669,7 +669,7 @@ table={{
 
 ```tsx
 <AutoCrudTable
-  // defaults 即内置三个按钮的信息，在此数组里你可以随意 map、过滤或插值
+  // defaults 即内置按钮的信息，在此数组里你可以随意 map、过滤或插值
   toolbar={(defaults) =>
     defaults.map((btn) =>
       btn.type === 'create'
@@ -697,7 +697,7 @@ type ToolbarActionConfig =
   | ((defaults: ToolbarBuiltinActionItem[]) => ToolbarActionItem[]);
 
 type ToolbarBuiltinActionItem = ActionMeta & {
-  type: 'create' | 'import' | 'export';
+  type: 'refresh' | 'create' | 'import' | 'export';
   onClick?: () => void; // 覆盖默认行为
   label?: string; // 覆盖默认文案
   component?: React.ReactNode | ((context: AutoCrudToolbarContext) => React.ReactNode);
@@ -715,10 +715,34 @@ interface AutoCrudToolbarContext {
   rowIds: string[];
   selectedRowIds: string[];
   selectedCount: number;
+  refresh?: () => Promise<unknown>;
+  openImport?: () => void;
+  exportData?: () => Promise<void>;
   openCreate?: () => void;
+  isRefreshing: boolean;
+  isExporting: boolean;
 }
 ```
 
+`AutoCrudToolbarContext` 是工具栏自定义组件的正式 command contract。自定义按钮需要复用 AutoCrud 内置能力时，直接调用 context 中的命令，不要绕过内部状态重新实现。
+
+例如业务侧希望把默认“新建”按钮替换成“手动创建”，可以替换 `type: "create"` 的组件并调用 `openCreate`：
+
+```tsx
+<AutoCrudTable
+  toolbar={[
+    {
+      type: 'create',
+      component: ({ openCreate }) => (
+        <Button onClick={() => openCreate?.()}>手动创建</Button>
+      ),
+    },
+  ]}
+/>
+```
+
+这里“手动创建”只是业务按钮文案，不是新的 AutoCrud 流程；它仍然打开 AutoCrud 原生的新建弹窗。`openCreate`、`openImport`、`exportData` 会按对应权限和能力可选暴露，扩展方应使用 `?.()` 或自行控制 disabled 状态。
+
 ### 工具栏扩展 Resolver
 
 宿主应用可以通过 `setToolbarResolver` 为指定 CRUD 注入额外工具栏动作。resolver 是普通纯函数，不是 React Hook；不要在 resolver 内调用 `useRouter`、`useMemo` 等 React Hooks。

package/dist/index.cjs

@@ -4365,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
 	};
 }
@@ -4599,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
@@ -5889,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;
@@ -5964,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]);
@@ -6085,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
@@ -6179,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;
@@ -6187,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);
@@ -6195,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,
@@ -6203,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;
@@ -6543,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(() => {
@@ -6576,28 +6744,10 @@ 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([...DEFAULT_IMPORT_MANAGED_FIELDS, ...denyFields ?? []]);
@@ -6634,10 +6784,64 @@ 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,
@@ -6649,12 +6853,6 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 		formConfig?.overrides,
 		denyFields
 	]);
-	const hiddenColumns = react.useMemo(() => buildHiddenColumns(resolvedFields, tableConfig?.hidden, denyFields, tableConfig?.overrides), [
-		resolvedFields,
-		tableConfig?.hidden,
-		denyFields,
-		tableConfig?.overrides
-	]);
 	const searchConfig = react.useMemo(() => {
 		const tableSearch = tableConfig?.search;
 		if (tableSearch === false) return false;
@@ -6715,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, {
@@ -6731,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;
@@ -6830,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
 			}),

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime5 from "react/jsx-runtime";
+import * as react_jsx_runtime3 from "react/jsx-runtime";
 import { z } from "zod";
 import { JsonSchemaFormScope } from "@wordrhyme/formily-shadcn";
 import * as _tanstack_react_table0 from "@tanstack/react-table";
@@ -395,7 +395,7 @@ declare function AutoTableActionBar<TData>({
   extraActions,
   actions,
   deleteConfirmation
-}: AutoTableActionBarProps<TData>): react_jsx_runtime5.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -571,7 +571,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   onSelectedCountChange,
   onSelectedRowsChange,
   getSelectedRows
-}: AutoTableProps<T>): react_jsx_runtime5.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/i18n/locale.d.ts
 /**
@@ -684,12 +684,19 @@ type AutoCrudOption = {
   count?: number;
   disabled?: boolean;
 };
+type AutoCrudDataSourceContextType = 'form' | 'filter' | 'resolve';
+type AutoCrudDataSourceResolveFields = readonly string[] | ((context: {
+  field: string;
+}) => readonly string[]);
 type AutoCrudDataSourceContext = {
   field: string;
+  type: AutoCrudDataSourceContextType;
   page?: number;
   pageSize?: number;
+  query?: string;
+  /** @deprecated Use `query` instead. */
   search?: string;
-  values?: Record<string, unknown>;
+  values?: Record<string, unknown> | Record<string, unknown>[];
   signal?: AbortSignal;
 };
 type AutoCrudDataSourceResult = AutoCrudOption[] | {
@@ -705,6 +712,7 @@ type AutoCrudDataSourceRegistration = AutoCrudDataSourceLoader | {
   debounceMs?: number;
   loadMore?: boolean;
   pageSize?: number;
+  resolveFields?: AutoCrudDataSourceResolveFields;
   load: AutoCrudDataSourceLoader;
 };
 type AutoCrudDataSourceEntry = {
@@ -714,6 +722,7 @@ type AutoCrudDataSourceEntry = {
   debounceMs: number;
   loadMore: boolean;
   pageSize: number;
+  resolveFields?: AutoCrudDataSourceResolveFields;
   load: AutoCrudDataSourceLoader;
 };
 type RegistryListener$1 = () => void;
@@ -915,8 +924,11 @@ interface AutoCrudToolbarContext {
   selectedRowIds: string[];
   selectedCount: number;
   refresh?: () => Promise<unknown>;
-  isRefreshing: boolean;
+  openImport?: () => void;
+  exportData?: () => Promise<void>;
   openCreate?: () => void;
+  isRefreshing: boolean;
+  isExporting: boolean;
 }
 type AutoCrudToolbarResolver = (targetId: string, ownerActions: readonly ToolbarActionItem[], context: AutoCrudToolbarContext) => ToolbarActionItem[];
 declare function setToolbarResolver(resolver: AutoCrudToolbarResolver | null): void;
@@ -1051,7 +1063,7 @@ declare function AutoCrudTable<TSchema extends z.ZodObject<z.ZodRawShape>>({
   toolbarActions,
   locale: localeProp,
   onCreate
-}: AutoCrudTableProps<TSchema>): react_jsx_runtime5.JSX.Element;
+}: AutoCrudTableProps<TSchema>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/auto-form.d.ts
 interface AutoFormProps<T extends z.ZodObject<z.ZodRawShape>> {
@@ -1090,7 +1102,7 @@ declare function AutoFormInner<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   showSubmitButton
-}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime5.JSX.Element;
+}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime3.JSX.Element;
 declare const AutoForm: <T extends z.ZodObject<z.ZodRawShape>>(props: AutoFormProps<T> & {
   ref?: React.Ref<AutoFormRef>;
 }) => ReturnType<typeof AutoFormInner>;
@@ -1406,7 +1418,7 @@ declare function AutoTableSimpleFilters<TData>({
   filters: externalFilters,
   onFiltersChange,
   leading
-}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime5.JSX.Element | null;
+}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime3.JSX.Element | null;
 //#endregion
 //#region src/components/auto-crud/form-modal.d.ts
 type ModalVariant = "dialog" | "sheet";
@@ -1450,7 +1462,7 @@ declare function CrudFormModal<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   className
-}: CrudFormModalProps<T>): react_jsx_runtime5.JSX.Element;
+}: CrudFormModalProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/import-dialog.d.ts
 interface ImportDialogProps {
@@ -1472,7 +1484,7 @@ declare function ImportDialog({
   columns,
   title,
   locale
-}: ImportDialogProps): react_jsx_runtime5.JSX.Element;
+}: ImportDialogProps): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/export-dialog.d.ts
 type ExportMode = "selected" | "filtered";
@@ -1492,7 +1504,7 @@ declare function ExportDialog({
   selectedCount,
   onExport,
   canExportFiltered
-}: ExportDialogProps): react_jsx_runtime5.JSX.Element;
+}: ExportDialogProps): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table.d.ts
 interface DataTableProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1505,7 +1517,7 @@ declare function DataTable<TData>({
   children,
   className,
   ...props
-}: DataTableProps<TData>): react_jsx_runtime5.JSX.Element;
+}: DataTableProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-advanced-toolbar.d.ts
 interface DataTableAdvancedToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1516,7 +1528,7 @@ declare function DataTableAdvancedToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime5.JSX.Element;
+}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-column-header.d.ts
 interface DataTableColumnHeaderProps<TData, TValue> extends React.ComponentProps<typeof DropdownMenuTrigger> {
@@ -1528,7 +1540,7 @@ declare function DataTableColumnHeader<TData, TValue>({
   label,
   className,
   ...props
-}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime5.JSX.Element;
+}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-faceted-filter.d.ts
 interface DataTableFacetedFilterProps<TData, TValue> {
@@ -1542,7 +1554,7 @@ declare function DataTableFacetedFilter<TData, TValue>({
   title,
   options,
   multiple
-}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime5.JSX.Element;
+}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-pagination.d.ts
 interface DataTablePaginationProps<TData> extends React.ComponentProps<"div"> {
@@ -1554,7 +1566,7 @@ declare function DataTablePagination<TData>({
   pageSizeOptions,
   className,
   ...props
-}: DataTablePaginationProps<TData>): react_jsx_runtime5.JSX.Element;
+}: DataTablePaginationProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-toolbar.d.ts
 interface DataTableToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1565,7 +1577,7 @@ declare function DataTableToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableToolbarProps<TData>): react_jsx_runtime5.JSX.Element;
+}: DataTableToolbarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-view-options.d.ts
 interface DataTableViewOptionsProps<TData> extends React$1.ComponentProps<typeof PopoverContent> {
@@ -1576,7 +1588,7 @@ declare function DataTableViewOptions<TData>({
   table,
   disabled,
   ...props
-}: DataTableViewOptionsProps<TData>): react_jsx_runtime5.JSX.Element;
+}: DataTableViewOptionsProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/lib/crud-actions.d.ts
 type CrudActionZone = 'toolbar' | 'row' | 'batch';

package/dist/index.d.ts

@@ -3,7 +3,7 @@ import * as _tanstack_react_table0 from "@tanstack/react-table";
 import { Column, ColumnDef, ColumnSort, Row, RowData, Table, TableOptions, TableState } from "@tanstack/react-table";
 import { DropdownMenuTrigger, PopoverContent } from "@wordrhyme/shadcn";
 import { ClassValue } from "clsx";
-import * as react_jsx_runtime2 from "react/jsx-runtime";
+import * as react_jsx_runtime5 from "react/jsx-runtime";
 import { MultiCombobox, MultiComboboxOption, MultiComboboxProps, MultiComboboxTriggerRenderProps, Select, SelectMode, SelectOption, SelectProps, SelectSearchableDynamicProps, SelectSearchableMultipleProps, SelectSearchableProps, SelectSearchableSingleProps, SelectSimpleProps, SelectTriggerRenderProps } from "@wordrhyme/shadcn-ui";
 import { z } from "zod";
 import { JsonSchemaFormScope } from "@wordrhyme/formily-shadcn";
@@ -395,7 +395,7 @@ declare function AutoTableActionBar<TData>({
   extraActions,
   actions,
   deleteConfirmation
-}: AutoTableActionBarProps<TData>): react_jsx_runtime2.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -571,7 +571,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   onSelectedCountChange,
   onSelectedRowsChange,
   getSelectedRows
-}: AutoTableProps<T>): react_jsx_runtime2.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/i18n/locale.d.ts
 /**
@@ -684,12 +684,19 @@ type AutoCrudOption = {
   count?: number;
   disabled?: boolean;
 };
+type AutoCrudDataSourceContextType = 'form' | 'filter' | 'resolve';
+type AutoCrudDataSourceResolveFields = readonly string[] | ((context: {
+  field: string;
+}) => readonly string[]);
 type AutoCrudDataSourceContext = {
   field: string;
+  type: AutoCrudDataSourceContextType;
   page?: number;
   pageSize?: number;
+  query?: string;
+  /** @deprecated Use `query` instead. */
   search?: string;
-  values?: Record<string, unknown>;
+  values?: Record<string, unknown> | Record<string, unknown>[];
   signal?: AbortSignal;
 };
 type AutoCrudDataSourceResult = AutoCrudOption[] | {
@@ -705,6 +712,7 @@ type AutoCrudDataSourceRegistration = AutoCrudDataSourceLoader | {
   debounceMs?: number;
   loadMore?: boolean;
   pageSize?: number;
+  resolveFields?: AutoCrudDataSourceResolveFields;
   load: AutoCrudDataSourceLoader;
 };
 type AutoCrudDataSourceEntry = {
@@ -714,6 +722,7 @@ type AutoCrudDataSourceEntry = {
   debounceMs: number;
   loadMore: boolean;
   pageSize: number;
+  resolveFields?: AutoCrudDataSourceResolveFields;
   load: AutoCrudDataSourceLoader;
 };
 type RegistryListener$1 = () => void;
@@ -915,8 +924,11 @@ interface AutoCrudToolbarContext {
   selectedRowIds: string[];
   selectedCount: number;
   refresh?: () => Promise<unknown>;
-  isRefreshing: boolean;
+  openImport?: () => void;
+  exportData?: () => Promise<void>;
   openCreate?: () => void;
+  isRefreshing: boolean;
+  isExporting: boolean;
 }
 type AutoCrudToolbarResolver = (targetId: string, ownerActions: readonly ToolbarActionItem[], context: AutoCrudToolbarContext) => ToolbarActionItem[];
 declare function setToolbarResolver(resolver: AutoCrudToolbarResolver | null): void;
@@ -1051,7 +1063,7 @@ declare function AutoCrudTable<TSchema extends z.ZodObject<z.ZodRawShape>>({
   toolbarActions,
   locale: localeProp,
   onCreate
-}: AutoCrudTableProps<TSchema>): react_jsx_runtime2.JSX.Element;
+}: AutoCrudTableProps<TSchema>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/auto-form.d.ts
 interface AutoFormProps<T extends z.ZodObject<z.ZodRawShape>> {
@@ -1090,7 +1102,7 @@ declare function AutoFormInner<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   showSubmitButton
-}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime2.JSX.Element;
+}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime5.JSX.Element;
 declare const AutoForm: <T extends z.ZodObject<z.ZodRawShape>>(props: AutoFormProps<T> & {
   ref?: React.Ref<AutoFormRef>;
 }) => ReturnType<typeof AutoFormInner>;
@@ -1406,7 +1418,7 @@ declare function AutoTableSimpleFilters<TData>({
   filters: externalFilters,
   onFiltersChange,
   leading
-}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime2.JSX.Element | null;
+}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime5.JSX.Element | null;
 //#endregion
 //#region src/components/auto-crud/form-modal.d.ts
 type ModalVariant = "dialog" | "sheet";
@@ -1450,7 +1462,7 @@ declare function CrudFormModal<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   className
-}: CrudFormModalProps<T>): react_jsx_runtime2.JSX.Element;
+}: CrudFormModalProps<T>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/import-dialog.d.ts
 interface ImportDialogProps {
@@ -1472,7 +1484,7 @@ declare function ImportDialog({
   columns,
   title,
   locale
-}: ImportDialogProps): react_jsx_runtime2.JSX.Element;
+}: ImportDialogProps): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/export-dialog.d.ts
 type ExportMode = "selected" | "filtered";
@@ -1492,7 +1504,7 @@ declare function ExportDialog({
   selectedCount,
   onExport,
   canExportFiltered
-}: ExportDialogProps): react_jsx_runtime2.JSX.Element;
+}: ExportDialogProps): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table.d.ts
 interface DataTableProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1505,7 +1517,7 @@ declare function DataTable<TData>({
   children,
   className,
   ...props
-}: DataTableProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTableProps<TData>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-advanced-toolbar.d.ts
 interface DataTableAdvancedToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1516,7 +1528,7 @@ declare function DataTableAdvancedToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-column-header.d.ts
 interface DataTableColumnHeaderProps<TData, TValue> extends React.ComponentProps<typeof DropdownMenuTrigger> {
@@ -1528,7 +1540,7 @@ declare function DataTableColumnHeader<TData, TValue>({
   label,
   className,
   ...props
-}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime2.JSX.Element;
+}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-faceted-filter.d.ts
 interface DataTableFacetedFilterProps<TData, TValue> {
@@ -1542,7 +1554,7 @@ declare function DataTableFacetedFilter<TData, TValue>({
   title,
   options,
   multiple
-}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime2.JSX.Element;
+}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-pagination.d.ts
 interface DataTablePaginationProps<TData> extends React.ComponentProps<"div"> {
@@ -1554,7 +1566,7 @@ declare function DataTablePagination<TData>({
   pageSizeOptions,
   className,
   ...props
-}: DataTablePaginationProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTablePaginationProps<TData>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-toolbar.d.ts
 interface DataTableToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1565,7 +1577,7 @@ declare function DataTableToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableToolbarProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTableToolbarProps<TData>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-view-options.d.ts
 interface DataTableViewOptionsProps<TData> extends React$1.ComponentProps<typeof PopoverContent> {
@@ -1576,7 +1588,7 @@ declare function DataTableViewOptions<TData>({
   table,
   disabled,
   ...props
-}: DataTableViewOptionsProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTableViewOptionsProps<TData>): react_jsx_runtime5.JSX.Element;
 //#endregion
 //#region src/lib/crud-actions.d.ts
 type CrudActionZone = 'toolbar' | 'row' | 'batch';

package/dist/index.js

@@ -4328,6 +4328,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
 	};
 }
@@ -4562,8 +4563,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
@@ -5852,8 +5855,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 +5930,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 +6092,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 +6188,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 +6307,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 +6315,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 +6324,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;
@@ -6506,6 +6666,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(() => {
@@ -6539,28 +6707,10 @@ 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([...DEFAULT_IMPORT_MANAGED_FIELDS, ...denyFields ?? []]);
@@ -6597,10 +6747,64 @@ 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,
@@ -6612,12 +6816,6 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 		formConfig?.overrides,
 		denyFields
 	]);
-	const hiddenColumns = React.useMemo(() => buildHiddenColumns(resolvedFields, tableConfig?.hidden, denyFields, tableConfig?.overrides), [
-		resolvedFields,
-		tableConfig?.hidden,
-		denyFields,
-		tableConfig?.overrides
-	]);
 	const searchConfig = React.useMemo(() => {
 		const tableSearch = tableConfig?.search;
 		if (tableSearch === false) return false;
@@ -6678,7 +6876,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__ */ jsx(Button, {
@@ -6694,18 +6892,18 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 						if (type === "import" && canImport) return /* @__PURE__ */ jsxs(Button, {
 							variant: "outline",
 							size: "sm",
-							onClick: overrides?.onClick ?? (() => setImportOpen(true)),
+							onClick: overrides?.onClick ?? toolbarOpenImport,
 							children: [/* @__PURE__ */ jsx(Download, { className: "mr-2 h-4 w-4" }), overrides?.label ?? locale.toolbar.import]
 						}, "import");
 						if (type === "export" && canExport) return /* @__PURE__ */ jsxs(Button, {
 							variant: "outline",
 							size: "sm",
-							onClick: overrides?.onClick ?? handleExportClick,
+							onClick: overrides?.onClick ?? toolbarExportData,
 							disabled: exporting || selectedCount === 0 && !resource.handlers.export,
 							children: [exporting ? /* @__PURE__ */ jsx(Loader2, { className: "mr-2 h-4 w-4 animate-spin" }) : /* @__PURE__ */ jsx(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__ */ jsx(Button, {
-							onClick: overrides?.onClick ?? onCreate ?? resource.handlers.openCreate,
+							onClick: overrides?.onClick ?? toolbarOpenCreate,
 							children: overrides?.label ?? locale.toolbar.create
 						}, "create");
 						return null;
@@ -6793,7 +6991,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
 			}),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud",
   "type": "module",
-  "version": "1.3.8",
+  "version": "1.3.9",
   "description": "Schema-first CRUD components with auto-generated tables and forms",
   "author": "wordrhyme",
   "license": "MIT",
@@ -67,6 +67,8 @@
     "@wordrhyme/shadcn-ui": "1.32.4"
   },
   "devDependencies": {
+    "@storybook/react": "^8.6.18",
+    "@storybook/test": "^8.6.18",
     "@tanstack/react-query": "^5.90.15",
     "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
@@ -82,8 +84,8 @@
     "tsdown": "^0.15.12",
     "typescript": "^5.9.3",
     "vitest": "^3.2.4",
-    "@internal/eslint-config": "0.3.0",
     "@internal/prettier-config": "0.0.1",
+    "@internal/eslint-config": "0.3.0",
     "@internal/tsconfig": "0.1.0",
     "@internal/tsdown-config": "0.1.0",
     "@internal/vitest-config": "0.1.0"