修复新增账号安全配置后的状态刷新

This commit is contained in:
xuans committed 2026-09-26 12:09:15 +08:00
1 parent c8514ce11a
commit 9b9636cc96
2 files changed
+39 -9

No files matched your search

+11 -5
View File
@@ -150,14 +150,17 @@ func CreateUser(ctx *context.Context, w http.ResponseWriter, req *http.Request)
writeAccountGroupError(w, err) writeAccountGroupError(w, err)
return return
} }
response.NewSuccessResponse(struct { response.NewSuccessResponse(userListItem{
models.User ID: user.ID, Account: user.Account, Name: user.Name,
GroupIDs []int Disabled: user.Disabled, Role: user.EffectiveRole(), IsAdmin: user.IsAdmin,
MembershipVersion int GroupIDs: groupIDs, MembershipVersion: user.SecurityVersion,
}{user, groupIDs, user.SecurityVersion}).FPrint(w) MustChangePassword: user.MustChangePassword,
ExternalEmailEnabled: user.ExternalEmailEnabled == 1,
}).FPrint(w)
} }
type userListRequest struct { type userListRequest struct {
UserID int `json:"user_id"`
GroupID *int `json:"group_id"` GroupID *int `json:"group_id"`
CurrentPage int `json:"current_page"` CurrentPage int `json:"current_page"`
PageSize int `json:"page_size"` PageSize int `json:"page_size"`
@@ -231,6 +234,9 @@ func UserList(ctx *context.Context, w http.ResponseWriter, req *http.Request) {
query := db.Instance.Table(&models.User{}) query := db.Instance.Table(&models.User{})
defer query.Close() defer query.Close()
accountgroup.ApplyScope(query, ctx.UserID, ctx.EffectiveRole()) accountgroup.ApplyScope(query, ctx.UserID, ctx.EffectiveRole())
if reqData.UserID != 0 {
query.And("id = ?", reqData.UserID)
}
if reqData.GroupID != nil { if reqData.GroupID != nil {
groups, err := accountgroup.VisibleGroups(db.Instance, ctx.UserID, ctx.EffectiveRole()) groups, err := accountgroup.VisibleGroups(db.Instance, ctx.UserID, ctx.EffectiveRole())
if err != nil { if err != nil {
@@ -130,10 +130,30 @@ export function usePage() {
const title = ref(lang.editUser) const title = ref(lang.editUser)
const reflushList = async function () { const reflushList = async function () {
const selectedID = selectedUser.value?.ID
await groups.refreshGroups() await groups.refreshGroups()
if (selectedUser.value?.ID) { if (selectedID && selectedUser.value?.ID === selectedID) {
const users = groups.accountGroups.value.flatMap(group => group.rows) const users = groups.accountGroups.value.flatMap(group => group.rows)
selectedUser.value = users.find(item => item.ID === selectedUser.value.ID) || selectedUser.value let current = users.find(item => item.ID === selectedID)
if (!current) {
const response = await http.post('/api/v1/user/list', { user_id: selectedID, page_size: 1 })
if (response?.errorNo !== 0) throw new Error(response?.errorMsg || lang.fail)
current = response.data?.list?.find(item => item.ID === selectedID)
}
if (selectedUser.value?.ID !== selectedID) return
if (!current) {
selectedUser.value = null
userInfoDialog.value = false
return
}
const savedGroups = selectedUser.value.GroupIDs || [0]
const currentGroups = current.GroupIDs || [0]
if (current.Role === selectedUser.value.Role
&& currentGroups.length === savedGroups.length
&& savedGroups.every(id => currentGroups.includes(id))) {
editingMembershipVersion.value = current.MembershipVersion
}
selectedUser.value = current
} }
} }
@@ -199,8 +219,12 @@ export function usePage() {
externalEmailDialogVisible.value = true externalEmailDialogVisible.value = true
} }
const handleSecurityChanged = function () { const handleSecurityChanged = async function () {
reflushList() try {
await reflushList()
} catch (error) {
ElNotification({ title: lang.fail, message: error?.message || lang.fail, type: 'error' })
}
} }
const submit = async function () { const submit = async function () {