refactor: 優化使用者管理介面與角色顯示
- 移除 Header 中的角色名稱顯示 - 調整使用者表單欄位順序（使用者名稱、姓名並排） - 將角色分配區塊移至基本資料下方 - 修復 email 欄位 null 值警告 - 修復角色選擇無限迴圈錯誤 - 統一角色顯示格式（中文名稱在上，代號在下）
This commit is contained in:
@@ -29,7 +29,7 @@ interface Props {
|
||||
export default function UserEdit({ user, roles, currentRoles }: Props) {
|
||||
const { data, setData, put, processing, errors } = useForm({
|
||||
name: user.name,
|
||||
email: user.email,
|
||||
email: user.email || '',
|
||||
username: user.username || '',
|
||||
password: '',
|
||||
password_confirmation: '',
|
||||
@@ -96,11 +96,24 @@ export default function UserEdit({ user, roles, currentRoles }: Props) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-3 gap-6">
|
||||
<div className="space-y-6">
|
||||
{/* Basic Info */}
|
||||
<div className="md:col-span-2 space-y-6">
|
||||
<div className="bg-white p-6 rounded-xl border border-gray-200 shadow-sm space-y-6">
|
||||
<h3 className="font-bold text-gray-900 border-b pb-2 mb-4">基本資料</h3>
|
||||
<div className="bg-white p-6 rounded-xl border border-gray-200 shadow-sm space-y-6">
|
||||
<h3 className="font-bold text-gray-900 border-b pb-2 mb-4">基本資料</h3>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="username" className="flex items-center gap-2">
|
||||
<User className="h-4 w-4" /> 使用者名稱 (登入用)
|
||||
</Label>
|
||||
<Input
|
||||
id="username"
|
||||
value={data.username}
|
||||
onChange={e => setData('username', e.target.value)}
|
||||
placeholder="請輸入登入帳號"
|
||||
/>
|
||||
{errors.username && <p className="text-sm text-red-500">{errors.username}</p>}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="name" className="flex items-center gap-2">
|
||||
@@ -114,100 +127,86 @@ export default function UserEdit({ user, roles, currentRoles }: Props) {
|
||||
/>
|
||||
{errors.name && <p className="text-sm text-red-500">{errors.name}</p>}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="email" className="flex items-center gap-2">
|
||||
<Mail className="h-4 w-4" /> 電子郵件 (選填)
|
||||
</Label>
|
||||
<Input
|
||||
id="email"
|
||||
type="email"
|
||||
value={data.email}
|
||||
onChange={e => setData('email', e.target.value)}
|
||||
placeholder="user@example.com (可省略)"
|
||||
/>
|
||||
{errors.email && <p className="text-sm text-red-500">{errors.email}</p>}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="username" className="flex items-center gap-2">
|
||||
<User className="h-4 w-4" /> 使用者名稱 (登入用)
|
||||
</Label>
|
||||
<Input
|
||||
id="username"
|
||||
value={data.username}
|
||||
onChange={e => setData('username', e.target.value)}
|
||||
placeholder="請輸入登入帳號"
|
||||
/>
|
||||
{errors.username && <p className="text-sm text-red-500">{errors.username}</p>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div className="bg-white p-6 rounded-xl border border-gray-200 shadow-sm space-y-6">
|
||||
<h3 className="font-bold text-gray-900 border-b pb-2 mb-4">重設密碼</h3>
|
||||
<div className="bg-amber-50 text-amber-800 p-3 rounded-lg text-sm flex items-start gap-2 mb-4">
|
||||
<AlertCircle className="h-4 w-4 mt-0.5 shrink-0" />
|
||||
若不修改密碼，請留空以下欄位。
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="password" className="flex items-center gap-2">
|
||||
<Lock className="h-4 w-4" /> 新密碼
|
||||
</Label>
|
||||
<Input
|
||||
id="password"
|
||||
type="password"
|
||||
value={data.password}
|
||||
onChange={e => setData('password', e.target.value)}
|
||||
placeholder="••••••••"
|
||||
/>
|
||||
{errors.password && <p className="text-sm text-red-500">{errors.password}</p>}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="password_confirmation" className="flex items-center gap-2">
|
||||
<Lock className="h-4 w-4" /> 確認新密碼
|
||||
</Label>
|
||||
<Input
|
||||
id="password_confirmation"
|
||||
type="password"
|
||||
value={data.password_confirmation}
|
||||
onChange={e => setData('password_confirmation', e.target.value)}
|
||||
placeholder="••••••••"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="email" className="flex items-center gap-2">
|
||||
<Mail className="h-4 w-4" /> 電子郵件 (選填)
|
||||
</Label>
|
||||
<Input
|
||||
id="email"
|
||||
type="email"
|
||||
value={data.email}
|
||||
onChange={e => setData('email', e.target.value)}
|
||||
placeholder="user@example.com (可省略)"
|
||||
/>
|
||||
{errors.email && <p className="text-sm text-red-500">{errors.email}</p>}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{/* Roles */}
|
||||
<div className="md:col-span-1">
|
||||
<div className="bg-white p-6 rounded-xl border border-gray-200 shadow-sm h-full">
|
||||
<h3 className="font-bold text-gray-900 border-b pb-2 mb-4">角色分配</h3>
|
||||
<div className="space-y-4">
|
||||
{roles.map((role) => (
|
||||
<div key={role.id} className="flex items-start space-x-3 p-2 hover:bg-gray-50 rounded-lg transition-colors">
|
||||
<Checkbox
|
||||
id={`role-${role.id}`}
|
||||
checked={data.roles.includes(role.name)}
|
||||
onCheckedChange={() => toggleRole(role.name)}
|
||||
// Prevent changing super-admin if user is editing themselves? Or just backend protection.
|
||||
/>
|
||||
<div className="grid gap-1.5 leading-none">
|
||||
<label
|
||||
htmlFor={`role-${role.id}`}
|
||||
className="text-sm font-medium leading-none cursor-pointer"
|
||||
>
|
||||
{role.display_name}
|
||||
</label>
|
||||
<p className="text-xs text-gray-500 font-mono">
|
||||
{role.name}
|
||||
</p>
|
||||
</div>
|
||||
<div className="bg-white p-6 rounded-xl border border-gray-200 shadow-sm">
|
||||
<h3 className="font-bold text-gray-900 border-b pb-2 mb-4">角色分配</h3>
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
|
||||
{roles.map((role) => (
|
||||
<div key={role.id} className="flex items-center space-x-3 p-3 border border-gray-100 bg-gray-50/50 hover:bg-gray-100 rounded-lg transition-colors">
|
||||
<Checkbox
|
||||
id={`role-${role.id}`}
|
||||
checked={data.roles.includes(role.name)}
|
||||
onCheckedChange={() => toggleRole(role.name)}
|
||||
/>
|
||||
<div className="grid gap-1 leading-none">
|
||||
<label
|
||||
htmlFor={`role-${role.id}`}
|
||||
className="text-sm font-medium leading-none cursor-pointer"
|
||||
onClick={() => toggleRole(role.name)}
|
||||
>
|
||||
{role.display_name}
|
||||
</label>
|
||||
<p className="text-xs text-gray-500 font-mono">
|
||||
{role.name}
|
||||
</p>
|
||||
</div>
|
||||
))}
|
||||
{errors.roles && <p className="text-sm text-red-500">{errors.roles}</p>}
|
||||
</div>
|
||||
))}
|
||||
</div>
|
||||
{errors.roles && <p className="text-sm text-red-500 mt-2">{errors.roles}</p>}
|
||||
</div>
|
||||
|
||||
{/* Password Reset */}
|
||||
<div className="bg-white p-6 rounded-xl border border-gray-200 shadow-sm space-y-6">
|
||||
<h3 className="font-bold text-gray-900 border-b pb-2 mb-4">重設密碼</h3>
|
||||
<div className="bg-amber-50 text-amber-800 p-3 rounded-lg text-sm flex items-start gap-2 mb-4">
|
||||
<AlertCircle className="h-4 w-4 mt-0.5 shrink-0" />
|
||||
若不修改密碼，請留空以下欄位。
|
||||
</div>
|
||||
|
||||
<div className="grid grid-cols-1 md:grid-cols-2 gap-6">
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="password" className="flex items-center gap-2">
|
||||
<Lock className="h-4 w-4" /> 新密碼
|
||||
</Label>
|
||||
<Input
|
||||
id="password"
|
||||
type="password"
|
||||
value={data.password}
|
||||
onChange={e => setData('password', e.target.value)}
|
||||
placeholder="••••••••"
|
||||
/>
|
||||
{errors.password && <p className="text-sm text-red-500">{errors.password}</p>}
|
||||
</div>
|
||||
|
||||
<div className="space-y-2">
|
||||
<Label htmlFor="password_confirmation" className="flex items-center gap-2">
|
||||
<Lock className="h-4 w-4" /> 確認新密碼
|
||||
</Label>
|
||||
<Input
|
||||
id="password_confirmation"
|
||||
type="password"
|
||||
value={data.password_confirmation}
|
||||
onChange={e => setData('password_confirmation', e.target.value)}
|
||||
placeholder="••••••••"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user