feat(admin): 管理首页标题修正、角色中文显示及用户总数补全
- 修正 admin layout title 后缀为「MetaLab 管理面板」 - 当前角色从原始字符串改为中文显示(注入 RoleDisplayName) - 补全管理首页「用户总数」统计,新增 CountUsers 方法 - 遵循 ISP 最小接口,Service 复用已有 CountSearchUsers
This commit is contained in:
@ -36,6 +36,11 @@ func BuildAdminPageData(c *gin.Context, extra gin.H) gin.H {
|
||||
if role, exists := c.Get("role"); exists {
|
||||
roleStr := role.(string)
|
||||
data["Role"] = roleStr
|
||||
if name, ok := model.RoleDisplayNames[roleStr]; ok {
|
||||
data["RoleDisplayName"] = name
|
||||
} else {
|
||||
data["RoleDisplayName"] = roleStr
|
||||
}
|
||||
data["CanManageUsers"] = model.HasMinRole(roleStr, model.RoleAdmin)
|
||||
data["CanManageSettings"] = model.HasMinRole(roleStr, model.RoleOwner)
|
||||
data["IsOwner"] = model.HasMinRole(roleStr, model.RoleOwner)
|
||||
|
||||
@ -25,8 +25,13 @@ func NewAdminController(adminService adminUseCase) *AdminController {
|
||||
|
||||
// Dashboard 管理首页(欢迎页)
|
||||
func (ac *AdminController) Dashboard(c *gin.Context) {
|
||||
totalUsers, err := ac.adminService.CountUsers()
|
||||
if err != nil {
|
||||
totalUsers = 0
|
||||
}
|
||||
c.HTML(http.StatusOK, "admin/dashboard/index.html", common.BuildAdminPageData(c, gin.H{
|
||||
"Title": "管理首页",
|
||||
"Title": "管理首页",
|
||||
"TotalUsers": totalUsers,
|
||||
}))
|
||||
}
|
||||
|
||||
|
||||
@ -2,9 +2,10 @@ package admin
|
||||
|
||||
import "metazone.cc/metalab/internal/service"
|
||||
|
||||
// adminUseCase AdminController 对 AdminService 的最小依赖(ISP:3 个方法)
|
||||
// adminUseCase AdminController 对 AdminService 的最小依赖(ISP:4 个方法)
|
||||
type adminUseCase interface {
|
||||
ListUsers(params service.ListUsersParams) (*service.ListUsersResult, error)
|
||||
UpdateUserStatus(operatorUID, targetUID uint, newStatus string) error
|
||||
ResetUserToken(operatorUID, targetUID uint) error
|
||||
CountUsers() (int64, error)
|
||||
}
|
||||
|
||||
@ -112,6 +112,11 @@ func (s *AdminService) ResetUserToken(operatorUID, targetUID uint) error {
|
||||
})
|
||||
}
|
||||
|
||||
// CountUsers 统计用户总数(管理首页用)
|
||||
func (s *AdminService) CountUsers() (int64, error) {
|
||||
return s.userRepo.CountSearchUsers("", "", "")
|
||||
}
|
||||
|
||||
// checkAndOperate 通用权限检查 + 执行操作
|
||||
func (s *AdminService) checkAndOperate(operatorUID, targetUID uint, operate func(*model.User, *model.User) error) error {
|
||||
// 1. 不可操作自己
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
<div class="stats-grid">
|
||||
<div class="stat-card">
|
||||
<div class="stat-icon stat-blue"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="12" cy="8" r="4"/><path d="M4 20c0-4 4-7 8-7s8 3 8 7"/></svg></div>
|
||||
<div class="stat-info"><div class="stat-label">用户总数</div><div class="stat-value">—</div></div>
|
||||
<div class="stat-info"><div class="stat-label">用户总数</div><div class="stat-value">{{.TotalUsers}}</div></div>
|
||||
</div>
|
||||
<div class="stat-card">
|
||||
<div class="stat-icon stat-green"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="3" y="3" width="18" height="18"/><line x1="9" y1="9" x2="15" y2="9"/><line x1="9" y1="13" x2="15" y2="13"/></svg></div>
|
||||
@ -15,7 +15,7 @@
|
||||
</div>
|
||||
<div class="stat-card">
|
||||
<div class="stat-icon stat-orange"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><polygon points="12 2 15.09 8.26 22 9.27 17 14.14 18.18 21.02 12 17.77 5.82 21.02 7 14.14 2 9.27 8.91 8.26 12 2"/></svg></div>
|
||||
<div class="stat-info"><div class="stat-label">当前角色</div><div class="stat-value">{{.Role}}</div></div>
|
||||
<div class="stat-info"><div class="stat-label">当前角色</div><div class="stat-value">{{.RoleDisplayName}}</div></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
<meta charset="UTF-8">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
{{if .CSRFToken}}<meta name="csrf-token" content="{{.CSRFToken}}">{{end}}
|
||||
<title>{{.Title}} - MetaLab CP</title>
|
||||
<title>{{.Title}} - MetaLab 管理面板</title>
|
||||
<link rel="stylesheet" href="/admin/static/css/common.css">
|
||||
{{if .ExtraCSS}}
|
||||
<link rel="stylesheet" href="{{.ExtraCSS}}">
|
||||
|
||||
Reference in New Issue
Block a user