Skip to content

Commit a54092a

Browse files
fix: user tag
1 parent cf44a7f commit a54092a

2 files changed

Lines changed: 7 additions & 3 deletions

File tree

‎ui/src/styles/element-plus.scss‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -427,6 +427,9 @@
427427
padding: 0;
428428
border-top: var(--el-border);
429429
}
430+
.el-dialog__headerbtn {
431+
top: 16px;
432+
}
430433
.dialog-content {
431434
padding: 0;
432435
max-height: none;

‎ui/src/views/system/identity/users/UserListView.vue‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,9 @@ onMounted(() => loadSystemUsers())
169169

170170
<el-table-column v-if="auth.isEE || auth.isPE" prop="role_name" width="180" label="角色">
171171
<template #default="{ row }">
172+
<span v-if="!row.role_workspace?.length">-</span>
172173
<WorkspaceRelationTags
174+
v-else
173175
:columns="[
174176
{ prop: 'role_name', label: '角色' },
175177
{ prop: 'workspace', label: '工作空间' },
@@ -209,8 +211,7 @@ onMounted(() => loadSystemUsers())
209211
<el-table-column label="操作" width="160" fixed="right">
210212
<template #default="{ row }">
211213
<div class="flex-align-center gap-3">
212-
213-
<span @click.stop >
214+
<span @click.stop>
214215
<el-switch
215216
v-model="row.is_active"
216217
:disabled="row.role === ROLE_TYPE.ADMIN || row.id === user.userInfo?.id || !perm.system.user.edit()"
@@ -231,7 +232,7 @@ onMounted(() => loadSystemUsers())
231232
<!-- 修改用户密码 -->
232233
<ButtonChangeUserPassword :user="row" @refresh="loadSystemUsers(false)" />
233234
<!-- 删除 -->
234-
<MkTooltip content="删除" placement="top" v-if="perm.system.user.delete()" >
235+
<MkTooltip content="删除" placement="top" v-if="perm.system.user.delete()">
235236
<el-button type="primary" text @click.stop="deleteUser(row)">
236237
<MkIcon name="icon_delete-trash_outlined" />
237238
</el-button>

0 commit comments

Comments
 (0)