From 2de36c3da6b2ab79306a72efd5713f332bda585c Mon Sep 17 00:00:00 2001
From: hailin <wbwang_hailin@kingdee.com>
Date: Thu, 2 Jul 2026 15:28:19 +0800
Subject: [PATCH] refactor: align select composition with shadcn

---
 .../design-system/DesignSystemPreview.tsx     | 10 ++++---
 .../features/solutions/SolutionCreatePage.tsx |  8 +++--
 .../features/solutions/SolutionListPage.tsx   | 10 ++++---
 .../src/features/tickets/TicketComments.tsx   |  8 +++--
 .../src/features/tickets/TicketCreatePage.tsx | 12 ++++----
 .../src/features/tickets/TicketFilterBar.tsx  | 30 +++++++++++--------
 6 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/frontend/src/features/design-system/DesignSystemPreview.tsx b/frontend/src/features/design-system/DesignSystemPreview.tsx
index fb3d94e..160e2cb 100644
--- a/frontend/src/features/design-system/DesignSystemPreview.tsx
+++ b/frontend/src/features/design-system/DesignSystemPreview.tsx
@@ -10,7 +10,7 @@ import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { Card, CardContent, CardHeader, CardTitle } from '@/components/ui/card'
 import { Input } from '@/components/ui/input'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 
 type PreviewRow = {
   id: number
@@ -75,9 +75,11 @@ export function DesignSystemPreview() {
               <SelectValue />
             </SelectTrigger>
             <SelectContent>
-              <SelectItem value="all">全部状态</SelectItem>
-              <SelectItem value="pending">待处理</SelectItem>
-              <SelectItem value="in_progress">处理中</SelectItem>
+              <SelectGroup>
+                <SelectItem value="all">全部状态</SelectItem>
+                <SelectItem value="pending">待处理</SelectItem>
+                <SelectItem value="in_progress">处理中</SelectItem>
+              </SelectGroup>
             </SelectContent>
           </Select>
         </AppFilterBar>
diff --git a/frontend/src/features/solutions/SolutionCreatePage.tsx b/frontend/src/features/solutions/SolutionCreatePage.tsx
index 09cb77a..c546863 100644
--- a/frontend/src/features/solutions/SolutionCreatePage.tsx
+++ b/frontend/src/features/solutions/SolutionCreatePage.tsx
@@ -7,7 +7,7 @@ import { AppSection } from '@/components/app/AppSection'
 import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import { Textarea } from '@/components/ui/textarea'
 import { getTicket } from '@/features/tickets/api'
 
@@ -114,8 +114,10 @@ export function SolutionCreatePage() {
                       <SelectValue placeholder="选择状态" />
                     </SelectTrigger>
                     <SelectContent>
-                      <SelectItem value="draft">草稿</SelectItem>
-                      <SelectItem value="published">发布</SelectItem>
+                      <SelectGroup>
+                        <SelectItem value="draft">草稿</SelectItem>
+                        <SelectItem value="published">发布</SelectItem>
+                      </SelectGroup>
                     </SelectContent>
                   </Select>
                 </AppField>
diff --git a/frontend/src/features/solutions/SolutionListPage.tsx b/frontend/src/features/solutions/SolutionListPage.tsx
index 212deba..dcc824b 100644
--- a/frontend/src/features/solutions/SolutionListPage.tsx
+++ b/frontend/src/features/solutions/SolutionListPage.tsx
@@ -9,7 +9,7 @@ import { Badge } from '@/components/ui/badge'
 import { Card, CardContent } from '@/components/ui/card'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import { formatDateTime } from '@/lib/format'
 
 import { listSolutions } from './api'
@@ -117,9 +117,11 @@ export function SolutionListPage() {
               <SelectValue placeholder="全部状态" />
             </SelectTrigger>
             <SelectContent>
-              <SelectItem value="all">全部状态</SelectItem>
-              <SelectItem value="published">已发布</SelectItem>
-              <SelectItem value="draft">草稿</SelectItem>
+              <SelectGroup>
+                <SelectItem value="all">全部状态</SelectItem>
+                <SelectItem value="published">已发布</SelectItem>
+                <SelectItem value="draft">草稿</SelectItem>
+              </SelectGroup>
             </SelectContent>
           </Select>
         </AppFilterBar>
diff --git a/frontend/src/features/tickets/TicketComments.tsx b/frontend/src/features/tickets/TicketComments.tsx
index 41661ec..296def9 100644
--- a/frontend/src/features/tickets/TicketComments.tsx
+++ b/frontend/src/features/tickets/TicketComments.tsx
@@ -2,7 +2,7 @@ import * as React from 'react'
 
 import { AppSection } from '@/components/app/AppSection'
 import { Button } from '@/components/ui/button'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import { Textarea } from '@/components/ui/textarea'
 
 import { addTicketComment } from './api'
@@ -37,8 +37,10 @@ export function TicketComments({ ticketId, onCommentAdded }: TicketCommentsProps
             <SelectValue placeholder="选择回复类型" />
           </SelectTrigger>
           <SelectContent>
-            <SelectItem value="internal">内部备注</SelectItem>
-            <SelectItem value="public">用户可见回复</SelectItem>
+            <SelectGroup>
+              <SelectItem value="internal">内部备注</SelectItem>
+              <SelectItem value="public">用户可见回复</SelectItem>
+            </SelectGroup>
           </SelectContent>
         </Select>
         <Textarea
diff --git a/frontend/src/features/tickets/TicketCreatePage.tsx b/frontend/src/features/tickets/TicketCreatePage.tsx
index 027b30b..1629ed2 100644
--- a/frontend/src/features/tickets/TicketCreatePage.tsx
+++ b/frontend/src/features/tickets/TicketCreatePage.tsx
@@ -8,7 +8,7 @@ import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert'
 import { Badge } from '@/components/ui/badge'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 import { Textarea } from '@/components/ui/textarea'
 
 import { createTicket } from './api'
@@ -79,10 +79,12 @@ export function TicketCreatePage() {
                       <SelectValue placeholder="请选择优先级" />
                     </SelectTrigger>
                     <SelectContent>
-                      <SelectItem value="low">低</SelectItem>
-                      <SelectItem value="medium">中</SelectItem>
-                      <SelectItem value="high">高</SelectItem>
-                      <SelectItem value="urgent">紧急</SelectItem>
+                      <SelectGroup>
+                        <SelectItem value="low">低</SelectItem>
+                        <SelectItem value="medium">中</SelectItem>
+                        <SelectItem value="high">高</SelectItem>
+                        <SelectItem value="urgent">紧急</SelectItem>
+                      </SelectGroup>
                     </SelectContent>
                   </Select>
                 </AppField>
diff --git a/frontend/src/features/tickets/TicketFilterBar.tsx b/frontend/src/features/tickets/TicketFilterBar.tsx
index 34ed7f3..a7c631c 100644
--- a/frontend/src/features/tickets/TicketFilterBar.tsx
+++ b/frontend/src/features/tickets/TicketFilterBar.tsx
@@ -3,7 +3,7 @@ import { RotateCcw } from 'lucide-react'
 import { AppFilterBar } from '@/components/app/AppFilterBar'
 import { Button } from '@/components/ui/button'
 import { Input } from '@/components/ui/input'
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
+import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'
 
 type TicketFilterBarProps = {
   q: string
@@ -43,13 +43,15 @@ export function TicketFilterBar({
           <SelectValue placeholder="全部状态" />
         </SelectTrigger>
         <SelectContent>
-          <SelectItem value="all">全部状态</SelectItem>
-          <SelectItem value="pending_info">待补充</SelectItem>
-          <SelectItem value="pending">待处理</SelectItem>
-          <SelectItem value="in_progress">处理中</SelectItem>
-          <SelectItem value="pending_confirm">待确认</SelectItem>
-          <SelectItem value="resolved">已解决</SelectItem>
-          <SelectItem value="closed">已关闭</SelectItem>
+          <SelectGroup>
+            <SelectItem value="all">全部状态</SelectItem>
+            <SelectItem value="pending_info">待补充</SelectItem>
+            <SelectItem value="pending">待处理</SelectItem>
+            <SelectItem value="in_progress">处理中</SelectItem>
+            <SelectItem value="pending_confirm">待确认</SelectItem>
+            <SelectItem value="resolved">已解决</SelectItem>
+            <SelectItem value="closed">已关闭</SelectItem>
+          </SelectGroup>
         </SelectContent>
       </Select>
       <Select onValueChange={onPriorityChange} value={priority}>
@@ -57,11 +59,13 @@ export function TicketFilterBar({
           <SelectValue placeholder="全部优先级" />
         </SelectTrigger>
         <SelectContent>
-          <SelectItem value="all">全部优先级</SelectItem>
-          <SelectItem value="low">低</SelectItem>
-          <SelectItem value="medium">中</SelectItem>
-          <SelectItem value="high">高</SelectItem>
-          <SelectItem value="urgent">紧急</SelectItem>
+          <SelectGroup>
+            <SelectItem value="all">全部优先级</SelectItem>
+            <SelectItem value="low">低</SelectItem>
+            <SelectItem value="medium">中</SelectItem>
+            <SelectItem value="high">高</SelectItem>
+            <SelectItem value="urgent">紧急</SelectItem>
+          </SelectGroup>
         </SelectContent>
       </Select>
       <Input