mirror of
https://github.com/jumpserver/lina.git
synced 2025-09-19 09:43:32 +00:00
fixed: Fixed an issue where the jump of skippable table data failed
This commit is contained in:
@@ -87,7 +87,9 @@ export default {
|
||||
console.error('No route found')
|
||||
return
|
||||
}
|
||||
|
||||
let detailRoute = { replace: true }
|
||||
|
||||
if (typeof route === 'string') {
|
||||
detailRoute.name = route
|
||||
detailRoute.params = { id: this.row.id }
|
||||
@@ -98,10 +100,6 @@ export default {
|
||||
const routeQuery = this.formatterArgs.routeQuery
|
||||
if (routeQuery && typeof routeQuery === 'object') {
|
||||
detailRoute.query = this.formatterArgs.routeQuery
|
||||
|
||||
if (detailRoute.query.tab) {
|
||||
detailRoute.name = detailRoute.query.tab
|
||||
}
|
||||
}
|
||||
return detailRoute
|
||||
},
|
||||
|
@@ -113,9 +113,9 @@ export default {
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
$route(to, from) {
|
||||
this.$router.go(0)
|
||||
}
|
||||
// $route(to, from) {
|
||||
// this.$router.go(0)
|
||||
// }
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
@@ -78,6 +78,3 @@ export default {
|
||||
}
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="less" scoped>
|
||||
</style>
|
||||
|
@@ -35,6 +35,7 @@ export const AssetPermissionTableMeta = {
|
||||
name: {
|
||||
minWidth: '120px',
|
||||
formatterArgs: {
|
||||
route: 'AssetPermissionDetail',
|
||||
routeQuery: {
|
||||
tab: 'AssetPermissionDetail'
|
||||
}
|
||||
|
@@ -7,24 +7,31 @@
|
||||
</template>
|
||||
|
||||
<script>
|
||||
import { GenericDetailPage } from '@/layout/components'
|
||||
import UserAssetPermissionRules from './UserAssetPermissionRules'
|
||||
import UserGrantedAssets from './UserGrantedAssets'
|
||||
import UserInfo from './UserInfo'
|
||||
import UserLoginAcl from './UserLoginAcl.vue'
|
||||
import UserSession from './UserSession.vue'
|
||||
import AssetPermissionDetail from '@/views/perms/AssetPermission/AssetPermissionDetail/index.vue'
|
||||
import { mapGetters } from 'vuex'
|
||||
import { GenericDetailPage } from '@/layout/components'
|
||||
|
||||
import UserInfo from './UserInfo'
|
||||
import UserSession from './UserSession.vue'
|
||||
import UserLoginAcl from './UserLoginAcl.vue'
|
||||
import UserGrantedAssets from './UserGrantedAssets'
|
||||
import AssetPermissionUser from '@/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionUser.vue'
|
||||
import AssetPermissionAsset from '@/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAsset.vue'
|
||||
import AssetPermissionDetail from '@/views/perms/AssetPermission/AssetPermissionDetail/index.vue'
|
||||
import AssetPermissionAccount from '@/views/perms/AssetPermission/AssetPermissionDetail/AssetPermissionAccount.vue'
|
||||
import UserAssetPermissionRules from './UserAssetPermissionRules'
|
||||
|
||||
export default {
|
||||
components: {
|
||||
UserInfo,
|
||||
UserSession,
|
||||
UserLoginAcl,
|
||||
GenericDetailPage,
|
||||
UserGrantedAssets,
|
||||
UserAssetPermissionRules,
|
||||
AssetPermissionUser,
|
||||
AssetPermissionAsset,
|
||||
AssetPermissionDetail,
|
||||
UserSession
|
||||
AssetPermissionAccount,
|
||||
UserAssetPermissionRules
|
||||
},
|
||||
data() {
|
||||
const vm = this
|
||||
@@ -78,7 +85,3 @@ export default {
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style lang='scss' scoped>
|
||||
|
||||
</style>
|
||||
|
@@ -59,6 +59,14 @@ export default {
|
||||
]
|
||||
},
|
||||
columnsMeta: {
|
||||
name: {
|
||||
formatterArgs: {
|
||||
route: 'UserDetail',
|
||||
routeQuery: {
|
||||
tab: 'UserInfo'
|
||||
}
|
||||
}
|
||||
},
|
||||
mfa_level: {
|
||||
width: '75px'
|
||||
},
|
||||
|
Reference in New Issue
Block a user