@wordrhyme/auto-crud 1.0.2 → 1.0.4

package/dist/index.cjs

@@ -4814,7 +4814,7 @@ function getComponentProps(type, parsed) {
 function createFormSchema(schema, options) {
 	const shape = schema.shape;
 	const properties = {};
-	const { overrides, exclude = [], layout = "vertical", gridColumns = 2, labelAlign = "top", labelWidth, labelCol, wrapperCol } = options ?? {};
+	const { overrides, exclude = [], layout = "vertical", gridColumns = 1, labelAlign = "top", labelWidth, labelCol, wrapperCol } = options ?? {};
 	const decoratorProps = { className: "space-y-2" };
 	if (labelAlign) decoratorProps.labelAlign = labelAlign;
 	if (labelWidth) decoratorProps.labelWidth = labelWidth;
@@ -4879,7 +4879,7 @@ const FormilySwitch = (0, __formily_react.connect)(__pixpilot_shadcn.Switch, (0,
 	value: "checked",
 	onInput: "onCheckedChange"
 }));
-function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides, mode = "create", loading = false, gridColumns = 2, labelAlign = "top", labelWidth, showSubmitButton = true }, ref) {
+function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides, mode = "create", loading = false, gridColumns = 1, labelAlign = "top", labelWidth, showSubmitButton = true }, ref) {
 	const form = (0, react.useMemo)(() => (0, __formily_core.createForm)({ initialValues }), [JSON.stringify(initialValues)]);
 	const formSchema = (0, react.useMemo)(() => createEditFormSchema(zodSchema, {
 		overrides,
@@ -5374,7 +5374,7 @@ function resolveLocale(localeProp) {
 
 //#endregion
 //#region src/components/auto-crud/crud-form-modal.tsx
-function CrudFormModal({ open, onOpenChange, mode, schema, initialValues, onSubmit, loading = false, variant = "dialog", overrides, title, locale = zhCN.formModal, labelAlign, labelWidth }) {
+function CrudFormModal({ open, onOpenChange, mode, schema, initialValues, onSubmit, loading = false, variant = "dialog", overrides, title, locale = zhCN.formModal, gridColumns, labelAlign, labelWidth }) {
 	const defaultTitle = mode === "create" ? locale.createTitle : locale.editTitle;
 	const formRef = (0, react.useRef)(null);
 	const handleSubmit = async () => {
@@ -5407,6 +5407,7 @@ function CrudFormModal({ open, onOpenChange, mode, schema, initialValues, onSubm
 			loading,
 			onSubmit,
 			overrides,
+			gridColumns,
 			labelAlign,
 			labelWidth,
 			showSubmitButton: false
@@ -6122,7 +6123,8 @@ function AutoCrudTable({ title, description, schema, resource, fields, table: ta
 				loading: resource.mutations.isCreating || resource.mutations.isUpdating,
 				variant: resource.modal.variant,
 				overrides: formOverrides,
-				locale: locale.formModal
+				locale: locale.formModal,
+				gridColumns: formConfig?.columns
 			}),
 			/* @__PURE__ */ (0, react_jsx_runtime.jsx)(ViewModal, {
 				open: resource.modal.viewOpen,

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime0 from "react/jsx-runtime";
+import * as react_jsx_runtime3 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";
@@ -314,7 +314,7 @@ declare function AutoTableActionBar<TData>({
   enableExport,
   enableDelete,
   extraActions
-}: AutoTableActionBarProps<TData>): react_jsx_runtime0.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -470,7 +470,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   enableExport,
   onSelectedCountChange,
   getSelectedRows
-}: AutoTableProps<T>): react_jsx_runtime0.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/i18n/locale.d.ts
 /**
@@ -766,7 +766,7 @@ declare function AutoCrudTable<TSchema extends z.ZodObject<z.ZodRawShape>>({
   permissions,
   actions: actionItems,
   locale: localeProp
-}: 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>> {
@@ -798,7 +798,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>;
@@ -1096,7 +1096,7 @@ declare function AutoTableSimpleFilters<TData>({
   shallow,
   filters: externalFilters,
   onFiltersChange
-}: 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";
@@ -1114,6 +1114,7 @@ interface CrudFormModalProps<T extends z.ZodObject<z.ZodRawShape>> {
   overrides?: FormSchemaOverrides;
   title?: string;
   locale?: AutoCrudLocale["formModal"];
+  gridColumns?: number;
   /** Label 对齐方式 */
   labelAlign?: "left" | "top" | "right";
   /** Label 宽度（labelAlign 为 left 时有效） */
@@ -1131,9 +1132,10 @@ declare function CrudFormModal<T extends z.ZodObject<z.ZodRawShape>>({
   overrides,
   title,
   locale,
+  gridColumns,
   labelAlign,
   labelWidth
-}: 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 {
@@ -1155,7 +1157,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";
@@ -1175,7 +1177,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"> {
@@ -1188,7 +1190,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"> {
@@ -1199,7 +1201,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> {
@@ -1211,7 +1213,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> {
@@ -1225,7 +1227,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"> {
@@ -1237,7 +1239,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"> {
@@ -1248,7 +1250,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> {
@@ -1259,7 +1261,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.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_runtime3 from "react/jsx-runtime";
+import * as react_jsx_runtime0 from "react/jsx-runtime";
 import { z } from "zod";
 import { ISchema } from "@formily/json-schema";
 
@@ -314,7 +314,7 @@ declare function AutoTableActionBar<TData>({
   enableExport,
   enableDelete,
   extraActions
-}: AutoTableActionBarProps<TData>): react_jsx_runtime3.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -470,7 +470,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   enableExport,
   onSelectedCountChange,
   getSelectedRows
-}: AutoTableProps<T>): react_jsx_runtime3.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/i18n/locale.d.ts
 /**
@@ -766,7 +766,7 @@ declare function AutoCrudTable<TSchema extends z.ZodObject<z.ZodRawShape>>({
   permissions,
   actions: actionItems,
   locale: localeProp
-}: AutoCrudTableProps<TSchema>): react_jsx_runtime3.JSX.Element;
+}: AutoCrudTableProps<TSchema>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/auto-form.d.ts
 interface AutoFormProps<T extends z.ZodObject<z.ZodRawShape>> {
@@ -798,7 +798,7 @@ declare function AutoFormInner<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   showSubmitButton
-}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime3.JSX.Element;
+}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime0.JSX.Element;
 declare const AutoForm: <T extends z.ZodObject<z.ZodRawShape>>(props: AutoFormProps<T> & {
   ref?: React.Ref<AutoFormRef>;
 }) => ReturnType<typeof AutoFormInner>;
@@ -1096,7 +1096,7 @@ declare function AutoTableSimpleFilters<TData>({
   shallow,
   filters: externalFilters,
   onFiltersChange
-}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime3.JSX.Element | null;
+}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime0.JSX.Element | null;
 //#endregion
 //#region src/components/auto-crud/form-modal.d.ts
 type ModalVariant = "dialog" | "sheet";
@@ -1114,6 +1114,7 @@ interface CrudFormModalProps<T extends z.ZodObject<z.ZodRawShape>> {
   overrides?: FormSchemaOverrides;
   title?: string;
   locale?: AutoCrudLocale["formModal"];
+  gridColumns?: number;
   /** Label 对齐方式 */
   labelAlign?: "left" | "top" | "right";
   /** Label 宽度（labelAlign 为 left 时有效） */
@@ -1131,9 +1132,10 @@ declare function CrudFormModal<T extends z.ZodObject<z.ZodRawShape>>({
   overrides,
   title,
   locale,
+  gridColumns,
   labelAlign,
   labelWidth
-}: CrudFormModalProps<T>): react_jsx_runtime3.JSX.Element;
+}: CrudFormModalProps<T>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/import-dialog.d.ts
 interface ImportDialogProps {
@@ -1155,7 +1157,7 @@ declare function ImportDialog({
   columns,
   title,
   locale
-}: ImportDialogProps): react_jsx_runtime3.JSX.Element;
+}: ImportDialogProps): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/export-dialog.d.ts
 type ExportMode = "selected" | "filtered";
@@ -1175,7 +1177,7 @@ declare function ExportDialog({
   selectedCount,
   onExport,
   canExportFiltered
-}: ExportDialogProps): react_jsx_runtime3.JSX.Element;
+}: ExportDialogProps): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table.d.ts
 interface DataTableProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1188,7 +1190,7 @@ declare function DataTable<TData>({
   children,
   className,
   ...props
-}: DataTableProps<TData>): react_jsx_runtime3.JSX.Element;
+}: DataTableProps<TData>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-advanced-toolbar.d.ts
 interface DataTableAdvancedToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1199,7 +1201,7 @@ declare function DataTableAdvancedToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime3.JSX.Element;
+}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-column-header.d.ts
 interface DataTableColumnHeaderProps<TData, TValue> extends React.ComponentProps<typeof DropdownMenuTrigger> {
@@ -1211,7 +1213,7 @@ declare function DataTableColumnHeader<TData, TValue>({
   label,
   className,
   ...props
-}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime3.JSX.Element;
+}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-faceted-filter.d.ts
 interface DataTableFacetedFilterProps<TData, TValue> {
@@ -1225,7 +1227,7 @@ declare function DataTableFacetedFilter<TData, TValue>({
   title,
   options,
   multiple
-}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime3.JSX.Element;
+}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-pagination.d.ts
 interface DataTablePaginationProps<TData> extends React.ComponentProps<"div"> {
@@ -1237,7 +1239,7 @@ declare function DataTablePagination<TData>({
   pageSizeOptions,
   className,
   ...props
-}: DataTablePaginationProps<TData>): react_jsx_runtime3.JSX.Element;
+}: DataTablePaginationProps<TData>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-toolbar.d.ts
 interface DataTableToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1248,7 +1250,7 @@ declare function DataTableToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableToolbarProps<TData>): react_jsx_runtime3.JSX.Element;
+}: DataTableToolbarProps<TData>): react_jsx_runtime0.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-view-options.d.ts
 interface DataTableViewOptionsProps<TData> extends React$1.ComponentProps<typeof PopoverContent> {
@@ -1259,7 +1261,7 @@ declare function DataTableViewOptions<TData>({
   table,
   disabled,
   ...props
-}: DataTableViewOptionsProps<TData>): react_jsx_runtime3.JSX.Element;
+}: DataTableViewOptionsProps<TData>): react_jsx_runtime0.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

@@ -4772,7 +4772,7 @@ function getComponentProps(type, parsed) {
 function createFormSchema(schema, options) {
 	const shape = schema.shape;
 	const properties = {};
-	const { overrides, exclude = [], layout = "vertical", gridColumns = 2, labelAlign = "top", labelWidth, labelCol, wrapperCol } = options ?? {};
+	const { overrides, exclude = [], layout = "vertical", gridColumns = 1, labelAlign = "top", labelWidth, labelCol, wrapperCol } = options ?? {};
 	const decoratorProps = { className: "space-y-2" };
 	if (labelAlign) decoratorProps.labelAlign = labelAlign;
 	if (labelWidth) decoratorProps.labelWidth = labelWidth;
@@ -4837,7 +4837,7 @@ const FormilySwitch = connect(Switch, mapProps({
 	value: "checked",
 	onInput: "onCheckedChange"
 }));
-function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides, mode = "create", loading = false, gridColumns = 2, labelAlign = "top", labelWidth, showSubmitButton = true }, ref) {
+function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides, mode = "create", loading = false, gridColumns = 1, labelAlign = "top", labelWidth, showSubmitButton = true }, ref) {
 	const form = useMemo(() => createForm({ initialValues }), [JSON.stringify(initialValues)]);
 	const formSchema = useMemo(() => createEditFormSchema(zodSchema, {
 		overrides,
@@ -5332,7 +5332,7 @@ function resolveLocale(localeProp) {
 
 //#endregion
 //#region src/components/auto-crud/crud-form-modal.tsx
-function CrudFormModal({ open, onOpenChange, mode, schema, initialValues, onSubmit, loading = false, variant = "dialog", overrides, title, locale = zhCN.formModal, labelAlign, labelWidth }) {
+function CrudFormModal({ open, onOpenChange, mode, schema, initialValues, onSubmit, loading = false, variant = "dialog", overrides, title, locale = zhCN.formModal, gridColumns, labelAlign, labelWidth }) {
 	const defaultTitle = mode === "create" ? locale.createTitle : locale.editTitle;
 	const formRef = useRef(null);
 	const handleSubmit = async () => {
@@ -5365,6 +5365,7 @@ function CrudFormModal({ open, onOpenChange, mode, schema, initialValues, onSubm
 			loading,
 			onSubmit,
 			overrides,
+			gridColumns,
 			labelAlign,
 			labelWidth,
 			showSubmitButton: false
@@ -6080,7 +6081,8 @@ function AutoCrudTable({ title, description, schema, resource, fields, table: ta
 				loading: resource.mutations.isCreating || resource.mutations.isUpdating,
 				variant: resource.modal.variant,
 				overrides: formOverrides,
-				locale: locale.formModal
+				locale: locale.formModal,
+				gridColumns: formConfig?.columns
 			}),
 			/* @__PURE__ */ jsx(ViewModal, {
 				open: resource.modal.viewOpen,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud",
   "type": "module",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Schema-first CRUD components with auto-generated tables and forms",
   "author": "wordrhyme",
   "license": "MIT",
@@ -65,9 +65,9 @@
     "nanoid": "^5.1.6",
     "tailwind-merge": "^3.4.0",
     "vaul": "^1.1.2",
-    "@pixpilot/formily-shadcn": "0.49.0",
-    "@pixpilot/shadcn-ui": "0.50.0",
-    "@pixpilot/shadcn": "0.9.0"
+    "@pixpilot/shadcn-ui": "1.4.0",
+    "@pixpilot/formily-shadcn": "1.7.2",
+    "@pixpilot/shadcn": "1.2.0"
   },
   "devDependencies": {
     "@tanstack/react-query": "^5.90.15",
@@ -81,8 +81,8 @@
     "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",
+    "@internal/eslint-config": "0.3.0",
     "@internal/tsconfig": "0.1.0",
     "@internal/tsdown-config": "0.1.0",
     "@internal/vitest-config": "0.1.0"