提交分组成员管理权限和前端入口调整,作为继续开发前的安全检查点。
This commit is contained in:
1 parent
bd0ce77fa3
commit
b7a1e44dc6
7 files changed
+69
-11
No files matched your search
@@ -8,6 +8,7 @@ export function useAccountGroups(globalStatus, onMembershipSaved = () => {}) {
|
||||
const groupsLoading = ref(false)
|
||||
const groupsError = ref('')
|
||||
const canManageGroups = computed(() => globalStatus.hasCapability('account_group.manage'))
|
||||
const canManageMembership = computed(() => globalStatus.hasCapability('account_group.member_manage'))
|
||||
const groupSaving = ref(false)
|
||||
const membershipVisible = ref(false)
|
||||
const membershipUser = ref(null)
|
||||
@@ -128,7 +129,7 @@ export function useAccountGroups(globalStatus, onMembershipSaved = () => {}) {
|
||||
}
|
||||
|
||||
const editMembership = (user, options = {}) => {
|
||||
if (!canManageGroups.value || groupSaving.value) return
|
||||
if (!canManageMembership.value || groupSaving.value) return
|
||||
membershipUser.value = { ...user, Role: options.role || user.Role }
|
||||
membershipSelection.value = [...(options.groupIDs || user.GroupIDs || [0])]
|
||||
applyMembershipDraft = options.onApply || null
|
||||
@@ -137,7 +138,7 @@ export function useAccountGroups(globalStatus, onMembershipSaved = () => {}) {
|
||||
}
|
||||
|
||||
const saveMembership = async () => {
|
||||
if (!canManageGroups.value || groupSaving.value || !membershipUser.value) return
|
||||
if (!canManageMembership.value || groupSaving.value || !membershipUser.value) return
|
||||
if (membershipSelection.value.length === 0) membershipSelection.value = [0]
|
||||
if (membershipSelection.value.length > membershipLimit.value) {
|
||||
ElMessage.error('普通用户只能选择一个分组,请重新选择')
|
||||
@@ -174,7 +175,7 @@ export function useAccountGroups(globalStatus, onMembershipSaved = () => {}) {
|
||||
}
|
||||
|
||||
return {
|
||||
accountGroups, groupsLoading, groupsError, canManageGroups, groupSaving,
|
||||
accountGroups, groupsLoading, groupsError, canManageGroups, canManageMembership, groupSaving,
|
||||
membershipVisible, membershipUser, membershipSelection, membershipLimit,
|
||||
membershipDraft, membershipSingleSelection,
|
||||
refreshGroups, loadGroup, toggleGroup, saveGroup, createMembershipGroup, editMembership, saveMembership
|
||||
|
||||
@@ -69,7 +69,7 @@ export function usePage() {
|
||||
const user = selectedUser.value
|
||||
if (!user && editModel.value !== 'create') return []
|
||||
return groups.accountGroups.value.filter(group =>
|
||||
groups.canManageGroups.value
|
||||
groups.canManageMembership.value
|
||||
? editingGroupIDs.value.includes(group.id)
|
||||
: group.rows.some(member => member.ID === user.ID)
|
||||
)
|
||||
@@ -243,7 +243,7 @@ export function usePage() {
|
||||
}
|
||||
if (creating || roleChanged.value) newData.role = editUserInfo.role
|
||||
if (creating || editUserInfo.password !== '') newData.password = editUserInfo.password
|
||||
if (groups.canManageGroups.value && (creating || membershipChanged.value || roleChanged.value)) {
|
||||
if (groups.canManageMembership.value && (creating || membershipChanged.value || roleChanged.value)) {
|
||||
if (editUserInfo.role !== 'admin' && editingGroupIDs.value.length !== 1) {
|
||||
throw new Error('普通用户只能属于一个分组,请在分组管理中选择一个分组')
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user