@wordrhyme/auto-crud 1.1.4 → 1.1.6

package/dist/index.cjs

@@ -1065,6 +1065,7 @@ function FacetedItem(props) {
 		else if (context.onItemSelect) context.onItemSelect(currentValue);
 	}, [onSelect, context]);
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.CommandItem, {
+		value,
 		"aria-selected": isSelected,
 		"data-selected": isSelected,
 		className: cn("gap-2", className),
@@ -1458,6 +1459,7 @@ function DataTableFilterList({ table, debounceMs = DEBOUNCE_MS$2, throttleMs = T
 	const descriptionId = react.useId();
 	const [open, setOpen] = react.useState(false);
 	const addButtonRef = react.useRef(null);
+	const columnDefs = table.options.columns;
 	const columns = react.useMemo(() => {
 		return table.getAllColumns().filter((column) => {
 			if (!column.getCanFilter()) return false;
@@ -1465,7 +1467,7 @@ function DataTableFilterList({ table, debounceMs = DEBOUNCE_MS$2, throttleMs = T
 			if (modes && !modes.includes("advanced")) return false;
 			return true;
 		});
-	}, [table]);
+	}, [table, columnDefs]);
 	const [filters, setFilters] = useReadableFilters(columns, { debounceMs });
 	const debouncedSetFilters = useDebouncedCallback(setFilters, debounceMs);
 	const [joinOperator, setJoinOperator] = useQueryState(table.options.meta?.queryKeys?.joinOperator ?? "", parseAsStringEnum(["and", "or"]).withDefault("and"));
@@ -1943,8 +1945,16 @@ const DEBOUNCE_MS$1 = 300;
 const THROTTLE_MS$1 = 50;
 const FILTER_SHORTCUT_KEY = "f";
 const REMOVE_FILTER_SHORTCUTS = ["backspace", "delete"];
+function getOptionCommandValue$2(option) {
+	return [
+		option.value,
+		option.label,
+		option.searchText
+	].filter(Boolean).join(" ");
+}
 function DataTableFilterMenu({ table, debounceMs = DEBOUNCE_MS$1, throttleMs = THROTTLE_MS$1, shallow = true, disabled,...props }) {
 	const id = react.useId();
+	const columnDefs = table.options.columns;
 	const columns = react.useMemo(() => {
 		return table.getAllColumns().filter((column) => {
 			if (!column.columnDef.enableColumnFilter) return false;
@@ -1952,7 +1962,7 @@ function DataTableFilterMenu({ table, debounceMs = DEBOUNCE_MS$1, throttleMs = T
 			if (modes && !modes.includes("command")) return false;
 			return true;
 		});
-	}, [table]);
+	}, [table, columnDefs]);
 	const [open, setOpen] = react.useState(false);
 	const [selectedColumn, setSelectedColumn] = react.useState(null);
 	const [inputValue, setInputValue] = react.useState("");
@@ -2221,7 +2231,7 @@ function FilterValueSelector({ column, value, onSelect }) {
 		})] });
 		case "select":
 		case "multiSelect": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.CommandGroup, { children: column.columnDef.meta?.options?.map((option) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.CommandItem, {
-			value: option.value,
+			value: getOptionCommandValue$2(option),
 			onSelect: () => onSelect(option.value),
 			children: [
 				option.icon && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(option.icon, {}),
@@ -2348,7 +2358,7 @@ function onFilterInputRender({ filter, column, inputId, onFilterUpdate, showValu
 					align: "start",
 					className: "w-48 p-0",
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.Command, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.CommandInput, { placeholder: "Search options..." }), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.CommandList, { children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.CommandEmpty, { children: "No options found." }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_shadcn.CommandGroup, { children: options.map((option) => /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.CommandItem, {
-						value: option.value,
+						value: getOptionCommandValue$2(option),
 						onSelect: () => {
 							const value = filter.variant === "multiSelect" ? selectedValues.includes(option.value) ? selectedValues.filter((v) => v !== option.value) : [...selectedValues, option.value] : option.value;
 							onFilterUpdate(filter.filterId, { value });
@@ -2708,6 +2718,7 @@ function DataTableViewOptions({ table, disabled,...props }) {
 //#endregion
 //#region src/components/auto-crud/auto-table-simple-filters.tsx
 function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilters, onFiltersChange, leading }) {
+	const columnDefs = table.options.columns;
 	const columns = react.useMemo(() => table.getAllColumns().filter((col) => col.getCanFilter()).sort((a, b) => {
 		const readOrder = (column) => {
 			const metaIndex = column.columnDef.meta?.index;
@@ -2717,7 +2728,7 @@ function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilte
 		const orderDiff = readOrder(a) - readOrder(b);
 		if (orderDiff !== 0) return orderDiff;
 		return a.getIndex() - b.getIndex();
-	}), [table]);
+	}), [table, columnDefs]);
 	const queryStateOptions = table.options.meta?.queryStateOptions;
 	const [queryFilters, setQueryFilters] = useReadableFilters(columns, {
 		...queryStateOptions,
@@ -2951,6 +2962,13 @@ function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilte
 		]
 	});
 }
+function getOptionCommandValue$1(option) {
+	return [
+		option.value,
+		option.label,
+		option.searchText
+	].filter(Boolean).join(" ");
+}
 function SimpleFacetedFilter({ title, options, multiple, value, onChange }) {
 	const [open, setOpen] = react.useState(false);
 	const selectedValues = react.useMemo(() => new Set(value), [value]);
@@ -3030,6 +3048,7 @@ function SimpleFacetedFilter({ title, options, multiple, value, onChange }) {
 						children: options.map((option) => {
 							const isSelected = selectedValues.has(option.value);
 							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.CommandItem, {
+								value: getOptionCommandValue$1(option),
 								onSelect: () => onItemSelect(option, isSelected),
 								children: [
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
@@ -4741,25 +4760,27 @@ function AutoTable({ schema, data, pageCount = 1, overrides, enableRowSelection
 		clearOnDefault: true
 	});
 	const searchConfig = search && typeof search === "object" ? search : {};
+	const enableAdvancedFilter = true;
+	const columns = (0, react.useMemo)(() => {
+		const dataColumns = createTableSchema(schema, {
+			overrides,
+			exclude
+		});
+		const result = enableRowSelection ? [createSelectColumn(), ...dataColumns] : dataColumns;
+		if (actions) result.push(createActionsColumn(actions));
+		return result;
+	}, [
+		schema,
+		overrides,
+		enableRowSelection,
+		exclude,
+		actions
+	]);
 	const { table, shallow, debounceMs, throttleMs } = useDataTable({
 		data,
-		columns: (0, react.useMemo)(() => {
-			const dataColumns = createTableSchema(schema, {
-				overrides,
-				exclude
-			});
-			const result = enableRowSelection ? [createSelectColumn(), ...dataColumns] : dataColumns;
-			if (actions) result.push(createActionsColumn(actions));
-			return result;
-		}, [
-			schema,
-			overrides,
-			enableRowSelection,
-			exclude,
-			actions
-		]),
+		columns,
 		pageCount,
-		enableAdvancedFilter: true,
+		enableAdvancedFilter,
 		initialState: (0, react.useMemo)(() => ({
 			sorting: initialSorting,
 			columnPinning: pinnedColumns ?? {
@@ -4845,6 +4866,7 @@ function AutoTable({ schema, data, pageCount = 1, overrides, enableRowSelection
 	}, [
 		currentMode,
 		table,
+		columns,
 		shallow,
 		searchInput,
 		debounceMs,
@@ -5054,7 +5076,7 @@ function createEditFormSchema(schema, options) {
 
 //#endregion
 //#region src/components/auto-crud/auto-form.tsx
-const COMBOBOX_LIST_CLASS = "[&_[cmdk-list]]:max-h-[360px]";
+const COMBOBOX_LIST_CLASS = "[&_[cmdk-list]]:max-h-[360px] [&_[cmdk-list]]:overflow-x-hidden [&_[cmdk-list]]:overflow-y-auto";
 const FormilySwitch = (0, __formily_react.connect)(__pixpilot_shadcn.Switch, (0, __formily_react.mapProps)({
 	value: "checked",
 	onInput: "onCheckedChange"
@@ -5926,6 +5948,28 @@ function ImportDialog({ open, onOpenChange, onImport, columns = [], title, local
 
 //#endregion
 //#region src/components/auto-crud/auto-crud-table.tsx
+function mergeFieldPart(base, override) {
+	if (override === void 0) return base;
+	if (override === false || base === false || typeof base !== "object" || typeof override !== "object" || base === null || override === null || Array.isArray(base) || Array.isArray(override)) return override;
+	return {
+		...base,
+		...override
+	};
+}
+function mergeFieldConfig(base, override) {
+	return {
+		...base,
+		...override,
+		table: mergeFieldPart(base?.table, override?.table),
+		filter: mergeFieldPart(base?.filter, override?.filter),
+		form: mergeFieldPart(base?.form, override?.form)
+	};
+}
+function mergeFields(base, override) {
+	if (!base && !override) return void 0;
+	const keys = new Set([...Object.keys(base ?? {}), ...Object.keys(override ?? {})]);
+	return Object.fromEntries(Array.from(keys).map((key) => [key, mergeFieldConfig(base?.[key], override?.[key])]));
+}
 /**
 * 从统一配置生成表格 overrides
 * 当 filter 配置存在时，合并到 meta 中（不影响列隐藏）
@@ -6218,10 +6262,7 @@ function resolveActions(actionsOrFn, defaults, rowActionsLocale) {
 function AutoCrudTable({ title, description, schema, resource, fields, table: tableConfig, form: formConfig, permissions, actions: actionItems, toolbarActions, locale: localeProp, onCreate }) {
 	const locale = resolveLocale(localeProp);
 	const resolvedSchema = resource.schema ?? schema;
-	const resolvedFields = react.useMemo(() => ({
-		...fields,
-		...resource.fields
-	}), [fields, resource.fields]);
+	const resolvedFields = react.useMemo(() => mergeFields(resource.fields, fields) ?? {}, [fields, resource.fields]);
 	const can = {
 		create: permissions?.can?.create ?? true,
 		update: permissions?.can?.update ?? true,
@@ -6545,6 +6586,13 @@ function DataTableAdvancedToolbar({ table, children, className,...props }) {
 
 //#endregion
 //#region src/components/data-table/data-table-faceted-filter.tsx
+function getOptionCommandValue(option) {
+	return [
+		option.value,
+		option.label,
+		option.searchText
+	].filter(Boolean).join(" ");
+}
 function DataTableFacetedFilter({ column, title, options, multiple }) {
 	const [open, setOpen] = react.useState(false);
 	const columnFilterValue = column?.getFilterValue();
@@ -6626,6 +6674,7 @@ function DataTableFacetedFilter({ column, title, options, multiple }) {
 						children: options.map((option) => {
 							const isSelected = selectedValues.has(option.value);
 							return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_shadcn.CommandItem, {
+								value: getOptionCommandValue(option),
 								onSelect: () => onItemSelect(option, isSelected),
 								children: [
 									/* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime0 from "react/jsx-runtime";
+import * as react_jsx_runtime7 from "react/jsx-runtime";
 import { z } from "zod";
 import * as _tanstack_react_table0 from "@tanstack/react-table";
 import { Column, ColumnDef, ColumnSort, Row, RowData, Table, TableOptions, TableState } from "@tanstack/react-table";
@@ -361,7 +361,7 @@ declare function AutoTableActionBar<TData>({
   enableDelete,
   extraActions,
   actions
-}: AutoTableActionBarProps<TData>): react_jsx_runtime0.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -529,7 +529,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   showDefaultExport,
   onSelectedCountChange,
   getSelectedRows
-}: AutoTableProps<T>): react_jsx_runtime0.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/i18n/locale.d.ts
 /**
@@ -635,6 +635,7 @@ interface FilterConfig {
   options?: Array<{
     label: string;
     value: string;
+    searchText?: string;
     count?: number;
     icon?: React$1.FC<React$1.SVGProps<SVGSVGElement>>;
   }>;
@@ -874,7 +875,7 @@ declare function AutoCrudTable<TSchema extends z.ZodObject<z.ZodRawShape>>({
   toolbarActions,
   locale: localeProp,
   onCreate
-}: AutoCrudTableProps<TSchema>): react_jsx_runtime0.JSX.Element;
+}: AutoCrudTableProps<TSchema>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/auto-form.d.ts
 interface AutoFormProps<T extends z.ZodObject<z.ZodRawShape>> {
@@ -882,11 +883,11 @@ interface AutoFormProps<T extends z.ZodObject<z.ZodRawShape>> {
   initialValues?: Partial<z.infer<T>>;
   onSubmit: (values: z.infer<T>) => void | Promise<void>;
   overrides?: FormSchemaOverrides;
-  mode?: "create" | "edit";
+  mode?: 'create' | 'edit';
   loading?: boolean;
   gridColumns?: number;
   /** Label 对齐方式 */
-  labelAlign?: "left" | "top" | "right";
+  labelAlign?: 'left' | 'top' | 'right';
   /** Label 宽度（labelAlign 为 left 时有效） */
   labelWidth?: number | string;
   /** 是否显示提交按钮（默认 true） */
@@ -906,7 +907,7 @@ declare function AutoFormInner<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   showSubmitButton
-}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime0.JSX.Element;
+}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime7.JSX.Element;
 declare const AutoForm: <T extends z.ZodObject<z.ZodRawShape>>(props: AutoFormProps<T> & {
   ref?: React.Ref<AutoFormRef>;
 }) => ReturnType<typeof AutoFormInner>;
@@ -1176,6 +1177,7 @@ interface QueryKeys {
 interface Option {
   label: string;
   value: string;
+  searchText?: string;
   count?: number;
   icon?: React.FC<React.SVGProps<SVGSVGElement>>;
 }
@@ -1207,7 +1209,7 @@ declare function AutoTableSimpleFilters<TData>({
   filters: externalFilters,
   onFiltersChange,
   leading
-}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime0.JSX.Element | null;
+}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime7.JSX.Element | null;
 //#endregion
 //#region src/components/auto-crud/form-modal.d.ts
 type ModalVariant = "dialog" | "sheet";
@@ -1249,7 +1251,7 @@ declare function CrudFormModal<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   className
-}: CrudFormModalProps<T>): react_jsx_runtime0.JSX.Element;
+}: CrudFormModalProps<T>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/import-dialog.d.ts
 interface ImportDialogProps {
@@ -1271,7 +1273,7 @@ declare function ImportDialog({
   columns,
   title,
   locale
-}: ImportDialogProps): react_jsx_runtime0.JSX.Element;
+}: ImportDialogProps): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/export-dialog.d.ts
 type ExportMode = "selected" | "filtered";
@@ -1291,7 +1293,7 @@ declare function ExportDialog({
   selectedCount,
   onExport,
   canExportFiltered
-}: ExportDialogProps): react_jsx_runtime0.JSX.Element;
+}: ExportDialogProps): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table.d.ts
 interface DataTableProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1304,7 +1306,7 @@ declare function DataTable<TData>({
   children,
   className,
   ...props
-}: DataTableProps<TData>): react_jsx_runtime0.JSX.Element;
+}: DataTableProps<TData>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-advanced-toolbar.d.ts
 interface DataTableAdvancedToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1315,7 +1317,7 @@ declare function DataTableAdvancedToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime0.JSX.Element;
+}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-column-header.d.ts
 interface DataTableColumnHeaderProps<TData, TValue> extends React.ComponentProps<typeof DropdownMenuTrigger> {
@@ -1327,7 +1329,7 @@ declare function DataTableColumnHeader<TData, TValue>({
   label,
   className,
   ...props
-}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime0.JSX.Element;
+}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-faceted-filter.d.ts
 interface DataTableFacetedFilterProps<TData, TValue> {
@@ -1341,7 +1343,7 @@ declare function DataTableFacetedFilter<TData, TValue>({
   title,
   options,
   multiple
-}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime0.JSX.Element;
+}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-pagination.d.ts
 interface DataTablePaginationProps<TData> extends React.ComponentProps<"div"> {
@@ -1353,7 +1355,7 @@ declare function DataTablePagination<TData>({
   pageSizeOptions,
   className,
   ...props
-}: DataTablePaginationProps<TData>): react_jsx_runtime0.JSX.Element;
+}: DataTablePaginationProps<TData>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-toolbar.d.ts
 interface DataTableToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1364,7 +1366,7 @@ declare function DataTableToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableToolbarProps<TData>): react_jsx_runtime0.JSX.Element;
+}: DataTableToolbarProps<TData>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-view-options.d.ts
 interface DataTableViewOptionsProps<TData> extends React$1.ComponentProps<typeof PopoverContent> {
@@ -1375,7 +1377,7 @@ declare function DataTableViewOptions<TData>({
   table,
   disabled,
   ...props
-}: DataTableViewOptionsProps<TData>): react_jsx_runtime0.JSX.Element;
+}: DataTableViewOptionsProps<TData>): react_jsx_runtime7.JSX.Element;
 //#endregion
 //#region src/hooks/use-data-table.d.ts
 interface UseDataTableProps<TData> extends Omit<TableOptions<TData>, "state" | "pageCount" | "getCoreRowModel" | "manualFiltering" | "manualPagination" | "manualSorting">, Required<Pick<TableOptions<TData>, "pageCount">> {

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 "@pixpilot/shadcn";
 import { ClassValue } from "clsx";
-import * as react_jsx_runtime0 from "react/jsx-runtime";
+import * as react_jsx_runtime3 from "react/jsx-runtime";
 import { z } from "zod";
 import { ISchema } from "@formily/json-schema";
 
@@ -361,7 +361,7 @@ declare function AutoTableActionBar<TData>({
   enableDelete,
   extraActions,
   actions
-}: AutoTableActionBarProps<TData>): react_jsx_runtime0.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -529,7 +529,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   showDefaultExport,
   onSelectedCountChange,
   getSelectedRows
-}: AutoTableProps<T>): react_jsx_runtime0.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/i18n/locale.d.ts
 /**
@@ -635,6 +635,7 @@ interface FilterConfig {
   options?: Array<{
     label: string;
     value: string;
+    searchText?: string;
     count?: number;
     icon?: React$1.FC<React$1.SVGProps<SVGSVGElement>>;
   }>;
@@ -874,7 +875,7 @@ declare function AutoCrudTable<TSchema extends z.ZodObject<z.ZodRawShape>>({
   toolbarActions,
   locale: localeProp,
   onCreate
-}: AutoCrudTableProps<TSchema>): react_jsx_runtime0.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>> {
@@ -882,11 +883,11 @@ interface AutoFormProps<T extends z.ZodObject<z.ZodRawShape>> {
   initialValues?: Partial<z.infer<T>>;
   onSubmit: (values: z.infer<T>) => void | Promise<void>;
   overrides?: FormSchemaOverrides;
-  mode?: "create" | "edit";
+  mode?: 'create' | 'edit';
   loading?: boolean;
   gridColumns?: number;
   /** Label 对齐方式 */
-  labelAlign?: "left" | "top" | "right";
+  labelAlign?: 'left' | 'top' | 'right';
   /** Label 宽度（labelAlign 为 left 时有效） */
   labelWidth?: number | string;
   /** 是否显示提交按钮（默认 true） */
@@ -906,7 +907,7 @@ declare function AutoFormInner<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   showSubmitButton
-}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime0.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>;
@@ -1176,6 +1177,7 @@ interface QueryKeys {
 interface Option {
   label: string;
   value: string;
+  searchText?: string;
   count?: number;
   icon?: React.FC<React.SVGProps<SVGSVGElement>>;
 }
@@ -1207,7 +1209,7 @@ declare function AutoTableSimpleFilters<TData>({
   filters: externalFilters,
   onFiltersChange,
   leading
-}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime0.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";
@@ -1249,7 +1251,7 @@ declare function CrudFormModal<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   className
-}: CrudFormModalProps<T>): react_jsx_runtime0.JSX.Element;
+}: CrudFormModalProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/import-dialog.d.ts
 interface ImportDialogProps {
@@ -1271,7 +1273,7 @@ declare function ImportDialog({
   columns,
   title,
   locale
-}: ImportDialogProps): react_jsx_runtime0.JSX.Element;
+}: ImportDialogProps): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/export-dialog.d.ts
 type ExportMode = "selected" | "filtered";
@@ -1291,7 +1293,7 @@ declare function ExportDialog({
   selectedCount,
   onExport,
   canExportFiltered
-}: ExportDialogProps): react_jsx_runtime0.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"> {
@@ -1304,7 +1306,7 @@ declare function DataTable<TData>({
   children,
   className,
   ...props
-}: DataTableProps<TData>): react_jsx_runtime0.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"> {
@@ -1315,7 +1317,7 @@ declare function DataTableAdvancedToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime0.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> {
@@ -1327,7 +1329,7 @@ declare function DataTableColumnHeader<TData, TValue>({
   label,
   className,
   ...props
-}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime0.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> {
@@ -1341,7 +1343,7 @@ declare function DataTableFacetedFilter<TData, TValue>({
   title,
   options,
   multiple
-}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime0.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"> {
@@ -1353,7 +1355,7 @@ declare function DataTablePagination<TData>({
   pageSizeOptions,
   className,
   ...props
-}: DataTablePaginationProps<TData>): react_jsx_runtime0.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"> {
@@ -1364,7 +1366,7 @@ declare function DataTableToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableToolbarProps<TData>): react_jsx_runtime0.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> {
@@ -1375,7 +1377,7 @@ declare function DataTableViewOptions<TData>({
   table,
   disabled,
   ...props
-}: DataTableViewOptionsProps<TData>): react_jsx_runtime0.JSX.Element;
+}: DataTableViewOptionsProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/hooks/use-data-table.d.ts
 interface UseDataTableProps<TData> extends Omit<TableOptions<TData>, "state" | "pageCount" | "getCoreRowModel" | "manualFiltering" | "manualPagination" | "manualSorting">, Required<Pick<TableOptions<TData>, "pageCount">> {

package/dist/index.js

@@ -1022,6 +1022,7 @@ function FacetedItem(props) {
 		else if (context.onItemSelect) context.onItemSelect(currentValue);
 	}, [onSelect, context]);
 	return /* @__PURE__ */ jsxs(CommandItem, {
+		value,
 		"aria-selected": isSelected,
 		"data-selected": isSelected,
 		className: cn("gap-2", className),
@@ -1415,6 +1416,7 @@ function DataTableFilterList({ table, debounceMs = DEBOUNCE_MS$2, throttleMs = T
 	const descriptionId = React.useId();
 	const [open, setOpen] = React.useState(false);
 	const addButtonRef = React.useRef(null);
+	const columnDefs = table.options.columns;
 	const columns = React.useMemo(() => {
 		return table.getAllColumns().filter((column) => {
 			if (!column.getCanFilter()) return false;
@@ -1422,7 +1424,7 @@ function DataTableFilterList({ table, debounceMs = DEBOUNCE_MS$2, throttleMs = T
 			if (modes && !modes.includes("advanced")) return false;
 			return true;
 		});
-	}, [table]);
+	}, [table, columnDefs]);
 	const [filters, setFilters] = useReadableFilters(columns, { debounceMs });
 	const debouncedSetFilters = useDebouncedCallback(setFilters, debounceMs);
 	const [joinOperator, setJoinOperator] = useQueryState(table.options.meta?.queryKeys?.joinOperator ?? "", parseAsStringEnum(["and", "or"]).withDefault("and"));
@@ -1900,8 +1902,16 @@ const DEBOUNCE_MS$1 = 300;
 const THROTTLE_MS$1 = 50;
 const FILTER_SHORTCUT_KEY = "f";
 const REMOVE_FILTER_SHORTCUTS = ["backspace", "delete"];
+function getOptionCommandValue$2(option) {
+	return [
+		option.value,
+		option.label,
+		option.searchText
+	].filter(Boolean).join(" ");
+}
 function DataTableFilterMenu({ table, debounceMs = DEBOUNCE_MS$1, throttleMs = THROTTLE_MS$1, shallow = true, disabled,...props }) {
 	const id = React.useId();
+	const columnDefs = table.options.columns;
 	const columns = React.useMemo(() => {
 		return table.getAllColumns().filter((column) => {
 			if (!column.columnDef.enableColumnFilter) return false;
@@ -1909,7 +1919,7 @@ function DataTableFilterMenu({ table, debounceMs = DEBOUNCE_MS$1, throttleMs = T
 			if (modes && !modes.includes("command")) return false;
 			return true;
 		});
-	}, [table]);
+	}, [table, columnDefs]);
 	const [open, setOpen] = React.useState(false);
 	const [selectedColumn, setSelectedColumn] = React.useState(null);
 	const [inputValue, setInputValue] = React.useState("");
@@ -2178,7 +2188,7 @@ function FilterValueSelector({ column, value, onSelect }) {
 		})] });
 		case "select":
 		case "multiSelect": return /* @__PURE__ */ jsx(CommandGroup, { children: column.columnDef.meta?.options?.map((option) => /* @__PURE__ */ jsxs(CommandItem, {
-			value: option.value,
+			value: getOptionCommandValue$2(option),
 			onSelect: () => onSelect(option.value),
 			children: [
 				option.icon && /* @__PURE__ */ jsx(option.icon, {}),
@@ -2305,7 +2315,7 @@ function onFilterInputRender({ filter, column, inputId, onFilterUpdate, showValu
 					align: "start",
 					className: "w-48 p-0",
 					children: /* @__PURE__ */ jsxs(Command, { children: [/* @__PURE__ */ jsx(CommandInput, { placeholder: "Search options..." }), /* @__PURE__ */ jsxs(CommandList, { children: [/* @__PURE__ */ jsx(CommandEmpty, { children: "No options found." }), /* @__PURE__ */ jsx(CommandGroup, { children: options.map((option) => /* @__PURE__ */ jsxs(CommandItem, {
-						value: option.value,
+						value: getOptionCommandValue$2(option),
 						onSelect: () => {
 							const value = filter.variant === "multiSelect" ? selectedValues.includes(option.value) ? selectedValues.filter((v) => v !== option.value) : [...selectedValues, option.value] : option.value;
 							onFilterUpdate(filter.filterId, { value });
@@ -2665,6 +2675,7 @@ function DataTableViewOptions({ table, disabled,...props }) {
 //#endregion
 //#region src/components/auto-crud/auto-table-simple-filters.tsx
 function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilters, onFiltersChange, leading }) {
+	const columnDefs = table.options.columns;
 	const columns = React.useMemo(() => table.getAllColumns().filter((col) => col.getCanFilter()).sort((a, b) => {
 		const readOrder = (column) => {
 			const metaIndex = column.columnDef.meta?.index;
@@ -2674,7 +2685,7 @@ function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilte
 		const orderDiff = readOrder(a) - readOrder(b);
 		if (orderDiff !== 0) return orderDiff;
 		return a.getIndex() - b.getIndex();
-	}), [table]);
+	}), [table, columnDefs]);
 	const queryStateOptions = table.options.meta?.queryStateOptions;
 	const [queryFilters, setQueryFilters] = useReadableFilters(columns, {
 		...queryStateOptions,
@@ -2908,6 +2919,13 @@ function AutoTableSimpleFilters({ table, shallow = false, filters: externalFilte
 		]
 	});
 }
+function getOptionCommandValue$1(option) {
+	return [
+		option.value,
+		option.label,
+		option.searchText
+	].filter(Boolean).join(" ");
+}
 function SimpleFacetedFilter({ title, options, multiple, value, onChange }) {
 	const [open, setOpen] = React.useState(false);
 	const selectedValues = React.useMemo(() => new Set(value), [value]);
@@ -2987,6 +3005,7 @@ function SimpleFacetedFilter({ title, options, multiple, value, onChange }) {
 						children: options.map((option) => {
 							const isSelected = selectedValues.has(option.value);
 							return /* @__PURE__ */ jsxs(CommandItem, {
+								value: getOptionCommandValue$1(option),
 								onSelect: () => onItemSelect(option, isSelected),
 								children: [
 									/* @__PURE__ */ jsx("div", {
@@ -4698,25 +4717,27 @@ function AutoTable({ schema, data, pageCount = 1, overrides, enableRowSelection
 		clearOnDefault: true
 	});
 	const searchConfig = search && typeof search === "object" ? search : {};
+	const enableAdvancedFilter = true;
+	const columns = useMemo(() => {
+		const dataColumns = createTableSchema(schema, {
+			overrides,
+			exclude
+		});
+		const result = enableRowSelection ? [createSelectColumn(), ...dataColumns] : dataColumns;
+		if (actions) result.push(createActionsColumn(actions));
+		return result;
+	}, [
+		schema,
+		overrides,
+		enableRowSelection,
+		exclude,
+		actions
+	]);
 	const { table, shallow, debounceMs, throttleMs } = useDataTable({
 		data,
-		columns: useMemo(() => {
-			const dataColumns = createTableSchema(schema, {
-				overrides,
-				exclude
-			});
-			const result = enableRowSelection ? [createSelectColumn(), ...dataColumns] : dataColumns;
-			if (actions) result.push(createActionsColumn(actions));
-			return result;
-		}, [
-			schema,
-			overrides,
-			enableRowSelection,
-			exclude,
-			actions
-		]),
+		columns,
 		pageCount,
-		enableAdvancedFilter: true,
+		enableAdvancedFilter,
 		initialState: useMemo(() => ({
 			sorting: initialSorting,
 			columnPinning: pinnedColumns ?? {
@@ -4802,6 +4823,7 @@ function AutoTable({ schema, data, pageCount = 1, overrides, enableRowSelection
 	}, [
 		currentMode,
 		table,
+		columns,
 		shallow,
 		searchInput,
 		debounceMs,
@@ -5011,7 +5033,7 @@ function createEditFormSchema(schema, options) {
 
 //#endregion
 //#region src/components/auto-crud/auto-form.tsx
-const COMBOBOX_LIST_CLASS = "[&_[cmdk-list]]:max-h-[360px]";
+const COMBOBOX_LIST_CLASS = "[&_[cmdk-list]]:max-h-[360px] [&_[cmdk-list]]:overflow-x-hidden [&_[cmdk-list]]:overflow-y-auto";
 const FormilySwitch = connect(Switch, mapProps({
 	value: "checked",
 	onInput: "onCheckedChange"
@@ -5883,6 +5905,28 @@ function ImportDialog({ open, onOpenChange, onImport, columns = [], title, local
 
 //#endregion
 //#region src/components/auto-crud/auto-crud-table.tsx
+function mergeFieldPart(base, override) {
+	if (override === void 0) return base;
+	if (override === false || base === false || typeof base !== "object" || typeof override !== "object" || base === null || override === null || Array.isArray(base) || Array.isArray(override)) return override;
+	return {
+		...base,
+		...override
+	};
+}
+function mergeFieldConfig(base, override) {
+	return {
+		...base,
+		...override,
+		table: mergeFieldPart(base?.table, override?.table),
+		filter: mergeFieldPart(base?.filter, override?.filter),
+		form: mergeFieldPart(base?.form, override?.form)
+	};
+}
+function mergeFields(base, override) {
+	if (!base && !override) return void 0;
+	const keys = new Set([...Object.keys(base ?? {}), ...Object.keys(override ?? {})]);
+	return Object.fromEntries(Array.from(keys).map((key) => [key, mergeFieldConfig(base?.[key], override?.[key])]));
+}
 /**
 * 从统一配置生成表格 overrides
 * 当 filter 配置存在时，合并到 meta 中（不影响列隐藏）
@@ -6175,10 +6219,7 @@ function resolveActions(actionsOrFn, defaults, rowActionsLocale) {
 function AutoCrudTable({ title, description, schema, resource, fields, table: tableConfig, form: formConfig, permissions, actions: actionItems, toolbarActions, locale: localeProp, onCreate }) {
 	const locale = resolveLocale(localeProp);
 	const resolvedSchema = resource.schema ?? schema;
-	const resolvedFields = React.useMemo(() => ({
-		...fields,
-		...resource.fields
-	}), [fields, resource.fields]);
+	const resolvedFields = React.useMemo(() => mergeFields(resource.fields, fields) ?? {}, [fields, resource.fields]);
 	const can = {
 		create: permissions?.can?.create ?? true,
 		update: permissions?.can?.update ?? true,
@@ -6502,6 +6543,13 @@ function DataTableAdvancedToolbar({ table, children, className,...props }) {
 
 //#endregion
 //#region src/components/data-table/data-table-faceted-filter.tsx
+function getOptionCommandValue(option) {
+	return [
+		option.value,
+		option.label,
+		option.searchText
+	].filter(Boolean).join(" ");
+}
 function DataTableFacetedFilter({ column, title, options, multiple }) {
 	const [open, setOpen] = React.useState(false);
 	const columnFilterValue = column?.getFilterValue();
@@ -6583,6 +6631,7 @@ function DataTableFacetedFilter({ column, title, options, multiple }) {
 						children: options.map((option) => {
 							const isSelected = selectedValues.has(option.value);
 							return /* @__PURE__ */ jsxs(CommandItem, {
+								value: getOptionCommandValue(option),
 								onSelect: () => onItemSelect(option, isSelected),
 								children: [
 									/* @__PURE__ */ jsx("div", {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud",
   "type": "module",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Schema-first CRUD components with auto-generated tables and forms",
   "author": "wordrhyme",
   "license": "MIT",
@@ -84,9 +84,9 @@
     "typescript": "^5.9.3",
     "@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"
+    "@internal/vitest-config": "0.1.0",
+    "@internal/tsconfig": "0.1.0"
   },
   "prettier": "@internal/prettier-config",
   "scripts": {