+
+ >
+
+
+
+
- 删除
+ 删除
-
-
-
-
- 新增角色
-
-
diff --git a/src/pages/management/UserDetail.vue b/src/pages/management/UserDetail.vue
index 4a98420..200477a 100644
--- a/src/pages/management/UserDetail.vue
+++ b/src/pages/management/UserDetail.vue
@@ -7,7 +7,7 @@
{
return {
id: item.id || "",
name: user?.nick || user?.name || "未命名用户",
- role: getRoleDisplayName(item.roleList?.[0], permissionStore.roleList),
+ role: getRoleDisplayName(getManagedUserRoleList(item)[0], permissionStore.roleList),
avatar: buildUserAvatar(user),
mobile: user?.phoneNo || "",
lastLoginAt: user?.lastLoginAt
@@ -146,7 +146,7 @@ function isUser(user?: Partial): user is User {
// ---------- 事件范围 ----------
function canEventItem(action: EventItem, item: ManagedUser): boolean {
- const userRoleCodeSet = buildEffectiveRoleCodeSet(item, permissionStore.roleList);
+ const userRoleCodeSet = buildEffectiveRoleCodeSet(item);
const roleCodeList = action.roleCodeList || [];
if (!roleCodeList.length) {
return false;
diff --git a/src/pages/management/UserList.vue b/src/pages/management/UserList.vue
index c3d1fb6..61cdcec 100644
--- a/src/pages/management/UserList.vue
+++ b/src/pages/management/UserList.vue
@@ -58,7 +58,7 @@ import type { ManagedUser } from "@/types/ManagedUser";
import type { EventItem } from "@/types/EventItem";
import { usePermissionSettingsStore } from "@/store/permissionSettingsStore";
import { buildFallbackAvatar } from "@/utils/avatar";
-import { buildEffectiveRoleCodeSet, getRoleDisplayName } from "@/utils/role";
+import { buildEffectiveRoleCodeSet, getManagedUserRoleList, getRoleDisplayName } from "@/utils/role";
import { gaoRoleCodes, permissionCodes } from "@/utils/permission";
defineOptions({
@@ -118,7 +118,7 @@ function getUserName(item: ManagedUser): string {
}
function getRoleName(item: ManagedUser): string {
- return getRoleDisplayName(item.roleList?.[0], permissionStore.roleList);
+ return getRoleDisplayName(getManagedUserRoleList(item)[0], permissionStore.roleList);
}
function getActionScope(item: ManagedUser): string {
@@ -131,7 +131,7 @@ function getActionScope(item: ManagedUser): string {
// ---------- 事件范围 ----------
function canEventItem(action: EventItem, item: ManagedUser): boolean {
- const userRoleCodeSet = buildEffectiveRoleCodeSet(item, permissionStore.roleList);
+ const userRoleCodeSet = buildEffectiveRoleCodeSet(item);
const roleCodeList = action.roleCodeList || [];
if (!roleCodeList.length) {
return false;
diff --git a/src/pages/management/UserRoleAssign.vue b/src/pages/management/UserRoleAssign.vue
index 646ad5b..f786240 100644
--- a/src/pages/management/UserRoleAssign.vue
+++ b/src/pages/management/UserRoleAssign.vue
@@ -49,23 +49,19 @@