Merge pull request #4917 from jumpserver/pr@v3@fix_special_drag

Fixed: Special Drag
This commit is contained in:
八千流 2025-03-27 09:27:56 +08:00 committed by GitHub
commit 4162bdb74d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 54 additions and 3 deletions

View File

@ -3,7 +3,7 @@
<table style="width: 100%"> <table style="width: 100%">
<tr> <tr>
<td colspan="2"> <td colspan="2">
<AssetSelect ref="assetSelect" :can-select="canSelect" :disabled="disabled" /> <AssetSelect ref="assetSelect" :can-select="canSelect" :disabled="disabled" :tree-setting="treeSetting" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -59,6 +59,10 @@ export default {
default(row, index) { default(row, index) {
return true return true
} }
},
treeSetting: {
type: Object,
default: () => {}
} }
}, },
data() { data() {

View File

@ -108,6 +108,11 @@ export default {
url: this.typeUrl, url: this.typeUrl,
nodeUrl: this.treeSetting?.nodeUrl || this.nodeUrl, nodeUrl: this.treeSetting?.nodeUrl || this.nodeUrl,
treeUrl: `${this.typeUrl}?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`, treeUrl: `${this.typeUrl}?assets=${showAssets ? '1' : '0'}&count_resource=${this.treeSetting.countResource || 'asset'}`,
edit: {
drag: {
isMove: false
}
},
callback: { callback: {
onSelected: (event, treeNode) => this.getAssetsUrl(treeNode) onSelected: (event, treeNode) => this.getAssetsUrl(treeNode)
} }

View File

@ -51,6 +51,11 @@ export default {
url: this.tableUrl, url: this.tableUrl,
// ?assets=0. =1 // ?assets=0. =1
treeUrl: this.treeUrl, treeUrl: this.treeUrl,
edit: {
drag: {
isMove: false
}
},
callback: { callback: {
onSelected: (event, node) => vm.onSelected(node, vm), onSelected: (event, node) => vm.onSelected(node, vm),
refresh: vm.refreshObjectAssetPermission refresh: vm.refreshObjectAssetPermission

View File

@ -30,7 +30,12 @@ export default {
showMenu: false, showMenu: false,
showAssets: true, showAssets: true,
url: '/api/v1/accounts/accounts/', url: '/api/v1/accounts/accounts/',
countResource: 'account' countResource: 'account',
edit: {
drag: {
isMove: false
}
}
} }
} }
} }

View File

@ -36,6 +36,11 @@ export default {
this.tableConfig.url = `/api/v1/perms/users/self/nodes/${currentNodeId}/assets/?cache_policy=1` this.tableConfig.url = `/api/v1/perms/users/self/nodes/${currentNodeId}/assets/?cache_policy=1`
} }
}.bind(this) }.bind(this)
},
edit: {
drag: {
isMove: false
}
} }
}, },
tableConfig: { tableConfig: {

View File

@ -205,6 +205,11 @@ export default {
view: { view: {
dblClickExpand: false, dblClickExpand: false,
showLine: true showLine: true
},
edit: {
drag: {
isMove: false
}
} }
}, },
iShowTree: true, iShowTree: true,

View File

@ -290,6 +290,11 @@ export default {
view: { view: {
dblClickExpand: false, dblClickExpand: false,
showLine: true showLine: true
},
edit: {
drag: {
isMove: false
}
} }
}, },
iShowTree: true iShowTree: true

View File

@ -107,6 +107,13 @@ export default {
this.$log.debug('AssetSelect value', that.assets) this.$log.debug('AssetSelect value', that.assets)
this.$message.success(this.$tc('common.updateSuccessMsg')) this.$message.success(this.$tc('common.updateSuccessMsg'))
this.$store.commit('common/reload') this.$store.commit('common/reload')
},
treeSetting: {
edit: {
drag: {
isMove: false
}
}
} }
}, },
nodeRelationConfig: { nodeRelationConfig: {

View File

@ -39,7 +39,12 @@ export default {
notShowBuiltinTree: true, notShowBuiltinTree: true,
url: '/api/v1/perms/asset-permissions/', url: '/api/v1/perms/asset-permissions/',
nodeUrl: '/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: { tableConfig: {
url: '/api/v1/perms/asset-permissions/', url: '/api/v1/perms/asset-permissions/',

View File

@ -54,6 +54,11 @@ export default {
showRefresh: true, showRefresh: true,
showSearch: false, showSearch: false,
treeUrl: '', treeUrl: '',
edit: {
drag: {
isMove: false
}
},
check: { check: {
enable: true enable: true
}, },