test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-04 13:17:50 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Fix the routing problem of the user management module (#8251)

Browse Source
This commit is contained in:
labbomb 2022-01-29 11:58:14 +08:00 committed by GitHub
parent 49d581d72e
commit c160bfba9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dolphinscheduler-ui-next/src/layouts/content/components/user/use-dropdown.ts
View File

@ -18,14 +18,17 @@
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { logout } from '@/service/modules/logout' import { logout } from '@/service/modules/logout'
import { useUserStore } from '@/store/user/user' import { useUserStore } from '@/store/user/user'
import { useMenuStore } from '@/store/menu/menu'
import type { Router } from 'vue-router' import type { Router } from 'vue-router'
import { DropdownOption } from 'naive-ui' import { DropdownOption } from 'naive-ui'
export function useDropDown() { export function useDropDown() {
const router: Router = useRouter() const router: Router = useRouter()
const userStore = useUserStore() const userStore = useUserStore()
const menuStore = useMenuStore()
const handleSelect = (key: string | number, option: DropdownOption) => { const handleSelect = (key: string | number, option: DropdownOption) => {
menuStore.setMenuKey('')
if (key === 'logout') { if (key === 'logout') {
useLogout() useLogout()
} else if (key === 'password') { } else if (key === 'password') {

3
dolphinscheduler-ui-next/src/layouts/content/index.tsx
View File

@ -61,8 +61,7 @@ const Content = defineComponent({
const getSideMenu = (state: any) => { const getSideMenu = (state: any) => {
const key = menuStore.getMenuKey const key = menuStore.getMenuKey
state.sideMenuOptions = state.sideMenuOptions =
state.menuOptions.filter((menu: { key: string }) => menu.key === key)[0] state.menuOptions.filter((menu: { key: string }) => menu.key === key)[0]?.children || state.menuOptions
.children || []
state.isShowSide = menuStore.getShowSideStatus state.isShowSide = menuStore.getShowSideStatus
} }

2
dolphinscheduler-ui-next/src/store/menu/menu.ts
View File

@ -28,7 +28,7 @@ export const useMenuStore = defineStore({
persist: true, persist: true,
getters: { getters: {
getMenuKey(): string { getMenuKey(): string {
return this.menuKey || 'home' return this.menuKey
}, },
getShowSideStatus(): boolean { getShowSideStatus(): boolean {
return this.isShowSide || false return this.isShowSide || false