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

Merge pull request #747 from jumpserver/pr@dev@fix_create_asset_node_lost

Browse Source 
fix(assets): 修复选中资产创建时，没有默认选中节点的问题
This commit is contained in:
Orange 2021-04-15 16:19:51 +08:00 committed by GitHub
commit 2bc4b53159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/components/AutoDataZTree/index.vue
View File

@ -100,15 +100,19 @@ export default {
if (this.setting.url.indexOf('?') !== -1) {
combinator = '&'
}
let url = ''
const query = Object.assign({}, this.$route.query)
if (treeNode.meta.type === 'node') {
this.currentNode = treeNode
this.currentNodeId = treeNode.meta.node.id
this.$route.query['node'] = this.currentNodeId
this.$emit('urlChange', `${this.setting.url}${combinator}node_id=${treeNode.meta.node.id}&show_current_asset=${show_current_asset}`)
query['node'] = this.currentNodeId
url = `${this.setting.url}${combinator}node_id=${treeNode.meta.node.id}&show_current_asset=${show_current_asset}`
} else if (treeNode.meta.type === 'asset') {
this.$route.query['asset'] = treeNode.meta.asset.id
this.$emit('urlChange', `${this.setting.url}${combinator}asset_id=${treeNode.meta.asset.id}&show_current_asset=${show_current_asset}`)
query['asset'] = treeNode.meta.asset.id
url = `${this.setting.url}${combinator}asset_id=${treeNode.meta.asset.id}&show_current_asset=${show_current_asset}`
}
this.$router.push({ query })
this.$emit('urlChange', url)
},
removeTreeNode: function() {
this.hideRMenu()
@ -242,7 +246,6 @@ export default {
})
},
refresh: function() {
},
getSelectedNodes: function() {
return this.zTree.getSelectedNodes()

1
src/components/TreeTable/index.vue
View File

@ -72,7 +72,6 @@ export default {
watch: {
treeConfig: {
handler(val) {
},
deep: true
}