Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ onMounted(() => loadChatUserGroups())
<component :is="Header">
<h4>{{ title }}</h4>
<!-- 创建用户组 -->
<MkTooltip content="创建用户组" placement="top">
<el-button v-if="perm.system.chatUserGroup.create()" text type="primary" @click="handleOpenGroupDialog()">
<MkTooltip content="创建用户组" placement="top" v-if="perm.system.chatUserGroup.create()">
<el-button text type="primary" @click="handleOpenGroupDialog()">
<MkIcon name="icon_add_outlined" :size="18" />
</el-button>
</MkTooltip>
Expand Down Expand Up @@ -203,8 +203,8 @@ onMounted(() => loadChatUserGroups())
<el-table-column label="操作" width="70" fixed="right">
<template #default="{ row }">
<!-- 移除成员 -->
<MkTooltip content="移除" placement="top">
<el-button v-if="perm.system.chatUserGroup.removeMember()" type="primary" text @click="handleRemoveMembers(row)">
<MkTooltip content="移除" placement="top" v-if="perm.system.chatUserGroup.removeMember()">
<el-button type="primary" text @click="handleRemoveMembers(row)">
<MkIcon name="icon_assigned_outlined" />
</el-button>
</MkTooltip>
Expand Down
6 changes: 3 additions & 3 deletions ui/src/views/system/chat-management/users/UserListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -209,13 +209,13 @@ onMounted(() => loadChatUsers())
<template #default="{ row }">
<div class="flex-align-center gap-3">
<span @click.stop>
<el-switch v-model="row.is_active" size="small" :before-change="() => handleChangeStatus(row)" />
<el-switch v-model="row.is_active" size="small" :disabled="!perm.system.chatUser.edit()" :before-change="() => handleChangeStatus(row)" />
</span>
<el-divider direction="vertical" />
<div class="flex">
<!-- 编辑 -->
<MkTooltip content="编辑" placement="top">
<el-button v-if="perm.system.chatUser.edit()" type="primary" text @click.stop="handleOpenUserFormDrawer(row)">
<MkTooltip content="编辑" placement="top" v-if="perm.system.chatUser.edit()">
<el-button type="primary" text @click.stop="handleOpenUserFormDrawer(row)">
<MkIcon name="icon_edit_outlined" />
</el-button>
</MkTooltip>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/system/identity/groups/GroupsListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@ onMounted(() => {
<el-table-column label="操作" width="70" fixed="right">
<template #default="{ row }">
<!-- 移除成员 -->
<MkTooltip content="移除" placement="top">
<el-button v-if="perm.system.userGroup.removeMember()" type="primary" text @click="handleRemoveMembers(row)">
<MkTooltip content="移除" placement="top" v-if="perm.system.userGroup.removeMember()">
<el-button type="primary" text @click="handleRemoveMembers(row)">
<MkIcon name="icon_assigned_outlined" />
</el-button>
</MkTooltip>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/system/identity/roles/RoleListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ onMounted(() => loadRoles())
<template #aside="{ title, Header }">
<component :is="Header">
<h4>{{ title }}</h4>
<MkTooltip content="创建角色" placement="top">
<MkTooltip content="创建角色" placement="top" v-if="perm.system.role.create()">
<!-- 创建角色 -->
<el-button v-if="perm.system.role.create()" class="-mr-1" text type="primary" @click="handleOpenRoleDialog()">
<el-button class="-mr-1" text type="primary" @click="handleOpenRoleDialog()">
<MkIcon name="icon_add_outlined" :size="18" />
</el-button>
</MkTooltip>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ watch(
<div class="flex-between mb-4">
<div>
<!-- 添加成员 -->
<el-button type="primary" v-if="perm.system.workspace.addMember()" @click="handleOpenAddMemberDrawer"> <MkIcon name="icon_add_outlined" />添加成员 </el-button>
<el-button type="primary" v-if="perm.system.role.addMember()" @click="handleOpenAddMemberDrawer"> <MkIcon name="icon_add_outlined" />添加成员 </el-button>
</div>

<MkComplexSearch :fields="searchFields" @change="handleSearch" />
Expand All @@ -117,13 +117,13 @@ watch(
<el-table-column v-if="currentRole.type !== ROLE_TYPE.ADMIN" prop="workspace_name" label="工作空间" min-width="180" show-overflow-tooltip />
<el-table-column label="操作" width="70" fixed="right">
<template #default="{ row }">
<MkTooltip content="移除" placement="top">
<el-button v-if="perm.system.workspace.removeMember()" type="primary" text @click="handleRemoveMember(row)"><MkIcon name="icon_assigned_outlined" /></el-button>
<MkTooltip content="移除" placement="top" v-if="perm.system.role.removeMember()">
<el-button type="primary" text @click="handleRemoveMember(row)"><MkIcon name="icon_assigned_outlined" /></el-button>
</MkTooltip>
</template>
</el-table-column>
<template #footer-batch-actions>
<el-button v-if="perm.system.workspace.removeMember()" type="danger" plain @click="handleBatchDelete">移除</el-button>
<el-button v-if="perm.system.role.removeMember()" type="danger" plain @click="handleBatchDelete">移除</el-button>
</template>
</MkTable>
</div>
Expand Down
10 changes: 5 additions & 5 deletions ui/src/views/system/identity/users/UserListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ onMounted(() => loadSystemUsers())
<span @click.stop>
<el-switch
v-model="row.is_active"
:disabled="row.role === ROLE_TYPE.ADMIN || row.id === user.userInfo?.id"
:disabled="row.role === ROLE_TYPE.ADMIN || row.id === user.userInfo?.id || !perm.system.user.edit()"
:before-change="() => handleChangeStatus(row)"
size="small"
class="mr-3"
Expand All @@ -222,16 +222,16 @@ onMounted(() => loadSystemUsers())

<div class="flex">
<!-- 编辑 -->
<MkTooltip content="编辑" placement="top">
<el-button v-if="perm.system.user.edit()" type="primary" text @click.stop="handleOpenUserFormDrawer(row)">
<MkTooltip content="编辑" placement="top" v-if="perm.system.user.edit()">
<el-button type="primary" text @click.stop="handleOpenUserFormDrawer(row)">
<MkIcon name="icon_edit_outlined" />
</el-button>
</MkTooltip>
<!-- 修改用户密码 -->
<ButtonChangeUserPassword :user="row" @refresh="loadSystemUsers(false)" />
<!-- 删除 -->
<MkTooltip content="删除" placement="top">
<el-button v-if="perm.system.user.delete()" type="primary" text @click.stop="deleteUser(row)">
<MkTooltip content="删除" placement="top" v-if="perm.system.user.delete()" >
<el-button type="primary" text @click.stop="deleteUser(row)">
<MkIcon name="icon_delete-trash_outlined" />
</el-button>
</MkTooltip>
Expand Down
8 changes: 4 additions & 4 deletions ui/src/views/system/identity/workspaces/WorkspaceListView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,8 @@ onMounted(() => loadWorkspaceOptions())
<component :is="Header">
<h4>{{ title }}</h4>
<!-- 创建工作空间 -->
<MkTooltip content="创建工作空间" placement="top">
<el-button v-if="perm.system.workspace.create()" text type="primary" class="-mr-1" @click="handleOpenWorkspaceDialog()">
<MkTooltip content="创建工作空间" placement="top" v-if="perm.system.workspace.create()">
<el-button text type="primary" class="-mr-1" @click="handleOpenWorkspaceDialog()">
<MkIcon name="icon_add_outlined" :size="18" />
</el-button>
</MkTooltip>
Expand Down Expand Up @@ -248,8 +248,8 @@ onMounted(() => loadWorkspaceOptions())
<el-table-column label="操作" width="70" fixed="right">
<template #default="{ row }">
<!-- 移除成员 -->
<MkTooltip content="移除" placement="top">
<el-button v-if="perm.system.workspace.removeMember()" type="primary" text @click="handleRemoveMember(row)">
<MkTooltip content="移除" placement="top" v-if="perm.system.workspace.removeMember()">
<el-button type="primary" text @click="handleRemoveMember(row)">
<MkIcon name="icon_assigned_outlined" />
</el-button>
</MkTooltip>
Expand Down
Loading