From 8f953cd6a161f41bce85479c83f29750809adefb Mon Sep 17 00:00:00 2001
From: imbytecat <imbytecat@gmail.com>
Date: Tue, 12 May 2026 00:39:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(ui):=20=E6=9B=BF=E6=8D=A2=E5=8E=9F?=
 =?UTF-8?q?=E7=94=9F=E4=B8=8B=E6=8B=89=E6=8E=A7=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ui.tsx    | 67 ++++++++++++++++++++++++++++++++++++----
 src/routes/batteries.tsx | 41 ++++++++++++------------
 2 files changed, 82 insertions(+), 26 deletions(-)

diff --git a/src/components/ui.tsx b/src/components/ui.tsx
index 9a35629..52d4990 100644
--- a/src/components/ui.tsx
+++ b/src/components/ui.tsx
@@ -1,3 +1,5 @@
+import * as RadixSelect from '@radix-ui/react-select'
+import { Check, ChevronDown } from 'lucide-react'
 import type { ComponentPropsWithoutRef, ReactNode } from 'react'
 
 type Variant = 'default' | 'muted' | 'success' | 'warning' | 'danger' | 'info'
@@ -72,17 +74,70 @@ export function Input({ className, ...props }: ComponentPropsWithoutRef<'input'>
   )
 }
 
-export function Select({ className, children, ...props }: ComponentPropsWithoutRef<'select'>) {
+export function Select({
+  value,
+  onValueChange,
+  children,
+  className,
+  id,
+}: {
+  value?: string | number
+  onValueChange?: (value: string) => void
+  children: ReactNode
+  className?: string
+  id?: string
+}) {
   return (
-    <select
+    <RadixSelect.Root value={value?.toString()} onValueChange={onValueChange}>
+      <RadixSelect.Trigger
+        id={id}
+        className={cn(
+          'flex h-10 w-full items-center justify-between gap-2 rounded-lg border border-white/10 bg-zinc-950/95 px-3 py-2 text-sm text-zinc-100 outline-none transition-colors focus:border-teal-400/60 focus:ring-2 focus:ring-teal-400/10 data-[placeholder]:text-zinc-500',
+          className,
+        )}
+      >
+        <RadixSelect.Value />
+        <RadixSelect.Icon asChild>
+          <ChevronDown className="size-4 opacity-50" />
+        </RadixSelect.Icon>
+      </RadixSelect.Trigger>
+      <RadixSelect.Portal>
+        <RadixSelect.Content
+          className="relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-lg border border-white/10 bg-zinc-950 text-zinc-100 shadow-xl shadow-black/40"
+          position="popper"
+          sideOffset={4}
+        >
+          <RadixSelect.Viewport className="p-1">{children}</RadixSelect.Viewport>
+        </RadixSelect.Content>
+      </RadixSelect.Portal>
+    </RadixSelect.Root>
+  )
+}
+
+export function SelectOption({
+  value,
+  children,
+  className,
+}: {
+  value: string | number
+  children: ReactNode
+  className?: string
+}) {
+  return (
+    <RadixSelect.Item
+      value={value.toString()}
       className={cn(
-        'h-10 rounded-lg border border-white/10 bg-zinc-950/95 px-3 py-2 text-sm text-zinc-100 outline-none transition-colors [color-scheme:dark] focus:border-teal-400/60 focus:ring-2 focus:ring-teal-400/10',
+        'relative flex w-full cursor-default select-none items-center rounded-md py-1.5 pl-8 pr-2 text-sm outline-none focus:bg-white/10 focus:text-zinc-50 data-[disabled]:pointer-events-none data-[disabled]:opacity-50',
         className,
       )}
-      {...props}
     >
-      {children}
-    </select>
+      <span className="absolute left-2 flex h-3.5 w-3.5 items-center justify-center">
+        <RadixSelect.ItemIndicator>
+          <Check className="size-4" />
+        </RadixSelect.ItemIndicator>
+      </span>
+      <RadixSelect.ItemText>{children}</RadixSelect.ItemText>
+    </RadixSelect.Item>
   )
 }
 
diff --git a/src/routes/batteries.tsx b/src/routes/batteries.tsx
index 21cd835..030af63 100644
--- a/src/routes/batteries.tsx
+++ b/src/routes/batteries.tsx
@@ -6,13 +6,14 @@ import { useEffect, useMemo, useState } from 'react'
 import { z } from 'zod'
 import { orpc } from '@/client/orpc'
 import { MotionCardDiv, MotionHeader, MotionSection, MotionTableRow } from '@/components/motion'
-import { Badge, Button, Card, Input, SectionTitle, Select } from '@/components/ui'
+import { Badge, Button, Card, Input, SectionTitle, Select, SelectOption } from '@/components/ui'
 import type { BatteryInfo, BatteryListSort, PowerStatus } from '@/domain/battery'
 import { BATTERY_LIST_SORT, BATTERY_LIST_SORT_VALUES, POWER_STATUS, POWER_STATUS_VALUES } from '@/domain/battery'
 
 const pageSizeOptions = [20, 50, 100] as const
 type PageSizeOption = (typeof pageSizeOptions)[number]
 const firstPageCursor = '__FIRST_PAGE__'
+const allPowerStatusValue = 'all'
 
 const searchFilterSchema = z.preprocess(
   (value) => (typeof value === 'string' ? value.trim() || undefined : value),
@@ -78,7 +79,7 @@ function parseSort(value: string): BatteryListSort {
 }
 
 function parsePowerStatus(value: string): PowerStatus | undefined {
-  if (value === '') return undefined
+  if (value === allPowerStatusValue) return undefined
 
   const parsed = Number(value)
 
@@ -326,22 +327,22 @@ function BatteriesPage() {
                 </label>
                 <Select
                   id="power-status-select"
-                  value={search.powerStatus ?? ''}
-                  onChange={(e) => {
+                  value={search.powerStatus ?? allPowerStatusValue}
+                  onValueChange={(value) => {
                     navigate({
                       search: (prev) => ({
                         ...prev,
-                        powerStatus: parsePowerStatus(e.target.value),
+                        powerStatus: parsePowerStatus(value),
                         cursor: undefined,
                         cursors: [],
                       }),
                     })
                   }}
                 >
-                  <option value="">所有充电状态</option>
-                  <option value={POWER_STATUS.NOT_CHARGING}>未充电</option>
-                  <option value={POWER_STATUS.CHARGING}>充电中</option>
-                  <option value={POWER_STATUS.FULL}>已充满</option>
+                  <SelectOption value={allPowerStatusValue}>所有充电状态</SelectOption>
+                  <SelectOption value={POWER_STATUS.NOT_CHARGING}>未充电</SelectOption>
+                  <SelectOption value={POWER_STATUS.CHARGING}>充电中</SelectOption>
+                  <SelectOption value={POWER_STATUS.FULL}>已充满</SelectOption>
                 </Select>
               </div>
 
@@ -352,21 +353,21 @@ function BatteriesPage() {
                 <Select
                   id="sort-select"
                   value={search.sort}
-                  onChange={(e) => {
+                  onValueChange={(value) => {
                     navigate({
                       search: (prev) => ({
                         ...prev,
-                        sort: parseSort(e.target.value),
+                        sort: parseSort(value),
                         cursor: undefined,
                         cursors: [],
                       }),
                     })
                   }}
                 >
-                  <option value={BATTERY_LIST_SORT.CREATED_AT_DESC}>最新更新</option>
-                  <option value={BATTERY_LIST_SORT.CREATED_AT_ASC}>最早更新</option>
-                  <option value={BATTERY_LIST_SORT.POWER_DESC}>电量从高到低</option>
-                  <option value={BATTERY_LIST_SORT.POWER_ASC}>电量从低到高</option>
+                  <SelectOption value={BATTERY_LIST_SORT.CREATED_AT_DESC}>最新更新</SelectOption>
+                  <SelectOption value={BATTERY_LIST_SORT.CREATED_AT_ASC}>最早更新</SelectOption>
+                  <SelectOption value={BATTERY_LIST_SORT.POWER_DESC}>电量从高到低</SelectOption>
+                  <SelectOption value={BATTERY_LIST_SORT.POWER_ASC}>电量从低到高</SelectOption>
                 </Select>
               </div>
 
@@ -377,20 +378,20 @@ function BatteriesPage() {
                 <Select
                   id="page-size-select"
                   value={search.pageSize}
-                  onChange={(e) => {
+                  onValueChange={(value) => {
                     navigate({
                       search: (prev) => ({
                         ...prev,
-                        pageSize: parsePageSize(e.target.value),
+                        pageSize: parsePageSize(value),
                         cursor: undefined,
                         cursors: [],
                       }),
                     })
                   }}
                 >
-                  <option value="20">20 条/页</option>
-                  <option value="50">50 条/页</option>
-                  <option value="100">100 条/页</option>
+                  <SelectOption value="20">20 条/页</SelectOption>
+                  <SelectOption value="50">50 条/页</SelectOption>
+                  <SelectOption value="100">100 条/页</SelectOption>
                 </Select>
               </div>