github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-05 17:01:21 +00:00
Code Issues Projects Releases Wiki Activity

fix: 修复2个tab只给其中一个tab权限接口提示报错问题

Browse Source
This commit is contained in:
“huailei000”
2022-03-18 17:05:21 +08:00
committed by Jiangjie.Bai
parent 26ba2c091e
commit b22b01529a
3 changed files with 20 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/accounts/ChangeAuthPlan/index.vue
View File

@@ -1,21 +1,14 @@
<template> <template>
<TabPage :active-menu.sync="config.activeMenu" :submenu="config.submenu"> <TabPage :active-menu.sync="config.activeMenu" :submenu="config.submenu" />
<keep-alive>
<component :is="config.activeMenu" />
</keep-alive>
</TabPage>
</template> </template>
<script> <script>
import { TabPage } from '@/layout/components' import { TabPage } from '@/layout/components'
import AssetChangeAuthPlanList from './AssetChangeAuthPlan/ChangeAuthPlanList'
import AppChangeAuthPlanList from './AppChangeAuthPlan/AppChangeAuthPlanList'
export default { export default {
name: 'Index', name: 'Index',
components: { components: {
TabPage, TabPage
AssetChangeAuthPlanList,
AppChangeAuthPlanList
}, },
data() { data() {
return { return {
@@ -25,13 +18,14 @@ export default {
{ {
title: this.$t('xpack.ChangeAuthPlan.AssetChangeAuthPlan'), title: this.$t('xpack.ChangeAuthPlan.AssetChangeAuthPlan'),
name: 'AssetChangeAuthPlanList', name: 'AssetChangeAuthPlanList',
hidden: () => !this.$hasPerm('xpack.view_changeauthplan') hidden: () => !this.$hasPerm('xpack.view_changeauthplan'),
component: () => import('@/views/accounts/ChangeAuthPlan/AssetChangeAuthPlan/ChangeAuthPlanList.vue')
}, },
{ {
title: this.$t('xpack.ChangeAuthPlan.AppChangeAuthPlan'), title: this.$t('xpack.ChangeAuthPlan.AppChangeAuthPlan'),
name: 'AppChangeAuthPlanList', name: 'AppChangeAuthPlanList',
hidden: () => !this.$hasPerm('xpack.view_applicationchangeauthplan') hidden: () => !this.$hasPerm('xpack.view_applicationchangeauthplan'),
component: () => import('@/views/accounts/ChangeAuthPlan/AppChangeAuthPlan/AppChangeAuthPlanList.vue')
} }
] ]
} }

19
src/views/accounts/GatheredUser/index.vue
View File

@@ -1,21 +1,14 @@
<template> <template>
<TabPage :active-menu.sync="config.activeMenu" :submenu="config.submenu"> <TabPage :active-menu.sync="config.activeMenu" :submenu="config.submenu" />
<keep-alive>
<component :is="config.activeMenu" />
</keep-alive>
</TabPage>
</template> </template>
<script> <script>
import { TabPage } from '@/layout/components' import { TabPage } from '@/layout/components'
import GatheredUserList from './GatheredUserList'
import TaskList from './TaskList'
export default { export default {
name: 'Index', name: 'Index',
components: { components: {
TabPage, TabPage
GatheredUserList,
TaskList
}, },
data() { data() {
return { return {
@@ -25,12 +18,14 @@ export default {
{ {
title: this.$t('xpack.GatherUser.GatherUserList'), title: this.$t('xpack.GatherUser.GatherUserList'),
name: 'GatheredUserList', name: 'GatheredUserList',
hidden: !this.$hasPerm('assets.view_gathereduser') hidden: !this.$hasPerm('assets.view_gathereduser'),
component: () => import('@/views/accounts/GatheredUser/GatheredUserList.vue')
}, },
{ {
title: this.$t('xpack.GatherUser.GatherUserTaskList'), title: this.$t('xpack.GatherUser.GatherUserTaskList'),
name: 'TaskList', name: 'TaskList',
hidden: !this.$hasPerm('xpack.view_gatherusertask') hidden: !this.$hasPerm('xpack.view_gatherusertask'),
component: () => import('@/views/accounts/GatheredUser/TaskList.vue')
} }
] ]
} }

20
src/views/users/Role/RoleList/index.vue
View File

@@ -3,22 +3,16 @@
<div slot="title"> <div slot="title">
{{ Title }} {{ Title }}
</div> </div>
<keep-alive exclude="SysRoleList,OrgRoleList">
<component :is="config.activeMenu" />
</keep-alive>
</TabPage> </TabPage>
</template> </template>
<script> <script>
import { TabPage } from '@/layout/components' import { TabPage } from '@/layout/components'
import OrgRoleList from './OrgRoleList'
import SysRoleList from './SysRoleList'
export default { export default {
name: 'Index', name: 'Index',
components: { components: {
TabPage, TabPage
SysRoleList,
OrgRoleList
}, },
data() { data() {
return { return {
@@ -28,16 +22,14 @@ export default {
{ {
title: this.$t('route.SystemRole'), title: this.$t('route.SystemRole'),
name: 'SysRoleList', name: 'SysRoleList',
hidden: () => { hidden: () => !this.$hasPerm('rbac.view_systemrole'),
return !this.$hasPerm('rbac.view_systemrole') component: () => import('@/views/users/Role/RoleList/SysRoleList.vue')
}
}, },
{ {
title: this.$t('route.OrgRole'), title: this.$t('route.OrgRole'),
name: 'OrgRoleList', name: 'OrgRoleList',
hidden: () => { hidden: () => !this.$store.getters.hasValidLicense || !this.$hasPerm('rbac.view_orgrole'),
return !this.$store.getters.hasValidLicense || !this.$hasPerm('rbac.view_orgrole') component: () => import('@/views/users/Role/RoleList/OrgRoleList.vue')
}
} }
] ]
} }