merge: 同步上游 dev 最新内容

2026-05-06 00:53:11 +08:00
parent ce81e31644 cf5312a890
commit aa9b437ad5
125 changed files with 3069 additions and 1271 deletions
--- a/dashboard/src/routes/resource/emoji/index.tsx
+++ b/dashboard/src/routes/resource/emoji/index.tsx
@@ -63,7 +63,7 @@ export function EmojiManagementPage() {
  const [page, setPage] = useState(1)
  const [total, setTotal] = useState(0)
  const [pageSize, setPageSize] = useState(20)
-  const [registeredFilter, setRegisteredFilter] = useState<string>('all')
+  const [registeredFilter, setRegisteredFilter] = useState<string>('registered')
  const [bannedFilter, setBannedFilter] = useState<string>('all')
  const [formatFilter, setFormatFilter] = useState<string>('all')
  const [sortBy, setSortBy] = useState<string>('usage_count')
@@ -280,7 +280,7 @@ export function EmojiManagementPage() {
      {/* 页面标题 */}
      <div className="mb-4 sm:mb-6 flex flex-col sm:flex-row sm:items-center sm:justify-between gap-4">
        <div>
-          <h1 className="text-2xl sm:text-3xl font-bold">表情包管理</h1>
+          <h1 className="text-2xl sm:text-3xl font-bold">表情包</h1>
          <p className="text-sm text-muted-foreground mt-1">
            管理麦麦的表情包资源
          </p>
@@ -449,8 +449,8 @@ export function EmojiManagementPage() {
                </div>
              </div>

-              <div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-3 pt-4 border-t">
-                <div className="flex items-center gap-4">
+              <div className="flex flex-col gap-3 border-t pt-4 sm:flex-row sm:items-center sm:justify-between">
+                <div className="flex flex-wrap items-center gap-3">
                  {selectedIds.size > 0 && (
                    <span className="text-sm text-muted-foreground">
                      已选择 {selectedIds.size} 个表情包
@@ -477,8 +477,41 @@ export function EmojiManagementPage() {
                      </SelectContent>
                    </Select>
                  </div>
+
+                  <Button
+                    variant="outline"
+                    size="sm"
+                    onClick={loadEmojiList}
+                    disabled={loading}
+                  >
+                    <RefreshCw
+                      className={`h-4 w-4 mr-2 ${loading ? 'animate-spin' : ''}`}
+                    />
+                    刷新
+                  </Button>
+
+                  {selectedIds.size > 0 && (
+                    <>
+                      <Button
+                        variant="outline"
+                        size="sm"
+                        onClick={() => setSelectedIds(new Set())}
+                      >
+                        取消选择
+                      </Button>
+                      <Button
+                        variant="destructive"
+                        size="sm"
+                        onClick={() => setBatchDeleteDialogOpen(true)}
+                      >
+                        <Trash2 className="h-4 w-4 mr-1" />
+                        批量删除
+                      </Button>
+                    </>
+                  )}
                </div>
-                <div className="flex items-center gap-2">
+
+                <div className="flex items-center gap-2 sm:ml-auto">
                  <Label
                    htmlFor="emoji-page-size"
                    className="text-sm whitespace-nowrap"
@@ -503,41 +536,8 @@ export function EmojiManagementPage() {
                      <SelectItem value="100">100</SelectItem>
                    </SelectContent>
                  </Select>
-                  {selectedIds.size > 0 && (
-                    <>
-                      <Button
-                        variant="outline"
-                        size="sm"
-                        onClick={() => setSelectedIds(new Set())}
-                      >
-                        取消选择
-                      </Button>
-                      <Button
-                        variant="destructive"
-                        size="sm"
-                        onClick={() => setBatchDeleteDialogOpen(true)}
-                      >
-                        <Trash2 className="h-4 w-4 mr-1" />
-                        批量删除
-                      </Button>
-                    </>
-                  )}
                </div>
              </div>
-
-              <div className="flex justify-end pt-4 border-t">
-                <Button
-                  variant="outline"
-                  size="sm"
-                  onClick={loadEmojiList}
-                  disabled={loading}
-                >
-                  <RefreshCw
-                    className={`h-4 w-4 mr-2 ${loading ? 'animate-spin' : ''}`}
-                  />
-                  刷新
-                </Button>
-              </div>
            </CardContent>
          </Card>

--- a/dashboard/src/routes/resource/expression/ExpressionDialogs.tsx
+++ b/dashboard/src/routes/resource/expression/ExpressionDialogs.tsx
@@ -60,8 +60,8 @@ export function ExpressionDetailDialog({
    return new Date(timestamp * 1000).toLocaleString('zh-CN')
  }

-  const getChatName = (chatId: string): string => {
-    return chatNameMap.get(chatId) || chatId
+  const getChatName = (): string => {
+    return expression.chat_name || chatNameMap.get(expression.chat_id) || expression.chat_id
  }

  return (
@@ -81,7 +81,7 @@ export function ExpressionDetailDialog({
            <InfoItem label="风格" value={expression.style} />
            <InfoItem 
              label="聊天" 
-              value={getChatName(expression.chat_id)} 
+              value={getChatName()} 
            />
            <InfoItem icon={Hash} label="记录ID" value={expression.id.toString()} mono />
          </div>
--- a/dashboard/src/routes/resource/expression/ExpressionList.tsx
+++ b/dashboard/src/routes/resource/expression/ExpressionList.tsx
@@ -51,8 +51,8 @@ export function ExpressionList({
 }) {
  const { toast } = useToast()

-  const getChatName = (chatId: string): string => {
-    return chatNameMap.get(chatId) || chatId
+  const getChatName = (expression: Expression): string => {
+    return expression.chat_name || chatNameMap.get(expression.chat_id) || expression.chat_id
  }

  const totalPages = Math.ceil(total / pageSize)
@@ -117,11 +117,11 @@ export function ExpressionList({
                  <TableCell className="max-w-xs truncate">{expression.style}</TableCell>
                  <TableCell 
                    className="max-w-[200px] truncate" 
-                    title={getChatName(expression.chat_id)}
+                    title={getChatName(expression)}
                    style={{ wordBreak: 'keep-all' }}
                  >
                    <span className="whitespace-nowrap overflow-hidden text-ellipsis block">
-                      {getChatName(expression.chat_id)}
+                      {getChatName(expression)}
                    </span>
                  </TableCell>
                  <TableCell className="text-right">
@@ -201,10 +201,10 @@ export function ExpressionList({
                <div className="text-xs text-muted-foreground mb-1">聊天</div>
                <p 
                  className="text-sm truncate" 
-                  title={getChatName(expression.chat_id)}
+                  title={getChatName(expression)}
                  style={{ wordBreak: 'keep-all' }}
                >
-                  {getChatName(expression.chat_id)}
+                  {getChatName(expression)}
                </p>
              </div>

--- a/dashboard/src/routes/resource/expression/index.tsx
+++ b/dashboard/src/routes/resource/expression/index.tsx
@@ -267,7 +267,7 @@ export function ExpressionManagementPage() {
          <div>
            <h1 className="text-2xl sm:text-3xl font-bold flex items-center gap-2">
              <MessageSquare className="h-8 w-8" strokeWidth={2} />
-              表达方式管理
+              表达方式
            </h1>
            <p className="text-muted-foreground mt-1 text-sm sm:text-base">
              管理麦麦的表达方式和话术模板
@@ -316,28 +316,21 @@ export function ExpressionManagementPage() {

      {/* 搜索和批量操作 */}
      <div className="rounded-lg border bg-card p-4">
-        <Label htmlFor="search">搜索</Label>
-        <div className="flex flex-col sm:flex-row gap-2 mt-1.5">
-          <div className="flex-1 relative">
-            <Search className="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
-            <Input
-              id="search"
-              placeholder="搜索情境、风格或上下文..."
-              value={search}
-              onChange={(e) => setSearch(e.target.value)}
-              className="pl-9"
-            />
+        <div className="flex flex-col gap-3 sm:flex-row sm:items-end">
+          <div className="flex-1">
+            <Label htmlFor="search">搜索</Label>
+            <div className="relative mt-1.5">
+              <Search className="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
+              <Input
+                id="search"
+                placeholder="搜索情境、风格或上下文..."
+                value={search}
+                onChange={(e) => setSearch(e.target.value)}
+                className="pl-9"
+              />
+            </div>
          </div>
-        </div>
-
-        {/* 批量操作工具栏 */}
-        <div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-3 mt-4 pt-4 border-t">
-          <div className="flex items-center gap-2 text-sm text-muted-foreground">
-            {selectedIds.size > 0 && (
-              <span>已选择 {selectedIds.size} 个表达方式</span>
-            )}
-          </div>
-          <div className="flex items-center gap-2">
+          <div className="flex items-center gap-2 sm:pb-0.5">
            <Label htmlFor="page-size" className="text-sm whitespace-nowrap">每页显示</Label>
            <Select
              value={pageSize.toString()}
@@ -357,6 +350,17 @@ export function ExpressionManagementPage() {
                <SelectItem value="100">100</SelectItem>
              </SelectContent>
            </Select>
+          </div>
+        </div>
+
+        {/* 批量操作工具栏 */}
+        <div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-3 mt-4 pt-4 border-t">
+          <div className="flex items-center gap-2 text-sm text-muted-foreground">
+            {selectedIds.size > 0 && (
+              <span>已选择 {selectedIds.size} 个表达方式</span>
+            )}
+          </div>
+          <div className="flex items-center gap-2">
            {selectedIds.size > 0 && (
              <>
                <Button
--- a/dashboard/src/routes/resource/jargon/index.tsx
+++ b/dashboard/src/routes/resource/jargon/index.tsx
@@ -250,7 +250,7 @@ export function JargonManagementPage() {
          <div>
            <h1 className="text-2xl sm:text-3xl font-bold flex items-center gap-2">
              <MessageCircle className="h-8 w-8" strokeWidth={2} />
-              黑话管理
+              黑话
            </h1>
            <p className="text-muted-foreground mt-1 text-sm sm:text-base">
              管理麦麦学习到的黑话和俗语