检查点:保留账号分组隔离实现,继续权限复审

This commit is contained in:
xuans committed 2026-09-25 21:46:42 +08:00
1 parent 4084bc0682
commit 8ad62d8509
23 files changed
+811 -81

No files matched your search

@@ -0,0 +1,143 @@
import { computed, onBeforeUnmount, ref } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { http } from '@/utils/axios'
import { isRecentAuthenticationCancelled, requestWithRecentAuthentication } from '@/utils/recentAuthentication'
export function useAccountGroups(globalStatus) {
const accountGroups = ref([])
const groupsLoading = ref(false)
const groupsError = ref('')
const canManageGroups = computed(() => globalStatus.hasCapability('account_group.manage'))
const groupSaving = ref(false)
const membershipVisible = ref(false)
const membershipUser = ref(null)
const membershipSelection = ref([])
const membershipLimit = computed(() => membershipUser.value?.Role === 'admin' ? 100 : 1)
let generation = 0
let alive = true
onBeforeUnmount(() => { alive = false; generation++ })
const loadGroup = async group => {
const requestID = ++group.requestID
group.loading = true
group.error = ''
// 切页先清空旧成员,失败时不能继续显示上一页数据。
group.rows = []
try {
const response = await http.post('/api/v1/user/list', {
current_page: group.page,
page_size: 6,
group_id: group.id
})
if (!alive || requestID !== group.requestID || !accountGroups.value.includes(group)) return
if (response?.errorNo !== 0) throw new Error(response?.errorMsg || '分组成员加载失败')
group.totalPages = Math.max(1, Number(response.data.total_page) || 1)
if (group.page > group.totalPages) {
group.page = group.totalPages
return await loadGroup(group)
}
group.rows = response.data.list || []
} catch (error) {
if (alive && requestID === group.requestID) group.error = error?.message || '分组成员加载失败'
} finally {
if (requestID === group.requestID) group.loading = false
}
}
const refreshGroups = async () => {
const requestID = ++generation
groupsLoading.value = true
groupsError.value = ''
if (!['admin', 'super_admin'].includes(globalStatus.role)) {
accountGroups.value = []
groupsLoading.value = false
return
}
const previous = new Map(accountGroups.value.map(group => [group.id, { page: group.page, expanded: group.expanded }]))
accountGroups.value = []
try {
const response = await http.get('/api/v1/user/groups')
if (!alive || requestID !== generation) return
if (response?.errorNo !== 0) throw new Error(response?.errorMsg || '账号分组加载失败')
accountGroups.value = (response.data.groups || []).map(group => ({
...group,
expanded: group.id === 0 || previous.get(group.id)?.expanded || false,
page: previous.get(group.id)?.page || 1,
totalPages: 1,
rows: [],
error: '',
loading: false,
requestID: 0
}))
await Promise.all(accountGroups.value.filter(group => group.expanded).map(loadGroup))
} catch (error) {
if (alive && requestID === generation) groupsError.value = error?.message || '账号分组加载失败'
} finally {
if (requestID === generation) groupsLoading.value = false
}
}
const toggleGroup = group => {
if (group.id === 0) return
group.expanded = !group.expanded
if (group.expanded) loadGroup(group)
}
const saveGroup = async (group = null) => {
if (!canManageGroups.value || groupSaving.value || group?.id === 0) return
groupSaving.value = true
try {
const { value } = await ElMessageBox.prompt('请输入分组名称(1–32 个字符)', group ? '重命名账号分组' : '新建账号分组', {
inputValue: group?.name || '',
confirmButtonText: '保存',
cancelButtonText: '取消',
inputValidator: value => {
const name = (value || '').trim()
return (name.length > 0 && [...name].length <= 32 && name !== '默认分组') || '名称不能为空、过长或使用“默认分组”'
}
})
const response = await requestWithRecentAuthentication(() => http.post('/api/v1/user/groups/save', { id: group?.id || 0, name: value.trim() }))
if (response?.errorNo !== 0) throw new Error(response?.errorMsg || '保存分组失败')
ElMessage.success('账号分组已保存')
await refreshGroups()
} catch (error) {
if (error !== 'cancel' && error !== 'close' && !isRecentAuthenticationCancelled(error)) ElMessage.error(error?.message || '保存分组失败')
} finally {
groupSaving.value = false
}
}
const editMembership = user => {
if (!canManageGroups.value || groupSaving.value) return
membershipUser.value = user
membershipSelection.value = [...(user.GroupIDs || [0])]
membershipVisible.value = true
}
const saveMembership = async () => {
if (!canManageGroups.value || groupSaving.value || !membershipUser.value) return
if (membershipSelection.value.length === 0) membershipSelection.value = [0]
groupSaving.value = true
try {
const response = await requestWithRecentAuthentication(() => http.post('/api/v1/user/groups/membership', {
user_id: membershipUser.value.ID,
version: membershipUser.value.MembershipVersion,
group_ids: [...membershipSelection.value]
}))
if (response?.errorNo !== 0) throw new Error(response?.errorMsg || '保存成员分组失败')
membershipVisible.value = false
ElMessage.success('成员分组已更新,目标账号需重新登录')
await refreshGroups()
} catch (error) {
if (!isRecentAuthenticationCancelled(error)) ElMessage.error(error?.message || '保存成员分组失败,请刷新后重试')
} finally {
groupSaving.value = false
}
}
return {
accountGroups, groupsLoading, groupsError, canManageGroups, groupSaving,
membershipVisible, membershipUser, membershipSelection, membershipLimit,
refreshGroups, loadGroup, toggleGroup, saveGroup, editMembership, saveMembership
}
}
@@ -171,3 +171,49 @@
grid-template-columns: 1fr;
}
}
.group-toolbar {
display: flex;
flex-wrap: wrap;
gap: 8px;
margin-top: 14px;
}
.account-group-panel {
margin-top: 16px;
border: 1px solid var(--el-border-color-light);
border-radius: 10px;
overflow: hidden;
}
.account-group-header {
display: flex;
justify-content: space-between;
align-items: center;
padding: 10px 14px;
background: var(--el-fill-color-light);
}
.account-group-header h4 {
margin: 0;
}
.account-group-toggle {
flex: 1;
border: 0;
padding: 4px 0;
background: transparent;
color: var(--el-text-color-primary);
font: inherit;
font-weight: 600;
text-align: left;
cursor: pointer;
}
.account-group-toggle:focus-visible {
outline: 2px solid var(--el-color-primary);
outline-offset: 4px;
}
.membership-select {
width: 100%;
}
@@ -11,6 +11,7 @@ import {Plus} from "@element-plus/icons-vue";
import {useGlobalStatusStore} from "@/stores/useGlobalStatusStore";
import {confirmRecentAuthentication, isRecentAuthenticationCancelled, requestWithRecentAuthentication} from '@/utils/recentAuthentication'
import {roleMeta, assignableRoles, canManageUser} from '@/utils/userRoles.mjs'
import {useAccountGroups} from './AccountGroups.js'
export function recoveryCodeMeta(configured) {
return configured
@@ -47,11 +48,7 @@ export function canManageRecoveryCode(user) {
export function usePage() {
const globalStatus = useGlobalStatusStore()
const userList = reactive([])
const currentPage = ref(1)
const totalPage = ref(1)
const groups = useAccountGroups(globalStatus)
const userInfoDialog = ref(false)
@@ -95,17 +92,12 @@ export function usePage() {
const title = ref(lang.editUser)
const reflushList = function () {
http.post('/api/v1/user/list', {"current_page": currentPage.value, "page_size": 6}).then(res => {
userList.length = 0
totalPage.value = res.data.total_page
if (res.data["list"]) {
userList.push(...res.data["list"])
if (selectedUser.value?.ID) {
selectedUser.value = userList.find(item => item.ID === selectedUser.value.ID) || selectedUser.value
}
}
})
const reflushList = async function () {
await groups.refreshGroups()
if (selectedUser.value?.ID) {
const users = groups.accountGroups.value.flatMap(group => group.rows)
selectedUser.value = users.find(item => item.ID === selectedUser.value.ID) || selectedUser.value
}
}
const handleEdit = function (idx, row) {
@@ -213,9 +205,7 @@ export function usePage() {
http,
ElNotification,
Plus,
userList,
currentPage,
totalPage,
...groups,
userInfoDialog,
editModel,
editUserInfo,
@@ -3,10 +3,31 @@
<div class="settings-header">
<h3>{{ lang.account_management }}</h3>
<p class="settings-desc">{{ lang.account_management_desc }}</p>
<p class="settings-desc">仅显示权限范围内的成员。新账号默认归入默认分组;分组及成员归属由超级管理员维护。</p>
<div class="group-toolbar">
<el-button v-if="canCreateUser" type="primary" :disabled="groupsLoading" @click="createUser">
<el-icon><Plus /></el-icon> 新建账号
</el-button>
<el-button v-if="canManageGroups" :loading="groupSaving" @click="saveGroup()">新建分组</el-button>
<el-button :loading="groupsLoading" @click="reflushList">刷新列表</el-button>
</div>
</div>
<el-alert v-if="groupsError" :title="groupsError" type="error" :closable="false" />
<el-empty v-if="!groupsLoading && !groupsError && accountGroups.length === 0" description="暂无可查看的分组" />
<section v-for="group in accountGroups" :key="group.id" class="account-group-panel">
<header class="account-group-header">
<h4 v-if="group.id === 0">{{ group.name }}</h4>
<button v-else type="button" class="account-group-toggle" :aria-expanded="group.expanded" :aria-controls="`account-group-${group.id}`" @click="toggleGroup(group)">
<span aria-hidden="true">{{ group.expanded ? '▾' : '▸' }}</span>
{{ group.name }}
</button>
<el-button v-if="canManageGroups && group.id !== 0" text :disabled="groupSaving" @click="saveGroup(group)">重命名</el-button>
</header>
<div v-if="group.expanded" :id="`account-group-${group.id}`" v-loading="group.loading">
<el-alert v-if="group.error" :title="group.error" type="error" :closable="false" />
<div class="table-container">
<el-table :data="userList" class="modern-table" style="width: 100%" empty-text="暂无用户">
<el-table :data="group.rows" class="modern-table" style="width: 100%" empty-text="本组暂无成员">
<el-table-column label="ID" prop="ID" width="44" />
<el-table-column :label="lang.account" prop="Account" width="88" show-overflow-tooltip />
<el-table-column :label="lang.user_name" prop="Name" width="76" show-overflow-tooltip />
@@ -58,12 +79,7 @@
</el-tag>
</template>
</el-table-column>
<el-table-column align="right" width="68">
<template #header>
<el-button v-if="canCreateUser" type="primary" size="small" @click="createUser" class="new-btn" plain>
<el-icon><Plus /></el-icon> 新建
</el-button>
</template>
<el-table-column label="操作" align="right" :width="canManageGroups ? 126 : 68">
<template #default="scope">
<el-button
size="small"
@@ -75,6 +91,7 @@
>
编辑
</el-button>
<el-button v-if="canManageGroups" size="small" text :disabled="groupSaving" @click="editMembership(scope.row)">分组</el-button>
</template>
</el-table-column>
</el-table>
@@ -82,14 +99,34 @@
<div class="pagination-wrapper">
<el-pagination
v-model:current-page="currentPage"
v-model:current-page="group.page"
size="small"
background
layout="prev, pager, next"
:page-count="totalPage"
@current-change="reflushList"
:page-count="group.totalPages"
:disabled="group.loading"
@current-change="loadGroup(group)"
/>
</div>
</div>
</section>
<el-dialog v-model="membershipVisible" title="设置账号所属分组" width="450px" :close-on-click-modal="!groupSaving" :close-on-press-escape="!groupSaving" :show-close="!groupSaving">
<p>账号:{{ membershipUser?.Account }}</p>
<el-form label-position="top">
<el-form-item label="所属分组">
<el-select v-model="membershipSelection" multiple :multiple-limit="membershipLimit" :disabled="groupSaving" placeholder="未选择时归入默认分组" class="membership-select">
<el-option v-for="group in accountGroups" :key="group.id" :label="group.name" :value="group.id" />
</el-select>
</el-form-item>
</el-form>
<p class="settings-desc">管理员可以多选;普通用户只能选择一个分组。</p>
<el-alert title="修改归属会使该账号的旧登录会话和通知发信凭据失效,需要重新登录并配置通知凭据。" type="warning" :closable="false" />
<template #footer>
<el-button :disabled="groupSaving" @click="membershipVisible = false">取消</el-button>
<el-button type="primary" :loading="groupSaving" @click="saveMembership">保存分组</el-button>
</template>
</el-dialog>
<el-dialog
v-model="userInfoDialog"
@@ -226,11 +263,22 @@ import UserExternalEmailDialog from "./UserExternalEmailDialog/UserExternalEmail
const {
lang,
userList,
accountGroups,
groupsLoading,
groupsError,
canManageGroups,
groupSaving,
membershipVisible,
membershipUser,
membershipSelection,
membershipLimit,
loadGroup,
toggleGroup,
saveGroup,
editMembership,
saveMembership,
createUser,
handleEdit,
currentPage,
totalPage,
reflushList,
userInfoDialog,
title,