优化

src/modules/iam/pages/PermissionsView.test.ts

@@ -103,8 +103,9 @@ describe('PermissionsView IAM mode', () => {
   })
 
   it('keeps technical permission fields out of the default list and labels the table', () => {
-    expect(permissionsSource).toContain("{ key: 'code', label: '权限编码', minWidth: 220, slotName: 'code', defaultVisible: false }")
-    expect(permissionsSource).toContain("{ key: 'endpoint', label: '路由 / 接口', minWidth: 260, slotName: 'endpoint', defaultVisible: false }")
+    expect(permissionsSource).toContain("{ key: 'code', label: '权限编码', minWidth: 220, slotName: 'code' }")
+    expect(permissionsSource).toContain("{ key: 'endpoint', label: '路由 / 接口', minWidth: 260, slotName: 'endpoint' }")
+    expect(permissionsSource).toContain("{ key: 'sort', prop: 'sort', label: '排序', width: 72, align: 'right' }")
     expect(permissionsSource).toContain('aria-label="平台权限资源列表"')
   })
 

src/modules/iam/pages/PermissionsView.vue

@@ -88,10 +88,10 @@ const parentOptions = computed(() => permissions.value.filter((item) => (
 const permissionColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 280, fixed: 'left', slotName: 'actions' },
   { key: 'name', label: '权限名称', minWidth: 260, slotName: 'name' },
-  { key: 'code', label: '权限编码', minWidth: 220, slotName: 'code', defaultVisible: false },
+  { key: 'code', label: '权限编码', minWidth: 220, slotName: 'code' },
   { key: 'type', prop: 'type', label: '类型', width: 80 },
-  { key: 'endpoint', label: '路由 / 接口', minWidth: 260, slotName: 'endpoint', defaultVisible: false },
-  { key: 'sort', prop: 'sort', label: '排序', width: 72, align: 'right', defaultVisible: false },
+  { key: 'endpoint', label: '路由 / 接口', minWidth: 260, slotName: 'endpoint' },
+  { key: 'sort', prop: 'sort', label: '排序', width: 72, align: 'right' },
   { key: 'status', label: '状态', width: 88, slotName: 'status' },
 ]
 

src/modules/iam/pages/RolesView.test.ts

@@ -3,7 +3,7 @@ import { readFileSync } from 'node:fs'
 import { resolve } from 'node:path'
 import { flushPromises, shallowMount } from '@vue/test-utils'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
-import { createPlatformRole, listPlatformInternalUsers, listPlatformPermissions, listPlatformRoles, type PlatformRoleResource } from '@/modules/iam/api/platformIam'
+import { createPlatformRole, listPlatformPermissions, listPlatformRoles, type PlatformRoleResource } from '@/modules/iam/api/platformIam'
 import { useAuthStore } from '@/core/auth/auth'
 import RolesView from './RolesView.vue'
 
@@ -11,7 +11,6 @@ const rolesSource = readFileSync(resolve(process.cwd(), 'src/modules/iam/pages/R
 
 vi.mock('@/modules/iam/api/platformIam', () => ({
   createPlatformRole: vi.fn(),
-  listPlatformInternalUsers: vi.fn(),
   listPlatformPermissions: vi.fn(),
   listPlatformRoles: vi.fn(),
   updatePlatformRole: vi.fn(),
@@ -29,6 +28,7 @@ const platformRole: PlatformRoleResource = {
   roleType: 'SYSTEM',
   status: 'ACTIVE',
   description: '企业资料与入驻审核',
+  memberCount: 3,
 }
 
 function mountView(pinia = createPinia()) {
@@ -86,9 +86,7 @@ describe('RolesView', () => {
     setActivePinia(createPinia())
     vi.mocked(listPlatformRoles).mockReset()
     vi.mocked(listPlatformPermissions).mockReset()
-    vi.mocked(listPlatformInternalUsers).mockReset()
     vi.mocked(listPlatformPermissions).mockResolvedValue([])
-    vi.mocked(listPlatformInternalUsers).mockResolvedValue([])
     vi.mocked(createPlatformRole).mockReset()
   })
 
@@ -98,8 +96,8 @@ describe('RolesView', () => {
     expect(wrapper.get('[data-testid="permission-tree"]').attributes('data-check-strictly')).toBe('true')
   })
 
-  it('keeps the role code available but hidden from the default list layout', () => {
-    expect(rolesSource).toContain("{ key: 'roleCode', prop: 'code', label: '角色编码', minWidth: 180, showOverflowTooltip: true, defaultVisible: false }")
+  it('shows the role code in the default list layout', () => {
+    expect(rolesSource).toContain("{ key: 'roleCode', prop: 'code', label: '角色编码', minWidth: 180, showOverflowTooltip: true }")
     expect(rolesSource).toContain('<el-form-item label="角色编码"')
     expect(rolesSource).not.toContain('<small>{{ (row as Role).code }}</small>')
     expect(rolesSource).toContain('aria-label="平台角色列表"')
@@ -126,7 +124,8 @@ describe('RolesView', () => {
     await flushPromises()
 
     expect(listPlatformRoles).toHaveBeenCalledTimes(1)
-    expect(listPlatformInternalUsers).toHaveBeenCalledTimes(1)
+    expect(rolesSource).toContain('userCount: role.memberCount')
+    expect(rolesSource).not.toContain('listPlatformInternalUsers')
     expect(wrapper.get('[data-testid="row-count"]').text()).toBe('1')
     expect(wrapper.text()).not.toContain('角色负责聚合菜单、操作和数据范围，内部用户可分配多个角色')
     expect(wrapper.find('[data-testid="permission-tree"]').exists()).toBe(false)

src/modules/iam/pages/RolesView.vue

@@ -6,7 +6,6 @@ import {
   changePlatformRoleStatus,
   createPlatformRole,
   deletePlatformRole,
-  listPlatformInternalUsers,
   listPlatformPermissions,
   listPlatformRoles,
   replacePlatformRolePermissions,
@@ -81,7 +80,7 @@ const pagedRows = computed(() => filteredRows.value.slice((page.value - 1) * pag
 const roleColumns: DataTableColumn[] = [
   { key: 'actions', label: '操作', width: 250, fixed: 'left', slotName: 'actions' },
   { key: 'role', label: '角色名称', minWidth: 180, slotName: 'role' },
-  { key: 'roleCode', prop: 'code', label: '角色编码', minWidth: 180, showOverflowTooltip: true, defaultVisible: false },
+  { key: 'roleCode', prop: 'code', label: '角色编码', minWidth: 180, showOverflowTooltip: true },
   { key: 'description', prop: 'description', label: '说明', minWidth: 240, showOverflowTooltip: true },
   { key: 'permissionSummary', label: '授权范围', minWidth: 170, slotName: 'permissionSummary' },
   { key: 'userCount', prop: 'userCount', label: '用户数', width: 86, align: 'right' },
@@ -97,13 +96,13 @@ function applyFilters() {
   void loadRoles()
 }
 
-function mapPlatformRole(role: PlatformRoleResource, userCount = 0): Role {
+function mapPlatformRole(role: PlatformRoleResource): Role {
   return {
     id: String(role.id),
     name: role.roleName,
     code: role.roleCode,
     description: role.description ?? '暂无角色说明',
-    userCount,
+    userCount: role.memberCount,
     dataScope: '全部数据',
     status: role.status === 'ACTIVE' ? '启用' : '停用',
     permissionIds: (role.permissionIds ?? []).map(String),
@@ -117,20 +116,12 @@ async function loadRoles() {
   serverRoles.value = []
   serverPermissions.value = []
   try {
-    const [roleRecords, permissionRecords, memberRecords] = await Promise.all([
+    const [roleRecords, permissionRecords] = await Promise.all([
       listPlatformRoles(),
       listPlatformPermissions(),
-      listPlatformInternalUsers(),
     ])
-    const roleMemberCounts = new Map<string, number>()
-    for (const member of memberRecords) {
-      for (const roleId of member.roleIds) {
-        const key = String(roleId)
-        roleMemberCounts.set(key, (roleMemberCounts.get(key) ?? 0) + 1)
-      }
-    }
     serverPermissions.value = permissionRecords.map(mapPlatformPermission)
-    serverRoles.value = roleRecords.map((role) => mapPlatformRole(role, roleMemberCounts.get(String(role.id)) ?? 0))
+    serverRoles.value = roleRecords.map(mapPlatformRole)
   } catch (error) {
     loadError.value = getApiErrorDetails(error, '平台角色列表加载失败，请稍后重试')
   } finally {