@wordrhyme/auto-crud 1.5.4 → 1.5.6

package/dist/index.cjs

@@ -405,6 +405,21 @@ function useDateFormatterVersion() {
 function getHostDateFormatter() {
 	return hostDateFormatters[hostDateFormatters.length - 1]?.formatter;
 }
+const canonicalDatePattern = /^(\d{4})-(\d{2})-(\d{2})$/;
+const canonicalDateTimePrefixPattern = /^(\d{4})-(\d{2})-(\d{2})(?=[T ])/;
+function isValidCalendarDate(year, month, day) {
+	if (!year || !month || !day) return false;
+	const date = /* @__PURE__ */ new Date(`${year}-${month}-${day}T00:00:00.000Z`);
+	return !Number.isNaN(date.getTime()) && date.getUTCFullYear() === Number(year) && date.getUTCMonth() + 1 === Number(month) && date.getUTCDate() === Number(day);
+}
+function isValidCanonicalDate(value) {
+	const match = canonicalDatePattern.exec(value);
+	return !!match && isValidCalendarDate(match[1], match[2], match[3]);
+}
+function hasValidCanonicalDateTimePrefix(value) {
+	const match = canonicalDateTimePrefixPattern.exec(value);
+	return !match || isValidCalendarDate(match[1], match[2], match[3]);
+}
 /**
 * Register the host's process-wide date presentation policy without coupling
 * AutoCrud to locale or timezone selection. The returned cleanup removes only
@@ -431,18 +446,45 @@ function setDateFormatter(formatter) {
 		if (hostDateFormatters.length !== previousLength && getHostDateFormatter() !== currentFormatter) notifyDateFormatterChange();
 	};
 }
-function formatDate(date, opts = {}) {
+function formatDate(date, opts = {}, preset) {
 	if (date === void 0) return "";
+	if (preset === "date" && typeof date === "string" && canonicalDatePattern.test(date)) return isValidCanonicalDate(date) ? date : "";
+	if (preset === "datetime" && typeof date === "string" && !hasValidCanonicalDateTimePrefix(date)) return "";
 	try {
 		const value = new Date(date);
+		if (Number.isNaN(value.getTime())) return "";
 		const options = {
-			month: opts.month ?? "long",
-			day: opts.day ?? "numeric",
+			month: opts.month ?? (preset ? "2-digit" : "long"),
+			day: opts.day ?? (preset ? "2-digit" : "numeric"),
 			year: opts.year ?? "numeric",
+			...preset === "datetime" ? {
+				hour: opts.hour ?? "2-digit",
+				minute: opts.minute ?? "2-digit",
+				second: opts.second ?? "2-digit",
+				hourCycle: opts.hourCycle ?? "h23"
+			} : {},
 			...opts
 		};
 		const hostDateFormatter = getHostDateFormatter();
-		return hostDateFormatter ? hostDateFormatter(value, options) : new Intl.DateTimeFormat("en-US", options).format(value);
+		if (hostDateFormatter) return preset ? hostDateFormatter(value, options, preset) : hostDateFormatter(value, options);
+		if (preset) {
+			const parts = new Intl.DateTimeFormat("en-CA", {
+				timeZone: opts.timeZone,
+				year: "numeric",
+				month: "2-digit",
+				day: "2-digit",
+				...preset === "datetime" ? {
+					hour: "2-digit",
+					minute: "2-digit",
+					second: "2-digit",
+					hourCycle: "h23"
+				} : {}
+			}).formatToParts(value);
+			const read = (type) => parts.find((part) => part.type === type)?.value ?? "";
+			const formattedDate = `${read("year")}-${read("month")}-${read("day")}`;
+			return preset === "datetime" ? `${formattedDate} ${read("hour")}:${read("minute")}:${read("second")}` : formattedDate;
+		}
+		return new Intl.DateTimeFormat("en-US", options).format(value);
 	} catch {
 		return "";
 	}
@@ -3194,6 +3236,10 @@ function renderCell(value, type, options) {
 		className: "text-muted-foreground",
 		children: "-"
 	});
+	if (Array.isArray(value) && value.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+		className: "text-muted-foreground",
+		children: "-"
+	});
 	const formatOptionValue = (optionValue) => {
 		const stringValue = String(optionValue);
 		return options?.find((option) => option.value === stringValue)?.label ?? stringValue;
@@ -5978,6 +6024,16 @@ function mergeFields(base, override) {
 	const keys = new Set([...Object.keys(base ?? {}), ...Object.keys(override ?? {})]);
 	return Object.fromEntries(Array.from(keys).map((key) => [key, mergeFieldConfig(base?.[key], override?.[key])]));
 }
+function applyResourceTablePresentation(fields, resourceFields) {
+	if (!fields || !resourceFields) return fields;
+	return Object.fromEntries(Object.entries(fields).map(([key, config]) => {
+		const table = resourceFields[key]?.table;
+		return [key, table === void 0 ? config : {
+			...config,
+			table: mergeFieldPart(config.table, table)
+		}];
+	}));
+}
 function normalizeFieldOptions(options) {
 	if (!options || options.length === 0) return void 0;
 	return options.map((option) => ({
@@ -5985,6 +6041,18 @@ function normalizeFieldOptions(options) {
 		value: String(option.value)
 	}));
 }
+function getTableConfig(config) {
+	return config.table && typeof config.table === "object" ? config.table : void 0;
+}
+function getTableOptions(config) {
+	const table = getTableConfig(config);
+	if (table?.options) return normalizeFieldOptions(table.options);
+	if (table?.dataSource) return void 0;
+	return normalizeFieldOptions(config.enum);
+}
+function getTableDataSource(config) {
+	return getTableConfig(config)?.dataSource ?? config.dataSource;
+}
 function toTableOptions(options) {
 	return options?.map(({ label, value, searchText, count, icon }) => ({
 		label,
@@ -6060,8 +6128,8 @@ function mergeOptionsByField(left, right) {
 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;
+	if (getTableOptions(config) && !getTableConfig(config)?.dataSource) return false;
+	return normalizeDataSourceConfig(getTableDataSource(config)) !== void 0;
 }
 function useRegistryVersion(subscribe) {
 	const [version$1, setVersion] = react.useState(0);
@@ -6306,7 +6374,7 @@ function useDynamicResolveOptions(fields, rows, hiddenColumns) {
 		const hiddenSet = new Set(hiddenColumns);
 		return Object.entries(fields).flatMap(([field, config]) => {
 			if (!shouldResolveOptions(field, config, hiddenSet)) return [];
-			const source = normalizeDataSourceConfig(config.dataSource);
+			const source = normalizeDataSourceConfig(getTableDataSource(config));
 			const values = getResolveValues(rows, field);
 			return source && values.length > 0 ? [{
 				field,
@@ -6403,12 +6471,16 @@ function buildTableOverrides(fields, legacyOverrides, dynamicFilterState, dynami
 	const result = { ...legacyOverrides };
 	if (fields) for (const [key, config] of Object.entries(fields)) {
 		const fieldOptions = normalizeFieldOptions(config.enum);
+		const tableConfig = getTableConfig(config);
+		const presentationOptions = getTableOptions(config);
 		const tableOptions = toTableOptions(fieldOptions);
 		const filterDataSourceRegistered = dynamicFilterState?.registeredByField[key];
 		const filterDataSourceSearchable = dynamicFilterState?.searchableByField[key];
 		const currentDynamicOptions = !fieldOptions && filterDataSourceRegistered ? toTableOptions(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 dynamicFilterLabelOptions = !fieldOptions && filterDataSourceRegistered ? dynamicFilterState?.labelOptionsByField[key] ?? dynamicFilterState?.optionsByField[key] ?? [] : void 0;
+		const dynamicResolveOptions = dynamicResolveState?.optionsByField[key];
+		const mergedSharedDynamicOptions = mergeFieldOptions(dynamicFilterLabelOptions, tableConfig?.dataSource ? void 0 : dynamicResolveOptions);
+		const dynamicOptions = !fieldOptions && mergedSharedDynamicOptions ? toTableOptions(mergedSharedDynamicOptions) : void 0;
 		const tableMeta = config.table !== false && typeof config.table === "object" ? config.table.meta : void 0;
 		const fieldEnumMeta = tableOptions ? {
 			options: tableOptions,
@@ -6472,11 +6544,24 @@ function buildTableOverrides(fields, legacyOverrides, dynamicFilterState, dynami
 			hidden: true
 		};
 		else if (config.table && typeof config.table === "object") {
-			const { meta,...tableProps } = config.table;
+			const { meta, display,...tableProps } = config.table;
+			delete tableProps.options;
+			delete tableProps.dataSource;
 			result[key] = {
 				...result[key],
 				...tableProps
 			};
+			const hasTableLabels = config.table.options !== void 0 || config.table.dataSource !== void 0;
+			if (display && display !== "auto" || hasTableLabels) {
+				const options = tableConfig?.dataSource ? mergeFieldOptions(dynamicResolveOptions, presentationOptions) : presentationOptions ?? mergedSharedDynamicOptions;
+				result[key] = {
+					...result[key],
+					cell: ({ row }) => renderFieldValue(row.getValue(key), "string", {
+						true: "true",
+						false: "false"
+					}, options, display ?? "auto")
+				};
+			}
 		}
 	}
 	return result;
@@ -6524,7 +6609,9 @@ function buildHiddenColumns(fields, legacyHidden, denyFields, legacyOverrides) {
 	for (const key of DEFAULT_HIDDEN_AUDIT_FIELDS) if (!legacyHiddenSet.has(key) && !denySet.has(key) && isTableOverrideExplicitlyVisible(legacyOverrides?.[key])) hidden.delete(key);
 	if (fields) for (const [key, config] of Object.entries(fields)) {
 		if (isDefaultHiddenAuditField(key) && !legacyHiddenSet.has(key) && !denySet.has(key) && isFieldTableExplicitlyVisible(config)) hidden.delete(key);
-		if (config.hidden) hidden.add(key);
+		if (config.table && typeof config.table === "object" && config.table.hidden === false) {
+			if (!legacyHiddenSet.has(key) && !denySet.has(key)) hidden.delete(key);
+		} else if (config.hidden) hidden.add(key);
 		else if (config.table === false) hidden.add(key);
 		else if (config.table && typeof config.table === "object" && config.table.hidden) hidden.add(key);
 	}
@@ -6574,12 +6661,36 @@ function buildBatchUpdateFields(schema, batchFields, fields) {
 /**
 * 渲染字段值
 */
-function renderFieldValue(value, type, booleanLocale, options) {
+function renderFieldValue(value, type, booleanLocale, options, display = "auto") {
 	if (value === null || value === void 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 		className: "text-muted-foreground",
 		children: "-"
 	});
-	if (options && options.length > 0) {
+	if (Array.isArray(value) && value.length === 0) return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+		className: "text-muted-foreground",
+		children: "-"
+	});
+	const renderText = (item) => getOptionLabel(item, options);
+	if (display === "text") return Array.isArray(value) ? value.map(renderText).join(", ") : renderText(value);
+	if (display === "date" || display === "datetime") return formatDate(value, {}, display);
+	if (display === "badge" && (!options || options.length === 0)) {
+		if (Array.isArray(value)) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+			className: "flex gap-1 flex-wrap",
+			children: [value.slice(0, 5).map((item, index$1) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Badge, {
+				variant: "secondary",
+				children: String(item)
+			}, index$1)), value.length > 5 && /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__wordrhyme_shadcn.Badge, {
+				variant: "outline",
+				children: ["+", value.length - 5]
+			})]
+		});
+		return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Badge, {
+			variant: "outline",
+			className: "capitalize",
+			children: String(value)
+		});
+	}
+	if ((display === "badge" || display === "auto") && options && options.length > 0) {
 		if (Array.isArray(value)) return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 			className: "flex gap-1 flex-wrap",
 			children: [value.slice(0, 5).map((v, i) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Badge, {
@@ -6771,7 +6882,7 @@ function resolveActions(actionsOrFn, defaults, rowActionsLocale, context) {
 function AutoCrudTable({ id, title, description, schema, resource, fields, table: tableConfig, form: formConfig, permissions, actions: actionItems, toolbar, toolbarActions, locale: localeProp, onCreate }) {
 	const locale = resolveLocale(localeProp);
 	const resolvedSchema = resource.schema ?? schema;
-	const resolvedFields = react.useMemo(() => mergeFields(resource.fields, fields) ?? {}, [fields, resource.fields]);
+	const resolvedFields = react.useMemo(() => applyResourceTablePresentation(mergeFields(resource.fields, fields), resource.fields) ?? {}, [fields, resource.fields]);
 	const can = {
 		create: permissions?.can?.create ?? true,
 		update: permissions?.can?.update ?? true,
@@ -6794,7 +6905,18 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 		tableConfig?.overrides
 	]);
 	const dynamicResolveOptions = useDynamicResolveOptions(resolvedFields, resource.tableData.data, hiddenColumns);
-	const dynamicOptionsByField = react.useMemo(() => mergeOptionsByField(dynamicFilterOptions.labelOptionsByField, dynamicResolveOptions.optionsByField), [dynamicFilterOptions.labelOptionsByField, dynamicResolveOptions.optionsByField]);
+	const sharedResolveOptions = useDynamicResolveOptions(react.useMemo(() => Object.fromEntries(Object.entries(resolvedFields).flatMap(([field, config]) => {
+		const table = getTableConfig(config);
+		if (table?.options === void 0 && table?.dataSource === void 0) return [];
+		const { table: _table,...sharedConfig } = config;
+		return [[field, sharedConfig]];
+	})), [resolvedFields]), resource.tableData.data, hiddenColumns);
+	const viewDynamicOptionsByField = react.useMemo(() => mergeOptionsByField(mergeOptionsByField(dynamicFilterOptions.labelOptionsByField, sharedResolveOptions.optionsByField), Object.fromEntries(Object.entries(dynamicResolveOptions.optionsByField).filter(([field]) => !getTableConfig(resolvedFields[field] ?? {})?.dataSource))), [
+		dynamicFilterOptions.labelOptionsByField,
+		dynamicResolveOptions.optionsByField,
+		sharedResolveOptions.optionsByField,
+		resolvedFields
+	]);
 	const resourceIdKey = resource.idKey ?? "id";
 	const actionRegistryVersion = useCrudActionsVersion();
 	const unifiedActions = react.useMemo(() => {
@@ -7126,7 +7248,7 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 				data: resource.modal.selected,
 				schema: resolvedSchema,
 				fields: resolvedFields,
-				dynamicOptions: dynamicOptionsByField,
+				dynamicOptions: viewDynamicOptionsByField,
 				denyFields,
 				locale
 			}),

package/dist/index.d.cts

@@ -808,6 +808,7 @@ interface FieldOption {
   icon?: React$1.FC<React$1.SVGProps<SVGSVGElement>>;
   disabled?: boolean;
 }
+type FieldTableDisplay = 'auto' | 'text' | 'badge' | 'date' | 'datetime';
 /**
  * 统一字段配置
  * 支持共用配置 + 表格/表单特定配置
@@ -838,8 +839,16 @@ interface Field {
   table?: {
     /** 是否在表格中隐藏 */
     hidden?: boolean;
+    /** 表格列标签 */
+    label?: string;
     /** 排序权重，数值越小越靠前 */
     index?: number;
+    /** 仅用于表格展示的静态值标签；与 dataSource 同时配置时覆盖同值的动态标签 */
+    options?: FieldOption[];
+    /** 仅用于表格展示的动态值标签源 */
+    dataSource?: AutoCrudDataSourceConfig;
+    /** 声明式单元格展示模式；非 auto 模式会覆盖拥有方自定义 cell */
+    display?: FieldTableDisplay;
     /** 筛选器配置 */
     meta?: Record<string, unknown>;
     /** 其他列配置 */
@@ -1337,12 +1346,12 @@ declare const filterItemSchema: z.ZodObject<{
   variant: z.ZodEnum<{
     number: "number";
     boolean: "boolean";
-    text: "text";
-    range: "range";
     date: "date";
-    dateRange: "dateRange";
+    text: "text";
     select: "select";
     multiSelect: "multiSelect";
+    dateRange: "dateRange";
+    range: "range";
   }>;
   operator: z.ZodEnum<{
     iLike: "iLike";
@@ -1904,7 +1913,8 @@ declare function createMemoryDataSource<T extends {
 }>(initialData?: T[]): DataSource<T>;
 //#endregion
 //#region src/lib/format.d.ts
-type DateFormatter = (date: Date, options: Intl.DateTimeFormatOptions) => string;
+type DateFormatPreset = 'date' | 'datetime';
+type DateFormatter = (date: Date, options: Intl.DateTimeFormatOptions, preset?: DateFormatPreset) => string;
 /**
  * Register the host's process-wide date presentation policy without coupling
  * AutoCrud to locale or timezone selection. The returned cleanup removes only
@@ -1912,7 +1922,7 @@ type DateFormatter = (date: Date, options: Intl.DateTimeFormatOptions) => string
  * Passing undefined clears every registration.
  */
 declare function setDateFormatter(formatter?: DateFormatter): () => void;
-declare function formatDate(date: Date | string | number | undefined, opts?: Intl.DateTimeFormatOptions): string;
+declare function formatDate(date: Date | string | number | undefined, opts?: Intl.DateTimeFormatOptions, preset?: DateFormatPreset): string;
 //#endregion
 //#region src/lib/humanize.d.ts
 /**
@@ -1992,4 +2002,4 @@ declare function exportAllToCSV<T extends Record<string, unknown>>(data: T[], op
  */
 declare function downloadCSVTemplate(headers: string[], filename?: string): void;
 //#endregion
-export { type ActionConfig, type ActionItem, type ActionsColumnConfig, type AutoCrudActionConfig, type AutoCrudActionsConfig, type AutoCrudDataSourceConfig, type AutoCrudDataSourceContext, type AutoCrudDataSourceEntry, type AutoCrudDataSourceLoader, type AutoCrudDataSourceRegistration, type AutoCrudFormComponentConfig, type AutoCrudLocale, type AutoCrudOption, type AutoCrudQueryCapabilities, type AutoCrudRowActionContext, AutoCrudTable, type AutoCrudTableProps, type AutoCrudToolbarContext, type AutoCrudToolbarResolver, AutoForm, type AutoFormProps, type AutoQueryParams, AutoTable, AutoTableActionBar, AutoTableSimpleFilters, type BatchActionConfig, type BatchActionContext, type BatchActionItem, type BatchBuiltinActionItem, type BatchBuiltinActionType, type BatchCustomActionItem, type BatchUpdateField, type ColumnOverrides, type CreateFormSchemaOptions, type CreateTableSchemaOptions, type CrudActionBase, type CrudActionEntry, type CrudActionRegistration, type CrudActionZone, CrudFormModal, type CrudHooks, type CrudOperationPermissions, type CrudPermissions, type DataSource, DataTable, DataTableAdvancedToolbar, DataTableColumnHeader, DataTableFacetedFilter, DataTablePagination, DataTableRowAction, DataTableToolbar, DataTableViewOptions, type DateFormatter, type EnumOption, ExportDialog, type ExportDialogProps, type ExportMode, ExtendedColumnFilter, ExtendedColumnSort, type Field, type FieldOption, type FieldType, type Fields, type FilterConfig, FilterOperator, type FilterVariant, type FormSchemaOverrides, ImportDialog, type ImportDialogProps, type ImportResult, type JSONSchema, type JSONSchemaProperty, JoinOperator, type ListParams, type ListResult, type LocaleProp, MultiCombobox, type MultiComboboxOption, type MultiComboboxProps, type MultiComboboxTriggerRenderProps, Option, type ParsedImportData, type ParsedZodField, type Parser, QueryKeys, type RowActionConfig, type RowActionItem, type RowBuiltinActionItem, type RowBuiltinActionType, type RowCustomActionItem, SchemaAdapter, Select, type SelectMode, type SelectOption, type SelectProps, type SelectSearchableDynamicProps, type SelectSearchableMultipleProps, type SelectSearchableProps, type SelectSearchableSingleProps, type SelectSimpleProps, type SelectTriggerRenderProps, type SimpleFieldConfig, type SimpleFieldsConfig, type ToastAdapter, type ToolbarActionConfig, type ToolbarActionItem, type ToolbarBuiltinActionItem, type ToolbarBuiltinActionType, type ToolbarCustomActionItem, type UnifiedField, type UnifiedSchema, type UrlStateOptions, type UseAutoCrudResourceOptions, type UseAutoCrudResourceParams, type UseAutoCrudResourceReturn, cn, coerceRowValues, components, createActionsColumn, createEditFormSchema, createFormSchema, createMemoryDataSource, createSelectColumn, createTRPCDataSource, createTableSchema, crudActions, dataSources, dataToCSV, deDE, downloadCSVTemplate, enUS, esES, exportAllToCSV, exportTableToCSV, formComponents, formatDate, frFR, generateCSVTemplate, getUrlParams, humanize, jaJP, koKR, noopToastAdapter, normalizeDataSourceConfig, normalizeOptions, parseAsArrayOf, parseAsInteger, parseAsString, parseAsStringEnum, parseCSV, parseImportFile, parseJSON, parseZodField, resolveLocale, setDateFormatter, setSearchParams, setToolbarResolver, useAutoCrudResource, useDataTable, useQueryState, useQueryStates, useReadableFilters, useUrlState, useUrlStates, zhCN };
+export { type ActionConfig, type ActionItem, type ActionsColumnConfig, type AutoCrudActionConfig, type AutoCrudActionsConfig, type AutoCrudDataSourceConfig, type AutoCrudDataSourceContext, type AutoCrudDataSourceEntry, type AutoCrudDataSourceLoader, type AutoCrudDataSourceRegistration, type AutoCrudFormComponentConfig, type AutoCrudLocale, type AutoCrudOption, type AutoCrudQueryCapabilities, type AutoCrudRowActionContext, AutoCrudTable, type AutoCrudTableProps, type AutoCrudToolbarContext, type AutoCrudToolbarResolver, AutoForm, type AutoFormProps, type AutoQueryParams, AutoTable, AutoTableActionBar, AutoTableSimpleFilters, type BatchActionConfig, type BatchActionContext, type BatchActionItem, type BatchBuiltinActionItem, type BatchBuiltinActionType, type BatchCustomActionItem, type BatchUpdateField, type ColumnOverrides, type CreateFormSchemaOptions, type CreateTableSchemaOptions, type CrudActionBase, type CrudActionEntry, type CrudActionRegistration, type CrudActionZone, CrudFormModal, type CrudHooks, type CrudOperationPermissions, type CrudPermissions, type DataSource, DataTable, DataTableAdvancedToolbar, DataTableColumnHeader, DataTableFacetedFilter, DataTablePagination, DataTableRowAction, DataTableToolbar, DataTableViewOptions, type DateFormatPreset, type DateFormatter, type EnumOption, ExportDialog, type ExportDialogProps, type ExportMode, ExtendedColumnFilter, ExtendedColumnSort, type Field, type FieldOption, type FieldTableDisplay, type FieldType, type Fields, type FilterConfig, FilterOperator, type FilterVariant, type FormSchemaOverrides, ImportDialog, type ImportDialogProps, type ImportResult, type JSONSchema, type JSONSchemaProperty, JoinOperator, type ListParams, type ListResult, type LocaleProp, MultiCombobox, type MultiComboboxOption, type MultiComboboxProps, type MultiComboboxTriggerRenderProps, Option, type ParsedImportData, type ParsedZodField, type Parser, QueryKeys, type RowActionConfig, type RowActionItem, type RowBuiltinActionItem, type RowBuiltinActionType, type RowCustomActionItem, SchemaAdapter, Select, type SelectMode, type SelectOption, type SelectProps, type SelectSearchableDynamicProps, type SelectSearchableMultipleProps, type SelectSearchableProps, type SelectSearchableSingleProps, type SelectSimpleProps, type SelectTriggerRenderProps, type SimpleFieldConfig, type SimpleFieldsConfig, type ToastAdapter, type ToolbarActionConfig, type ToolbarActionItem, type ToolbarBuiltinActionItem, type ToolbarBuiltinActionType, type ToolbarCustomActionItem, type UnifiedField, type UnifiedSchema, type UrlStateOptions, type UseAutoCrudResourceOptions, type UseAutoCrudResourceParams, type UseAutoCrudResourceReturn, cn, coerceRowValues, components, createActionsColumn, createEditFormSchema, createFormSchema, createMemoryDataSource, createSelectColumn, createTRPCDataSource, createTableSchema, crudActions, dataSources, dataToCSV, deDE, downloadCSVTemplate, enUS, esES, exportAllToCSV, exportTableToCSV, formComponents, formatDate, frFR, generateCSVTemplate, getUrlParams, humanize, jaJP, koKR, noopToastAdapter, normalizeDataSourceConfig, normalizeOptions, parseAsArrayOf, parseAsInteger, parseAsString, parseAsStringEnum, parseCSV, parseImportFile, parseJSON, parseZodField, resolveLocale, setDateFormatter, setSearchParams, setToolbarResolver, useAutoCrudResource, useDataTable, useQueryState, useQueryStates, useReadableFilters, useUrlState, useUrlStates, zhCN };

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_runtime3 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";
@@ -413,7 +413,7 @@ declare function AutoTableActionBar<TData>({
   extraActions,
   actions,
   deleteConfirmation
-}: AutoTableActionBarProps<TData>): react_jsx_runtime2.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -592,7 +592,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   onSelectedCountChange,
   onSelectedRowsChange,
   getSelectedRows
-}: AutoTableProps<T>): react_jsx_runtime2.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/i18n/locale.d.ts
 /**
@@ -808,6 +808,7 @@ interface FieldOption {
   icon?: React$1.FC<React$1.SVGProps<SVGSVGElement>>;
   disabled?: boolean;
 }
+type FieldTableDisplay = 'auto' | 'text' | 'badge' | 'date' | 'datetime';
 /**
  * 统一字段配置
  * 支持共用配置 + 表格/表单特定配置
@@ -838,8 +839,16 @@ interface Field {
   table?: {
     /** 是否在表格中隐藏 */
     hidden?: boolean;
+    /** 表格列标签 */
+    label?: string;
     /** 排序权重，数值越小越靠前 */
     index?: number;
+    /** 仅用于表格展示的静态值标签；与 dataSource 同时配置时覆盖同值的动态标签 */
+    options?: FieldOption[];
+    /** 仅用于表格展示的动态值标签源 */
+    dataSource?: AutoCrudDataSourceConfig;
+    /** 声明式单元格展示模式；非 auto 模式会覆盖拥有方自定义 cell */
+    display?: FieldTableDisplay;
     /** 筛选器配置 */
     meta?: Record<string, unknown>;
     /** 其他列配置 */
@@ -1084,7 +1093,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>> {
@@ -1123,7 +1132,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>;
@@ -1337,12 +1346,12 @@ declare const filterItemSchema: z.ZodObject<{
   variant: z.ZodEnum<{
     number: "number";
     boolean: "boolean";
-    text: "text";
-    range: "range";
     date: "date";
-    dateRange: "dateRange";
+    text: "text";
     select: "select";
     multiSelect: "multiSelect";
+    dateRange: "dateRange";
+    range: "range";
   }>;
   operator: z.ZodEnum<{
     iLike: "iLike";
@@ -1439,7 +1448,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';
@@ -1483,7 +1492,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 {
@@ -1505,7 +1514,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';
@@ -1525,7 +1534,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'> {
@@ -1538,7 +1547,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'> {
@@ -1549,7 +1558,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> {
@@ -1561,7 +1570,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> {
@@ -1575,7 +1584,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'> {
@@ -1587,7 +1596,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'> {
@@ -1598,7 +1607,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> {
@@ -1609,7 +1618,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/lib/crud-actions.d.ts
 type CrudActionZone = 'toolbar' | 'row' | 'batch';
@@ -1904,7 +1913,8 @@ declare function createMemoryDataSource<T extends {
 }>(initialData?: T[]): DataSource<T>;
 //#endregion
 //#region src/lib/format.d.ts
-type DateFormatter = (date: Date, options: Intl.DateTimeFormatOptions) => string;
+type DateFormatPreset = 'date' | 'datetime';
+type DateFormatter = (date: Date, options: Intl.DateTimeFormatOptions, preset?: DateFormatPreset) => string;
 /**
  * Register the host's process-wide date presentation policy without coupling
  * AutoCrud to locale or timezone selection. The returned cleanup removes only
@@ -1912,7 +1922,7 @@ type DateFormatter = (date: Date, options: Intl.DateTimeFormatOptions) => string
  * Passing undefined clears every registration.
  */
 declare function setDateFormatter(formatter?: DateFormatter): () => void;
-declare function formatDate(date: Date | string | number | undefined, opts?: Intl.DateTimeFormatOptions): string;
+declare function formatDate(date: Date | string | number | undefined, opts?: Intl.DateTimeFormatOptions, preset?: DateFormatPreset): string;
 //#endregion
 //#region src/lib/humanize.d.ts
 /**
@@ -1992,4 +2002,4 @@ declare function exportAllToCSV<T extends Record<string, unknown>>(data: T[], op
  */
 declare function downloadCSVTemplate(headers: string[], filename?: string): void;
 //#endregion
-export { type ActionConfig, type ActionItem, type ActionsColumnConfig, type AutoCrudActionConfig, type AutoCrudActionsConfig, type AutoCrudDataSourceConfig, type AutoCrudDataSourceContext, type AutoCrudDataSourceEntry, type AutoCrudDataSourceLoader, type AutoCrudDataSourceRegistration, type AutoCrudFormComponentConfig, type AutoCrudLocale, type AutoCrudOption, type AutoCrudQueryCapabilities, type AutoCrudRowActionContext, AutoCrudTable, type AutoCrudTableProps, type AutoCrudToolbarContext, type AutoCrudToolbarResolver, AutoForm, type AutoFormProps, type AutoQueryParams, AutoTable, AutoTableActionBar, AutoTableSimpleFilters, type BatchActionConfig, type BatchActionContext, type BatchActionItem, type BatchBuiltinActionItem, type BatchBuiltinActionType, type BatchCustomActionItem, type BatchUpdateField, type ColumnOverrides, type CreateFormSchemaOptions, type CreateTableSchemaOptions, type CrudActionBase, type CrudActionEntry, type CrudActionRegistration, type CrudActionZone, CrudFormModal, type CrudHooks, type CrudOperationPermissions, type CrudPermissions, type DataSource, DataTable, DataTableAdvancedToolbar, DataTableColumnHeader, DataTableFacetedFilter, DataTablePagination, DataTableRowAction, DataTableToolbar, DataTableViewOptions, type DateFormatter, type EnumOption, ExportDialog, type ExportDialogProps, type ExportMode, ExtendedColumnFilter, ExtendedColumnSort, type Field, type FieldOption, type FieldType, type Fields, type FilterConfig, FilterOperator, type FilterVariant, type FormSchemaOverrides, ImportDialog, type ImportDialogProps, type ImportResult, type JSONSchema, type JSONSchemaProperty, JoinOperator, type ListParams, type ListResult, type LocaleProp, MultiCombobox, type MultiComboboxOption, type MultiComboboxProps, type MultiComboboxTriggerRenderProps, Option, type ParsedImportData, type ParsedZodField, type Parser, QueryKeys, type RowActionConfig, type RowActionItem, type RowBuiltinActionItem, type RowBuiltinActionType, type RowCustomActionItem, SchemaAdapter, Select, type SelectMode, type SelectOption, type SelectProps, type SelectSearchableDynamicProps, type SelectSearchableMultipleProps, type SelectSearchableProps, type SelectSearchableSingleProps, type SelectSimpleProps, type SelectTriggerRenderProps, type SimpleFieldConfig, type SimpleFieldsConfig, type ToastAdapter, type ToolbarActionConfig, type ToolbarActionItem, type ToolbarBuiltinActionItem, type ToolbarBuiltinActionType, type ToolbarCustomActionItem, type UnifiedField, type UnifiedSchema, type UrlStateOptions, type UseAutoCrudResourceOptions, type UseAutoCrudResourceParams, type UseAutoCrudResourceReturn, cn, coerceRowValues, components, createActionsColumn, createEditFormSchema, createFormSchema, createMemoryDataSource, createSelectColumn, createTRPCDataSource, createTableSchema, crudActions, dataSources, dataToCSV, deDE, downloadCSVTemplate, enUS, esES, exportAllToCSV, exportTableToCSV, formComponents, formatDate, frFR, generateCSVTemplate, getUrlParams, humanize, jaJP, koKR, noopToastAdapter, normalizeDataSourceConfig, normalizeOptions, parseAsArrayOf, parseAsInteger, parseAsString, parseAsStringEnum, parseCSV, parseImportFile, parseJSON, parseZodField, resolveLocale, setDateFormatter, setSearchParams, setToolbarResolver, useAutoCrudResource, useDataTable, useQueryState, useQueryStates, useReadableFilters, useUrlState, useUrlStates, zhCN };
+export { type ActionConfig, type ActionItem, type ActionsColumnConfig, type AutoCrudActionConfig, type AutoCrudActionsConfig, type AutoCrudDataSourceConfig, type AutoCrudDataSourceContext, type AutoCrudDataSourceEntry, type AutoCrudDataSourceLoader, type AutoCrudDataSourceRegistration, type AutoCrudFormComponentConfig, type AutoCrudLocale, type AutoCrudOption, type AutoCrudQueryCapabilities, type AutoCrudRowActionContext, AutoCrudTable, type AutoCrudTableProps, type AutoCrudToolbarContext, type AutoCrudToolbarResolver, AutoForm, type AutoFormProps, type AutoQueryParams, AutoTable, AutoTableActionBar, AutoTableSimpleFilters, type BatchActionConfig, type BatchActionContext, type BatchActionItem, type BatchBuiltinActionItem, type BatchBuiltinActionType, type BatchCustomActionItem, type BatchUpdateField, type ColumnOverrides, type CreateFormSchemaOptions, type CreateTableSchemaOptions, type CrudActionBase, type CrudActionEntry, type CrudActionRegistration, type CrudActionZone, CrudFormModal, type CrudHooks, type CrudOperationPermissions, type CrudPermissions, type DataSource, DataTable, DataTableAdvancedToolbar, DataTableColumnHeader, DataTableFacetedFilter, DataTablePagination, DataTableRowAction, DataTableToolbar, DataTableViewOptions, type DateFormatPreset, type DateFormatter, type EnumOption, ExportDialog, type ExportDialogProps, type ExportMode, ExtendedColumnFilter, ExtendedColumnSort, type Field, type FieldOption, type FieldTableDisplay, type FieldType, type Fields, type FilterConfig, FilterOperator, type FilterVariant, type FormSchemaOverrides, ImportDialog, type ImportDialogProps, type ImportResult, type JSONSchema, type JSONSchemaProperty, JoinOperator, type ListParams, type ListResult, type LocaleProp, MultiCombobox, type MultiComboboxOption, type MultiComboboxProps, type MultiComboboxTriggerRenderProps, Option, type ParsedImportData, type ParsedZodField, type Parser, QueryKeys, type RowActionConfig, type RowActionItem, type RowBuiltinActionItem, type RowBuiltinActionType, type RowCustomActionItem, SchemaAdapter, Select, type SelectMode, type SelectOption, type SelectProps, type SelectSearchableDynamicProps, type SelectSearchableMultipleProps, type SelectSearchableProps, type SelectSearchableSingleProps, type SelectSimpleProps, type SelectTriggerRenderProps, type SimpleFieldConfig, type SimpleFieldsConfig, type ToastAdapter, type ToolbarActionConfig, type ToolbarActionItem, type ToolbarBuiltinActionItem, type ToolbarBuiltinActionType, type ToolbarCustomActionItem, type UnifiedField, type UnifiedSchema, type UrlStateOptions, type UseAutoCrudResourceOptions, type UseAutoCrudResourceParams, type UseAutoCrudResourceReturn, cn, coerceRowValues, components, createActionsColumn, createEditFormSchema, createFormSchema, createMemoryDataSource, createSelectColumn, createTRPCDataSource, createTableSchema, crudActions, dataSources, dataToCSV, deDE, downloadCSVTemplate, enUS, esES, exportAllToCSV, exportTableToCSV, formComponents, formatDate, frFR, generateCSVTemplate, getUrlParams, humanize, jaJP, koKR, noopToastAdapter, normalizeDataSourceConfig, normalizeOptions, parseAsArrayOf, parseAsInteger, parseAsString, parseAsStringEnum, parseCSV, parseImportFile, parseJSON, parseZodField, resolveLocale, setDateFormatter, setSearchParams, setToolbarResolver, useAutoCrudResource, useDataTable, useQueryState, useQueryStates, useReadableFilters, useUrlState, useUrlStates, zhCN };

package/dist/index.js

@@ -368,6 +368,21 @@ function useDateFormatterVersion() {
 function getHostDateFormatter() {
 	return hostDateFormatters[hostDateFormatters.length - 1]?.formatter;
 }
+const canonicalDatePattern = /^(\d{4})-(\d{2})-(\d{2})$/;
+const canonicalDateTimePrefixPattern = /^(\d{4})-(\d{2})-(\d{2})(?=[T ])/;
+function isValidCalendarDate(year, month, day) {
+	if (!year || !month || !day) return false;
+	const date = /* @__PURE__ */ new Date(`${year}-${month}-${day}T00:00:00.000Z`);
+	return !Number.isNaN(date.getTime()) && date.getUTCFullYear() === Number(year) && date.getUTCMonth() + 1 === Number(month) && date.getUTCDate() === Number(day);
+}
+function isValidCanonicalDate(value) {
+	const match = canonicalDatePattern.exec(value);
+	return !!match && isValidCalendarDate(match[1], match[2], match[3]);
+}
+function hasValidCanonicalDateTimePrefix(value) {
+	const match = canonicalDateTimePrefixPattern.exec(value);
+	return !match || isValidCalendarDate(match[1], match[2], match[3]);
+}
 /**
 * Register the host's process-wide date presentation policy without coupling
 * AutoCrud to locale or timezone selection. The returned cleanup removes only
@@ -394,18 +409,45 @@ function setDateFormatter(formatter) {
 		if (hostDateFormatters.length !== previousLength && getHostDateFormatter() !== currentFormatter) notifyDateFormatterChange();
 	};
 }
-function formatDate(date, opts = {}) {
+function formatDate(date, opts = {}, preset) {
 	if (date === void 0) return "";
+	if (preset === "date" && typeof date === "string" && canonicalDatePattern.test(date)) return isValidCanonicalDate(date) ? date : "";
+	if (preset === "datetime" && typeof date === "string" && !hasValidCanonicalDateTimePrefix(date)) return "";
 	try {
 		const value = new Date(date);
+		if (Number.isNaN(value.getTime())) return "";
 		const options = {
-			month: opts.month ?? "long",
-			day: opts.day ?? "numeric",
+			month: opts.month ?? (preset ? "2-digit" : "long"),
+			day: opts.day ?? (preset ? "2-digit" : "numeric"),
 			year: opts.year ?? "numeric",
+			...preset === "datetime" ? {
+				hour: opts.hour ?? "2-digit",
+				minute: opts.minute ?? "2-digit",
+				second: opts.second ?? "2-digit",
+				hourCycle: opts.hourCycle ?? "h23"
+			} : {},
 			...opts
 		};
 		const hostDateFormatter = getHostDateFormatter();
-		return hostDateFormatter ? hostDateFormatter(value, options) : new Intl.DateTimeFormat("en-US", options).format(value);
+		if (hostDateFormatter) return preset ? hostDateFormatter(value, options, preset) : hostDateFormatter(value, options);
+		if (preset) {
+			const parts = new Intl.DateTimeFormat("en-CA", {
+				timeZone: opts.timeZone,
+				year: "numeric",
+				month: "2-digit",
+				day: "2-digit",
+				...preset === "datetime" ? {
+					hour: "2-digit",
+					minute: "2-digit",
+					second: "2-digit",
+					hourCycle: "h23"
+				} : {}
+			}).formatToParts(value);
+			const read = (type) => parts.find((part) => part.type === type)?.value ?? "";
+			const formattedDate = `${read("year")}-${read("month")}-${read("day")}`;
+			return preset === "datetime" ? `${formattedDate} ${read("hour")}:${read("minute")}:${read("second")}` : formattedDate;
+		}
+		return new Intl.DateTimeFormat("en-US", options).format(value);
 	} catch {
 		return "";
 	}
@@ -3157,6 +3199,10 @@ function renderCell(value, type, options) {
 		className: "text-muted-foreground",
 		children: "-"
 	});
+	if (Array.isArray(value) && value.length === 0) return /* @__PURE__ */ jsx("span", {
+		className: "text-muted-foreground",
+		children: "-"
+	});
 	const formatOptionValue = (optionValue) => {
 		const stringValue = String(optionValue);
 		return options?.find((option) => option.value === stringValue)?.label ?? stringValue;
@@ -5941,6 +5987,16 @@ function mergeFields(base, override) {
 	const keys = new Set([...Object.keys(base ?? {}), ...Object.keys(override ?? {})]);
 	return Object.fromEntries(Array.from(keys).map((key) => [key, mergeFieldConfig(base?.[key], override?.[key])]));
 }
+function applyResourceTablePresentation(fields, resourceFields) {
+	if (!fields || !resourceFields) return fields;
+	return Object.fromEntries(Object.entries(fields).map(([key, config]) => {
+		const table = resourceFields[key]?.table;
+		return [key, table === void 0 ? config : {
+			...config,
+			table: mergeFieldPart(config.table, table)
+		}];
+	}));
+}
 function normalizeFieldOptions(options) {
 	if (!options || options.length === 0) return void 0;
 	return options.map((option) => ({
@@ -5948,6 +6004,18 @@ function normalizeFieldOptions(options) {
 		value: String(option.value)
 	}));
 }
+function getTableConfig(config) {
+	return config.table && typeof config.table === "object" ? config.table : void 0;
+}
+function getTableOptions(config) {
+	const table = getTableConfig(config);
+	if (table?.options) return normalizeFieldOptions(table.options);
+	if (table?.dataSource) return void 0;
+	return normalizeFieldOptions(config.enum);
+}
+function getTableDataSource(config) {
+	return getTableConfig(config)?.dataSource ?? config.dataSource;
+}
 function toTableOptions(options) {
 	return options?.map(({ label, value, searchText, count, icon }) => ({
 		label,
@@ -6023,8 +6091,8 @@ function mergeOptionsByField(left, right) {
 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;
+	if (getTableOptions(config) && !getTableConfig(config)?.dataSource) return false;
+	return normalizeDataSourceConfig(getTableDataSource(config)) !== void 0;
 }
 function useRegistryVersion(subscribe) {
 	const [version$1, setVersion] = React.useState(0);
@@ -6269,7 +6337,7 @@ function useDynamicResolveOptions(fields, rows, hiddenColumns) {
 		const hiddenSet = new Set(hiddenColumns);
 		return Object.entries(fields).flatMap(([field, config]) => {
 			if (!shouldResolveOptions(field, config, hiddenSet)) return [];
-			const source = normalizeDataSourceConfig(config.dataSource);
+			const source = normalizeDataSourceConfig(getTableDataSource(config));
 			const values = getResolveValues(rows, field);
 			return source && values.length > 0 ? [{
 				field,
@@ -6366,12 +6434,16 @@ function buildTableOverrides(fields, legacyOverrides, dynamicFilterState, dynami
 	const result = { ...legacyOverrides };
 	if (fields) for (const [key, config] of Object.entries(fields)) {
 		const fieldOptions = normalizeFieldOptions(config.enum);
+		const tableConfig = getTableConfig(config);
+		const presentationOptions = getTableOptions(config);
 		const tableOptions = toTableOptions(fieldOptions);
 		const filterDataSourceRegistered = dynamicFilterState?.registeredByField[key];
 		const filterDataSourceSearchable = dynamicFilterState?.searchableByField[key];
 		const currentDynamicOptions = !fieldOptions && filterDataSourceRegistered ? toTableOptions(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 dynamicFilterLabelOptions = !fieldOptions && filterDataSourceRegistered ? dynamicFilterState?.labelOptionsByField[key] ?? dynamicFilterState?.optionsByField[key] ?? [] : void 0;
+		const dynamicResolveOptions = dynamicResolveState?.optionsByField[key];
+		const mergedSharedDynamicOptions = mergeFieldOptions(dynamicFilterLabelOptions, tableConfig?.dataSource ? void 0 : dynamicResolveOptions);
+		const dynamicOptions = !fieldOptions && mergedSharedDynamicOptions ? toTableOptions(mergedSharedDynamicOptions) : void 0;
 		const tableMeta = config.table !== false && typeof config.table === "object" ? config.table.meta : void 0;
 		const fieldEnumMeta = tableOptions ? {
 			options: tableOptions,
@@ -6435,11 +6507,24 @@ function buildTableOverrides(fields, legacyOverrides, dynamicFilterState, dynami
 			hidden: true
 		};
 		else if (config.table && typeof config.table === "object") {
-			const { meta,...tableProps } = config.table;
+			const { meta, display,...tableProps } = config.table;
+			delete tableProps.options;
+			delete tableProps.dataSource;
 			result[key] = {
 				...result[key],
 				...tableProps
 			};
+			const hasTableLabels = config.table.options !== void 0 || config.table.dataSource !== void 0;
+			if (display && display !== "auto" || hasTableLabels) {
+				const options = tableConfig?.dataSource ? mergeFieldOptions(dynamicResolveOptions, presentationOptions) : presentationOptions ?? mergedSharedDynamicOptions;
+				result[key] = {
+					...result[key],
+					cell: ({ row }) => renderFieldValue(row.getValue(key), "string", {
+						true: "true",
+						false: "false"
+					}, options, display ?? "auto")
+				};
+			}
 		}
 	}
 	return result;
@@ -6487,7 +6572,9 @@ function buildHiddenColumns(fields, legacyHidden, denyFields, legacyOverrides) {
 	for (const key of DEFAULT_HIDDEN_AUDIT_FIELDS) if (!legacyHiddenSet.has(key) && !denySet.has(key) && isTableOverrideExplicitlyVisible(legacyOverrides?.[key])) hidden.delete(key);
 	if (fields) for (const [key, config] of Object.entries(fields)) {
 		if (isDefaultHiddenAuditField(key) && !legacyHiddenSet.has(key) && !denySet.has(key) && isFieldTableExplicitlyVisible(config)) hidden.delete(key);
-		if (config.hidden) hidden.add(key);
+		if (config.table && typeof config.table === "object" && config.table.hidden === false) {
+			if (!legacyHiddenSet.has(key) && !denySet.has(key)) hidden.delete(key);
+		} else if (config.hidden) hidden.add(key);
 		else if (config.table === false) hidden.add(key);
 		else if (config.table && typeof config.table === "object" && config.table.hidden) hidden.add(key);
 	}
@@ -6537,12 +6624,36 @@ function buildBatchUpdateFields(schema, batchFields, fields) {
 /**
 * 渲染字段值
 */
-function renderFieldValue(value, type, booleanLocale, options) {
+function renderFieldValue(value, type, booleanLocale, options, display = "auto") {
 	if (value === null || value === void 0) return /* @__PURE__ */ jsx("span", {
 		className: "text-muted-foreground",
 		children: "-"
 	});
-	if (options && options.length > 0) {
+	if (Array.isArray(value) && value.length === 0) return /* @__PURE__ */ jsx("span", {
+		className: "text-muted-foreground",
+		children: "-"
+	});
+	const renderText = (item) => getOptionLabel(item, options);
+	if (display === "text") return Array.isArray(value) ? value.map(renderText).join(", ") : renderText(value);
+	if (display === "date" || display === "datetime") return formatDate(value, {}, display);
+	if (display === "badge" && (!options || options.length === 0)) {
+		if (Array.isArray(value)) return /* @__PURE__ */ jsxs("div", {
+			className: "flex gap-1 flex-wrap",
+			children: [value.slice(0, 5).map((item, index$1) => /* @__PURE__ */ jsx(Badge, {
+				variant: "secondary",
+				children: String(item)
+			}, index$1)), value.length > 5 && /* @__PURE__ */ jsxs(Badge, {
+				variant: "outline",
+				children: ["+", value.length - 5]
+			})]
+		});
+		return /* @__PURE__ */ jsx(Badge, {
+			variant: "outline",
+			className: "capitalize",
+			children: String(value)
+		});
+	}
+	if ((display === "badge" || display === "auto") && options && options.length > 0) {
 		if (Array.isArray(value)) return /* @__PURE__ */ jsxs("div", {
 			className: "flex gap-1 flex-wrap",
 			children: [value.slice(0, 5).map((v, i) => /* @__PURE__ */ jsx(Badge, {
@@ -6734,7 +6845,7 @@ function resolveActions(actionsOrFn, defaults, rowActionsLocale, context) {
 function AutoCrudTable({ id, title, description, schema, resource, fields, table: tableConfig, form: formConfig, permissions, actions: actionItems, toolbar, toolbarActions, locale: localeProp, onCreate }) {
 	const locale = resolveLocale(localeProp);
 	const resolvedSchema = resource.schema ?? schema;
-	const resolvedFields = React.useMemo(() => mergeFields(resource.fields, fields) ?? {}, [fields, resource.fields]);
+	const resolvedFields = React.useMemo(() => applyResourceTablePresentation(mergeFields(resource.fields, fields), resource.fields) ?? {}, [fields, resource.fields]);
 	const can = {
 		create: permissions?.can?.create ?? true,
 		update: permissions?.can?.update ?? true,
@@ -6757,7 +6868,18 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 		tableConfig?.overrides
 	]);
 	const dynamicResolveOptions = useDynamicResolveOptions(resolvedFields, resource.tableData.data, hiddenColumns);
-	const dynamicOptionsByField = React.useMemo(() => mergeOptionsByField(dynamicFilterOptions.labelOptionsByField, dynamicResolveOptions.optionsByField), [dynamicFilterOptions.labelOptionsByField, dynamicResolveOptions.optionsByField]);
+	const sharedResolveOptions = useDynamicResolveOptions(React.useMemo(() => Object.fromEntries(Object.entries(resolvedFields).flatMap(([field, config]) => {
+		const table = getTableConfig(config);
+		if (table?.options === void 0 && table?.dataSource === void 0) return [];
+		const { table: _table,...sharedConfig } = config;
+		return [[field, sharedConfig]];
+	})), [resolvedFields]), resource.tableData.data, hiddenColumns);
+	const viewDynamicOptionsByField = React.useMemo(() => mergeOptionsByField(mergeOptionsByField(dynamicFilterOptions.labelOptionsByField, sharedResolveOptions.optionsByField), Object.fromEntries(Object.entries(dynamicResolveOptions.optionsByField).filter(([field]) => !getTableConfig(resolvedFields[field] ?? {})?.dataSource))), [
+		dynamicFilterOptions.labelOptionsByField,
+		dynamicResolveOptions.optionsByField,
+		sharedResolveOptions.optionsByField,
+		resolvedFields
+	]);
 	const resourceIdKey = resource.idKey ?? "id";
 	const actionRegistryVersion = useCrudActionsVersion();
 	const unifiedActions = React.useMemo(() => {
@@ -7089,7 +7211,7 @@ function AutoCrudTable({ id, title, description, schema, resource, fields, table
 				data: resource.modal.selected,
 				schema: resolvedSchema,
 				fields: resolvedFields,
-				dynamicOptions: dynamicOptionsByField,
+				dynamicOptions: viewDynamicOptionsByField,
 				denyFields,
 				locale
 			}),

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud",
   "type": "module",
-  "version": "1.5.4",
+  "version": "1.5.6",
   "description": "Schema-first CRUD components with auto-generated tables and forms",
   "author": "wordrhyme",
   "license": "MIT",
@@ -84,9 +84,9 @@
     "tsdown": "^0.15.12",
     "typescript": "^5.9.3",
     "vitest": "^3.2.4",
-    "@internal/prettier-config": "0.0.1",
-    "@internal/tsconfig": "0.1.0",
     "@internal/eslint-config": "0.3.0",
+    "@internal/tsconfig": "0.1.0",
+    "@internal/prettier-config": "0.0.1",
     "@internal/tsdown-config": "0.1.0",
     "@internal/vitest-config": "0.1.0"
   },