@wordrhyme/auto-crud 1.17.0 → 1.17.1

package/dist/index.cjs

@@ -1794,6 +1794,7 @@ function ViewMenu({ resourceId, table, fieldsReady = true, selector = "dropdown"
 		"aria-hidden": "true",
 		className: cn("pointer-events-none absolute inset-x-0 h-1 bg-primary", linePosition === "top" ? "top-0" : "bottom-0", tabs?.classNames?.indicator)
 	}) : null;
+	const triggerLabel = display === "tabs" ? "视图设置" : selected === null ? "切换视图" : void 0;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [children(/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: "flex min-w-0 flex-wrap items-center gap-2",
 		children: [
@@ -1837,19 +1838,22 @@ function ViewMenu({ resourceId, table, fieldsReady = true, selector = "dropdown"
 					children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)(__wordrhyme_shadcn.Button, {
 						type: "button",
 						variant: display === "tabs" ? "ghost" : "outline",
-						size: display === "tabs" ? "icon-sm" : "sm",
-						className: "shrink-0",
-						"aria-label": display === "tabs" ? "视图设置" : void 0,
-						title: display === "tabs" ? "视图设置" : void 0,
+						size: display === "tabs" || selected === null ? "icon-sm" : "sm",
+						className: cn("relative shrink-0", display === "dropdown" && selected === null && counts && "w-auto px-2"),
+						"aria-label": triggerLabel,
+						title: triggerLabel,
 						disabled: !fieldsReady || views.isPending || mutation.isPending,
 						children: display === "tabs" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Settings, { className: "size-4" }) : /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(react_jsx_runtime.Fragment, { children: [
-							selected?.name ?? "全部",
+							selected ? selected.name : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.Layers, {
+								"aria-hidden": "true",
+								className: "size-4"
+							}),
 							renderCount(selected ? `view:${views.data?.findIndex((view) => view.id === selected.id)}` : "all"),
 							dirty && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
 								"aria-label": "有未保存修改",
-								className: "size-1.5 rounded-full bg-current"
+								className: cn("size-1.5 rounded-full bg-current", selected === null && "absolute right-1 top-1")
 							}),
-							/* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.ChevronDown, { className: "size-4" })
+							selected && /* @__PURE__ */ (0, react_jsx_runtime.jsx)(lucide_react.ChevronDown, { className: "size-4" })
 						] })
 					})
 				}), /* @__PURE__ */ (0, react_jsx_runtime.jsxs)(__wordrhyme_shadcn.DropdownMenuContent, {

package/dist/index.js

@@ -4,7 +4,7 @@ import { Fragment, createContext, forwardRef, useCallback, useContext, useEffect
 import { Fragment as Fragment$1, jsx, jsxs } from "react/jsx-runtime";
 import { keepPreviousData, useInfiniteQuery, useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle, Badge, Button, Calendar, Checkbox, Command, CommandEmpty, CommandGroup, CommandInput, CommandItem, CommandList, Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle, DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuContent, DropdownMenuItem, DropdownMenuLabel, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSeparator, DropdownMenuSub, DropdownMenuSubContent, DropdownMenuSubTrigger, DropdownMenuTrigger, Input, InputGroup, InputGroupAddon, InputGroupButton, InputGroupInput, Label, Popover, PopoverContent, PopoverTrigger, RadioGroup, RadioGroupItem, Select as Select$1, SelectContent, SelectItem, SelectTrigger, SelectValue, Separator, Slider, Switch, Table, TableBody, TableCell, TableHead, TableHeader, TableRow, Textarea, ToggleGroup, ToggleGroupItem, cn as cn$1 } from "@wordrhyme/shadcn";
-import { AppWindow, ArrowDownUp, BadgeCheck, CalendarIcon, Check, CheckCircle2, ChevronDown, ChevronLeft, ChevronRight, ChevronRightIcon, ChevronUp, ChevronsLeft, ChevronsRight, ChevronsRightIcon, ChevronsUpDown, CommandIcon, Copy, Download, Ellipsis, EyeOff, FileDown, FileSpreadsheetIcon, GripVertical, Info, List, ListFilter, ListFilterIcon, Loader2, PanelsTopLeft, Pencil, Plus, PlusCircle, RefreshCw, Search, Settings, Settings2, Text, Trash2, Upload, X, XCircle } from "lucide-react";
+import { AppWindow, ArrowDownUp, BadgeCheck, CalendarIcon, Check, CheckCircle2, ChevronDown, ChevronLeft, ChevronRight, ChevronRightIcon, ChevronUp, ChevronsLeft, ChevronsRight, ChevronsRightIcon, ChevronsUpDown, CommandIcon, Copy, Download, Ellipsis, EyeOff, FileDown, FileSpreadsheetIcon, GripVertical, Info, Layers, List, ListFilter, ListFilterIcon, Loader2, PanelsTopLeft, Pencil, Plus, PlusCircle, RefreshCw, Search, Settings, Settings2, Text, Trash2, Upload, X, XCircle } from "lucide-react";
 import { z } from "zod";
 import { clsx } from "clsx";
 import { twMerge } from "tailwind-merge";
@@ -1778,6 +1778,7 @@ function ViewMenu({ resourceId, table, fieldsReady = true, selector = "dropdown"
 		"aria-hidden": "true",
 		className: cn("pointer-events-none absolute inset-x-0 h-1 bg-primary", linePosition === "top" ? "top-0" : "bottom-0", tabs?.classNames?.indicator)
 	}) : null;
+	const triggerLabel = display === "tabs" ? "视图设置" : selected === null ? "切换视图" : void 0;
 	return /* @__PURE__ */ jsxs(Fragment$1, { children: [children(/* @__PURE__ */ jsxs("div", {
 		className: "flex min-w-0 flex-wrap items-center gap-2",
 		children: [
@@ -1821,19 +1822,22 @@ function ViewMenu({ resourceId, table, fieldsReady = true, selector = "dropdown"
 					children: /* @__PURE__ */ jsx(Button, {
 						type: "button",
 						variant: display === "tabs" ? "ghost" : "outline",
-						size: display === "tabs" ? "icon-sm" : "sm",
-						className: "shrink-0",
-						"aria-label": display === "tabs" ? "视图设置" : void 0,
-						title: display === "tabs" ? "视图设置" : void 0,
+						size: display === "tabs" || selected === null ? "icon-sm" : "sm",
+						className: cn("relative shrink-0", display === "dropdown" && selected === null && counts && "w-auto px-2"),
+						"aria-label": triggerLabel,
+						title: triggerLabel,
 						disabled: !fieldsReady || views.isPending || mutation.isPending,
 						children: display === "tabs" ? /* @__PURE__ */ jsx(Settings, { className: "size-4" }) : /* @__PURE__ */ jsxs(Fragment$1, { children: [
-							selected?.name ?? "全部",
+							selected ? selected.name : /* @__PURE__ */ jsx(Layers, {
+								"aria-hidden": "true",
+								className: "size-4"
+							}),
 							renderCount(selected ? `view:${views.data?.findIndex((view) => view.id === selected.id)}` : "all"),
 							dirty && /* @__PURE__ */ jsx("span", {
 								"aria-label": "有未保存修改",
-								className: "size-1.5 rounded-full bg-current"
+								className: cn("size-1.5 rounded-full bg-current", selected === null && "absolute right-1 top-1")
 							}),
-							/* @__PURE__ */ jsx(ChevronDown, { className: "size-4" })
+							selected && /* @__PURE__ */ jsx(ChevronDown, { className: "size-4" })
 						] })
 					})
 				}), /* @__PURE__ */ jsxs(DropdownMenuContent, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@wordrhyme/auto-crud",
   "type": "module",
-  "version": "1.17.0",
+  "version": "1.17.1",
   "description": "Schema-first CRUD components with auto-generated tables and forms",
   "author": "wordrhyme",
   "license": "MIT",
@@ -71,9 +71,9 @@
     "nanoid": "^5.1.6",
     "tailwind-merge": "^3.5.0",
     "vaul": "^1.1.2",
+    "@wordrhyme/formily-shadcn": "2.1.3",
     "@wordrhyme/shadcn": "2.0.2",
-    "@wordrhyme/shadcn-ui": "2.1.3",
-    "@wordrhyme/formily-shadcn": "2.1.3"
+    "@wordrhyme/shadcn-ui": "2.1.3"
   },
   "devDependencies": {
     "@storybook/react": "^8.6.18",