@wordrhyme/auto-crud 1.12.0 → 1.12.1

package/dist/index.cjs

@@ -8990,7 +8990,8 @@ function useAutoCrudResource({ router, schema, query: queryTransform, fields, op
 	(0, react.useEffect)(() => {
 		hooksRef.current = hooks;
 	}, [hooks]);
-	const metadata = (router.meta?.useQuery(void 0, { staleTime: 3e4 }))?.data;
+	const metadataQuery = router.meta?.useQuery(void 0, { staleTime: 3e4 });
+	const metadata = metadataQuery?.data;
 	const resolvedSchema = (0, react.useMemo)(() => mergeMetadataSchema(schema, metadata?.schema), [schema, metadata?.schema]);
 	const defaultSorting = (0, react.useMemo)(() => defaultSortOption === false ? [] : defaultSortOption ?? getDefaultSortingForSchema(resolvedSchema), [defaultSortOption, resolvedSchema]);
 	const metadataFields = (0, react.useMemo)(() => readMetadataFields(metadata?.fields), [metadata?.fields]);
@@ -9011,6 +9012,10 @@ function useAutoCrudResource({ router, schema, query: queryTransform, fields, op
 		search: parseAsString.withDefault("")
 	}, { shallow: false });
 	const [filters] = useReadableFilters(columns, { shallow: false });
+	const metadataPending = Boolean(metadataQuery?.isPending);
+	const [filtersReady, setFiltersReady] = (0, react.useState)(!metadataPending);
+	(0, react.useEffect)(() => setFiltersReady(!metadataPending), [metadataPending]);
+	const listReady = !metadataPending && filtersReady;
 	const queryInput = (0, react.useMemo)(() => {
 		const autoParams = {
 			page: urlParams.page,
@@ -9026,11 +9031,17 @@ function useAutoCrudResource({ router, schema, query: queryTransform, fields, op
 		filters,
 		queryTransform
 	]);
+	const hasReadyListData = (0, react.useRef)(false);
 	const listQuery = router.list.useQuery(queryInput, {
-		placeholderData: __tanstack_react_query.keepPreviousData,
+		enabled: listReady,
+		placeholderData: hasReadyListData.current ? __tanstack_react_query.keepPreviousData : void 0,
 		staleTime: 0
 	});
-	const tableRows = listQuery.data?.data ?? [];
+	(0, react.useEffect)(() => {
+		if (listReady && listQuery.data !== void 0) hasReadyListData.current = true;
+	}, [listReady, listQuery.data]);
+	const listData = listReady ? listQuery.data : void 0;
+	const tableRows = listData?.data ?? [];
 	const createMutation = router.create.useMutation();
 	const updateMutation = router.update.useMutation();
 	const deleteMutation = router.delete.useMutation();
@@ -9288,16 +9299,17 @@ function useAutoCrudResource({ router, schema, query: queryTransform, fields, op
 	]);
 	const canExport = !!(exportFetcher || exportQuery);
 	const refresh = (0, react.useCallback)(async () => {
+		if (!listReady) return;
 		return listQuery.refetch();
-	}, [listQuery]);
+	}, [listQuery, listReady]);
 	return {
 		idKey,
 		tableData: {
 			data: tableRows,
-			pageCount: listQuery.data?.pageCount ?? 0,
-			...typeof listQuery.data?.total === "number" ? { total: listQuery.data.total } : {},
-			isLoading: listQuery.isLoading,
-			isFetching: listQuery.isFetching
+			pageCount: listData?.pageCount ?? 0,
+			...typeof listData?.total === "number" ? { total: listData.total } : {},
+			isLoading: !listReady || listQuery.isLoading,
+			isFetching: !listReady || listQuery.isFetching
 		},
 		schema: resolvedSchema,
 		fields: metadataFields,

package/dist/index.d.cts

@@ -1,5 +1,5 @@
 import { a as positionActions, i as matchesPosition, n as actionPositionSchema, r as compareOrder, t as ActionPosition } from "./position-DoBV7yB6.cjs";
-import * as react_jsx_runtime8 from "react/jsx-runtime";
+import * as react_jsx_runtime9 from "react/jsx-runtime";
 import * as React$1 from "react";
 import { ComponentProps, ReactNode } from "react";
 import * as _tanstack_react_table0 from "@tanstack/react-table";
@@ -672,7 +672,7 @@ declare function DataTable<TData>({
   className,
   classNames,
   ...props
-}: DataTableProps<TData>): react_jsx_runtime8.JSX.Element;
+}: DataTableProps<TData>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/auto-table-action-bar.d.ts
 /** 批量更新字段配置 */
@@ -761,7 +761,7 @@ declare function AutoTableActionBar<TData>({
   extraActions,
   actions,
   deleteConfirmation
-}: AutoTableActionBarProps<TData>): react_jsx_runtime8.JSX.Element;
+}: AutoTableActionBarProps<TData>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/lib/schema-bridge/types.d.ts
 /**
@@ -1099,7 +1099,7 @@ declare function AutoTable<T extends z.ZodObject<z.ZodRawShape>>({
   onSelectedRowsChange,
   getSelectedRows,
   exportTableRef
-}: AutoTableProps<T>): react_jsx_runtime8.JSX.Element;
+}: AutoTableProps<T>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/lib/row-action-dialog.d.ts
 interface RowActionDialogProps {
@@ -1562,7 +1562,7 @@ declare function AutoCrudTable<TSchema extends z.ZodObject<z.ZodRawShape>>({
   locale: localeProp,
   onCreate,
   onExport
-}: AutoCrudTableProps<TSchema>): react_jsx_runtime8.JSX.Element;
+}: AutoCrudTableProps<TSchema>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/auto-form.d.ts
 interface AutoFormProps<T extends z.ZodObject<z.ZodRawShape>> {
@@ -1601,7 +1601,7 @@ declare function AutoFormInner<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   showSubmitButton
-}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime8.JSX.Element;
+}: AutoFormProps<T>, ref: React.Ref<AutoFormRef>): react_jsx_runtime9.JSX.Element;
 declare const AutoForm: <T extends z.ZodObject<z.ZodRawShape>>(props: AutoFormProps<T> & {
   ref?: React.Ref<AutoFormRef>;
 }) => ReturnType<typeof AutoFormInner>;
@@ -1620,7 +1620,7 @@ declare function AutoTableSimpleFilters<TData>({
   filters: externalFilters,
   onFiltersChange,
   leading
-}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime8.JSX.Element | null;
+}: AutoTableSimpleFiltersProps<TData>): react_jsx_runtime9.JSX.Element | null;
 //#endregion
 //#region src/components/auto-crud/form-modal.d.ts
 type ModalVariant = 'dialog' | 'sheet';
@@ -1664,7 +1664,7 @@ declare function CrudFormModal<T extends z.ZodObject<z.ZodRawShape>>({
   labelAlign,
   labelWidth,
   className
-}: CrudFormModalProps<T>): react_jsx_runtime8.JSX.Element;
+}: CrudFormModalProps<T>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/import-dialog.d.ts
 interface ImportDialogProps {
@@ -1686,7 +1686,7 @@ declare function ImportDialog({
   columns,
   title,
   locale
-}: ImportDialogProps): react_jsx_runtime8.JSX.Element;
+}: ImportDialogProps): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/auto-crud/export-dialog.d.ts
 type ExportMode = 'selected' | 'filtered';
@@ -1706,7 +1706,7 @@ declare function ExportDialog({
   selectedCount,
   onExport,
   canExportFiltered
-}: ExportDialogProps): react_jsx_runtime8.JSX.Element;
+}: ExportDialogProps): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-advanced-toolbar.d.ts
 interface DataTableAdvancedToolbarProps<TData> extends React$1.ComponentProps<'div'> {
@@ -1717,7 +1717,7 @@ declare function DataTableAdvancedToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime8.JSX.Element;
+}: DataTableAdvancedToolbarProps<TData>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-column-header.d.ts
 interface DataTableColumnHeaderProps<TData, TValue> extends React.ComponentProps<typeof DropdownMenuTrigger> {
@@ -1729,7 +1729,7 @@ declare function DataTableColumnHeader<TData, TValue>({
   label,
   className,
   ...props
-}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime8.JSX.Element;
+}: DataTableColumnHeaderProps<TData, TValue>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-faceted-filter.d.ts
 interface DataTableFacetedFilterProps<TData, TValue> {
@@ -1743,7 +1743,7 @@ declare function DataTableFacetedFilter<TData, TValue>({
   title,
   options,
   multiple
-}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime8.JSX.Element;
+}: DataTableFacetedFilterProps<TData, TValue>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-pagination.d.ts
 interface DataTablePaginationProps<TData> extends React.ComponentProps<'div'>, TablePaginationOptions {
@@ -1759,7 +1759,7 @@ declare function DataTablePagination<TData>({
   pageJumpLabel,
   className,
   ...props
-}: DataTablePaginationProps<TData>): react_jsx_runtime8.JSX.Element;
+}: DataTablePaginationProps<TData>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-toolbar.d.ts
 interface DataTableToolbarProps<TData> extends React$1.ComponentProps<'div'> {
@@ -1770,7 +1770,7 @@ declare function DataTableToolbar<TData>({
   children,
   className,
   ...props
-}: DataTableToolbarProps<TData>): react_jsx_runtime8.JSX.Element;
+}: DataTableToolbarProps<TData>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/components/data-table/data-table-view-options.d.ts
 interface DataTableViewOptionsProps<TData> extends PopoverContentProps {
@@ -1783,7 +1783,7 @@ declare function DataTableViewOptions<TData>({
   disabled,
   locale,
   ...props
-}: DataTableViewOptionsProps<TData>): react_jsx_runtime8.JSX.Element;
+}: DataTableViewOptionsProps<TData>): react_jsx_runtime9.JSX.Element;
 //#endregion
 //#region src/lib/crud-actions.d.ts
 type CrudActionZone = 'toolbar' | 'row' | 'batch';

package/dist/index.js

@@ -8975,7 +8975,8 @@ function useAutoCrudResource({ router, schema, query: queryTransform, fields, op
 	useEffect(() => {
 		hooksRef.current = hooks;
 	}, [hooks]);
-	const metadata = (router.meta?.useQuery(void 0, { staleTime: 3e4 }))?.data;
+	const metadataQuery = router.meta?.useQuery(void 0, { staleTime: 3e4 });
+	const metadata = metadataQuery?.data;
 	const resolvedSchema = useMemo(() => mergeMetadataSchema(schema, metadata?.schema), [schema, metadata?.schema]);
 	const defaultSorting = useMemo(() => defaultSortOption === false ? [] : defaultSortOption ?? getDefaultSortingForSchema(resolvedSchema), [defaultSortOption, resolvedSchema]);
 	const metadataFields = useMemo(() => readMetadataFields(metadata?.fields), [metadata?.fields]);
@@ -8996,6 +8997,10 @@ function useAutoCrudResource({ router, schema, query: queryTransform, fields, op
 		search: parseAsString.withDefault("")
 	}, { shallow: false });
 	const [filters] = useReadableFilters(columns, { shallow: false });
+	const metadataPending = Boolean(metadataQuery?.isPending);
+	const [filtersReady, setFiltersReady] = useState(!metadataPending);
+	useEffect(() => setFiltersReady(!metadataPending), [metadataPending]);
+	const listReady = !metadataPending && filtersReady;
 	const queryInput = useMemo(() => {
 		const autoParams = {
 			page: urlParams.page,
@@ -9011,11 +9016,17 @@ function useAutoCrudResource({ router, schema, query: queryTransform, fields, op
 		filters,
 		queryTransform
 	]);
+	const hasReadyListData = useRef(false);
 	const listQuery = router.list.useQuery(queryInput, {
-		placeholderData: keepPreviousData,
+		enabled: listReady,
+		placeholderData: hasReadyListData.current ? keepPreviousData : void 0,
 		staleTime: 0
 	});
-	const tableRows = listQuery.data?.data ?? [];
+	useEffect(() => {
+		if (listReady && listQuery.data !== void 0) hasReadyListData.current = true;
+	}, [listReady, listQuery.data]);
+	const listData = listReady ? listQuery.data : void 0;
+	const tableRows = listData?.data ?? [];
 	const createMutation = router.create.useMutation();
 	const updateMutation = router.update.useMutation();
 	const deleteMutation = router.delete.useMutation();
@@ -9273,16 +9284,17 @@ function useAutoCrudResource({ router, schema, query: queryTransform, fields, op
 	]);
 	const canExport = !!(exportFetcher || exportQuery);
 	const refresh = useCallback(async () => {
+		if (!listReady) return;
 		return listQuery.refetch();
-	}, [listQuery]);
+	}, [listQuery, listReady]);
 	return {
 		idKey,
 		tableData: {
 			data: tableRows,
-			pageCount: listQuery.data?.pageCount ?? 0,
-			...typeof listQuery.data?.total === "number" ? { total: listQuery.data.total } : {},
-			isLoading: listQuery.isLoading,
-			isFetching: listQuery.isFetching
+			pageCount: listData?.pageCount ?? 0,
+			...typeof listData?.total === "number" ? { total: listData.total } : {},
+			isLoading: !listReady || listQuery.isLoading,
+			isFetching: !listReady || listQuery.isFetching
 		},
 		schema: resolvedSchema,
 		fields: metadataFields,

package/package.json

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