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
3 changes: 2 additions & 1 deletion apps/users/serializers/user_serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,8 @@ def get_user_profile(user: User):
permission_list = get_user_dynamics_permission(str(user.id))
permission_list += [p.value for p in get_permission_list_by_role(RoleConstants[user.role])]
return {'id': user.id, 'username': user.username, 'email': user.email, 'role': user.role,
'permissions': [str(p) for p in permission_list]}
'permissions': [str(p) for p in permission_list],
'is_edit_password': user.password == 'd880e722c47a34d8e9fce789fc62389d' if user.role == 'ADMIN' else False}

@staticmethod
def get_response_body_api():
Expand Down
4 changes: 4 additions & 0 deletions ui/src/api/type/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@ interface User {
* 用户权限
*/
permissions: Array<string>
/**
* 是否需要修改密码
*/
is_edit_password?: boolean
}

interface LoginRequest {
Expand Down
11 changes: 10 additions & 1 deletion ui/src/layout/components/top-bar/avatar/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,19 @@
</el-dropdown>
<ResetPassword ref="resetPasswordRef"></ResetPassword>
<AboutDialog ref="AboutDialogRef"></AboutDialog>
<UserPwdDialog ref="UserPwdDialogRef" />
</template>
<script setup lang="ts">
import { ref } from 'vue'
import { ref, onMounted } from 'vue'
import useStore from '@/stores'
import { useRouter } from 'vue-router'
import ResetPassword from './ResetPassword.vue'
import AboutDialog from './AboutDialog.vue'
import UserPwdDialog from '@/views/user-manage/component/UserPwdDialog.vue'
const { user } = useStore()
const router = useRouter()

const UserPwdDialogRef = ref()
const AboutDialogRef = ref()
const resetPasswordRef = ref<InstanceType<typeof ResetPassword>>()

Expand All @@ -56,6 +59,12 @@ const logout = () => {
router.push({ name: 'login' })
})
}

onMounted(() => {
if (user.userInfo?.is_edit_password) {
UserPwdDialogRef.value.open(user.userInfo)
}
})
</script>
<style lang="scss" scoped>
.avatar-dropdown {
Expand Down