Merge pull request #3948 from jumpserver/pr@v4@tree

perf: gather account and connect asset tree css
This commit is contained in:
feng626 2024-05-17 17:17:36 +08:00 committed by GitHub
commit ef25720797
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 13 additions and 6 deletions

View File

@ -1,16 +1,20 @@
<template>
<TreeTable :header-actions="headerActions" :table-config="tableConfig" :tree-setting="treeSetting" />
<AssetTreeTable
:header-actions="headerActions"
:table-config="tableConfig"
:tree-setting="treeSetting"
/>
</template>
<script type="text/jsx">
import TreeTable from '../../Table/TreeTable/index.vue'
import AssetTreeTable from '@/components/Apps/AssetTreeTable'
import { AccountInfoFormatter, DetailFormatter } from '@/components/Table/TableFormatters'
import { connectivityMeta } from '@/components/Apps/AccountListTable/const'
export default {
name: 'GrantedAssets',
components: {
TreeTable
AssetTreeTable
},
props: {
treeUrl: {
@ -54,6 +58,7 @@ export default {
url: this.tableUrl,
// ?assets=0. =1
treeUrl: this.treeUrl,
notShowBuiltinTree: true,
callback: {
onSelected: (event, node) => vm.onSelected(node, vm),
refresh: vm.refreshObjectAssetPermission

View File

@ -5,7 +5,8 @@
:accounts="gatherAccounts"
:visible.sync="showDeleteAccountDialog"
/>
<TreeTable
<AssetTreeTable
ref="AssetTreeTable"
:header-actions="headerActions"
:table-config="tableConfig"
:tree-setting="treeSetting"
@ -14,14 +15,14 @@
</template>
<script>
import TreeTable from '@/components/Table/TreeTable'
import AssetTreeTable from '@/components/Apps/AssetTreeTable'
import { toSafeLocalDateStr } from '@/utils/common'
import { ActionsFormatter } from '@/components/Table/TableFormatters'
import RemoveAccount from '@/components/Apps/AccountListTable/RemoveAccount.vue'
export default {
components: {
TreeTable,
AssetTreeTable,
RemoveAccount
},
data() {
@ -34,6 +35,7 @@ export default {
showRefresh: true,
showSearch: true,
showAssets: true,
notShowBuiltinTree: true,
url: '/api/v1/accounts/gathered-accounts/',
nodeUrl: '/api/v1/assets/nodes/',
// ?assets=0. =1