feat: restore settings routes for admin modules
This commit is contained in:
@@ -6,14 +6,13 @@ import { Modal } from "~/components/ui/Modal";
|
||||
import { toastService } from "~/components/ui/Toast";
|
||||
import {
|
||||
getRoles,
|
||||
getRoutes,
|
||||
getAllRoutes,
|
||||
getRoleRoutePermissions,
|
||||
updateRoleRoutePermissions,
|
||||
getRoleRoutesWithPermissions,
|
||||
saveRoleApiPermissions,
|
||||
getRolePermissions,
|
||||
getRoleUsers,
|
||||
getAllUsers,
|
||||
getUsersWithRoles,
|
||||
assignUserRoles,
|
||||
createRole,
|
||||
@@ -75,14 +74,14 @@ export async function clientLoader({ request }: ClientLoaderFunctionArgs) {
|
||||
try {
|
||||
const [roles, routes, users] = await Promise.all([
|
||||
getRoles(),
|
||||
getRoutes(),
|
||||
getAllUsers()
|
||||
getAllRoutes(),
|
||||
getUsersWithRoles()
|
||||
]);
|
||||
|
||||
return {
|
||||
roles,
|
||||
routes,
|
||||
users
|
||||
users: users.items || []
|
||||
};
|
||||
} catch (error) {
|
||||
console.error("加载数据失败:", error);
|
||||
@@ -1047,15 +1046,15 @@ export default function RolePermissions() {
|
||||
|
||||
const [rolesData, routesData, usersData] = await Promise.all([
|
||||
getRoles(),
|
||||
getRoutes(),
|
||||
getAllUsers()
|
||||
getAllRoutes(),
|
||||
getUsersWithRoles()
|
||||
]);
|
||||
|
||||
// v3.3: 角色列表对所有人可见(不过滤)
|
||||
const filteredRoles = rolesData;
|
||||
|
||||
// v3.3: 根据用户地区过滤可见的用户列表
|
||||
const filteredUsers = usersData;
|
||||
const filteredUsers = usersData.items || [];
|
||||
// let filteredUsers = usersData;
|
||||
// if (isCityAdmin && currentUserArea) {
|
||||
// // 市级管理员只能看到同地区的用户(使用 area 字段)
|
||||
|
||||
Reference in New Issue
Block a user