@wordrhyme/auto-crud 1.2.0 → 1.2.1

package/dist/index.cjs

@@ -61,6 +61,8 @@ let __formily_react = require("@formily/react");
 __formily_react = __toESM(__formily_react);
 let sonner = require("sonner");
 sonner = __toESM(sonner);
+let __tanstack_react_query = require("@tanstack/react-query");
+__tanstack_react_query = __toESM(__tanstack_react_query);
 
 //#region src/lib/utils.ts
 function cn(...inputs) {
@@ -5173,12 +5175,8 @@ function getComponentProps(type, parsed) {
 function createFormSchema(schema, options) {
 	const shape = schema.shape;
 	const properties = {};
-	const { overrides, exclude = [], layout = "vertical", gridColumns = 1, labelAlign = "top", labelWidth, labelCol, wrapperCol } = options ?? {};
+	const { overrides, exclude = [], layout = "vertical", gridColumns = 1 } = options ?? {};
 	const decoratorProps = { className: "space-y-2" };
-	if (labelAlign) decoratorProps.labelAlign = labelAlign;
-	if (labelWidth) decoratorProps.labelWidth = labelWidth;
-	if (labelCol) decoratorProps.labelCol = labelCol;
-	if (wrapperCol) decoratorProps.wrapperCol = wrapperCol;
 	for (const [key, fieldSchema] of Object.entries(shape)) {
 		if (exclude.includes(key)) continue;
 		const parsed = parseZodField(fieldSchema);
@@ -5430,16 +5428,22 @@ function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides,
 	const formSchema = (0, react.useMemo)(() => createEditFormSchema(zodSchema, {
 		overrides,
 		layout: "grid",
-		gridColumns,
-		labelAlign,
-		labelWidth
+		gridColumns
 	}), [
 		zodSchema,
 		overrides,
-		gridColumns,
-		labelAlign,
-		labelWidth
+		gridColumns
 	]);
+	const formLayout = (0, react.useMemo)(() => {
+		const inlineLabel = labelAlign === "left" || labelAlign === "right";
+		return {
+			labelPlacement: inlineLabel ? "start" : "top",
+			itemProps: inlineLabel ? { label: {
+				className: labelAlign === "right" ? "text-right" : void 0,
+				style: labelWidth != null ? { width: labelWidth } : void 0
+			} } : void 0
+		};
+	}, [labelAlign, labelWidth]);
 	const fieldComponents = (0, react.useMemo)(() => ({ fields: {
 		...defaultFieldComponents,
 		...formComponents.all()
@@ -5452,6 +5456,7 @@ function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides,
 	(0, react.useImperativeHandle)(ref, () => ({ submit: handleSubmit }));
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__pixpilot_formily_shadcn.Form, {
 		form,
+		layout: formLayout,
 		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)(__pixpilot_formily_shadcn.JsonSchemaField, {
 			schema: formSchema,
 			components: fieldComponents
@@ -7560,13 +7565,6 @@ function DataTableToolbarFilter({ column }) {
 	}
 }
 
-//#endregion
-//#region ../../node_modules/.pnpm/@tanstack+query-core@5.90.20/node_modules/@tanstack/query-core/build/modern/utils.js
-var isServer = typeof window === "undefined" || "Deno" in globalThis;
-function keepPreviousData(previousData) {
-	return previousData;
-}
-
 //#endregion
 //#region src/hooks/use-auto-crud-resource.ts
 /** 默认 toast 适配器（使用 sonner） */
@@ -7716,7 +7714,7 @@ function useAutoCrudResource({ router, schema, query: queryTransform, options =
 		queryTransform
 	]);
 	const listQuery = router.list.useQuery(queryInput, {
-		placeholderData: keepPreviousData,
+		placeholderData: __tanstack_react_query.keepPreviousData,
 		staleTime: 0
 	});
 	const tableRows = listQuery.data?.data ?? [];

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import * as react_jsx_runtime2 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";
@@ -362,7 +362,7 @@ declare function AutoTableActionBar<TData>({
   enableDelete,
   extraActions,
   actions
-}: AutoTableActionBarProps<TData>): react_jsx_runtime2.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -530,7 +530,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   showDefaultExport,
   onSelectedCountChange,
   getSelectedRows
-}: AutoTableProps<T>): react_jsx_runtime2.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/i18n/locale.d.ts
 /**
@@ -935,7 +935,7 @@ declare function AutoCrudTable<TSchema extends z.ZodObject<z.ZodRawShape>>({
   toolbarActions,
   locale: localeProp,
   onCreate
-}: AutoCrudTableProps<TSchema>): react_jsx_runtime2.JSX.Element;
+}: AutoCrudTableProps<TSchema>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/auto-form.d.ts
 interface AutoFormProps<T extends z.ZodObject<z.ZodRawShape>> {
@@ -967,7 +967,7 @@ declare function AutoFormInner<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   showSubmitButton
-}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime2.JSX.Element;
+}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime3.JSX.Element;
 declare const AutoForm: <T extends z.ZodObject<z.ZodRawShape>>(props: AutoFormProps<T> & {
   ref?: React.Ref<AutoFormRef>;
 }) => ReturnType<typeof AutoFormInner>;
@@ -1269,7 +1269,7 @@ declare function AutoTableSimpleFilters<TData>({
   filters: externalFilters,
   onFiltersChange,
   leading
-}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime2.JSX.Element | null;
+}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime3.JSX.Element | null;
 //#endregion
 //#region src/components/auto-crud/form-modal.d.ts
 type ModalVariant = "dialog" | "sheet";
@@ -1311,7 +1311,7 @@ declare function CrudFormModal<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   className
-}: CrudFormModalProps<T>): react_jsx_runtime2.JSX.Element;
+}: CrudFormModalProps<T>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/import-dialog.d.ts
 interface ImportDialogProps {
@@ -1333,7 +1333,7 @@ declare function ImportDialog({
   columns,
   title,
   locale
-}: ImportDialogProps): react_jsx_runtime2.JSX.Element;
+}: ImportDialogProps): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/export-dialog.d.ts
 type ExportMode = "selected" | "filtered";
@@ -1353,7 +1353,7 @@ declare function ExportDialog({
   selectedCount,
   onExport,
   canExportFiltered
-}: ExportDialogProps): react_jsx_runtime2.JSX.Element;
+}: ExportDialogProps): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table.d.ts
 interface DataTableProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1366,7 +1366,7 @@ declare function DataTable<TData>({
   children,
   className,
   ...props
-}: DataTableProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTableProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-advanced-toolbar.d.ts
 interface DataTableAdvancedToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1377,7 +1377,7 @@ declare function DataTableAdvancedToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-column-header.d.ts
 interface DataTableColumnHeaderProps<TData, TValue> extends React.ComponentProps<typeof DropdownMenuTrigger> {
@@ -1389,7 +1389,7 @@ declare function DataTableColumnHeader<TData, TValue>({
   label,
   className,
   ...props
-}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime2.JSX.Element;
+}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-faceted-filter.d.ts
 interface DataTableFacetedFilterProps<TData, TValue> {
@@ -1403,7 +1403,7 @@ declare function DataTableFacetedFilter<TData, TValue>({
   title,
   options,
   multiple
-}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime2.JSX.Element;
+}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-pagination.d.ts
 interface DataTablePaginationProps<TData> extends React.ComponentProps<"div"> {
@@ -1415,7 +1415,7 @@ declare function DataTablePagination<TData>({
   pageSizeOptions,
   className,
   ...props
-}: DataTablePaginationProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTablePaginationProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-toolbar.d.ts
 interface DataTableToolbarProps<TData> extends React$1.ComponentProps<"div"> {
@@ -1426,7 +1426,7 @@ declare function DataTableToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableToolbarProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTableToolbarProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-view-options.d.ts
 interface DataTableViewOptionsProps<TData> extends React$1.ComponentProps<typeof PopoverContent> {
@@ -1437,7 +1437,7 @@ declare function DataTableViewOptions<TData>({
   table,
   disabled,
   ...props
-}: DataTableViewOptionsProps<TData>): react_jsx_runtime2.JSX.Element;
+}: DataTableViewOptionsProps<TData>): react_jsx_runtime3.JSX.Element;
 //#endregion
 //#region src/components/ui/multi-combobox.d.ts
 interface MultiComboboxOption {
@@ -1523,7 +1523,7 @@ declare function createFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema:
 /**
  * 为编辑模式创建 Form Schema（排除 id, createdAt, updatedAt）
  */
-declare function createEditFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema: T, options?: Omit<CreateFormSchemaOptions, "exclude">): ISchema;
+declare function createEditFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema: T, options?: Omit<CreateFormSchemaOptions, 'exclude'>): ISchema;
 //#endregion
 //#region src/lib/schema-bridge/schema-adapter.d.ts
 /**

package/dist/index.d.ts

@@ -1523,7 +1523,7 @@ declare function createFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema:
 /**
  * 为编辑模式创建 Form Schema（排除 id, createdAt, updatedAt）
  */
-declare function createEditFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema: T, options?: Omit<CreateFormSchemaOptions, "exclude">): ISchema;
+declare function createEditFormSchema<T extends z.ZodObject<z.ZodRawShape>>(schema: T, options?: Omit<CreateFormSchemaOptions, 'exclude'>): ISchema;
 //#endregion
 //#region src/lib/schema-bridge/schema-adapter.d.ts
 /**

package/dist/index.js

@@ -19,6 +19,7 @@ import { createForm, onFieldValueChange } from "@formily/core";
 import { Form, JsonSchemaField } from "@pixpilot/formily-shadcn";
 import { connect, mapProps } from "@formily/react";
 import { toast } from "sonner";
+import { keepPreviousData } from "@tanstack/react-query";
 
 //#region src/lib/utils.ts
 function cn(...inputs) {
@@ -5131,12 +5132,8 @@ function getComponentProps(type, parsed) {
 function createFormSchema(schema, options) {
 	const shape = schema.shape;
 	const properties = {};
-	const { overrides, exclude = [], layout = "vertical", gridColumns = 1, labelAlign = "top", labelWidth, labelCol, wrapperCol } = options ?? {};
+	const { overrides, exclude = [], layout = "vertical", gridColumns = 1 } = options ?? {};
 	const decoratorProps = { className: "space-y-2" };
-	if (labelAlign) decoratorProps.labelAlign = labelAlign;
-	if (labelWidth) decoratorProps.labelWidth = labelWidth;
-	if (labelCol) decoratorProps.labelCol = labelCol;
-	if (wrapperCol) decoratorProps.wrapperCol = wrapperCol;
 	for (const [key, fieldSchema] of Object.entries(shape)) {
 		if (exclude.includes(key)) continue;
 		const parsed = parseZodField(fieldSchema);
@@ -5388,16 +5385,22 @@ function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides,
 	const formSchema = useMemo(() => createEditFormSchema(zodSchema, {
 		overrides,
 		layout: "grid",
-		gridColumns,
-		labelAlign,
-		labelWidth
+		gridColumns
 	}), [
 		zodSchema,
 		overrides,
-		gridColumns,
-		labelAlign,
-		labelWidth
+		gridColumns
 	]);
+	const formLayout = useMemo(() => {
+		const inlineLabel = labelAlign === "left" || labelAlign === "right";
+		return {
+			labelPlacement: inlineLabel ? "start" : "top",
+			itemProps: inlineLabel ? { label: {
+				className: labelAlign === "right" ? "text-right" : void 0,
+				style: labelWidth != null ? { width: labelWidth } : void 0
+			} } : void 0
+		};
+	}, [labelAlign, labelWidth]);
 	const fieldComponents = useMemo(() => ({ fields: {
 		...defaultFieldComponents,
 		...formComponents.all()
@@ -5410,6 +5413,7 @@ function AutoFormInner({ schema: zodSchema, initialValues, onSubmit, overrides,
 	useImperativeHandle(ref, () => ({ submit: handleSubmit }));
 	return /* @__PURE__ */ jsxs(Form, {
 		form,
+		layout: formLayout,
 		children: [/* @__PURE__ */ jsx(JsonSchemaField, {
 			schema: formSchema,
 			components: fieldComponents
@@ -7518,13 +7522,6 @@ function DataTableToolbarFilter({ column }) {
 	}
 }
 
-//#endregion
-//#region ../../node_modules/.pnpm/@tanstack+query-core@5.90.20/node_modules/@tanstack/query-core/build/modern/utils.js
-var isServer = typeof window === "undefined" || "Deno" in globalThis;
-function keepPreviousData(previousData) {
-	return previousData;
-}
-
 //#endregion
 //#region src/hooks/use-auto-crud-resource.ts
 /** 默认 toast 适配器（使用 sonner） */

package/package.json

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