Selaa lähdekoodia

🗑️ chore(admin): 移除未使用的管理组件和页面

- 删除 AvatarSelector 组件,该组件用于头像选择但未被使用
- 删除 DataTablePagination 组件,该组件用于表格分页但未被使用
- 删除 FileSelector 组件,该组件用于文件选择但未被使用
- 删除 MinioUploader 组件,该组件用于文件上传但未被使用
- 删除 Files 页面,该页面用于文件管理但未被使用
- 删除 Users 页面,该页面用于用户管理但未被使用

【清理】移除未使用的代码以减少项目体积和维护成本
yourname 1 viikko sitten
vanhempi
sitoutus
3de213887b

+ 0 - 319
web/src/client/admin/components/AvatarSelector.tsx

@@ -1,319 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { Button } from '@/client/components/ui/button';
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/client/components/ui/dialog';
-import { Card, CardContent } from '@/client/components/ui/card';
-import { toast } from 'sonner';
-import { fileClient } from '@/client/api';
-import MinioUploader from '@/client/admin/components/MinioUploader';
-import { Check, Upload, Eye, X } from 'lucide-react';
-import { Avatar, AvatarFallback, AvatarImage } from '@/client/components/ui/avatar';
-import { cn } from '@/client/lib/utils';
-import type { InferResponseType } from 'hono/client';
-
-type FileType = InferResponseType<typeof fileClient.$get, 200>['data'][0]
-
-interface AvatarSelectorProps {
-  value?: number | null;
-  onChange: (fileId: number | null) => void;
-  accept?: string;
-  maxSize?: number;
-  uploadPath?: string;
-  uploadButtonText?: string;
-  previewSize?: 'small' | 'medium' | 'large';
-  showPreview?: boolean;
-  placeholder?: string;
-}
-
-const AvatarSelector: React.FC<AvatarSelectorProps> = ({
-  value,
-  onChange,
-  accept = 'image/*',
-  maxSize = 2,
-  uploadPath = '/avatars',
-  uploadButtonText = '上传',
-  previewSize = 'medium',
-  showPreview = true,
-  placeholder = '选择头像',
-}) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const [selectedFile, setSelectedFile] = useState<FileType | null>(null);
-
-  // 获取当前选中的文件详情
-  const { data: currentFile } = useQuery({
-    queryKey: ['file-detail', value],
-    queryFn: async () => {
-      if (!value) return null;
-      const response = await fileClient[':id']['$get']({ param: { id: Number(value) } });
-      if (response.status !== 200) throw new Error('获取文件详情失败');
-      return response.json();
-    },
-    enabled: !!value,
-  });
-
-  // 当对话框打开时,设置当前选中的头像
-  useEffect(() => {
-    if (isOpen && value && currentFile) {
-      setSelectedFile(currentFile);
-    }
-  }, [isOpen, value, currentFile]);
-
-  // 获取头像列表
-  const { data: filesData, isLoading, refetch } = useQuery({
-    queryKey: ['avatars-for-selection'] as const,
-    queryFn: async () => {
-      const response = await fileClient.$get({
-        query: {
-          page: 1,
-          pageSize: 50,
-          keyword: 'image'
-        }
-      });
-      if (response.status !== 200) throw new Error('获取头像列表失败');
-      return response.json();
-    },
-    enabled: isOpen,
-  });
-
-  const avatars = filesData?.data?.filter((f: any) => f?.type?.startsWith('image/')) || [];
-
-  const handleSelectAvatar = (file: FileType) => {
-    setSelectedFile(prevSelected => {
-      // 如果点击的是已选中的头像,则取消选择
-      if (prevSelected?.id === file.id) {
-        return null;
-      }
-      // 否则选择新的头像
-      return file;
-    });
-  };
-
-  const handleConfirm = () => {
-    if (!selectedFile) {
-      toast.warning('请选择一个头像');
-      return;
-    }
-    onChange(selectedFile.id);
-    setIsOpen(false);
-    setSelectedFile(null);
-  };
-
-  const handleCancel = () => {
-    setIsOpen(false);
-    setSelectedFile(null);
-  };
-
-  const handleUploadSuccess = () => {
-    toast.success('头像上传成功!请从列表中选择新上传的头像');
-    // 重新获取头像列表以显示新上传的头像
-    refetch();
-  };
-
-  const getPreviewSize = () => {
-    switch (previewSize) {
-      case 'small':
-        return 'h-16 w-16';
-      case 'medium':
-        return 'h-24 w-24';
-      case 'large':
-        return 'h-32 w-32';
-      default:
-        return 'h-24 w-24';
-    }
-  };
-
-  const handleRemoveAvatar = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    onChange(null as any);
-  };
-
-  return (
-    <>
-      <div className="space-y-4">
-        {showPreview && (
-          <div className="flex items-center space-x-4">
-            <div className="relative group">
-              <Avatar 
-                className={cn(
-                  getPreviewSize(),
-                  "border-2 border-dashed cursor-pointer hover:border-primary transition-colors"
-                )}
-                onClick={() => setIsOpen(true)}
-              >
-                {currentFile ? (
-                  <AvatarImage src={currentFile.fullUrl} alt={currentFile.name} />
-                ) : (
-                  <AvatarFallback className="text-sm">
-                    {placeholder.charAt(0).toUpperCase()}
-                  </AvatarFallback>
-                )}
-              </Avatar>
-              
-              {currentFile && (
-                <button
-                  type="button"
-                  className="absolute -top-2 -right-2 bg-red-500 text-white rounded-full p-1 opacity-0 group-hover:opacity-100 transition-opacity"
-                  onClick={handleRemoveAvatar}
-                >
-                  <X className="h-3 w-3" />
-                </button>
-              )}
-            </div>
-            
-            <div className="space-y-2">
-              <Button 
-                type="button" 
-                variant="outline" 
-                onClick={() => setIsOpen(true)}
-                className="text-sm"
-              >
-                {currentFile ? '更换头像' : placeholder}
-              </Button>
-              {currentFile && (
-                <p className="text-xs text-muted-foreground truncate w-40 sm:w-64 ">
-                  当前: {currentFile.name}
-                </p>
-              )}
-            </div>
-          </div>
-        )}
-
-        {!showPreview && (
-          <Button 
-            type="button" 
-            variant="outline" 
-            onClick={() => setIsOpen(true)}
-            className="w-full"
-          >
-            {currentFile ? '更换头像' : placeholder}
-          </Button>
-        )}
-      </div>
-
-      <Dialog open={isOpen} onOpenChange={setIsOpen}>
-        <DialogContent className="max-w-3xl max-h-[90vh]">
-          <DialogHeader>
-            <DialogTitle>选择头像</DialogTitle>
-            <DialogDescription>
-              上传新头像或从已有头像中选择
-            </DialogDescription>
-          </DialogHeader>
-
-          <div className="space-y-4">
-            {/* 头像列表 */}
-            <div className="space-y-2 max-h-96 overflow-y-auto p-1">
-              {isLoading ? (
-                <Card>
-                  <CardContent className="text-center py-8">
-                    <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary mx-auto"></div>
-                    <p className="text-gray-500 mt-2">加载中...</p>
-                  </CardContent>
-                </Card>
-              ) : (
-                <div className="grid grid-cols-4 gap-3">
-                  {/* 上传区域 - 作为第一项 */}
-                  <div className="relative cursor-pointer transition-all duration-200">
-                    <div className="rounded-lg border-2 border-dashed border-gray-300 hover:border-primary transition-colors hover:scale-105">
-                      <div className="p-2 h-24 flex items-center justify-center">
-                        <MinioUploader
-                          uploadPath={uploadPath}
-                          accept={accept}
-                          maxSize={maxSize}
-                          onUploadSuccess={handleUploadSuccess}
-                          buttonText={uploadButtonText}
-                          size="minimal"
-                          displayMode="card"
-                          showUploadList={false}
-                        />
-                      </div>
-                    </div>
-                    <p className="text-xs text-center mt-1 text-muted-foreground">
-                      上传新头像
-                    </p>
-                  </div>
-
-                  {/* 现有头像列表 */}
-                  {avatars.map((file) => (
-                    <div
-                      key={file.id}
-                      className={cn(
-                        "relative cursor-pointer transition-all duration-200",
-                        "hover:scale-105"
-                      )}
-                      onClick={() => handleSelectAvatar(file)}
-                    >
-                      <div
-                        className={cn(
-                          "relative rounded-lg overflow-hidden border-2",
-                          selectedFile?.id === file.id
-                            ? "border-primary ring-2 ring-primary ring-offset-2"
-                            : "border-gray-200 hover:border-primary"
-                        )}
-                      >
-                        <img
-                          src={file.fullUrl}
-                          alt={file.name}
-                          className="w-full h-24 object-cover"
-                        />
-                        
-                        {selectedFile?.id === file.id && (
-                          <div className="absolute inset-0 bg-primary/20 flex items-center justify-center">
-                            <Check className="h-6 w-6 text-white bg-primary rounded-full p-1" />
-                          </div>
-                        )}
-                        
-                        <div className="absolute top-1 right-1">
-                          <Eye
-                            className="h-4 w-4 text-white bg-black/50 rounded-full p-0.5 cursor-pointer hover:bg-black/70"
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              window.open(file.fullUrl, '_blank');
-                            }}
-                          />
-                        </div>
-                      </div>
-                      
-                      <p className="text-xs text-center mt-1 truncate">
-                        {file.name}
-                      </p>
-                    </div>
-                  ))}
-                  
-                  {/* 空状态 - 当没有头像时显示 */}
-                  {avatars.length === 0 && (
-                    <div className="col-span-3">
-                      <Card>
-                        <CardContent className="text-center py-8">
-                          <div className="flex flex-col items-center">
-                            <Upload className="h-12 w-12 text-gray-400 mb-4" />
-                            <p className="text-gray-600">暂无头像</p>
-                            <p className="text-sm text-gray-500 mt-2">请上传头像文件</p>
-                          </div>
-                        </CardContent>
-                      </Card>
-                    </div>
-                  )}
-                </div>
-              )}
-            </div>
-          </div>
-
-          <DialogFooter>
-            <Button type="button" variant="outline" onClick={handleCancel}>
-              取消
-            </Button>
-            <Button
-              type="button"
-              onClick={handleConfirm}
-              disabled={!selectedFile}
-            >
-              确认选择
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </>
-  );
-};
-
-export default AvatarSelector;

+ 0 - 124
web/src/client/admin/components/DataTablePagination.tsx

@@ -1,124 +0,0 @@
-import React from 'react';
-import {
-  Pagination,
-  PaginationContent,
-  PaginationEllipsis,
-  PaginationItem,
-  PaginationLink,
-  PaginationNext,
-  PaginationPrevious,
-} from '@/client/components/ui/pagination';
-
-interface DataTablePaginationProps {
-  currentPage: number;
-  totalCount: number;
-  pageSize: number;
-  onPageChange: (page: number, pageSize: number) => void;
-}
-
-export const DataTablePagination: React.FC<DataTablePaginationProps> = ({
-  currentPage,
-  totalCount,
-  pageSize,
-  onPageChange,
-}) => {
-  const totalPages = Math.ceil(totalCount / pageSize);
-
-  const getPageNumbers = () => {
-    const pages = [];
-    
-    if (totalPages <= 7) {
-      // 如果总页数小于等于7,显示所有页码
-      for (let i = 1; i <= totalPages; i++) {
-        pages.push(i);
-      }
-    } else {
-      // 显示当前页附近的页码
-      const startPage = Math.max(1, currentPage - 2);
-      const endPage = Math.min(totalPages, currentPage + 2);
-      
-      // 始终显示第一页
-      pages.push(1);
-      
-      // 添加省略号和中间页码
-      if (startPage > 2) {
-        pages.push('...');
-      }
-      
-      for (let i = Math.max(2, startPage); i <= Math.min(totalPages - 1, endPage); i++) {
-        pages.push(i);
-      }
-      
-      if (endPage < totalPages - 1) {
-        pages.push('...');
-      }
-      
-      // 始终显示最后一页
-      pages.push(totalPages);
-    }
-    
-    return pages;
-  };
-
-  const pageNumbers = getPageNumbers();
-
-  return (
-    <div className="flex justify-between items-center mt-4">
-      <Pagination>
-        <PaginationContent>
-          <PaginationItem>
-            <PaginationPrevious
-              href="#"
-              onClick={(e) => {
-                e.preventDefault();
-                if (currentPage > 1) {
-                  onPageChange(currentPage - 1, pageSize);
-                }
-              }}
-              aria-disabled={currentPage <= 1}
-              className={currentPage <= 1 ? "pointer-events-none opacity-50" : ""}
-            />
-          </PaginationItem>
-          
-          {pageNumbers.map((page, index) => {
-            if (page === '...') {
-              return (
-                <PaginationItem key={`ellipsis-${index}`}>
-                  <PaginationEllipsis />
-                </PaginationItem>
-              );
-            }
-            return (
-              <PaginationItem key={page}>
-                <PaginationLink
-                  href="#"
-                  isActive={page === currentPage}
-                  onClick={(e) => {
-                    e.preventDefault();
-                    onPageChange(page as number, pageSize);
-                  }}
-                >
-                  {page}
-                </PaginationLink>
-              </PaginationItem>
-            );
-          })}
-          
-          <PaginationItem>
-            <PaginationNext
-              href="#"
-              onClick={(e) => {
-                e.preventDefault();
-                if (currentPage < totalPages) {
-                  onPageChange(currentPage + 1, pageSize);
-                }
-              }}
-              aria-disabled={currentPage >= totalPages}
-              className={currentPage >= totalPages ? "pointer-events-none opacity-50" : ""}
-            />
-          </PaginationItem>
-        </PaginationContent>
-      </Pagination>
-    </div>
-  );
-};

+ 0 - 514
web/src/client/admin/components/FileSelector.tsx

@@ -1,514 +0,0 @@
-import React, { useState, useEffect } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { Button } from '@/client/components/ui/button';
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/client/components/ui/dialog';
-import { Card, CardContent } from '@/client/components/ui/card';
-import { toast } from 'sonner';
-import { fileClient } from '@/client/api';
-import MinioUploader from '@/client/admin/components/MinioUploader';
-import { Check, Upload, Eye, X, File as FileIcon, Image as ImageIcon } from 'lucide-react';
-import { cn } from '@/client/lib/utils';
-import type { InferResponseType } from 'hono/client';
-
-type FileType = InferResponseType<typeof fileClient.$get, 200>['data'][0]
-
-export interface FileSelectorProps {
-  value?: number | null | number[];
-  onChange?: (fileId: number | null | number[]) => void;
-  accept?: string;
-  maxSize?: number;
-  uploadPath?: string;
-  previewSize?: 'small' | 'medium' | 'large';
-  showPreview?: boolean;
-  placeholder?: string;
-  title?: string;
-  description?: string;
-  filterType?: 'image' | 'all' | string;
-  allowMultiple?: boolean;
-}
-
-export const FileSelector: React.FC<FileSelectorProps> = ({
-  value,
-  onChange,
-  accept = '*/*',
-  maxSize = 10,
-  uploadPath = '/files',
-  previewSize = 'medium',
-  showPreview = true,
-  placeholder = '选择文件',
-  title = '选择文件',
-  description = '上传新文件或从已有文件中选择',
-  filterType = 'all',
-  allowMultiple = false,
-}) => {
-  const [isOpen, setIsOpen] = useState(false);
-  const [selectedFile, setSelectedFile] = useState<FileType | null>(null);
-  const [localSelectedFiles, setLocalSelectedFiles] = useState<number[]>([]);
-
-  // 获取当前选中的文件详情 - 支持单值和数组
-  const { data: currentFiles } = useQuery<FileType[]>({
-    queryKey: ['file-details', value, allowMultiple],
-    queryFn: async (): Promise<FileType[]> => {
-      if (!value) return [];
-      
-      // 处理多选模式下的数组值
-      if (allowMultiple && Array.isArray(value)) {
-        if (value.length === 0) return [];
-        
-        // 批量获取多个文件详情
-        const filePromises = value.map(async (fileId) => {
-          try {
-            const response = await fileClient[':id']['$get']({ param: { id: Number(fileId) } });
-            if (response.status === 200) {
-              return response.json();
-            }
-            return null;
-          } catch (error) {
-            console.error(`获取文件 ${fileId} 详情失败:`, error);
-            return null;
-          }
-        });
-        
-        const files = await Promise.all(filePromises);
-        return files.filter(file => file !== null);
-      }
-      
-      // 处理单选模式下的单值
-      if (!Array.isArray(value)) {
-        const response = await fileClient[':id']['$get']({ param: { id: Number(value) } });
-        if (response.status !== 200) throw new Error('获取文件详情失败');
-        return [await response.json()];
-      }
-      
-      return [];
-    },
-    enabled: !!value,
-  });
-
-  // 当对话框打开时,设置当前选中的文件
-  useEffect(() => {
-    if (isOpen) {
-      if (allowMultiple) {
-        // 在多选模式下,使用 value 数组初始化本地选择
-        const initialSelection = Array.isArray(value) ? value : [];
-        setLocalSelectedFiles(initialSelection);
-      } else if (value && currentFiles && currentFiles.length > 0) {
-        setSelectedFile(currentFiles[0]);
-      }
-    }
-  }, [isOpen, value, currentFiles, allowMultiple]);
-
-  // 获取文件列表
-  const { data: filesData, isLoading, refetch } = useQuery({
-    queryKey: ['files-for-selection', filterType] as const,
-    queryFn: async () => {
-      const response = await fileClient.$get({
-        query: {
-          page: 1,
-          pageSize: 50,
-          ...(filterType !== 'all' && { keyword: filterType })
-        }
-      });
-      if (response.status !== 200) throw new Error('获取文件列表失败');
-      return response.json();
-    },
-    enabled: isOpen,
-  });
-
-  const files = filesData?.data?.filter((f) => {
-    if (filterType === 'all') return true;
-    if (filterType === 'image') return f?.type?.startsWith('image/');
-    return f?.type?.includes(filterType);
-  }) || [];
-
-  const handleSelectFile = (file: FileType) => {
-    if (allowMultiple) {
-      setLocalSelectedFiles(prev => {
-        const newSelection = prev.includes(file.id)
-          ? prev.filter(id => id !== file.id)
-          : [...prev, file.id];
-        return newSelection;
-      });
-    } else {
-      setSelectedFile(prevSelected => {
-        if (prevSelected?.id === file.id) {
-          return null;
-        }
-        return file;
-      });
-    }
-  };
-
-  const handleConfirm = () => {
-    if (allowMultiple) {
-      if (onChange) {
-        onChange(localSelectedFiles);
-      }
-      setIsOpen(false);
-      return;
-    }
-
-    if (!selectedFile) {
-      toast.warning('请选择一个文件');
-      return;
-    }
-    if (onChange) {
-      onChange(selectedFile.id);
-    }
-    setIsOpen(false);
-    setSelectedFile(null);
-  };
-
-  const handleCancel = () => {
-    setIsOpen(false);
-    setSelectedFile(null);
-    // 取消时重置为初始的 value 值
-    const initialSelection = allowMultiple && Array.isArray(value) ? value : [];
-    setLocalSelectedFiles(initialSelection);
-  };
-
-  const handleUploadSuccess = () => {
-    toast.success('文件上传成功!请从列表中选择新上传的文件');
-    refetch();
-  };
-
-  const getPreviewSize = () => {
-    switch (previewSize) {
-      case 'small':
-        return 'h-16 w-16';
-      case 'medium':
-        return 'h-24 w-24';
-      case 'large':
-        return 'h-32 w-32';
-      default:
-        return 'h-24 w-24';
-    }
-  };
-
-  const getFileIcon = (fileType: string) => {
-    if (fileType.startsWith('image/')) {
-      return <ImageIcon className="h-8 w-8 text-gray-400" />;
-    }
-    if (fileType.startsWith('video/')) {
-      return <FileIcon className="h-8 w-8 text-blue-500" />;
-    }
-    if (fileType.startsWith('audio/')) {
-      return <FileIcon className="h-8 w-8 text-green-500" />;
-    }
-    if (fileType.includes('pdf')) {
-      return <FileIcon className="h-8 w-8 text-red-500" />;
-    }
-    if (fileType.includes('text')) {
-      return <FileIcon className="h-8 w-8 text-gray-600" />;
-    }
-    return <FileIcon className="h-8 w-8 text-gray-400" />;
-  };
-
-  const handleRemoveFile = (e: React.MouseEvent) => {
-    e.stopPropagation();
-    if (allowMultiple && Array.isArray(value)) {
-      // 在多选模式下,移除所有选中文件
-      onChange?.([]);
-    } else {
-      // 在单选模式下,设置为null
-      onChange?.(null);
-    }
-  };
-
-  const isSelected = (fileId: number) => {
-    if (allowMultiple) {
-      return localSelectedFiles.includes(fileId);
-    }
-    return selectedFile?.id === fileId;
-  };
-
-  return (
-    <>
-      <div className="space-y-4">
-        {showPreview && (
-          <div className="flex items-start space-x-4">
-            {/* 预览区域 */}
-            <div className="flex flex-wrap gap-2">
-              {allowMultiple && Array.isArray(currentFiles) && currentFiles.length > 0 ? (
-                // 多选模式下的预览
-                currentFiles.map((file) => (
-                  <div key={file.id} className="relative group">
-                    <div
-                      className={cn(
-                        getPreviewSize(),
-                        "border-2 border-dashed cursor-pointer hover:border-primary transition-colors rounded-lg overflow-hidden flex items-center justify-center bg-gray-100"
-                      )}
-                      onClick={() => setIsOpen(true)}
-                    >
-                      {file?.type ? (
-                        <div className="w-full h-full flex items-center justify-center">
-                          {file.type.startsWith('image/') ? (
-                            <img
-                              src={file.fullUrl}
-                              alt={file.name}
-                              className="w-full h-full object-cover"
-                            />
-                          ) : (
-                            <div className="flex flex-col items-center justify-center text-gray-400">
-                              {getFileIcon(file.type)}
-                              <span className="text-xs mt-1 text-center px-1 truncate max-w-full">
-                                {file.name}
-                              </span>
-                            </div>
-                          )}
-                        </div>
-                      ) : (
-                        <div className="flex flex-col items-center justify-center text-gray-400">
-                          <FileIcon className="h-8 w-8 mb-1" />
-                          <span className="text-xs">{placeholder}</span>
-                        </div>
-                      )}
-                    </div>
-                    
-                    <button
-                      type="button"
-                      className="absolute -top-2 -right-2 bg-red-500 text-white rounded-full p-1 opacity-0 group-hover:opacity-100 transition-opacity"
-                      onClick={(e) => {
-                        e.stopPropagation();
-                        if (allowMultiple && Array.isArray(value)) {
-                          const newValue = value.filter(id => id !== file.id);
-                          onChange?.(newValue);
-                        }
-                      }}
-                    >
-                      <X className="h-3 w-3" />
-                    </button>
-                  </div>
-                ))
-              ) : !allowMultiple && currentFiles && currentFiles.length > 0 ? (
-                // 单选模式下的预览
-                <div className="relative group">
-                  <div
-                    className={cn(
-                      getPreviewSize(),
-                      "border-2 border-dashed cursor-pointer hover:border-primary transition-colors rounded-lg overflow-hidden flex items-center justify-center bg-gray-100"
-                    )}
-                    onClick={() => setIsOpen(true)}
-                  >
-                    {currentFiles[0]?.type ? (
-                      <div className="w-full h-full flex items-center justify-center">
-                        {currentFiles[0].type.startsWith('image/') ? (
-                          <img
-                            src={currentFiles[0].fullUrl}
-                            alt={currentFiles[0].name}
-                            className="w-full h-full object-cover"
-                          />
-                        ) : (
-                          <div className="flex flex-col items-center justify-center text-gray-400">
-                            {getFileIcon(currentFiles[0].type)}
-                            <span className="text-xs mt-1 text-center">{currentFiles[0].name}</span>
-                          </div>
-                        )}
-                      </div>
-                    ) : (
-                      <div className="flex flex-col items-center justify-center text-gray-400">
-                        <FileIcon className="h-8 w-8 mb-1" />
-                        <span className="text-xs">{placeholder}</span>
-                      </div>
-                    )}
-                  </div>
-                  
-                  {currentFiles[0] && (
-                    <button
-                      type="button"
-                      className="absolute -top-2 -right-2 bg-red-500 text-white rounded-full p-1 opacity-0 group-hover:opacity-100 transition-opacity"
-                      onClick={handleRemoveFile}
-                    >
-                      <X className="h-3 w-3" />
-                    </button>
-                  )}
-                </div>
-              ) : (
-                // 没有选中文件时的占位符
-                <div
-                  className={cn(
-                    getPreviewSize(),
-                    "border-2 border-dashed cursor-pointer hover:border-primary transition-colors rounded-lg overflow-hidden flex items-center justify-center bg-gray-100"
-                  )}
-                  onClick={() => setIsOpen(true)}
-                >
-                  <div className="flex flex-col items-center justify-center text-gray-400">
-                    <FileIcon className="h-8 w-8 mb-1" />
-                    <span className="text-xs">{placeholder}</span>
-                  </div>
-                </div>
-              )}
-            </div>
-            
-            <div className="space-y-2">
-              <Button
-                type="button"
-                variant="outline"
-                onClick={() => setIsOpen(true)}
-                className="text-sm"
-              >
-                {((allowMultiple && currentFiles && currentFiles.length > 0) ||
-                  (!allowMultiple && currentFiles && currentFiles.length > 0)) ? '更换文件' : placeholder}
-              </Button>
-              {!allowMultiple && currentFiles && currentFiles.length > 0 && (
-                <p className="text-xs text-muted-foreground truncate w-40 sm:w-64">
-                  当前: {currentFiles[0].name}
-                </p>
-              )}
-              {allowMultiple && currentFiles && currentFiles.length > 0 && (
-                <p className="text-xs text-muted-foreground">
-                  已选择 {currentFiles.length} 个文件
-                </p>
-              )}
-            </div>
-          </div>
-        )}
-
-        {!showPreview && (
-          <Button 
-            type="button" 
-            variant="outline" 
-            onClick={() => setIsOpen(true)}
-            className="w-full"
-          >
-            {currentFiles ? '更换文件' : placeholder}
-          </Button>
-        )}
-      </div>
-
-      <Dialog open={isOpen} onOpenChange={setIsOpen}>
-        <DialogContent className="max-w-4xl max-h-[90vh]">
-          <DialogHeader>
-            <DialogTitle>{title}</DialogTitle>
-            <DialogDescription>
-              {description}
-            </DialogDescription>
-          </DialogHeader>
-
-          <div className="space-y-4">
-            {/* 文件列表 */}
-            <div className="space-y-2 max-h-96 overflow-y-auto p-1">
-              {isLoading ? (
-                <Card>
-                  <CardContent className="text-center py-8">
-                    <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary mx-auto"></div>
-                    <p className="text-gray-500 mt-2">加载中...</p>
-                  </CardContent>
-                </Card>
-              ) : (
-                <div className="grid grid-cols-3 sm:grid-cols-4 md:grid-cols-5 gap-3">
-                  {/* 上传区域 - 作为第一项 */}
-                  <div className="relative cursor-pointer transition-all duration-200">
-                    <div className="rounded-lg border-2 border-dashed border-gray-300 hover:border-primary transition-colors hover:scale-105">
-                      <div className="p-2 h-20 flex items-center justify-center">
-                        <MinioUploader
-                          uploadPath={uploadPath}
-                          accept={accept}
-                          maxSize={maxSize}
-                          onUploadSuccess={handleUploadSuccess}
-                          buttonText="上传"
-                          size="minimal"
-                          displayMode="card"
-                          showUploadList={false}
-                        />
-                      </div>
-                    </div>
-                    <p className="text-xs text-center mt-1 text-muted-foreground">
-                      上传新文件
-                    </p>
-                  </div>
-
-                  {/* 现有文件列表 */}
-                  {files.map((file) => (
-                    <div
-                      key={file.id}
-                      className={cn(
-                        "relative cursor-pointer transition-all duration-200",
-                        "hover:scale-105"
-                      )}
-                      onClick={() => handleSelectFile(file)}
-                    >
-                      <div
-                        className={cn(
-                          "relative rounded-lg overflow-hidden border-2 aspect-square",
-                          isSelected(file.id)
-                            ? "border-primary ring-2 ring-primary ring-offset-2"
-                            : "border-gray-200 hover:border-primary"
-                        )}
-                      >
-                        {file?.type?.startsWith('image/') ? (
-                          <img
-                            src={file.fullUrl}
-                            alt={file.name}
-                            className="w-full h-full object-cover"
-                          />
-                        ) : (
-                          <div className="w-full h-full flex flex-col items-center justify-center bg-gray-50 p-2">
-                            {file.type && getFileIcon(file.type)}
-                            <p className="text-xs text-center mt-1 truncate max-w-full">
-                              {file.name}
-                            </p>
-                          </div>
-                        )}
-                        
-                        {isSelected(file.id) && (
-                          <div className="absolute inset-0 bg-primary/20 flex items-center justify-center">
-                            <Check className="h-6 w-6 text-white bg-primary rounded-full p-1" />
-                          </div>
-                        )}
-                        
-                        <div className="absolute top-1 right-1">
-                          <Eye
-                            className="h-4 w-4 text-white bg-black/50 rounded-full p-0.5 cursor-pointer hover:bg-black/70"
-                            onClick={(e) => {
-                              e.stopPropagation();
-                              window.open(file.fullUrl, '_blank');
-                            }}
-                          />
-                        </div>
-                      </div>
-                      
-                      <p className="text-xs text-center mt-1 truncate">
-                        {file.name}
-                      </p>
-                    </div>
-                  ))}
-                  
-                  {/* 空状态 - 当没有文件时显示 */}
-                  {files.length === 0 && (
-                    <div className="col-span-full">
-                      <Card>
-                        <CardContent className="text-center py-8">
-                          <div className="flex flex-col items-center">
-                            <Upload className="h-12 w-12 text-gray-400 mb-4" />
-                            <p className="text-gray-600">暂无文件</p>
-                            <p className="text-sm text-gray-500 mt-2">请上传文件</p>
-                          </div>
-                        </CardContent>
-                      </Card>
-                    </div>
-                  )}
-                </div>
-              )}
-            </div>
-          </div>
-
-          <DialogFooter>
-            <Button type="button" variant="outline" onClick={handleCancel}>
-              取消
-            </Button>
-            <Button
-              type="button"
-              onClick={handleConfirm}
-              disabled={allowMultiple ? localSelectedFiles.length === 0 : !selectedFile}
-            >
-              {allowMultiple ? `确认选择 (${localSelectedFiles.length})` : '确认选择'}
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </>
-  );
-};
-
-export default FileSelector;

+ 0 - 471
web/src/client/admin/components/MinioUploader.tsx

@@ -1,471 +0,0 @@
-import React, { useState, useCallback } from 'react';
-import { Button } from '@/client/components/ui/button';
-import { Card, CardContent } from '@/client/components/ui/card';
-import { Progress } from '@/client/components/ui/progress';
-import { Badge } from '@/client/components/ui/badge';
-import { toast } from 'sonner';
-import { Upload, X, CheckCircle, Loader2, FileText } from 'lucide-react';
-import { uploadMinIOWithPolicy, MinioProgressEvent } from '@/client/utils/minio';
-
-interface MinioUploaderProps {
-  /** 上传路径 */
-  uploadPath: string;
-  /** 允许的文件类型,如['image/*', '.pdf'] */
-  accept?: string;
-  /** 最大文件大小(MB) */
-  maxSize?: number;
-  /** 是否允许多文件上传 */
-  multiple?: boolean;
-  /** 上传成功回调 */
-  onUploadSuccess?: (fileKey: string, fileUrl: string, file: File) => void;
-  /** 上传失败回调 */
-  onUploadError?: (error: Error, file: File) => void;
-  /** 自定义上传按钮文本 */
-  buttonText?: string;
-  /** 自定义提示文本 */
-  tipText?: string;
-  /** 上传模式:拖放模式或传统模式 */
-  uploadMode?: 'dragdrop' | 'traditional';
-  /** 是否显示已上传文件列表 */
-  showUploadList?: boolean;
-  /** 已上传文件列表标题 */
-  uploadListTitle?: string;
-  /** 组件尺寸模式 */
-  size?: 'default' | 'compact' | 'minimal';
-  /** 显示模式:卡片模式或完整模式 */
-  displayMode?: 'full' | 'card';
-}
-
-// 定义上传文件状态
-interface UploadFile {
-  uid: string;
-  name: string;
-  size: number;
-  type?: string;
-  status: 'uploading' | 'success' | 'error';
-  percent: number;
-  error?: string;
-  url?: string;
-}
-
-const MinioUploader: React.FC<MinioUploaderProps> = ({
-  uploadPath = '/',
-  accept,
-  maxSize = 500, // 默认最大500MB
-  multiple = false,
-  onUploadSuccess,
-  onUploadError,
-  buttonText = '点击或拖拽上传文件',
-  tipText = '支持单文件或多文件上传,单个文件大小不超过500MB',
-  uploadMode = 'dragdrop',
-  showUploadList = true,
-  uploadListTitle = '上传进度',
-  size = 'default',
-  displayMode = 'full'
-}) => {
-  const [fileList, setFileList] = useState<UploadFile[]>([]);
-  const [dragActive, setDragActive] = useState(false);
-
-  // 根据尺寸模式获取样式配置
-  const getSizeConfig = () => {
-    switch (size) {
-      case 'minimal':
-        return {
-          container: 'p-3',
-          icon: 'h-8 w-8',
-          title: 'text-sm',
-          description: 'text-xs',
-          button: 'h-8 px-3 text-xs',
-          spacing: 'space-y-2',
-          fileList: 'space-y-2',
-          cardPadding: 'p-3',
-          progressHeight: 'h-1'
-        };
-      case 'compact':
-        return {
-          container: 'p-4',
-          icon: 'h-10 w-10',
-          title: 'text-base',
-          description: 'text-sm',
-          button: 'h-9 px-4 text-sm',
-          spacing: 'space-y-3',
-          fileList: 'space-y-3',
-          cardPadding: 'p-4',
-          progressHeight: 'h-2'
-        };
-      default:
-        return {
-          container: 'p-6',
-          icon: 'h-12 w-12',
-          title: 'text-lg',
-          description: 'text-sm',
-          button: 'h-10 px-4',
-          spacing: 'space-y-4',
-          fileList: 'space-y-4',
-          cardPadding: 'p-6',
-          progressHeight: 'h-2'
-        };
-    }
-  };
-
-  // 处理上传进度
-  const handleProgress = useCallback((uid: string, event: MinioProgressEvent) => {
-    setFileList(prev => 
-      prev.map(item => {
-        if (item.uid === uid) {
-          return {
-            ...item,
-            status: event.stage === 'error' ? 'error' : 'uploading',
-            percent: event.progress,
-            error: event.stage === 'error' ? event.message : undefined
-          };
-        }
-        return item;
-      })
-    );
-  }, []);
-
-  // 处理上传成功
-  const handleComplete = useCallback((uid: string, result: { fileKey: string; fileUrl: string }, file: File) => {
-    setFileList(prev => 
-      prev.map(item => {
-        if (item.uid === uid) {
-          return {
-            ...item,
-            status: 'success',
-            percent: 100,
-            url: result.fileUrl,
-          };
-        }
-        return item;
-      })
-    );
-    
-    
-    // toast.success(`文件 "${file.name}" 上传成功`);
-    onUploadSuccess?.(result.fileKey, result.fileUrl, file);
-  }, [onUploadSuccess]);
-
-  // 处理上传失败
-  const handleError = useCallback((uid: string, error: Error, file: File) => {
-    setFileList(prev => 
-      prev.map(item => {
-        if (item.uid === uid) {
-          return {
-            ...item,
-            status: 'error',
-            percent: 0,
-            error: error.message || '上传失败'
-          };
-        }
-        return item;
-      })
-    );
-    
-    
-    // toast.error(`文件 "${file.name}" 上传失败: ${error.message}`);
-    onUploadError?.(error, file);
-  }, [onUploadError]);
-
-  // 自定义上传逻辑
-  const handleUpload = async (file: File) => {
-    const uid = Date.now().toString() + Math.random().toString(36).substring(2, 11);
-    
-    // 添加到文件列表
-    setFileList(prev => [
-      ...prev,
-      {
-        uid,
-        name: file.name,
-        size: file.size,
-        type: file.type,
-        status: 'uploading',
-        percent: 0,
-      }
-    ]);
-    
-    
-    try {
-      // 验证文件大小
-      const fileSizeMB = file.size / (1024 * 1024);
-      if (fileSizeMB > maxSize) {
-        throw new Error(`文件大小超过 ${maxSize}MB 限制`);
-      }
-      
-      // 调用minio上传方法
-      const result = await uploadMinIOWithPolicy(
-        uploadPath,
-        file,
-        file.name,
-        {
-          onProgress: (event) => handleProgress(uid, event),
-          signal: new AbortController().signal
-        }
-      );
-      
-      handleComplete(uid, result, file);
-    } catch (error) {
-      handleError(uid, error instanceof Error ? error : new Error('未知错误'), file);
-    }
-  };
-
-  // 处理文件选择
-  const handleFileSelect = (files: FileList) => {
-    if (!files || files.length === 0) return;
-
-    const fileArray = Array.from(files);
-    
-    if (!multiple && fileArray.length > 1) {
-      toast.error('不支持多文件上传');
-      return;
-    }
-
-    fileArray.forEach(file => handleUpload(file));
-  };
-
-  // 处理拖拽
-  const handleDrag = (e: React.DragEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    
-    if (e.type === 'dragenter' || e.type === 'dragover') {
-      setDragActive(true);
-    } else if (e.type === 'dragleave') {
-      setDragActive(false);
-    }
-  };
-
-  const handleDrop = (e: React.DragEvent) => {
-    e.preventDefault();
-    e.stopPropagation();
-    setDragActive(false);
-    
-    const files = e.dataTransfer.files;
-    handleFileSelect(files);
-  };
-
-  // 处理文件移除
-  const handleRemove = (uid: string) => {
-    setFileList(prev => prev.filter(item => item.uid !== uid));
-  };
-
-  // 渲染上传状态
-  const renderUploadStatus = (item: UploadFile) => {
-    switch (item.status) {
-      case 'uploading':
-        return (
-          <div className="flex items-center gap-2">
-            <Loader2 className="h-4 w-4 animate-spin" />
-            <span className="text-sm">{Math.round(item.percent)}%</span>
-          </div>
-        );
-      case 'success':
-        return (
-          <div className="flex items-center gap-2">
-            <CheckCircle className="h-4 w-4 text-green-500" />
-            <Badge variant="outline" className="bg-green-50 text-green-700 border-green-200">
-              上传成功
-            </Badge>
-          </div>
-        );
-      case 'error':
-        return (
-          <div className="flex items-center gap-2">
-            <div className="h-4 w-4 text-red-500">×</div>
-            <Badge variant="outline" className="bg-red-50 text-red-700 border-red-200">
-              {item.error || '上传失败'}
-            </Badge>
-          </div>
-        );
-      default:
-        return null;
-    }
-  };
-
-  // 渲染文件图标
-  const renderFileIcon = (type?: string, iconSize: 'small' | 'normal' = 'normal') => {
-    const sizeClass = iconSize === 'small' ? 'h-4 w-4' : 'h-8 w-8';
-    
-    if (type?.startsWith('image/')) {
-      return <FileText className={`${sizeClass} text-blue-500`} />;
-    } else if (type?.startsWith('video/')) {
-      return <FileText className={`${sizeClass} text-red-500`} />;
-    } else if (type?.startsWith('audio/')) {
-      return <FileText className={`${sizeClass} text-purple-500`} />;
-    } else if (type?.includes('pdf')) {
-      return <FileText className={`${sizeClass} text-red-500`} />;
-    } else if (type?.includes('word')) {
-      return <FileText className={`${sizeClass} text-blue-600`} />;
-    } else if (type?.includes('excel') || type?.includes('sheet')) {
-      return <FileText className={`${sizeClass} text-green-500`} />;
-    } else {
-      return <FileText className={`${sizeClass} text-gray-500`} />;
-    }
-  };
-
-  const sizeConfig = getSizeConfig();
-
-  // 卡片模式渲染
-  if (displayMode === 'card') {
-    return (
-      <div className="h-full flex items-center justify-center">
-        <button
-          type="button"
-          className={`flex flex-col items-center justify-center w-full h-full text-muted-foreground hover:text-primary transition-colors cursor-pointer
-            ${size === 'minimal' ? 'text-xs' : 'text-sm'}`}
-          onClick={() => {
-            const input = document.createElement('input');
-            input.type = 'file';
-            input.accept = accept || '';
-            input.multiple = multiple;
-            input.onchange = (e) => {
-              const files = (e.target as HTMLInputElement).files;
-              if (files) handleFileSelect(files);
-            };
-            input.click();
-          }}
-        >
-          <Upload className={`${size === 'minimal' ? 'h-6 w-6 mb-1' : 'h-8 w-8 mb-2'}`} />
-          <span>{buttonText}</span>
-        </button>
-      </div>
-    );
-  }
-
-  return (
-    <div className={sizeConfig.spacing}>
-      {/* 上传区域 - 根据模式显示不同界面 */}
-      {uploadMode === 'dragdrop' ? (
-        <div
-          className={`relative border-2 border-dashed rounded-lg transition-all ${
-            dragActive
-              ? 'border-primary bg-primary/5'
-              : 'border-gray-300 hover:border-primary/50'
-          } ${sizeConfig.container}`}
-          onDragEnter={handleDrag}
-          onDragLeave={handleDrag}
-          onDragOver={handleDrag}
-          onDrop={handleDrop}
-        >
-          <div className={`flex flex-col items-center justify-center ${sizeConfig.spacing}`}>
-            <Upload className={`${sizeConfig.icon} ${dragActive ? 'text-primary' : 'text-gray-400'}`} />
-            <div className="text-center">
-              <p className={`${sizeConfig.title} font-medium`}>{buttonText}</p>
-              {size !== 'minimal' && (
-                <p className={`${sizeConfig.description} text-gray-500 mt-1`}>{tipText}</p>
-              )}
-            </div>
-            <Button
-              type="button"
-              variant="outline"
-              size={size === 'minimal' ? 'sm' : size === 'compact' ? 'sm' : 'default'}
-              onClick={() => {
-                const input = document.createElement('input');
-                input.type = 'file';
-                input.accept = accept || '';
-                input.multiple = multiple;
-                input.onchange = (e) => {
-                  const files = (e.target as HTMLInputElement).files;
-                  if (files) handleFileSelect(files);
-                };
-                input.click();
-              }}
-            >
-              <Upload className="h-4 w-4 mr-2" />
-              选择文件
-            </Button>
-          </div>
-        </div>
-      ) : (
-        <Card>
-          <CardContent className={sizeConfig.cardPadding}>
-            <div className={`flex flex-col items-center justify-center ${sizeConfig.spacing}`}>
-              <Upload className={`${sizeConfig.icon} text-gray-400`} />
-              <div className="text-center">
-                <p className={`${sizeConfig.title} font-medium`}>{buttonText}</p>
-                {size !== 'minimal' && (
-                  <p className={`${sizeConfig.description} text-gray-500 mt-1`}>{tipText}</p>
-                )}
-              </div>
-              <Button
-                type="button"
-                variant="outline"
-                size={size === 'minimal' ? 'sm' : size === 'compact' ? 'sm' : 'default'}
-                onClick={() => {
-                  const input = document.createElement('input');
-                  input.type = 'file';
-                  input.accept = accept || '';
-                  input.multiple = multiple;
-                  input.onchange = (e) => {
-                    const files = (e.target as HTMLInputElement).files;
-                    if (files) handleFileSelect(files);
-                  };
-                  input.click();
-                }}
-              >
-                <Upload className="h-4 w-4 mr-2" />
-                选择文件
-              </Button>
-            </div>
-          </CardContent>
-        </Card>
-      )}
-
-      {/* 上传进度列表 */}
-      {showUploadList && fileList.length > 0 && (
-        <Card>
-          <CardContent className={sizeConfig.cardPadding}>
-            <h3 className={`${sizeConfig.title} font-semibold mb-3`}>{uploadListTitle}</h3>
-            <div className={sizeConfig.fileList}>
-              {fileList.map(item => (
-                <div key={item.uid} className={`flex items-center space-x-3 p-3 border rounded-lg ${size === 'minimal' ? 'text-sm' : ''}`}>
-                  <div className="flex-shrink-0">
-                    {renderFileIcon(item.type, size === 'minimal' ? 'small' : 'normal')}
-                  </div>
-                  <div className="flex-1 min-w-0">
-                    <div className="flex justify-between items-center mb-1">
-                      <p className={`${size === 'minimal' ? 'text-xs' : 'text-sm'} font-medium truncate`}>{item.name}</p>
-                      <div className="flex items-center space-x-1">
-                        {renderUploadStatus(item)}
-                        <Button
-                          variant="ghost"
-                          size={size === 'minimal' ? 'icon' : 'sm'}
-                          onClick={() => handleRemove(item.uid)}
-                          disabled={item.status === 'uploading'}
-                          className={size === 'minimal' ? 'h-6 w-6' : ''}
-                        >
-                          <X className={size === 'minimal' ? 'h-3 w-3' : 'h-4 w-4'} />
-                        </Button>
-                      </div>
-                    </div>
-                    {item.status === 'uploading' && (
-                      <div className="space-y-1">
-                        <Progress value={item.percent} className={sizeConfig.progressHeight} />
-                        {size !== 'minimal' && (
-                          <p className={`${sizeConfig.description} text-gray-500`}>
-                            {Math.round(item.percent)}% - {formatFileSize(item.size * (item.percent / 100))} / {formatFileSize(item.size)}
-                          </p>
-                        )}
-                      </div>
-                    )}
-                  </div>
-                </div>
-              ))}
-            </div>
-          </CardContent>
-        </Card>
-      )}
-    </div>
-  );
-};
-
-// 辅助函数:格式化文件大小
-const formatFileSize = (bytes: number): string => {
-  if (bytes === 0) return '0 Bytes';
-  const k = 1024;
-  const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
-  const i = Math.floor(Math.log(bytes) / Math.log(k));
-  return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
-};
-
-export default MinioUploader;

+ 0 - 468
web/src/client/admin/pages/Files.tsx

@@ -1,468 +0,0 @@
-import React, { useState } from 'react';
-import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import { Button } from '@/client/components/ui/button';
-import { Input } from '@/client/components/ui/input';
-import { Card, CardContent, CardHeader, CardTitle } from '@/client/components/ui/card';
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/client/components/ui/dialog';
-import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from '@/client/components/ui/form';
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/client/components/ui/table';
-import { Badge } from '@/client/components/ui/badge';
-import { AlertDialog, AlertDialogAction, AlertDialogCancel, AlertDialogContent, AlertDialogDescription, AlertDialogFooter, AlertDialogHeader, AlertDialogTitle } from '@/client/components/ui/alert-dialog';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { toast } from 'sonner';
-import { Eye, Download, Edit, Trash2, Search, FileText, Upload } from 'lucide-react';
-import { fileClient } from '@/client/api';
-import type { InferResponseType, InferRequestType } from 'hono/client';
-import dayjs from 'dayjs';
-import MinioUploader from '@/client/admin/components/MinioUploader';
-import { UpdateFileDto } from '@d8d/file-module/schemas/file.schema';
-import * as z from 'zod';
-
-// 定义类型
-type FileItem = InferResponseType<typeof fileClient.$get, 200>['data'][0];
-type FileListResponse = InferResponseType<typeof fileClient.$get, 200>;
-type UpdateFileRequest = InferRequestType<typeof fileClient[':id']['$put']>['json'];
-type FileFormData = z.infer<typeof UpdateFileDto>;
-
-export const FilesPage: React.FC = () => {
-  const [isModalOpen, setIsModalOpen] = useState(false);
-  const [isUploadModalOpen, setIsUploadModalOpen] = useState(false);
-  const [editingFile, setEditingFile] = useState<FileItem | null>(null);
-  const [searchText, setSearchText] = useState('');
-  const [pagination, setPagination] = useState({
-    current: 1,
-    pageSize: 10,
-    total: 0,
-  });
-  const [deleteFileId, setDeleteFileId] = useState<number | null>(null);
-  const [isDeleteDialogOpen, setIsDeleteDialogOpen] = useState(false);
-
-  const queryClient = useQueryClient();
-  
-  // 表单初始化
-  const form = useForm<FileFormData>({
-    resolver: zodResolver(UpdateFileDto),
-    defaultValues: {
-      name: '',
-      description: '',
-    },
-  });
-
-  // 获取文件列表数据
-  const fetchFiles = async ({ page, pageSize }: { page: number; pageSize: number }): Promise<FileListResponse> => {
-    const response = await fileClient.$get({ query: { page, pageSize, keyword: searchText } });
-    if (!response.ok) throw new Error('Failed to fetch files');
-    return await response.json() as FileListResponse;
-  };
-
-  const { data, isLoading, error } = useQuery({
-    queryKey: ['files', pagination.current, pagination.pageSize, searchText],
-    queryFn: () => fetchFiles({ page: pagination.current, pageSize: pagination.pageSize }),
-  });
-
-  // 更新文件记录
-  const updateFile = useMutation({
-    mutationFn: ({ id, data }: { id: number; data: UpdateFileRequest }) =>
-      fileClient[':id'].$put({ param: { id: Number(id) }, json: data }),
-    onSuccess: () => {
-      toast.success('文件记录更新成功');
-      queryClient.invalidateQueries({ queryKey: ['files'] });
-      setIsModalOpen(false);
-      setEditingFile(null);
-    },
-    onError: (error: Error) => {
-      toast.error(`操作失败: ${error.message}`);
-    }
-  });
-
-  // 删除文件记录
-  const deleteFile = useMutation({
-    mutationFn: (id: number) => fileClient[':id'].$delete({ param: { id: Number(id) } }),
-    onSuccess: () => {
-      toast.success('文件记录删除成功');
-      queryClient.invalidateQueries({ queryKey: ['files'] });
-    },
-    onError: (error: Error) => {
-      toast.error(`删除失败: ${error.message}`);
-    }
-  });
-
-  // 处理文件下载
-  const handleDownload = (record: FileItem) => {
-    const a = document.createElement('a');
-    a.href = record.fullUrl;
-    a.download = record.name;
-    document.body.appendChild(a);
-    a.click();
-    document.body.removeChild(a);
-  };
-
-  // 处理文件预览
-  const handlePreview = (record: FileItem) => {
-    if (isPreviewable(record.type)) {
-      window.open(record.fullUrl, '_blank');
-    } else {
-      toast.warning('该文件类型不支持预览');
-    }
-  };
-
-  // 检查是否为可预览的文件类型
-  const isPreviewable = (fileType: string | null) => {
-    if (!fileType) return false;
-    return fileType.startsWith('image/') || fileType.startsWith('video/');
-  };
-
-  // 处理上传成功回调
-  const handleUploadSuccess = () => {
-    toast.success('文件上传成功');
-    queryClient.invalidateQueries({ queryKey: ['files'] });
-  };
-
-  // 处理上传失败回调
-  const handleUploadError = (error: Error) => {
-    toast.error(`上传失败: ${error instanceof Error ? error.message : '未知错误'}`);
-  };
-
-  // 显示编辑弹窗
-  const showEditModal = (record: FileItem) => {
-    setEditingFile(record);
-    setIsModalOpen(true);
-    form.reset({
-      name: record.name,
-      description: record.description || '',
-    });
-  };
-
-  // 处理表单提交
-  const handleFormSubmit = async (data: FileFormData) => {
-    if (editingFile) {
-      await updateFile.mutateAsync({ 
-        id: editingFile.id, 
-        data: {
-          name: data.name,
-          description: data.description,
-        }
-      });
-    }
-  };
-
-  // 处理删除确认
-  const handleDeleteConfirm = () => {
-    if (deleteFileId) {
-      deleteFile.mutate(deleteFileId);
-      setIsDeleteDialogOpen(false);
-      setDeleteFileId(null);
-    }
-  };
-
-  const handleSearch = () => {
-    setPagination({ ...pagination, current: 1 });
-  };
-
-  // 格式化文件大小
-  const formatFileSize = (bytes: number | null) => {
-    if (!bytes || bytes === 0) return '0 Bytes';
-    const k = 1024;
-    const sizes = ['Bytes', 'KB', 'MB', 'GB'];
-    const i = Math.floor(Math.log(bytes) / Math.log(k));
-    return parseFloat((bytes / Math.pow(k, i)).toFixed(2)) + ' ' + sizes[i];
-  };
-
-  // 分页数据
-  const tablePagination = data?.pagination || pagination;
-
-  if (error) {
-    return (
-      <div className="p-6">
-        <Card>
-          <CardContent className="text-center py-8">
-            <FileText className="h-12 w-12 mx-auto text-gray-400 mb-4" />
-            <p className="text-gray-600">获取文件列表失败</p>
-          </CardContent>
-        </Card>
-      </div>
-    );
-  }
-
-  return (
-    <div className="p-6 space-y-6">
-      <div className="flex justify-between items-center">
-        <h1 className="text-3xl font-bold">文件管理</h1>
-        <Button onClick={() => setIsUploadModalOpen(true)}>
-          <Upload className="h-4 w-4 mr-2" />
-          上传文件
-        </Button>
-      </div>
-      
-      <Card>
-        <CardHeader>
-          <CardTitle>文件列表</CardTitle>
-        </CardHeader>
-        <CardContent>
-          <div className="mb-4 flex gap-4">
-            <div className="flex-1">
-              <Input
-                placeholder="搜索文件名称或类型"
-                value={searchText}
-                onChange={(e) => setSearchText(e.target.value)}
-                onKeyDown={(e) => e.key === 'Enter' && handleSearch()}
-                className="max-w-sm"
-              />
-            </div>
-            <Button onClick={handleSearch}>
-              <Search className="h-4 w-4 mr-2" />
-              搜索
-            </Button>
-          </div>
-
-          <div className="overflow-x-auto">
-            <Table>
-              <TableHeader>
-                <TableRow>
-                  <TableHead className="w-16">ID</TableHead>
-                  <TableHead>预览</TableHead>
-                  <TableHead>文件名称</TableHead>
-                  <TableHead>文件类型</TableHead>
-                  <TableHead>文件大小</TableHead>
-                  <TableHead>上传时间</TableHead>
-                  <TableHead>上传用户</TableHead>
-                  <TableHead className="text-right">操作</TableHead>
-                </TableRow>
-              </TableHeader>
-              <TableBody>
-                {isLoading ? (
-                  <TableRow>
-                    <TableCell colSpan={7} className="text-center">
-                      <div className="flex justify-center items-center py-8">
-                        <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary"></div>
-                      </div>
-                    </TableCell>
-                  </TableRow>
-                ) : data?.data?.length === 0 ? (
-                  <TableRow>
-                    <TableCell colSpan={7} className="text-center py-8">
-                      <FileText className="h-12 w-12 mx-auto text-gray-400 mb-4" />
-                      <p className="text-gray-600">暂无文件</p>
-                    </TableCell>
-                  </TableRow>
-                ) : (
-                  data?.data?.map((file) => (
-                    <TableRow key={file.id}>
-                      <TableCell className="font-medium">{file.id}</TableCell>
-                      <TableCell>
-                        {isPreviewable(file.type) ? (
-                          <img
-                            src={file.fullUrl}
-                            alt={file.name}
-                            className="w-12 h-12 object-cover rounded border cursor-pointer hover:opacity-80 transition-opacity"
-                            onClick={() => handlePreview(file)}
-                            title="点击查看大图"
-                          />
-                        ) : (
-                          <div className="w-12 h-12 flex items-center justify-center bg-gray-100 rounded border">
-                            <FileText className="h-6 w-6 text-gray-400" />
-                          </div>
-                        )}
-                      </TableCell>
-                      <TableCell>
-                        <div className="max-w-xs truncate" title={file.name}>
-                          {file.name}
-                        </div>
-                      </TableCell>
-                      <TableCell>
-                        <Badge variant="secondary">{file.type}</Badge>
-                      </TableCell>
-                      <TableCell>{formatFileSize(file.size)}</TableCell>
-                      <TableCell>
-                        {file.uploadTime ? dayjs(file.uploadTime).format('YYYY-MM-DD HH:mm:ss') : '-'}
-                      </TableCell>
-                      <TableCell>
-                        {file.uploadUser ? (file.uploadUser.nickname || file.uploadUser.username) : '-'}
-                      </TableCell>
-                      <TableCell className="text-right">
-                        <div className="flex justify-end gap-2">
-                          <Button
-                            variant="ghost"
-                            size="sm"
-                            onClick={() => handlePreview(file)}
-                            disabled={!isPreviewable(file.type)}
-                            title={isPreviewable(file.type) ? '预览文件' : '该文件类型不支持预览'}
-                          >
-                            <Eye className="h-4 w-4" />
-                          </Button>
-                          <Button
-                            variant="ghost"
-                            size="sm"
-                            onClick={() => handleDownload(file)}
-                            title="下载文件"
-                          >
-                            <Download className="h-4 w-4" />
-                          </Button>
-                          <Button
-                            variant="ghost"
-                            size="sm"
-                            onClick={() => showEditModal(file)}
-                            title="编辑文件信息"
-                          >
-                            <Edit className="h-4 w-4" />
-                          </Button>
-                          <Button
-                            variant="ghost"
-                            size="sm"
-                            onClick={() => {
-                              setDeleteFileId(file.id);
-                              setIsDeleteDialogOpen(true);
-                            }}
-                            className="text-red-600 hover:text-red-700"
-                            title="删除文件"
-                          >
-                            <Trash2 className="h-4 w-4" />
-                          </Button>
-                        </div>
-                      </TableCell>
-                    </TableRow>
-                  ))
-                )}
-              </TableBody>
-            </Table>
-          </div>
-
-          {/* 分页 */}
-          {tablePagination.total > 0 && (
-            <div className="flex justify-between items-center mt-4">
-              <div className="text-sm text-gray-600">
-                显示 {((tablePagination.current - 1) * tablePagination.pageSize + 1)}-
-                {Math.min(tablePagination.current * tablePagination.pageSize, tablePagination.total)} 条,
-                共 {tablePagination.total} 条
-              </div>
-              <div className="flex gap-2">
-                <Button
-                  variant="outline"
-                  size="sm"
-                  disabled={tablePagination.current <= 1}
-                  onClick={() => setPagination({ ...pagination, current: tablePagination.current - 1 })}
-                >
-                  上一页
-                </Button>
-                <span className="px-3 py-1 text-sm">
-                  第 {tablePagination.current} 页
-                </span>
-                <Button
-                  variant="outline"
-                  size="sm"
-                  disabled={tablePagination.current >= Math.ceil(tablePagination.total / tablePagination.pageSize)}
-                  onClick={() => setPagination({ ...pagination, current: tablePagination.current + 1 })}
-                >
-                  下一页
-                </Button>
-              </div>
-            </div>
-          )}
-        </CardContent>
-      </Card>
-
-      {/* 上传文件对话框 */}
-      <Dialog open={isUploadModalOpen} onOpenChange={setIsUploadModalOpen}>
-        <DialogContent className="sm:max-w-[600px]">
-          <DialogHeader>
-            <DialogTitle>上传文件</DialogTitle>
-            <DialogDescription>
-              选择要上传的文件,支持拖拽上传
-            </DialogDescription>
-          </DialogHeader>
-          
-          <div className="py-4">
-            <MinioUploader
-              uploadPath="/files"
-              maxSize={500}
-              multiple={false}
-              onUploadSuccess={() => {
-                handleUploadSuccess();
-                setIsUploadModalOpen(false);
-              }}
-              onUploadError={handleUploadError}
-              buttonText="点击或拖拽上传文件"
-              tipText="支持单文件上传,单个文件大小不超过500MB"
-              size="default"
-            />
-          </div>
-          
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setIsUploadModalOpen(false)}>
-              取消
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-
-      {/* 编辑对话框 */}
-      <Dialog open={isModalOpen} onOpenChange={setIsModalOpen}>
-        <DialogContent className="sm:max-w-[500px]">
-          <DialogHeader>
-            <DialogTitle>编辑文件信息</DialogTitle>
-            <DialogDescription>
-              修改文件的基本信息
-            </DialogDescription>
-          </DialogHeader>
-          <Form {...form}>
-            <form onSubmit={form.handleSubmit(handleFormSubmit)} className="space-y-4">
-              <FormField
-                control={form.control}
-                name="name"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>文件名称</FormLabel>
-                    <FormControl>
-                      <Input placeholder="请输入文件名称" {...field} />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <FormField
-                control={form.control}
-                name="description"
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>文件描述</FormLabel>
-                    <FormControl>
-                      <Input placeholder="请输入文件描述" {...field} />
-                    </FormControl>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <DialogFooter>
-                <Button type="button" variant="outline" onClick={() => setIsModalOpen(false)}>
-                  取消
-                </Button>
-                <Button type="submit" disabled={updateFile.isPending}>
-                  {updateFile.isPending ? '保存中...' : '保存'}
-                </Button>
-              </DialogFooter>
-            </form>
-          </Form>
-        </DialogContent>
-      </Dialog>
-
-      {/* 删除确认对话框 */}
-      <AlertDialog open={isDeleteDialogOpen} onOpenChange={setIsDeleteDialogOpen}>
-        <AlertDialogContent>
-          <AlertDialogHeader>
-            <AlertDialogTitle>确认删除</AlertDialogTitle>
-            <AlertDialogDescription>
-              确定要删除这个文件记录吗?此操作不可恢复。
-            </AlertDialogDescription>
-          </AlertDialogHeader>
-          <AlertDialogFooter>
-            <AlertDialogCancel>取消</AlertDialogCancel>
-            <AlertDialogAction onClick={handleDeleteConfirm} className="bg-red-600 hover:bg-red-700">
-              确认删除
-            </AlertDialogAction>
-          </AlertDialogFooter>
-        </AlertDialogContent>
-      </AlertDialog>
-    </div>
-  );
-};

+ 0 - 927
web/src/client/admin/pages/Users.tsx

@@ -1,927 +0,0 @@
-import React, { useState, useMemo, useCallback } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { format } from 'date-fns';
-import { Plus, Search, Edit, Trash2, Filter, X } from 'lucide-react';
-import { userClient } from '@/client/api';
-import type { InferRequestType, InferResponseType } from 'hono/client';
-import { Button } from '@/client/components/ui/button';
-import { Input } from '@/client/components/ui/input';
-import { Card, CardContent, CardDescription, CardHeader, CardTitle } from '@/client/components/ui/card';
-import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/client/components/ui/table';
-import { Badge } from '@/client/components/ui/badge';
-import { Dialog, DialogContent, DialogDescription, DialogFooter, DialogHeader, DialogTitle } from '@/client/components/ui/dialog';
-import { Form, FormControl, FormDescription, FormField, FormItem, FormLabel, FormMessage } from '@/client/components/ui/form';
-import { DataTablePagination } from '@/client/admin/components/DataTablePagination';
-import AvatarSelector from '@/client/admin/components/AvatarSelector';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { toast } from 'sonner';
-import { Skeleton } from '@/client/components/ui/skeleton';
-import { Switch } from '@/client/components/ui/switch';
-import { DisabledStatus } from '@/share/types';
-import { CreateUserDto, UpdateUserDto } from '@d8d/user-module/schemas/user.schema';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/client/components/ui/select';
-import { Popover, PopoverContent, PopoverTrigger } from '@/client/components/ui/popover';
-import { Calendar } from '@/client/components/ui/calendar';
-import { cn } from '@/client/lib/utils';
-
-// 使用RPC方式提取类型
-type CreateUserRequest = InferRequestType<typeof userClient.$post>['json'];
-type UpdateUserRequest = InferRequestType<typeof userClient[':id']['$put']>['json'];
-type UserResponse = InferResponseType<typeof userClient.$get, 200>['data'][0];
-
-// 直接使用后端定义的 schema
-const createUserFormSchema = CreateUserDto;
-const updateUserFormSchema = UpdateUserDto;
-
-type CreateUserFormData = CreateUserRequest;
-type UpdateUserFormData = UpdateUserRequest;
-
-export const UsersPage = () => {
-  const [searchParams, setSearchParams] = useState({
-    page: 1,
-    limit: 10,
-    keyword: ''
-  });
-  const [filters, setFilters] = useState({
-    isDisabled: undefined as number | undefined,
-    roleIds: [] as number[],
-    createdAt: undefined as { gte?: string; lte?: string } | undefined
-  });
-  const [showFilters, setShowFilters] = useState(false);
-  const [isModalOpen, setIsModalOpen] = useState(false);
-  const [editingUser, setEditingUser] = useState<UserResponse | null>(null);
-  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);
-  const [userToDelete, setUserToDelete] = useState<number | null>(null);
-  // Avatar selector is now integrated, no separate state needed
-
-  const [isCreateForm, setIsCreateForm] = useState(true);
-  
-  const createForm = useForm<CreateUserFormData>({
-    resolver: zodResolver(createUserFormSchema),
-    defaultValues: {
-      username: '',
-      nickname: undefined,
-      email: null,
-      phone: null,
-      name: null,
-      password: '',
-      isDisabled: DisabledStatus.ENABLED,
-    },
-  });
-
-  const updateForm = useForm<UpdateUserFormData>({
-    resolver: zodResolver(updateUserFormSchema),
-    defaultValues: {
-      username: undefined,
-      nickname: undefined,
-      email: null,
-      phone: null,
-      name: null,
-      password: undefined,
-      isDisabled: undefined,
-    },
-  });
-
-  const { data: usersData, isLoading, refetch } = useQuery({
-    queryKey: ['users', searchParams, filters],
-    queryFn: async () => {
-      const filterParams: Record<string, unknown> = {};
-
-      if (filters.isDisabled !== undefined) {
-        filterParams.isDisabled = filters.isDisabled;
-      }
-
-      if (filters.roleIds.length > 0) {
-        filterParams['roles.id'] = filters.roleIds;
-      }
-
-      if (filters.createdAt) {
-        filterParams.createdAt = filters.createdAt;
-      }
-
-      const res = await userClient.$get({
-        query: {
-          page: searchParams.page,
-          pageSize: searchParams.limit,
-          keyword: searchParams.keyword,
-          filters: Object.keys(filterParams).length > 0 ? JSON.stringify(filterParams) : undefined
-        }
-      });
-      if (res.status !== 200) {
-        throw new Error('获取用户列表失败');
-      }
-      return await res.json();
-    }
-  });
-
-  const users = usersData?.data || [];
-  const totalCount = usersData?.pagination?.total || 0;
-
-  // 防抖搜索函数
-  const debounce = (func: Function, delay: number) => {
-    let timeoutId: NodeJS.Timeout;
-    return (...args: any[]) => {
-      clearTimeout(timeoutId);
-      timeoutId = setTimeout(() => func(...args), delay);
-    };
-  };
-
-  // 使用useCallback包装防抖搜索
-  const debouncedSearch = useCallback(
-    debounce((keyword: string) => {
-      setSearchParams(prev => ({ ...prev, keyword, page: 1 }));
-    }, 300),
-    []
-  );
-
-  // 处理搜索输入变化
-  const handleSearchChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const keyword = e.target.value;
-    setSearchParams(prev => ({ ...prev, keyword }));
-    debouncedSearch(keyword);
-  };
-
-  // 处理搜索表单提交
-  const handleSearch = (e: React.FormEvent) => {
-    e.preventDefault();
-    setSearchParams(prev => ({ ...prev, page: 1 }));
-  };
-
-  // 处理分页
-  const handlePageChange = (page: number, limit: number) => {
-    setSearchParams(prev => ({ ...prev, page, limit }));
-  };
-
-  // 处理过滤条件变化
-  const handleFilterChange = (newFilters: Partial<typeof filters>) => {
-    setFilters(prev => ({ ...prev, ...newFilters }));
-    setSearchParams(prev => ({ ...prev, page: 1 }));
-  };
-
-  // 重置所有过滤条件
-  const resetFilters = () => {
-    setFilters({
-      isDisabled: undefined,
-      roleIds: [],
-      createdAt: undefined
-    });
-    setSearchParams(prev => ({ ...prev, page: 1 }));
-  };
-
-  // 检查是否有活跃的过滤条件
-  const hasActiveFilters = useMemo(() => {
-    return filters.isDisabled !== undefined ||
-           filters.roleIds.length > 0 ||
-           filters.createdAt !== undefined;
-  }, [filters]);
-
-
-  // 打开创建用户对话框
-  const handleCreateUser = () => {
-    setEditingUser(null);
-    setIsCreateForm(true);
-    createForm.reset({
-      username: '',
-      nickname: null,
-      email: null,
-      phone: null,
-      name: null,
-      password: '',
-      isDisabled: DisabledStatus.ENABLED,
-    });
-    setIsModalOpen(true);
-  };
-
-  // 打开编辑用户对话框
-  const handleEditUser = (user: UserResponse) => {
-    setEditingUser(user);
-    setIsCreateForm(false);
-    updateForm.reset({
-      username: user.username,
-      nickname: user.nickname,
-      email: user.email,
-      phone: user.phone,
-      name: user.name,
-      avatarFileId: user.avatarFileId,
-      isDisabled: user.isDisabled,
-    });
-    setIsModalOpen(true);
-  };
-
-  // 处理创建表单提交
-  const handleCreateSubmit = async (data: CreateUserFormData) => {
-    try {
-      const res = await userClient.$post({
-        json: data
-      });
-      if (res.status !== 201) {
-        throw new Error('创建用户失败');
-      }
-      toast.success('用户创建成功');
-      setIsModalOpen(false);
-      refetch();
-    } catch {
-      toast.error('创建失败,请重试');
-    }
-  };
-
-  // 处理更新表单提交
-  const handleUpdateSubmit = async (data: UpdateUserFormData) => {
-    if (!editingUser) return;
-    
-    try {
-      const res = await userClient[':id']['$put']({
-        param: { id: editingUser.id },
-        json: data
-      });
-      if (res.status !== 200) {
-        throw new Error('更新用户失败');
-      }
-      toast.success('用户更新成功');
-      setIsModalOpen(false);
-      refetch();
-    } catch {
-      toast.error('更新失败,请重试');
-    }
-  };
-
-  // 处理删除用户
-  const handleDeleteUser = (id: number) => {
-    setUserToDelete(id);
-    setDeleteDialogOpen(true);
-  };
-
-  const confirmDelete = async () => {
-    if (!userToDelete) return;
-    
-    try {
-      const res = await userClient[':id']['$delete']({
-        param: { id: userToDelete }
-      });
-      if (res.status !== 204) {
-        throw new Error('删除用户失败');
-      }
-      toast.success('用户删除成功');
-      refetch();
-    } catch {
-      toast.error('删除失败,请重试');
-    } finally {
-      setDeleteDialogOpen(false);
-      setUserToDelete(null);
-    }
-  };
-
-  // 渲染表格部分的骨架屏
-  const renderTableSkeleton = () => (
-    <div className="space-y-2">
-      {Array.from({ length: 5 }).map((_, index) => (
-        <div key={index} className="flex space-x-4">
-          <Skeleton className="h-4 flex-1" />
-          <Skeleton className="h-4 flex-1" />
-          <Skeleton className="h-4 flex-1" />
-          <Skeleton className="h-4 flex-1" />
-          <Skeleton className="h-4 flex-1" />
-          <Skeleton className="h-4 flex-1" />
-          <Skeleton className="h-4 flex-1" />
-          <Skeleton className="h-4 w-16" />
-        </div>
-      ))}
-    </div>
-  );
-
-  return (
-    <div className="space-y-4">
-      <div className="flex justify-between items-center">
-        <h1 className="text-2xl font-bold">用户管理</h1>
-        <Button onClick={handleCreateUser}>
-          <Plus className="mr-2 h-4 w-4" />
-          创建用户
-        </Button>
-      </div>
-
-      <Card>
-        <CardHeader>
-          <CardTitle>用户列表</CardTitle>
-          <CardDescription>
-            管理系统中的所有用户,共 {totalCount} 位用户
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <div className="mb-4 space-y-4">
-            <form onSubmit={handleSearch} className="flex gap-2">
-              <div className="relative flex-1 max-w-sm">
-                <Search className="absolute left-2 top-2.5 h-4 w-4 text-muted-foreground" />
-                <Input
-                  placeholder="搜索用户名、昵称或邮箱..."
-                  value={searchParams.keyword}
-                  onChange={handleSearchChange}
-                  className="pl-8"
-                />
-              </div>
-              <Button type="submit" variant="outline">
-                搜索
-              </Button>
-              <Button
-                type="button"
-                variant="outline"
-                onClick={() => setShowFilters(!showFilters)}
-                className="flex items-center gap-2"
-              >
-                <Filter className="h-4 w-4" />
-                高级筛选
-                {hasActiveFilters && (
-                  <Badge variant="secondary" className="ml-1">
-                    {Object.values(filters).filter(v =>
-                      v !== undefined &&
-                      (!Array.isArray(v) || v.length > 0)
-                    ).length}
-                  </Badge>
-                )}
-              </Button>
-              {hasActiveFilters && (
-                <Button
-                  type="button"
-                  variant="ghost"
-                  onClick={resetFilters}
-                  className="flex items-center gap-2"
-                >
-                  <X className="h-4 w-4" />
-                  重置
-                </Button>
-              )}
-            </form>
-
-            {showFilters && (
-              <div className="grid grid-cols-1 md:grid-cols-3 gap-4 p-4 border rounded-lg bg-muted/50">
-                {/* 状态筛选 */}
-                <div className="space-y-2">
-                  <label className="text-sm font-medium">用户状态</label>
-                  <Select
-                    value={filters.isDisabled === undefined ? 'all' : filters.isDisabled.toString()}
-                    onValueChange={(value) =>
-                      handleFilterChange({
-                        isDisabled: value === 'all' ? undefined : parseInt(value)
-                      })
-                    }
-                  >
-                    <SelectTrigger>
-                      <SelectValue placeholder="选择状态" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="all">全部状态</SelectItem>
-                      <SelectItem value="0">启用</SelectItem>
-                      <SelectItem value="1">禁用</SelectItem>
-                    </SelectContent>
-                  </Select>
-                </div>
-
-                {/* 角色筛选 */}
-                <div className="space-y-2">
-                  <label className="text-sm font-medium">用户角色</label>
-                  <Select
-                    value=""
-                    onValueChange={(value) => {
-                      const roleId = parseInt(value);
-                      if (!filters.roleIds.includes(roleId)) {
-                        handleFilterChange({
-                          roleIds: [...filters.roleIds, roleId]
-                        });
-                      }
-                    }}
-                  >
-                    <SelectTrigger>
-                      <SelectValue placeholder="选择角色" />
-                    </SelectTrigger>
-                    <SelectContent>
-                      <SelectItem value="1">管理员</SelectItem>
-                      <SelectItem value="2">普通用户</SelectItem>
-                    </SelectContent>
-                  </Select>
-                  {filters.roleIds.length > 0 && (
-                    <div className="flex flex-wrap gap-2 mt-2">
-                      {filters.roleIds.map(roleId => (
-                        <Badge
-                          key={roleId}
-                          variant="secondary"
-                          className="flex items-center gap-1"
-                        >
-                          {roleId === 1 ? '管理员' : '普通用户'}
-                          <X
-                            className="h-3 w-3 cursor-pointer"
-                            onClick={() => handleFilterChange({
-                              roleIds: filters.roleIds.filter(id => id !== roleId)
-                            })}
-                          />
-                        </Badge>
-                      ))}
-                    </div>
-                  )}
-                </div>
-
-                {/* 创建时间筛选 */}
-                <div className="space-y-2">
-                  <label className="text-sm font-medium">创建时间</label>
-                  <Popover>
-                    <PopoverTrigger asChild>
-                      <Button
-                        variant="outline"
-                        className={cn(
-                          "w-full justify-start text-left font-normal",
-                          !filters.createdAt && "text-muted-foreground"
-                        )}
-                      >
-                        {filters.createdAt ?
-                          `${filters.createdAt.gte || ''} 至 ${filters.createdAt.lte || ''}` :
-                          '选择日期范围'
-                        }
-                      </Button>
-                    </PopoverTrigger>
-                    <PopoverContent className="w-auto p-0" align="start">
-                      <Calendar
-                        mode="range"
-                        selected={{
-                          from: filters.createdAt?.gte ? new Date(filters.createdAt.gte) : undefined,
-                          to: filters.createdAt?.lte ? new Date(filters.createdAt.lte) : undefined
-                        }}
-                        onSelect={(range) => {
-                          handleFilterChange({
-                            createdAt: range?.from && range?.to ? {
-                              gte: format(range.from, 'yyyy-MM-dd'),
-                              lte: format(range.to, 'yyyy-MM-dd')
-                            } : undefined
-                          });
-                        }}
-                        initialFocus
-                      />
-                    </PopoverContent>
-                  </Popover>
-                </div>
-              </div>
-            )}
-
-            {/* 过滤条件标签 */}
-            {hasActiveFilters && (
-              <div className="flex flex-wrap gap-2">
-                {filters.isDisabled !== undefined && (
-                  <Badge variant="secondary" className="flex items-center gap-1">
-                    状态: {filters.isDisabled === 0 ? '启用' : '禁用'}
-                    <X
-                      className="h-3 w-3 cursor-pointer"
-                      onClick={() => handleFilterChange({ isDisabled: undefined })}
-                    />
-                  </Badge>
-                )}
-                {filters.roleIds.map(roleId => (
-                  <Badge key={roleId} variant="secondary" className="flex items-center gap-1">
-                    角色: {roleId === 1 ? '管理员' : '普通用户'}
-                    <X
-                      className="h-3 w-3 cursor-pointer"
-                      onClick={() => handleFilterChange({
-                        roleIds: filters.roleIds.filter(id => id !== roleId)
-                      })}
-                    />
-                  </Badge>
-                ))}
-                {filters.createdAt && (
-                  <Badge variant="secondary" className="flex items-center gap-1">
-                    创建时间: {filters.createdAt.gte || ''} 至 {filters.createdAt.lte || ''}
-                    <X
-                      className="h-3 w-3 cursor-pointer"
-                      onClick={() => handleFilterChange({ createdAt: undefined })}
-                    />
-                  </Badge>
-                )}
-              </div>
-            )}
-          </div>
-
-          <div className="rounded-md border">
-            <Table>
-              <TableHeader>
-                <TableRow>
-                  <TableHead>头像</TableHead>
-                  <TableHead>用户名</TableHead>
-                  <TableHead>昵称</TableHead>
-                  <TableHead>邮箱</TableHead>
-                  <TableHead>真实姓名</TableHead>
-                  <TableHead>角色</TableHead>
-                  <TableHead>状态</TableHead>
-                  <TableHead>创建时间</TableHead>
-                  <TableHead className="text-right">操作</TableHead>
-                </TableRow>
-              </TableHeader>
-              <TableBody>
-                {isLoading ? (
-                  // 显示表格骨架屏
-                  <TableRow>
-                    <TableCell colSpan={8} className="p-4">
-                      {renderTableSkeleton()}
-                    </TableCell>
-                  </TableRow>
-                ) : (
-                  // 显示实际用户数据
-                  users.map((user) => (
-                    <TableRow key={user.id}>
-                      <TableCell>
-                      <div className="w-10 h-10">
-                        {user.avatarFile?.fullUrl ? (
-                          <img
-                            src={user.avatarFile.fullUrl}
-                            alt={user.username}
-                            className="w-10 h-10 rounded-full object-cover"
-                          />
-                        ) : (
-                          <div className="w-10 h-10 rounded-full bg-gray-200 flex items-center justify-center">
-                            <span className="text-sm font-medium text-gray-500">
-                              {user.username?.charAt(0)?.toUpperCase() || 'U'}
-                            </span>
-                          </div>
-                        )}
-                      </div>
-                    </TableCell>
-                    <TableCell className="font-medium">{user.username}</TableCell>
-                      <TableCell>{user.nickname || '-'}</TableCell>
-                      <TableCell>{user.email || '-'}</TableCell>
-                      <TableCell>{user.name || '-'}</TableCell>
-                      <TableCell>
-                        <Badge
-                          variant={user.roles?.some((role) => role.name === 'admin') ? 'destructive' : 'default'}
-                          className="capitalize"
-                        >
-                          {user.roles?.some((role) => role.name === 'admin') ? '管理员' : '普通用户'}
-                        </Badge>
-                      </TableCell>
-                      <TableCell>
-                        <Badge
-                          variant={user.isDisabled === 1 ? 'secondary' : 'default'}
-                        >
-                          {user.isDisabled === 1 ? '禁用' : '启用'}
-                        </Badge>
-                      </TableCell>
-                      <TableCell>
-                        {format(new Date(user.createdAt), 'yyyy-MM-dd HH:mm')}
-                      </TableCell>
-                      <TableCell className="text-right">
-                        <div className="flex justify-end gap-2">
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            onClick={() => handleEditUser(user)}
-                          >
-                            <Edit className="h-4 w-4" />
-                          </Button>
-                          <Button
-                            variant="ghost"
-                            size="icon"
-                            onClick={() => handleDeleteUser(user.id)}
-                          >
-                            <Trash2 className="h-4 w-4" />
-                          </Button>
-                        </div>
-                      </TableCell>
-                    </TableRow>
-                  ))
-                )}
-              </TableBody>
-            </Table>
-          </div>
-
-          <DataTablePagination
-            currentPage={searchParams.page}
-            totalCount={totalCount}
-            pageSize={searchParams.limit}
-            onPageChange={handlePageChange}
-          />
-        </CardContent>
-      </Card>
-
-      {/* 创建/编辑用户对话框 */}
-      <Dialog open={isModalOpen} onOpenChange={setIsModalOpen}>
-        <DialogContent className="sm:max-w-[500px] max-h-[90vh] overflow-y-auto">
-          <DialogHeader>
-            <DialogTitle>
-              {editingUser ? '编辑用户' : '创建用户'}
-            </DialogTitle>
-            <DialogDescription>
-              {editingUser ? '编辑现有用户信息' : '创建一个新的用户账户'}
-            </DialogDescription>
-          </DialogHeader>
-          
-          {isCreateForm ? (
-            <Form {...createForm}>
-              <form onSubmit={createForm.handleSubmit(handleCreateSubmit)} className="space-y-4">
-                <FormField
-                  control={createForm.control}
-                  name="username"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel className="flex items-center">
-                        用户名
-                        <span className="text-red-500 ml-1">*</span>
-                      </FormLabel>
-                      <FormControl>
-                        <Input placeholder="请输入用户名" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={createForm.control}
-                  name="nickname"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>昵称</FormLabel>
-                      <FormControl>
-                        <Input placeholder="请输入昵称" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={createForm.control}
-                  name="email"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>邮箱</FormLabel>
-                      <FormControl>
-                        <Input type="email" placeholder="请输入邮箱" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={createForm.control}
-                  name="phone"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>手机号</FormLabel>
-                      <FormControl>
-                        <Input placeholder="请输入手机号" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={createForm.control}
-                  name="name"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>真实姓名</FormLabel>
-                      <FormControl>
-                        <Input placeholder="请输入真实姓名" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={createForm.control}
-                  name="password"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel className="flex items-center">
-                        密码
-                        <span className="text-red-500 ml-1">*</span>
-                      </FormLabel>
-                      <FormControl>
-                        <Input type="password" placeholder="请输入密码" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={createForm.control}
-                  name="avatarFileId"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>头像</FormLabel>
-                      <FormControl>
-                        <AvatarSelector
-                          value={field.value || undefined}
-                          onChange={(value) => field.onChange(value)}
-                          maxSize={2}
-                          uploadPath="/avatars"
-                          uploadButtonText="上传头像"
-                          previewSize="medium"
-                          placeholder="选择头像"
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={createForm.control}
-                  name="isDisabled"
-                  render={({ field }) => (
-                    <FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
-                      <div className="space-y-0.5">
-                        <FormLabel className="text-base">用户状态</FormLabel>
-                        <FormDescription>
-                          禁用后用户将无法登录系统
-                        </FormDescription>
-                      </div>
-                      <FormControl>
-                        <Switch
-                          checked={field.value === 1}
-                          onCheckedChange={(checked) => field.onChange(checked ? 1 : 0)}
-                        />
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-
-                <DialogFooter>
-                  <Button type="button" variant="outline" onClick={() => setIsModalOpen(false)}>
-                    取消
-                  </Button>
-                  <Button type="submit">
-                    创建用户
-                  </Button>
-                </DialogFooter>
-              </form>
-            </Form>
-          ) : (
-            <Form {...updateForm}>
-              <form onSubmit={updateForm.handleSubmit(handleUpdateSubmit)} className="space-y-4">
-                <FormField
-                  control={updateForm.control}
-                  name="username"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel className="flex items-center">
-                        用户名
-                        <span className="text-red-500 ml-1">*</span>
-                      </FormLabel>
-                      <FormControl>
-                        <Input placeholder="请输入用户名" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={updateForm.control}
-                  name="nickname"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>昵称</FormLabel>
-                      <FormControl>
-                        <Input placeholder="请输入昵称" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={updateForm.control}
-                  name="email"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>邮箱</FormLabel>
-                      <FormControl>
-                        <Input type="email" placeholder="请输入邮箱" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={updateForm.control}
-                  name="phone"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>手机号</FormLabel>
-                      <FormControl>
-                        <Input placeholder="请输入手机号" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={updateForm.control}
-                  name="name"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>真实姓名</FormLabel>
-                      <FormControl>
-                        <Input placeholder="请输入真实姓名" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={updateForm.control}
-                  name="password"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>新密码</FormLabel>
-                      <FormControl>
-                        <Input type="password" placeholder="留空则不修改密码" {...field} />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={updateForm.control}
-                  name="avatarFileId"
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>头像</FormLabel>
-                      <FormControl>
-                        <AvatarSelector
-                          value={field.value || undefined}
-                          onChange={(value) => field.onChange(value)}
-                          maxSize={2}
-                          uploadPath="/avatars"
-                          uploadButtonText="上传头像"
-                          previewSize="medium"
-                          placeholder="选择头像"
-                        />
-                      </FormControl>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-
-                <FormField
-                  control={updateForm.control}
-                  name="isDisabled"
-                  render={({ field }) => (
-                    <FormItem className="flex flex-row items-center justify-between rounded-lg border p-4">
-                      <div className="space-y-0.5">
-                        <FormLabel className="text-base">用户状态</FormLabel>
-                        <FormDescription>
-                          禁用后用户将无法登录系统
-                        </FormDescription>
-                      </div>
-                      <FormControl>
-                        <Switch
-                          checked={field.value === 1}
-                          onCheckedChange={(checked) => field.onChange(checked ? 1 : 0)}
-                        />
-                      </FormControl>
-                    </FormItem>
-                  )}
-                />
-
-                <DialogFooter>
-                  <Button type="button" variant="outline" onClick={() => setIsModalOpen(false)}>
-                    取消
-                  </Button>
-                  <Button type="submit">
-                    更新用户
-                  </Button>
-                </DialogFooter>
-              </form>
-            </Form>
-          )}
-        </DialogContent>
-      </Dialog>
-
-      {/* Avatar selector is now integrated within the form */}
-
-      {/* 删除确认对话框 */}
-      <Dialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen}>
-        <DialogContent>
-          <DialogHeader>
-            <DialogTitle>确认删除</DialogTitle>
-            <DialogDescription>
-              确定要删除这个用户吗?此操作无法撤销。
-            </DialogDescription>
-          </DialogHeader>
-          <DialogFooter>
-            <Button variant="outline" onClick={() => setDeleteDialogOpen(false)}>
-              取消
-            </Button>
-            <Button variant="destructive" onClick={confirmDelete}>
-              删除
-            </Button>
-          </DialogFooter>
-        </DialogContent>
-      </Dialog>
-    </div>
-  );
-};