mirror of
				https://github.com/continew-org/continew-admin-ui.git
				synced 2025-11-04 10:57:08 +08:00 
			
		
		
		
	refactor: 优化用户角色名称展示
This commit is contained in:
		@@ -16,12 +16,12 @@ export interface UserResp {
 | 
				
			|||||||
  updateTime: string
 | 
					  updateTime: string
 | 
				
			||||||
  deptId: string
 | 
					  deptId: string
 | 
				
			||||||
  deptName: string
 | 
					  deptName: string
 | 
				
			||||||
 | 
					  roleIds: Array<number>
 | 
				
			||||||
 | 
					  roleNames: Array<string>
 | 
				
			||||||
  disabled: boolean
 | 
					  disabled: boolean
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
export type UserDetailResp = UserResp & {
 | 
					export type UserDetailResp = UserResp & {
 | 
				
			||||||
  roleIds?: Array<number>
 | 
					 | 
				
			||||||
  roleNames: string
 | 
					 | 
				
			||||||
  pwdResetTime?: string
 | 
					  pwdResetTime?: string
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -22,7 +22,7 @@
 | 
				
			|||||||
        <a-typography-paragraph :copyable="!!dataDetail?.email">{{ dataDetail?.email || '暂无' }}</a-typography-paragraph>
 | 
					        <a-typography-paragraph :copyable="!!dataDetail?.email">{{ dataDetail?.email || '暂无' }}</a-typography-paragraph>
 | 
				
			||||||
      </a-descriptions-item>
 | 
					      </a-descriptions-item>
 | 
				
			||||||
      <a-descriptions-item label="所属部门">{{ dataDetail?.deptName }}</a-descriptions-item>
 | 
					      <a-descriptions-item label="所属部门">{{ dataDetail?.deptName }}</a-descriptions-item>
 | 
				
			||||||
      <a-descriptions-item label="角色">{{ dataDetail?.roleNames }}</a-descriptions-item>
 | 
					      <a-descriptions-item label="角色"><GiCellTags :data="dataDetail?.roleNames" /></a-descriptions-item>
 | 
				
			||||||
      <a-descriptions-item label="创建人">{{ dataDetail?.createUserString }}</a-descriptions-item>
 | 
					      <a-descriptions-item label="创建人">{{ dataDetail?.createUserString }}</a-descriptions-item>
 | 
				
			||||||
      <a-descriptions-item label="创建时间">{{ dataDetail?.createTime }}</a-descriptions-item>
 | 
					      <a-descriptions-item label="创建时间">{{ dataDetail?.createTime }}</a-descriptions-item>
 | 
				
			||||||
      <a-descriptions-item label="修改人">{{ dataDetail?.updateUserString }}</a-descriptions-item>
 | 
					      <a-descriptions-item label="修改人">{{ dataDetail?.updateUserString }}</a-descriptions-item>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -73,6 +73,9 @@
 | 
				
			|||||||
          <template #gender="{ record }">
 | 
					          <template #gender="{ record }">
 | 
				
			||||||
            <GiCellGender :gender="record.gender" />
 | 
					            <GiCellGender :gender="record.gender" />
 | 
				
			||||||
          </template>
 | 
					          </template>
 | 
				
			||||||
 | 
					          <template #roleNames="{ record }">
 | 
				
			||||||
 | 
					            <GiCellTags :data="record.roleNames" />
 | 
				
			||||||
 | 
					          </template>
 | 
				
			||||||
          <template #status="{ record }">
 | 
					          <template #status="{ record }">
 | 
				
			||||||
            <GiCellStatus :status="record.status" />
 | 
					            <GiCellStatus :status="record.status" />
 | 
				
			||||||
          </template>
 | 
					          </template>
 | 
				
			||||||
@@ -155,16 +158,17 @@ const columns: TableInstanceColumns[] = [
 | 
				
			|||||||
    fixed: !isMobile() ? 'left' : undefined
 | 
					    fixed: !isMobile() ? 'left' : undefined
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
  { title: '昵称', dataIndex: 'nickname', width: 120, ellipsis: true, tooltip: true },
 | 
					  { title: '昵称', dataIndex: 'nickname', width: 120, ellipsis: true, tooltip: true },
 | 
				
			||||||
  { title: '状态', slotName: 'status', align: 'center' },
 | 
					  { title: '状态', slotName: 'status', align: 'center', width: 80 },
 | 
				
			||||||
  { title: '性别', slotName: 'gender', align: 'center' },
 | 
					  { title: '性别', slotName: 'gender', align: 'center', width: 100 },
 | 
				
			||||||
  { title: '所属部门', dataIndex: 'deptName', ellipsis: true, tooltip: true },
 | 
					  { title: '所属部门', dataIndex: 'deptName', ellipsis: true, tooltip: true, width: 180 },
 | 
				
			||||||
 | 
					  { title: '角色', dataIndex: 'roleNames', slotName: 'roleNames', width: 160 },
 | 
				
			||||||
  { title: '手机号', dataIndex: 'phone', width: 170, ellipsis: true, tooltip: true },
 | 
					  { title: '手机号', dataIndex: 'phone', width: 170, ellipsis: true, tooltip: true },
 | 
				
			||||||
  { title: '邮箱', dataIndex: 'email', width: 170, ellipsis: true, tooltip: true },
 | 
					  { title: '邮箱', dataIndex: 'email', width: 170, ellipsis: true, tooltip: true },
 | 
				
			||||||
  { title: '系统内置', slotName: 'isSystem', width: 100, align: 'center', show: false },
 | 
					  { title: '系统内置', slotName: 'isSystem', width: 100, align: 'center', show: false },
 | 
				
			||||||
  { title: '描述', dataIndex: 'description', ellipsis: true, tooltip: true },
 | 
					  { title: '描述', dataIndex: 'description', ellipsis: true, tooltip: true },
 | 
				
			||||||
  { title: '创建人', dataIndex: 'createUserString', ellipsis: true, tooltip: true, show: false },
 | 
					  { title: '创建人', dataIndex: 'createUserString', ellipsis: true, tooltip: true, width: 140, show: false },
 | 
				
			||||||
  { title: '创建时间', dataIndex: 'createTime', width: 180 },
 | 
					  { title: '创建时间', dataIndex: 'createTime', width: 180 },
 | 
				
			||||||
  { title: '修改人', dataIndex: 'updateUserString', ellipsis: true, tooltip: true, show: false },
 | 
					  { title: '修改人', dataIndex: 'updateUserString', ellipsis: true, tooltip: true, width: 140, show: false },
 | 
				
			||||||
  { title: '修改时间', dataIndex: 'updateTime', width: 180, show: false },
 | 
					  { title: '修改时间', dataIndex: 'updateTime', width: 180, show: false },
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    title: '操作',
 | 
					    title: '操作',
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user