@wordrhyme/auto-crud 1.1.8 → 1.2.1

package/dist/index.cjs

@@ -61,6 +61,8 @@ let __formily_react = require("@formily/react");
 __formily_react = __toESM(__formily_react);
 let sonner = require("sonner");
 sonner = __toESM(sonner);
+let __tanstack_react_query = require("@tanstack/react-query");
+__tanstack_react_query = __toESM(__tanstack_react_query);
 
 //#region src/lib/utils.ts
 function cn(...inputs) {
@@ -5173,12 +5175,8 @@ function getComponentProps(type, parsed) {
 function createFormSchema(schema, options) {
 	const shape = schema.shape;
 	const properties = {};
-	const { overrides, exclude = [], layout = "vertical", gridColumns = 1, labelAlign = "top", labelWidth, labelCol, wrapperCol } = options ?? {};
+	const { overrides, exclude = [], layout = "vertical", gridColumns = 1 } = options ?? {};
 	const decoratorProps = { className: "space-y-2" };
-	if (labelAlign) decoratorProps.labelAlign = labelAlign;
-	if (labelWidth) decoratorProps.labelWidth = labelWidth;
-	if (labelCol) decoratorProps.labelCol = labelCol;
-	if (wrapperCol) decoratorProps.wrapperCol = wrapperCol;
 	for (const [key, fieldSchema] of Object.entries(shape)) {
 		if (exclude.includes(key)) continue;
 		const parsed = parseZodField(fieldSchema);
@@ -5235,65 +5233,59 @@ function createEditFormSchema(schema, options) {
 //#endregion
 //#region src/lib/registries.ts
 function createRegistry(label) {
-	const items = /* @__PURE__ */ new Map();
+	const entries = /* @__PURE__ */ new Map();
 	const listeners = /* @__PURE__ */ new Set();
-	let notifyQueued = false;
 	const notify = () => {
-		if (notifyQueued) return;
-		notifyQueued = true;
 		queueMicrotask(() => {
-			notifyQueued = false;
-			listeners.forEach((listener) => listener());
+			for (const listener of listeners) listener();
 		});
 	};
 	return {
 		register(name, value) {
-			const current = items.get(name);
-			if (current === value) return;
-			if (current !== void 0) {
+			if (entries.has(name)) {
 				console.warn(`[AutoCrud] ${label} "${name}" is already registered.`);
 				return;
 			}
-			items.set(name, value);
+			entries.set(name, value);
 			notify();
 		},
 		unregister(name) {
-			if (!items.delete(name)) return;
+			if (!entries.delete(name)) return;
 			notify();
 		},
 		get(name) {
-			return items.get(name);
+			return entries.get(name);
 		},
 		all() {
-			return Object.fromEntries(items);
+			return Object.fromEntries(entries);
 		},
 		subscribe(listener) {
 			listeners.add(listener);
-			return () => {
-				listeners.delete(listener);
-			};
+			return () => listeners.delete(listener);
 		}
 	};
 }
 const formComponents = createRegistry("form component");
 const dataSources = createRegistry("data source");
 function normalizeDataSourceConfig(config) {
-	if (!config) return void 0;
-	if (typeof config === "string") return {
+	if (typeof config === "string") return config.length > 0 ? {
 		key: config,
 		dependsOn: [],
 		resetOnChange: false
-	};
+	} : void 0;
+	if (!config?.key) return void 0;
 	return {
 		key: config.key,
-		dependsOn: config.dependsOn ?? [],
-		resetOnChange: config.resetOnChange ?? false
+		dependsOn: Array.isArray(config.dependsOn) ? config.dependsOn : [],
+		resetOnChange: config.resetOnChange === true
 	};
 }
 function normalizeOptions(result) {
 	const options = Array.isArray(result) ? result : result?.options;
-	if (!options) return [];
-	return options.map((option) => ({
+	if (!Array.isArray(options)) return [];
+	return options.filter((option) => {
+		return typeof option === "object" && option !== null && typeof option.value === "string" && typeof option.label === "string";
+	}).map((option) => ({
 		...option,
 		value: String(option.value)
 	}));
@@ -5347,7 +5339,7 @@ const defaultFieldComponents = {
 		decorator: "FormItem"
 	}
 };
-function useRegistryVersion(subscribe) {
+function useRegistryVersion$1(subscribe) {
 	const [version, setVersion] = (0, react.useState)(0);
 	(0, react.useEffect)(() => subscribe(() => setVersion((current) => current + 1)), [subscribe]);
 	return version;
@@ -5359,13 +5351,15 @@ function isDataSourceConfig(value) {
 }
 function collectDataSourceConfigs(schema, result = {}) {
 	const properties = schema.properties;
-	if (!properties) return result;
+	if (!properties || typeof properties !== "object") return result;
 	for (const [key, property] of Object.entries(properties)) {
-		const customDataSource = property["x-data-source"];
-		const schemaDataSource = property.dataSource;
+		if (!property || typeof property !== "object" || Array.isArray(property)) continue;
+		const record = property;
+		const customDataSource = record["x-data-source"];
+		const schemaDataSource = record.dataSource;
 		const dataSourceConfig = isDataSourceConfig(customDataSource) ? customDataSource : isDataSourceConfig(schemaDataSource) ? schemaDataSource : void 0;
 		if (dataSourceConfig) result[key] = dataSourceConfig;
-		collectDataSourceConfigs(property, result);
+		collectDataSourceConfigs(record, result);
 	}
 	return result;
 }
@@ -5374,7 +5368,7 @@ function useFormDataSources(form, schema) {
 		const sourceEntries = Object.entries(collectDataSourceConfigs(schema)).map(([fieldName, config]) => {
 			const normalized = normalizeDataSourceConfig(config);
 			return normalized ? [fieldName, normalized] : void 0;
-		}).filter(Boolean);
+		}).filter((entry) => entry !== void 0);
 		if (sourceEntries.length === 0) return;
 		let active = true;
 		const effectId = Symbol("autoCrudDataSources");
@@ -5410,14 +5404,12 @@ function useFormDataSources(form, schema) {
 		};
 		for (const [fieldName, source] of sourceEntries) loadFieldOptions(fieldName, source);
 		form.addEffects(effectId, () => {
-			new Set(sourceEntries.flatMap(([, source]) => source.dependsOn)).forEach((dependency) => {
-				(0, __formily_core.onFieldValueChange)(dependency, () => {
-					sourceEntries.forEach(([fieldName, source]) => {
-						if (!source.dependsOn.includes(dependency)) return;
-						if (source.resetOnChange) form.setValuesIn(fieldName, void 0);
-						loadFieldOptions(fieldName, source);
-					});
-				});
+			for (const dependency of new Set(sourceEntries.flatMap(([, source]) => source.dependsOn))) (0, __formily_core.onFieldValueChange)(dependency, () => {
+				for (const [fieldName, source] of sourceEntries) {
+					if (!source.dependsOn.includes(dependency)) continue;
+					if (source.resetOnChange) form.setValuesIn(fieldName, void 0);
+					loadFieldOptions(fieldName, source);
+				}
 			});
 		});
 		return () => {
@@ -5426,9 +5418,9 @@ function useFormDataSources(form, schema) {
 			form.removeEffects(effectId);
 		};
 	}, [
-		useRegistryVersion(dataSources.subscribe),
 		form,
-		schema
+		schema,
+		useRegistryVersion$1(dataSources.subscribe)
 	]);
 }
 function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides, mode = "create", loading = false, gridColumns = 1, labelAlign = "top", labelWidth, showSubmitButton = true }, ref) {
@@ -5436,20 +5428,26 @@ function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides,
 	const formSchema = (0, react.useMemo)(() => createEditFormSchema(zodSchema, {
 		overrides,
 		layout: "grid",
-		gridColumns,
-		labelAlign,
-		labelWidth
+		gridColumns
 	}), [
 		zodSchema,
 		overrides,
-		gridColumns,
-		labelAlign,
-		labelWidth
+		gridColumns
 	]);
+	const formLayout = (0, react.useMemo)(() => {
+		const inlineLabel = labelAlign === "left" || labelAlign === "right";
+		return {
+			labelPlacement: inlineLabel ? "start" : "top",
+			itemProps: inlineLabel ? { label: {
+				className: labelAlign === "right" ? "text-right" : void 0,
+				style: labelWidth != null ? { width: labelWidth } : void 0
+			} } : void 0
+		};
+	}, [labelAlign, labelWidth]);
 	const fieldComponents = (0, react.useMemo)(() => ({ fields: {
 		...defaultFieldComponents,
 		...formComponents.all()
-	} }), [useRegistryVersion(formComponents.subscribe)]);
+	} }), [useRegistryVersion$1(formComponents.subscribe)]);
 	useFormDataSources(form, formSchema);
 	const handleSubmit = async () => {
 		await form.validate();
@@ -5458,6 +5456,7 @@ function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides,
 	(0, react.useImperativeHandle)(ref, () => ({ submit: handleSubmit }));
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_formily_shadcn.Form, {
 		form,
+		layout: formLayout,
 		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_formily_shadcn.JsonSchemaField, {
 			schema: formSchema,
 			components: fieldComponents
@@ -6307,6 +6306,69 @@ function toBatchOptions(options) {
 		value
 	}));
 }
+function getFilterDataSource(config) {
+	if (config.filter && typeof config.filter === "object") return config.filter.dataSource ?? config.dataSource;
+	return config.dataSource;
+}
+function shouldLoadDynamicFilterOptions(config) {
+	if (config.filter === false) return false;
+	if (normalizeFieldOptions(config.enum)) return false;
+	if (config.filter && typeof config.filter === "object") {
+		if (config.filter.enabled === false || config.filter.hidden === true) return false;
+		if (normalizeFieldOptions(config.filter.options)) return false;
+	}
+	return normalizeDataSourceConfig(getFilterDataSource(config)) !== void 0;
+}
+function useRegistryVersion(subscribe) {
+	const [version, setVersion] = react.useState(0);
+	react.useEffect(() => subscribe(() => setVersion((current) => current + 1)), [subscribe]);
+	return version;
+}
+function useDynamicFilterOptions(fields) {
+	const registryVersion = useRegistryVersion(dataSources.subscribe);
+	const [optionsByField, setOptionsByField] = react.useState({});
+	const sourceEntries = react.useMemo(() => {
+		if (!fields) return [];
+		return Object.entries(fields).flatMap(([field, config]) => {
+			if (!shouldLoadDynamicFilterOptions(config)) return [];
+			const source = normalizeDataSourceConfig(getFilterDataSource(config));
+			return source ? [{
+				field,
+				source
+			}] : [];
+		});
+	}, [fields]);
+	react.useEffect(() => {
+		if (sourceEntries.length === 0) {
+			setOptionsByField({});
+			return;
+		}
+		let active = true;
+		const controller = typeof AbortController === "undefined" ? void 0 : new AbortController();
+		Promise.all(sourceEntries.map(async ({ field, source }) => {
+			const loader = dataSources.get(source.key);
+			if (!loader) return [field, []];
+			try {
+				return [field, normalizeOptions(await loader({
+					field,
+					values: {},
+					signal: controller?.signal
+				}))];
+			} catch (error) {
+				if (!controller?.signal.aborted) console.warn(`[AutoCrud] Failed to load filter data source "${source.key}".`, error);
+				return [field, []];
+			}
+		})).then((entries) => {
+			if (!active) return;
+			setOptionsByField(Object.fromEntries(entries));
+		});
+		return () => {
+			active = false;
+			controller?.abort();
+		};
+	}, [sourceEntries, registryVersion]);
+	return optionsByField;
+}
 function getOptionLabel(value, options) {
 	const stringValue = String(value);
 	return options?.find((option) => option.value === stringValue)?.label ?? stringValue;
@@ -6315,15 +6377,21 @@ function getOptionLabel(value, options) {
 * 从统一配置生成表格 overrides
 * 当 filter 配置存在时，合并到 meta 中（不影响列隐藏）
 */
-function buildTableOverrides(fields, legacyOverrides) {
+function buildTableOverrides(fields, legacyOverrides, dynamicFilterOptions) {
 	const result = { ...legacyOverrides };
 	if (fields) for (const [key, config] of Object.entries(fields)) {
-		const tableOptions = toTableOptions(normalizeFieldOptions(config.enum));
+		const fieldOptions = normalizeFieldOptions(config.enum);
+		const tableOptions = toTableOptions(fieldOptions);
+		const dynamicOptions = !fieldOptions ? toTableOptions(normalizeFieldOptions(dynamicFilterOptions?.[key])) : void 0;
 		const tableMeta = config.table !== false && typeof config.table === "object" ? config.table.meta : void 0;
 		const fieldEnumMeta = tableOptions ? {
 			options: tableOptions,
 			variant: "multiSelect"
 		} : void 0;
+		const fieldDataSourceMeta = dynamicOptions ? {
+			options: dynamicOptions,
+			variant: "multiSelect"
+		} : void 0;
 		let filterMeta;
 		if (config.filter && typeof config.filter === "object") {
 			if (config.filter.enabled !== false && config.filter.hidden !== true) {
@@ -6341,11 +6409,12 @@ function buildTableOverrides(fields, legacyOverrides) {
 				enableColumnFilter: false
 			};
 		}
-		if (fieldEnumMeta || tableMeta || filterMeta) result[key] = {
+		if (fieldEnumMeta || fieldDataSourceMeta || tableMeta || filterMeta) result[key] = {
 			...result[key],
 			meta: {
 				...result[key]?.meta ?? {},
 				...fieldEnumMeta ?? {},
+				...fieldDataSourceMeta ?? {},
 				...tableMeta ?? {},
 				...filterMeta ?? {}
 			}
@@ -6658,6 +6727,7 @@ function AutoCrudTable({ title, description, schema, resource, fields, table: ta
 	const [selectedCount, setSelectedCount] = react.useState(0);
 	const [exporting, setExporting] = react.useState(false);
 	const getSelectedRowsRef = react.useRef(null);
+	const dynamicFilterOptions = useDynamicFilterOptions(resolvedFields);
 	const importColumns = react.useMemo(() => {
 		const shape = resolvedSchema.shape;
 		const denySet = new Set(denyFields ?? []);
@@ -6694,7 +6764,11 @@ function AutoCrudTable({ title, description, schema, resource, fields, table: ta
 			setExporting(false);
 		}
 	}, [selectedCount, handleExport]);
-	const tableOverrides = react.useMemo(() => buildTableOverrides(resolvedFields, tableConfig?.overrides), [resolvedFields, tableConfig?.overrides]);
+	const tableOverrides = react.useMemo(() => buildTableOverrides(resolvedFields, tableConfig?.overrides, dynamicFilterOptions), [
+		resolvedFields,
+		tableConfig?.overrides,
+		dynamicFilterOptions
+	]);
 	const formOverrides = react.useMemo(() => buildFormOverrides(resolvedFields, formConfig?.overrides, denyFields), [
 		resolvedFields,
 		formConfig?.overrides,
@@ -7491,13 +7565,6 @@ function DataTableToolbarFilter({ column }) {
 	}
 }
 
-//#endregion
-//#region ../../node_modules/.pnpm/@tanstack+query-core@5.90.20/node_modules/@tanstack/query-core/build/modern/utils.js
-var isServer = typeof window === "undefined" || "Deno" in globalThis;
-function keepPreviousData(previousData) {
-	return previousData;
-}
-
 //#endregion
 //#region src/hooks/use-auto-crud-resource.ts
 /** 默认 toast 适配器（使用 sonner） */
@@ -7647,7 +7714,7 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 		queryTransform
 	]);
 	const listQuery = router.list.useQuery(queryInput, {
-		placeholderData: keepPreviousData,
+		placeholderData: __tanstack_react_query.keepPreviousData,
 		staleTime: 0
 	});
 	const tableRows = listQuery.data?.data ?? [];

package/dist/index.d.cts

@@ -642,11 +642,10 @@ type AutoCrudDataSourceContext = {
   values?: Record<string, unknown>;
   signal?: AbortSignal;
 };
-type AutoCrudDataSourceLoader = (context: AutoCrudDataSourceContext) => Promise<AutoCrudOption[] | {
-  options?: AutoCrudOption[];
-}> | AutoCrudOption[] | {
+type AutoCrudDataSourceResult = AutoCrudOption[] | {
   options?: AutoCrudOption[];
 };
+type AutoCrudDataSourceLoader = (context: AutoCrudDataSourceContext) => AutoCrudDataSourceResult | Promise<AutoCrudDataSourceResult>;
 type AutoCrudDataSourceConfig = string | {
   key: string;
   dependsOn?: string[];
@@ -672,9 +671,7 @@ declare function normalizeDataSourceConfig(config: AutoCrudDataSourceConfig | un
   dependsOn: string[];
   resetOnChange: boolean;
 } | undefined;
-declare function normalizeOptions(result: AutoCrudOption[] | {
-  options?: AutoCrudOption[];
-} | undefined): AutoCrudOption[];
+declare function normalizeOptions(result: AutoCrudDataSourceResult | undefined): AutoCrudOption[];
 //#endregion
 //#region src/components/auto-crud/auto-crud-table.d.ts
 /**
@@ -688,6 +685,8 @@ interface FilterConfig {
   variant?: 'text' | 'number' | 'range' | 'date' | 'dateRange' | 'boolean' | 'select' | 'multiSelect';
   /** select/multiSelect 的选项列表 */
   options?: FieldOption[];
+  /** select/multiSelect 的动态选项源 */
+  dataSource?: AutoCrudDataSourceConfig;
   /** range 的最小/最大值 */
   range?: [number, number];
   /** number 的单位 */
@@ -1182,12 +1181,12 @@ declare const filterItemSchema: z.ZodObject<{
   variant: z.ZodEnum<{
     number: "number";
     boolean: "boolean";
-    date: "date";
     text: "text";
+    range: "range";
+    date: "date";
+    dateRange: "dateRange";
     select: "select";
     multiSelect: "multiSelect";
-    dateRange: "dateRange";
-    range: "range";
   }>;
   operator: z.ZodEnum<{
     iLike: "iLike";
@@ -1524,7 +1523,7 @@ declare function createFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema:
 /**
  * 为编辑模式创建 Form Schema（排除 id, createdAt, updatedAt）
  */
-declare function createEditFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema: T, options?: Omit<CreateFormSchemaOptions, "exclude">): ISchema;
+declare function createEditFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema: T, options?: Omit<CreateFormSchemaOptions, 'exclude'>): ISchema;
 //#endregion
 //#region src/lib/schema-bridge/schema-adapter.d.ts
 /**

package/dist/index.d.ts

@@ -4,7 +4,7 @@ import * as _tanstack_react_table0 from "@tanstack/react-table";
 import { Column, ColumnDef, ColumnSort, Row, RowData, Table, TableOptions, TableState } from "@tanstack/react-table";
 import { Command, DropdownMenuTrigger, PopoverContent } from "@pixpilot/shadcn";
 import { ClassValue } from "clsx";
-import * as react_jsx_runtime2 from "react/jsx-runtime";
+import * as react_jsx_runtime3 from "react/jsx-runtime";
 import { z } from "zod";
 import { ISchema } from "@formily/json-schema";
 
@@ -362,7 +362,7 @@ declare function AutoTableActionBar<TData>({
   enableDelete,
   extraActions,
   actions
-}: AutoTableActionBarProps<TData>): react_jsx_runtime2.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -530,7 +530,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   showDefaultExport,
   onSelectedCountChange,
   getSelectedRows
-}: AutoTableProps<T>): react_jsx_runtime2.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/i18n/locale.d.ts
 /**
@@ -642,11 +642,10 @@ type AutoCrudDataSourceContext = {
   values?: Record<string, unknown>;
   signal?: AbortSignal;
 };
-type AutoCrudDataSourceLoader = (context: AutoCrudDataSourceContext) => Promise<AutoCrudOption[] | {
-  options?: AutoCrudOption[];
-}> | AutoCrudOption[] | {
+type AutoCrudDataSourceResult = AutoCrudOption[] | {
   options?: AutoCrudOption[];
 };
+type AutoCrudDataSourceLoader = (context: AutoCrudDataSourceContext) => AutoCrudDataSourceResult | Promise<AutoCrudDataSourceResult>;
 type AutoCrudDataSourceConfig = string | {
   key: string;
   dependsOn?: string[];
@@ -672,9 +671,7 @@ declare function normalizeDataSourceConfig(config: AutoCrudDataSourceConfig | un
   dependsOn: string[];
   resetOnChange: boolean;
 } | undefined;
-declare function normalizeOptions(result: AutoCrudOption[] | {
-  options?: AutoCrudOption[];
-} | undefined): AutoCrudOption[];
+declare function normalizeOptions(result: AutoCrudDataSourceResult | undefined): AutoCrudOption[];
 //#endregion
 //#region src/components/auto-crud/auto-crud-table.d.ts
 /**
@@ -688,6 +685,8 @@ interface FilterConfig {
   variant?: 'text' | 'number' | 'range' | 'date' | 'dateRange' | 'boolean' | 'select' | 'multiSelect';
   /** select/multiSelect 的选项列表 */
   options?: FieldOption[];
+  /** select/multiSelect 的动态选项源 */
+  dataSource?: AutoCrudDataSourceConfig;
   /** range 的最小/最大值 */
   range?: [number, number];
   /** number 的单位 */
@@ -936,7 +935,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_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/auto-form.d.ts
 interface AutoFormProps<T extends z.ZodObject<z.ZodRawShape>> {
@@ -968,7 +967,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_runtime3.JSX.Element;
 declare const AutoForm: <T extends z.ZodObject<z.ZodRawShape>>(props: AutoFormProps<T> & {
   ref?: React.Ref<AutoFormRef>;
 }) => ReturnType<typeof AutoFormInner>;
@@ -1182,12 +1181,12 @@ declare const filterItemSchema: z.ZodObject<{
   variant: z.ZodEnum<{
     number: "number";
     boolean: "boolean";
-    date: "date";
     text: "text";
+    range: "range";
+    date: "date";
+    dateRange: "dateRange";
     select: "select";
     multiSelect: "multiSelect";
-    dateRange: "dateRange";
-    range: "range";
   }>;
   operator: z.ZodEnum<{
     iLike: "iLike";
@@ -1270,7 +1269,7 @@ declare function AutoTableSimpleFilters<TData>({
   filters: externalFilters,
   onFiltersChange,
   leading
-}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime2.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";
@@ -1312,7 +1311,7 @@ declare function CrudFormModal<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   className
-}: CrudFormModalProps<T>): react_jsx_runtime2.JSX.Element;
+}: CrudFormModalProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/import-dialog.d.ts
 interface ImportDialogProps {
@@ -1334,7 +1333,7 @@ declare function ImportDialog({
   columns,
   title,
   locale
-}: ImportDialogProps): react_jsx_runtime2.JSX.Element;
+}: ImportDialogProps): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/export-dialog.d.ts
 type ExportMode = "selected" | "filtered";
@@ -1354,7 +1353,7 @@ declare function ExportDialog({
   selectedCount,
   onExport,
   canExportFiltered
-}: ExportDialogProps): react_jsx_runtime2.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"> {
@@ -1367,7 +1366,7 @@ declare function DataTable<TData>({
   children,
   className,
   ...props
-}: DataTableProps<TData>): react_jsx_runtime2.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"> {
@@ -1378,7 +1377,7 @@ declare function DataTableAdvancedToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime2.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> {
@@ -1390,7 +1389,7 @@ declare function DataTableColumnHeader<TData, TValue>({
   label,
   className,
   ...props
-}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime2.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> {
@@ -1404,7 +1403,7 @@ declare function DataTableFacetedFilter<TData, TValue>({
   title,
   options,
   multiple
-}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime2.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"> {
@@ -1416,7 +1415,7 @@ declare function DataTablePagination<TData>({
   pageSizeOptions,
   className,
   ...props
-}: DataTablePaginationProps<TData>): react_jsx_runtime2.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"> {
@@ -1427,7 +1426,7 @@ declare function DataTableToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableToolbarProps<TData>): react_jsx_runtime2.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> {
@@ -1438,7 +1437,7 @@ declare function DataTableViewOptions<TData>({
   table,
   disabled,
   ...props
-}: DataTableViewOptionsProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTableViewOptionsProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/ui/multi-combobox.d.ts
 interface MultiComboboxOption {
@@ -1524,7 +1523,7 @@ declare function createFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema:
 /**
  * 为编辑模式创建 Form Schema（排除 id, createdAt, updatedAt）
  */
-declare function createEditFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema: T, options?: Omit<CreateFormSchemaOptions, "exclude">): ISchema;
+declare function createEditFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema: T, options?: Omit<CreateFormSchemaOptions, 'exclude'>): ISchema;
 //#endregion
 //#region src/lib/schema-bridge/schema-adapter.d.ts
 /**

package/dist/index.js

@@ -19,6 +19,7 @@ import { createForm, onFieldValueChange } from "@formily/core";
 import { Form, JsonSchemaField } from "@pixpilot/formily-shadcn";
 import { connect, mapProps } from "@formily/react";
 import { toast } from "sonner";
+import { keepPreviousData } from "@tanstack/react-query";
 
 //#region src/lib/utils.ts
 function cn(...inputs) {
@@ -5131,12 +5132,8 @@ function getComponentProps(type, parsed) {
 function createFormSchema(schema, options) {
 	const shape = schema.shape;
 	const properties = {};
-	const { overrides, exclude = [], layout = "vertical", gridColumns = 1, labelAlign = "top", labelWidth, labelCol, wrapperCol } = options ?? {};
+	const { overrides, exclude = [], layout = "vertical", gridColumns = 1 } = options ?? {};
 	const decoratorProps = { className: "space-y-2" };
-	if (labelAlign) decoratorProps.labelAlign = labelAlign;
-	if (labelWidth) decoratorProps.labelWidth = labelWidth;
-	if (labelCol) decoratorProps.labelCol = labelCol;
-	if (wrapperCol) decoratorProps.wrapperCol = wrapperCol;
 	for (const [key, fieldSchema] of Object.entries(shape)) {
 		if (exclude.includes(key)) continue;
 		const parsed = parseZodField(fieldSchema);
@@ -5193,65 +5190,59 @@ function createEditFormSchema(schema, options) {
 //#endregion
 //#region src/lib/registries.ts
 function createRegistry(label) {
-	const items = /* @__PURE__ */ new Map();
+	const entries = /* @__PURE__ */ new Map();
 	const listeners = /* @__PURE__ */ new Set();
-	let notifyQueued = false;
 	const notify = () => {
-		if (notifyQueued) return;
-		notifyQueued = true;
 		queueMicrotask(() => {
-			notifyQueued = false;
-			listeners.forEach((listener) => listener());
+			for (const listener of listeners) listener();
 		});
 	};
 	return {
 		register(name, value) {
-			const current = items.get(name);
-			if (current === value) return;
-			if (current !== void 0) {
+			if (entries.has(name)) {
 				console.warn(`[AutoCrud] ${label} "${name}" is already registered.`);
 				return;
 			}
-			items.set(name, value);
+			entries.set(name, value);
 			notify();
 		},
 		unregister(name) {
-			if (!items.delete(name)) return;
+			if (!entries.delete(name)) return;
 			notify();
 		},
 		get(name) {
-			return items.get(name);
+			return entries.get(name);
 		},
 		all() {
-			return Object.fromEntries(items);
+			return Object.fromEntries(entries);
 		},
 		subscribe(listener) {
 			listeners.add(listener);
-			return () => {
-				listeners.delete(listener);
-			};
+			return () => listeners.delete(listener);
 		}
 	};
 }
 const formComponents = createRegistry("form component");
 const dataSources = createRegistry("data source");
 function normalizeDataSourceConfig(config) {
-	if (!config) return void 0;
-	if (typeof config === "string") return {
+	if (typeof config === "string") return config.length > 0 ? {
 		key: config,
 		dependsOn: [],
 		resetOnChange: false
-	};
+	} : void 0;
+	if (!config?.key) return void 0;
 	return {
 		key: config.key,
-		dependsOn: config.dependsOn ?? [],
-		resetOnChange: config.resetOnChange ?? false
+		dependsOn: Array.isArray(config.dependsOn) ? config.dependsOn : [],
+		resetOnChange: config.resetOnChange === true
 	};
 }
 function normalizeOptions(result) {
 	const options = Array.isArray(result) ? result : result?.options;
-	if (!options) return [];
-	return options.map((option) => ({
+	if (!Array.isArray(options)) return [];
+	return options.filter((option) => {
+		return typeof option === "object" && option !== null && typeof option.value === "string" && typeof option.label === "string";
+	}).map((option) => ({
 		...option,
 		value: String(option.value)
 	}));
@@ -5305,7 +5296,7 @@ const defaultFieldComponents = {
 		decorator: "FormItem"
 	}
 };
-function useRegistryVersion(subscribe) {
+function useRegistryVersion$1(subscribe) {
 	const [version, setVersion] = useState(0);
 	useEffect(() => subscribe(() => setVersion((current) => current + 1)), [subscribe]);
 	return version;
@@ -5317,13 +5308,15 @@ function isDataSourceConfig(value) {
 }
 function collectDataSourceConfigs(schema, result = {}) {
 	const properties = schema.properties;
-	if (!properties) return result;
+	if (!properties || typeof properties !== "object") return result;
 	for (const [key, property] of Object.entries(properties)) {
-		const customDataSource = property["x-data-source"];
-		const schemaDataSource = property.dataSource;
+		if (!property || typeof property !== "object" || Array.isArray(property)) continue;
+		const record = property;
+		const customDataSource = record["x-data-source"];
+		const schemaDataSource = record.dataSource;
 		const dataSourceConfig = isDataSourceConfig(customDataSource) ? customDataSource : isDataSourceConfig(schemaDataSource) ? schemaDataSource : void 0;
 		if (dataSourceConfig) result[key] = dataSourceConfig;
-		collectDataSourceConfigs(property, result);
+		collectDataSourceConfigs(record, result);
 	}
 	return result;
 }
@@ -5332,7 +5325,7 @@ function useFormDataSources(form, schema) {
 		const sourceEntries = Object.entries(collectDataSourceConfigs(schema)).map(([fieldName, config]) => {
 			const normalized = normalizeDataSourceConfig(config);
 			return normalized ? [fieldName, normalized] : void 0;
-		}).filter(Boolean);
+		}).filter((entry) => entry !== void 0);
 		if (sourceEntries.length === 0) return;
 		let active = true;
 		const effectId = Symbol("autoCrudDataSources");
@@ -5368,14 +5361,12 @@ function useFormDataSources(form, schema) {
 		};
 		for (const [fieldName, source] of sourceEntries) loadFieldOptions(fieldName, source);
 		form.addEffects(effectId, () => {
-			new Set(sourceEntries.flatMap(([, source]) => source.dependsOn)).forEach((dependency) => {
-				onFieldValueChange(dependency, () => {
-					sourceEntries.forEach(([fieldName, source]) => {
-						if (!source.dependsOn.includes(dependency)) return;
-						if (source.resetOnChange) form.setValuesIn(fieldName, void 0);
-						loadFieldOptions(fieldName, source);
-					});
-				});
+			for (const dependency of new Set(sourceEntries.flatMap(([, source]) => source.dependsOn))) onFieldValueChange(dependency, () => {
+				for (const [fieldName, source] of sourceEntries) {
+					if (!source.dependsOn.includes(dependency)) continue;
+					if (source.resetOnChange) form.setValuesIn(fieldName, void 0);
+					loadFieldOptions(fieldName, source);
+				}
 			});
 		});
 		return () => {
@@ -5384,9 +5375,9 @@ function useFormDataSources(form, schema) {
 			form.removeEffects(effectId);
 		};
 	}, [
-		useRegistryVersion(dataSources.subscribe),
 		form,
-		schema
+		schema,
+		useRegistryVersion$1(dataSources.subscribe)
 	]);
 }
 function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides, mode = "create", loading = false, gridColumns = 1, labelAlign = "top", labelWidth, showSubmitButton = true }, ref) {
@@ -5394,20 +5385,26 @@ function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides,
 	const formSchema = useMemo(() => createEditFormSchema(zodSchema, {
 		overrides,
 		layout: "grid",
-		gridColumns,
-		labelAlign,
-		labelWidth
+		gridColumns
 	}), [
 		zodSchema,
 		overrides,
-		gridColumns,
-		labelAlign,
-		labelWidth
+		gridColumns
 	]);
+	const formLayout = useMemo(() => {
+		const inlineLabel = labelAlign === "left" || labelAlign === "right";
+		return {
+			labelPlacement: inlineLabel ? "start" : "top",
+			itemProps: inlineLabel ? { label: {
+				className: labelAlign === "right" ? "text-right" : void 0,
+				style: labelWidth != null ? { width: labelWidth } : void 0
+			} } : void 0
+		};
+	}, [labelAlign, labelWidth]);
 	const fieldComponents = useMemo(() => ({ fields: {
 		...defaultFieldComponents,
 		...formComponents.all()
-	} }), [useRegistryVersion(formComponents.subscribe)]);
+	} }), [useRegistryVersion$1(formComponents.subscribe)]);
 	useFormDataSources(form, formSchema);
 	const handleSubmit = async () => {
 		await form.validate();
@@ -5416,6 +5413,7 @@ function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides,
 	useImperativeHandle(ref, () => ({ submit: handleSubmit }));
 	return /* @__PURE__ */ jsxs(Form, {
 		form,
+		layout: formLayout,
 		children: [/* @__PURE__ */ jsx(JsonSchemaField, {
 			schema: formSchema,
 			components: fieldComponents
@@ -6265,6 +6263,69 @@ function toBatchOptions(options) {
 		value
 	}));
 }
+function getFilterDataSource(config) {
+	if (config.filter && typeof config.filter === "object") return config.filter.dataSource ?? config.dataSource;
+	return config.dataSource;
+}
+function shouldLoadDynamicFilterOptions(config) {
+	if (config.filter === false) return false;
+	if (normalizeFieldOptions(config.enum)) return false;
+	if (config.filter && typeof config.filter === "object") {
+		if (config.filter.enabled === false || config.filter.hidden === true) return false;
+		if (normalizeFieldOptions(config.filter.options)) return false;
+	}
+	return normalizeDataSourceConfig(getFilterDataSource(config)) !== void 0;
+}
+function useRegistryVersion(subscribe) {
+	const [version, setVersion] = React.useState(0);
+	React.useEffect(() => subscribe(() => setVersion((current) => current + 1)), [subscribe]);
+	return version;
+}
+function useDynamicFilterOptions(fields) {
+	const registryVersion = useRegistryVersion(dataSources.subscribe);
+	const [optionsByField, setOptionsByField] = React.useState({});
+	const sourceEntries = React.useMemo(() => {
+		if (!fields) return [];
+		return Object.entries(fields).flatMap(([field, config]) => {
+			if (!shouldLoadDynamicFilterOptions(config)) return [];
+			const source = normalizeDataSourceConfig(getFilterDataSource(config));
+			return source ? [{
+				field,
+				source
+			}] : [];
+		});
+	}, [fields]);
+	React.useEffect(() => {
+		if (sourceEntries.length === 0) {
+			setOptionsByField({});
+			return;
+		}
+		let active = true;
+		const controller = typeof AbortController === "undefined" ? void 0 : new AbortController();
+		Promise.all(sourceEntries.map(async ({ field, source }) => {
+			const loader = dataSources.get(source.key);
+			if (!loader) return [field, []];
+			try {
+				return [field, normalizeOptions(await loader({
+					field,
+					values: {},
+					signal: controller?.signal
+				}))];
+			} catch (error) {
+				if (!controller?.signal.aborted) console.warn(`[AutoCrud] Failed to load filter data source "${source.key}".`, error);
+				return [field, []];
+			}
+		})).then((entries) => {
+			if (!active) return;
+			setOptionsByField(Object.fromEntries(entries));
+		});
+		return () => {
+			active = false;
+			controller?.abort();
+		};
+	}, [sourceEntries, registryVersion]);
+	return optionsByField;
+}
 function getOptionLabel(value, options) {
 	const stringValue = String(value);
 	return options?.find((option) => option.value === stringValue)?.label ?? stringValue;
@@ -6273,15 +6334,21 @@ function getOptionLabel(value, options) {
 * 从统一配置生成表格 overrides
 * 当 filter 配置存在时，合并到 meta 中（不影响列隐藏）
 */
-function buildTableOverrides(fields, legacyOverrides) {
+function buildTableOverrides(fields, legacyOverrides, dynamicFilterOptions) {
 	const result = { ...legacyOverrides };
 	if (fields) for (const [key, config] of Object.entries(fields)) {
-		const tableOptions = toTableOptions(normalizeFieldOptions(config.enum));
+		const fieldOptions = normalizeFieldOptions(config.enum);
+		const tableOptions = toTableOptions(fieldOptions);
+		const dynamicOptions = !fieldOptions ? toTableOptions(normalizeFieldOptions(dynamicFilterOptions?.[key])) : void 0;
 		const tableMeta = config.table !== false && typeof config.table === "object" ? config.table.meta : void 0;
 		const fieldEnumMeta = tableOptions ? {
 			options: tableOptions,
 			variant: "multiSelect"
 		} : void 0;
+		const fieldDataSourceMeta = dynamicOptions ? {
+			options: dynamicOptions,
+			variant: "multiSelect"
+		} : void 0;
 		let filterMeta;
 		if (config.filter && typeof config.filter === "object") {
 			if (config.filter.enabled !== false && config.filter.hidden !== true) {
@@ -6299,11 +6366,12 @@ function buildTableOverrides(fields, legacyOverrides) {
 				enableColumnFilter: false
 			};
 		}
-		if (fieldEnumMeta || tableMeta || filterMeta) result[key] = {
+		if (fieldEnumMeta || fieldDataSourceMeta || tableMeta || filterMeta) result[key] = {
 			...result[key],
 			meta: {
 				...result[key]?.meta ?? {},
 				...fieldEnumMeta ?? {},
+				...fieldDataSourceMeta ?? {},
 				...tableMeta ?? {},
 				...filterMeta ?? {}
 			}
@@ -6616,6 +6684,7 @@ function AutoCrudTable({ title, description, schema, resource, fields, table: ta
 	const [selectedCount, setSelectedCount] = React.useState(0);
 	const [exporting, setExporting] = React.useState(false);
 	const getSelectedRowsRef = React.useRef(null);
+	const dynamicFilterOptions = useDynamicFilterOptions(resolvedFields);
 	const importColumns = React.useMemo(() => {
 		const shape = resolvedSchema.shape;
 		const denySet = new Set(denyFields ?? []);
@@ -6652,7 +6721,11 @@ function AutoCrudTable({ title, description, schema, resource, fields, table: ta
 			setExporting(false);
 		}
 	}, [selectedCount, handleExport]);
-	const tableOverrides = React.useMemo(() => buildTableOverrides(resolvedFields, tableConfig?.overrides), [resolvedFields, tableConfig?.overrides]);
+	const tableOverrides = React.useMemo(() => buildTableOverrides(resolvedFields, tableConfig?.overrides, dynamicFilterOptions), [
+		resolvedFields,
+		tableConfig?.overrides,
+		dynamicFilterOptions
+	]);
 	const formOverrides = React.useMemo(() => buildFormOverrides(resolvedFields, formConfig?.overrides, denyFields), [
 		resolvedFields,
 		formConfig?.overrides,
@@ -7449,13 +7522,6 @@ function DataTableToolbarFilter({ column }) {
 	}
 }
 
-//#endregion
-//#region ../../node_modules/.pnpm/@tanstack+query-core@5.90.20/node_modules/@tanstack/query-core/build/modern/utils.js
-var isServer = typeof window === "undefined" || "Deno" in globalThis;
-function keepPreviousData(previousData) {
-	return previousData;
-}
-
 //#endregion
 //#region src/hooks/use-auto-crud-resource.ts
 /** 默认 toast 适配器（使用 sonner） */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud",
   "type": "module",
-  "version": "1.1.8",
+  "version": "1.2.1",
   "description": "Schema-first CRUD components with auto-generated tables and forms",
   "author": "wordrhyme",
   "license": "MIT",
@@ -27,6 +27,7 @@
     "access": "public"
   },
   "peerDependencies": {
+    "@tanstack/react-query": "^5.0.0",
     "react": "^18.0.0 || ^19.0.0",
     "react-dom": "^18.0.0 || ^19.0.0",
     "sonner": "^2.0.0",
@@ -71,6 +72,7 @@
   },
   "devDependencies": {
     "@tanstack/react-query": "^5.90.15",
+    "@testing-library/jest-dom": "^6.9.1",
     "@testing-library/react": "^16.3.2",
     "@trpc/server": "^11.0.0",
     "@types/node": "^22.19.17",
@@ -78,15 +80,17 @@
     "@types/react-dom": "^19.2.3",
     "drizzle-orm": "1.0.0-beta.15-859cf75",
     "eslint": "^9.39.4",
+    "jsdom": "^27.4.0",
     "react": "19.2.4",
     "react-dom": "19.2.4",
     "tsdown": "^0.15.12",
     "typescript": "^5.9.3",
-    "@internal/eslint-config": "0.3.0",
-    "@internal/prettier-config": "0.0.1",
+    "vitest": "^3.2.4",
     "@internal/tsconfig": "0.1.0",
-    "@internal/tsdown-config": "0.1.0",
-    "@internal/vitest-config": "0.1.0"
+    "@internal/prettier-config": "0.0.1",
+    "@internal/vitest-config": "0.1.0",
+    "@internal/eslint-config": "0.3.0",
+    "@internal/tsdown-config": "0.1.0"
   },
   "prettier": "@internal/prettier-config",
   "scripts": {