mirror of
https://github.com/jumpserver/lina.git
synced 2025-04-27 19:15:13 +00:00
Merge pull request #4917 from jumpserver/pr@v3@fix_special_drag
Fixed: Special Drag
This commit is contained in:
commit
4162bdb74d
@ -3,7 +3,7 @@
|
||||
<table style="width: 100%">
|
||||
<tr>
|
||||
<td colspan="2">
|
||||
<AssetSelect ref="assetSelect" :can-select="canSelect" :disabled="disabled" />
|
||||
<AssetSelect ref="assetSelect" :can-select="canSelect" :disabled="disabled" :tree-setting="treeSetting" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -59,6 +59,10 @@ export default {
|
||||
default(row, index) {
|
||||
return true
|
||||
}
|
||||
},
|
||||
treeSetting: {
|
||||
type: Object,
|
||||
default: () => {}
|
||||
}
|
||||
},
|
||||
data() {
|
||||
|
@ -108,6 +108,11 @@ export default {
|
||||
url: this.typeUrl,
|
||||
nodeUrl: this.treeSetting?.nodeUrl || this.nodeUrl,
|
||||
treeUrl: `${this.typeUrl}?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
|
||||
edit: {
|
||||
drag: {
|
||||
isMove: false
|
||||
}
|
||||
},
|
||||
callback: {
|
||||
onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
|
||||
}
|
||||
|
@ -51,6 +51,11 @@ export default {
|
||||
url: this.tableUrl,
|
||||
// ?assets=0不显示资产. =1显示资产
|
||||
treeUrl: this.treeUrl,
|
||||
edit: {
|
||||
drag: {
|
||||
isMove: false
|
||||
}
|
||||
},
|
||||
callback: {
|
||||
onSelected: (event, node) => vm.onSelected(node, vm),
|
||||
refresh: vm.refreshObjectAssetPermission
|
||||
|
@ -30,7 +30,12 @@ export default {
|
||||
showMenu: false,
|
||||
showAssets: true,
|
||||
url: '/api/v1/accounts/accounts/',
|
||||
countResource: 'account'
|
||||
countResource: 'account',
|
||||
edit: {
|
||||
drag: {
|
||||
isMove: false
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -36,6 +36,11 @@ export default {
|
||||
this.tableConfig.url = `/api/v1/perms/users/self/nodes/${currentNodeId}/assets/?cache_policy=1`
|
||||
}
|
||||
}.bind(this)
|
||||
},
|
||||
edit: {
|
||||
drag: {
|
||||
isMove: false
|
||||
}
|
||||
}
|
||||
},
|
||||
tableConfig: {
|
||||
|
@ -205,6 +205,11 @@ export default {
|
||||
view: {
|
||||
dblClickExpand: false,
|
||||
showLine: true
|
||||
},
|
||||
edit: {
|
||||
drag: {
|
||||
isMove: false
|
||||
}
|
||||
}
|
||||
},
|
||||
iShowTree: true,
|
||||
|
@ -290,6 +290,11 @@ export default {
|
||||
view: {
|
||||
dblClickExpand: false,
|
||||
showLine: true
|
||||
},
|
||||
edit: {
|
||||
drag: {
|
||||
isMove: false
|
||||
}
|
||||
}
|
||||
},
|
||||
iShowTree: true
|
||||
|
@ -107,6 +107,13 @@ export default {
|
||||
this.$log.debug('AssetSelect value', that.assets)
|
||||
this.$message.success(this.$tc('common.updateSuccessMsg'))
|
||||
this.$store.commit('common/reload')
|
||||
},
|
||||
treeSetting: {
|
||||
edit: {
|
||||
drag: {
|
||||
isMove: false
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
nodeRelationConfig: {
|
||||
|
@ -39,7 +39,12 @@ export default {
|
||||
notShowBuiltinTree: true,
|
||||
url: '/api/v1/perms/asset-permissions/',
|
||||
nodeUrl: '/api/v1/perms/asset-permissions/',
|
||||
treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1'
|
||||
treeUrl: '/api/v1/assets/nodes/children/tree/?assets=1',
|
||||
edit: {
|
||||
drag: {
|
||||
isMove: false
|
||||
}
|
||||
}
|
||||
},
|
||||
tableConfig: {
|
||||
url: '/api/v1/perms/asset-permissions/',
|
||||
|
@ -54,6 +54,11 @@ export default {
|
||||
showRefresh: true,
|
||||
showSearch: false,
|
||||
treeUrl: '',
|
||||
edit: {
|
||||
drag: {
|
||||
isMove: false
|
||||
}
|
||||
},
|
||||
check: {
|
||||
enable: true
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user