mirror of
https://github.com/jumpserver/lina.git
synced 2025-09-19 17:54:37 +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')
|
console.error('No route found')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
let detailRoute = { replace: true }
|
let detailRoute = { replace: true }
|
||||||
|
|
||||||
if (typeof route === 'string') {
|
if (typeof route === 'string') {
|
||||||
detailRoute.name = route
|
detailRoute.name = route
|
||||||
detailRoute.params = { id: this.row.id }
|
detailRoute.params = { id: this.row.id }
|
||||||
@@ -98,10 +100,6 @@ export default {
|
|||||||
const routeQuery = this.formatterArgs.routeQuery
|
const routeQuery = this.formatterArgs.routeQuery
|
||||||
if (routeQuery && typeof routeQuery === 'object') {
|
if (routeQuery && typeof routeQuery === 'object') {
|
||||||
detailRoute.query = this.formatterArgs.routeQuery
|
detailRoute.query = this.formatterArgs.routeQuery
|
||||||
|
|
||||||
if (detailRoute.query.tab) {
|
|
||||||
detailRoute.name = detailRoute.query.tab
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return detailRoute
|
return detailRoute
|
||||||
},
|
},
|
||||||
|
@@ -113,9 +113,9 @@ export default {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
$route(to, from) {
|
// $route(to, from) {
|
||||||
this.$router.go(0)
|
// this.$router.go(0)
|
||||||
}
|
// }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@@ -78,6 +78,3 @@ export default {
|
|||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="less" scoped>
|
|
||||||
</style>
|
|
||||||
|
@@ -35,6 +35,7 @@ export const AssetPermissionTableMeta = {
|
|||||||
name: {
|
name: {
|
||||||
minWidth: '120px',
|
minWidth: '120px',
|
||||||
formatterArgs: {
|
formatterArgs: {
|
||||||
|
route: 'AssetPermissionDetail',
|
||||||
routeQuery: {
|
routeQuery: {
|
||||||
tab: 'AssetPermissionDetail'
|
tab: 'AssetPermissionDetail'
|
||||||
}
|
}
|
||||||
|
@@ -7,24 +7,31 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script>
|
<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 { 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 {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
UserInfo,
|
UserInfo,
|
||||||
|
UserSession,
|
||||||
UserLoginAcl,
|
UserLoginAcl,
|
||||||
GenericDetailPage,
|
GenericDetailPage,
|
||||||
UserGrantedAssets,
|
UserGrantedAssets,
|
||||||
UserAssetPermissionRules,
|
AssetPermissionUser,
|
||||||
|
AssetPermissionAsset,
|
||||||
AssetPermissionDetail,
|
AssetPermissionDetail,
|
||||||
UserSession
|
AssetPermissionAccount,
|
||||||
|
UserAssetPermissionRules
|
||||||
},
|
},
|
||||||
data() {
|
data() {
|
||||||
const vm = this
|
const vm = this
|
||||||
@@ -78,7 +85,3 @@ export default {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang='scss' scoped>
|
|
||||||
|
|
||||||
</style>
|
|
||||||
|
@@ -59,6 +59,14 @@ export default {
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
columnsMeta: {
|
columnsMeta: {
|
||||||
|
name: {
|
||||||
|
formatterArgs: {
|
||||||
|
route: 'UserDetail',
|
||||||
|
routeQuery: {
|
||||||
|
tab: 'UserInfo'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
mfa_level: {
|
mfa_level: {
|
||||||
width: '75px'
|
width: '75px'
|
||||||
},
|
},
|
||||||
|
Reference in New Issue
Block a user