a4f60ef21c
- 级联清理的有效集改为按目标「完整直接授权」计算(读库,含 admin/app 全类型)。 此前 admin/app 分区落库把本次提交的 id 当成完整有效集,员工持有的另一类型授权 会整体被判越权删除;两次分区落库互相补刀,最终清空员工全部菜单权限 (生产表现:保存某非超管的权限后,他直建员工的菜单隔三差五自己消失) - AdminUserService 改为两类落库完成后再统一级联一次,新增 cascadeSubordinateOverreach 入口 - 后台「编辑用户」弹窗:授权未加载完成/失败时禁用保存并明确提示, 避免以空 columnIds 整树清空该用户授权(改动密码等操作也会连带触发) - 回归测试:deferredCascadeKeepsSubordinateGrantsOfOtherMenuType、 perTypeReplacementDoesNotCascadeBeforeAllTypesWritten、edit_user_dialog_blocks_save_until_auth_loaded 已知既有红测试(与本次改动无关,干净 HEAD 上同样复现,未新增): ArchitectureBoundaryTest.taskToBusinessDependencyDoesNotGrow(110 > 基线 84)、 HttpClientTimeoutEffectiveTest.connectTimeoutFiresOnUnreachableHost(本机网络环境 60s)
146 lines
4.8 KiB
Vue
146 lines
4.8 KiB
Vue
<script setup lang="ts">
|
||
import { reactive, ref, watch } from 'vue'
|
||
import type { AdminUser } from '@/types/admin'
|
||
import { fillEditUserForm, validateEditUserForm, type EditUserForm, type EditUserFormErrors } from './user-edit-model'
|
||
import { submitEditUser } from './user-edit-adapter'
|
||
import { loadUserMenuAuth } from './user-menu-auth-api'
|
||
import { showAdminFeedback } from '@/components/admin-feedback-ui'
|
||
import { actionableErrorText } from '@/components/admin-feedback'
|
||
import UserMenuAuthTree from './UserMenuAuthTree.vue'
|
||
|
||
const props = defineProps<{ modelValue: boolean; user: AdminUser | null; operatorSuper?: boolean }>()
|
||
const emit = defineEmits<{ (e: 'update:modelValue', v: boolean): void; (e: 'updated'): void }>()
|
||
|
||
const form = reactive<EditUserForm>({ uid: 0, username: '', password: '', role: 'normal', columnIds: [], originalRole: '' })
|
||
const errors = reactive<EditUserFormErrors>({})
|
||
const busy = ref(false)
|
||
const loadingAuth = ref(false)
|
||
/** 授权是否已成功加载:未就绪时保存会把空 columnIds 提交为“清空授权”,必须拦住。 */
|
||
const authReady = ref(false)
|
||
|
||
watch(
|
||
() => props.modelValue,
|
||
(open) => {
|
||
if (!open || !props.user) return
|
||
const base = fillEditUserForm(props.user)
|
||
form.uid = base.uid
|
||
form.username = base.username
|
||
form.password = ''
|
||
form.role = base.role
|
||
form.columnIds = []
|
||
form.originalRole = base.originalRole
|
||
errors.password = undefined
|
||
authReady.value = false
|
||
void refreshAuth()
|
||
},
|
||
)
|
||
|
||
async function refreshAuth(): Promise<void> {
|
||
if (!props.user) return
|
||
loadingAuth.value = true
|
||
try {
|
||
const { checkedIds } = await loadUserMenuAuth(props.user.id)
|
||
form.columnIds = checkedIds
|
||
authReady.value = true
|
||
} catch (error) {
|
||
// 加载失败保持 authReady=false:保存按钮禁用,避免以空数组整树清空该用户授权。
|
||
authReady.value = false
|
||
showAdminFeedback(actionableErrorText(error), 'error')
|
||
} finally {
|
||
loadingAuth.value = false
|
||
}
|
||
}
|
||
|
||
function close(): void {
|
||
emit('update:modelValue', false)
|
||
}
|
||
|
||
async function save(): Promise<void> {
|
||
if (!authReady.value) {
|
||
showAdminFeedback('菜单权限尚未加载完成,请稍后重试', 'error')
|
||
return
|
||
}
|
||
const { valid, errors: errs } = validateEditUserForm(form)
|
||
Object.assign(errors, errs)
|
||
if (!valid) return
|
||
busy.value = true
|
||
try {
|
||
await submitEditUser(form)
|
||
showAdminFeedback('更新成功', 'success')
|
||
emit('updated')
|
||
close()
|
||
} catch (error) {
|
||
showAdminFeedback(actionableErrorText(error), 'error')
|
||
} finally {
|
||
busy.value = false
|
||
}
|
||
}
|
||
</script>
|
||
|
||
<template>
|
||
<el-dialog
|
||
:model-value="modelValue"
|
||
title="编辑用户"
|
||
width="640px"
|
||
:close-on-click-modal="false"
|
||
destroy-on-close
|
||
@update:model-value="(v: boolean) => emit('update:modelValue', v)"
|
||
>
|
||
<el-form label-position="top" @submit.prevent>
|
||
<el-form-item label="用户名">
|
||
<el-input :model-value="form.username" readonly />
|
||
</el-form-item>
|
||
<el-form-item label="新密码(不修改可留空)" :error="errors.password">
|
||
<el-input
|
||
v-model="form.password"
|
||
type="password"
|
||
show-password
|
||
autocomplete="new-password"
|
||
placeholder="留空则不修改密码"
|
||
@input="errors.password = undefined"
|
||
/>
|
||
</el-form-item>
|
||
<el-form-item v-if="operatorSuper" label="角色">
|
||
<el-radio-group v-model="form.role">
|
||
<el-radio-button value="normal">普通账号</el-radio-button>
|
||
<el-radio-button value="admin">管理员</el-radio-button>
|
||
</el-radio-group>
|
||
</el-form-item>
|
||
<el-form-item v-if="props.user && props.user.creatorUsername" label="所属管理员">
|
||
<el-input :model-value="props.user.creatorUsername" readonly />
|
||
</el-form-item>
|
||
<el-form-item label="菜单权限(勾选上级菜单会继承全部子菜单)">
|
||
<div class="auth-tree-box">
|
||
<UserMenuAuthTree v-model:checked="form.columnIds" />
|
||
<div v-if="loadingAuth" class="auth-loading">菜单权限加载中…</div>
|
||
<div v-else-if="!authReady" class="auth-loading auth-loading-error">
|
||
菜单权限加载失败,保存已禁用;请关闭后重试
|
||
</div>
|
||
</div>
|
||
</el-form-item>
|
||
</el-form>
|
||
<template #footer>
|
||
<el-button @click="close">取消</el-button>
|
||
<el-button type="primary" :loading="busy" :disabled="!authReady" @click="save">保存</el-button>
|
||
</template>
|
||
</el-dialog>
|
||
</template>
|
||
|
||
<style scoped>
|
||
.auth-tree-box {
|
||
position: relative;
|
||
width: 100%;
|
||
border: 1px solid var(--el-border-color);
|
||
border-radius: 9px;
|
||
padding: 8px;
|
||
}
|
||
.auth-loading {
|
||
margin-top: 6px;
|
||
font-size: 12px;
|
||
color: var(--admin-muted);
|
||
}
|
||
.auth-loading-error {
|
||
color: var(--el-color-danger);
|
||
}
|
||
</style>
|