github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-08-06 17:25:03 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/Apps/GrantedAssets/index.vue
View File

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

8
src/views/accounts/AccountGather/AccountGatherList.vue
View File

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