7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

acl

This commit is contained in:
wang-liang0615 2023-07-27 15:30:27 +08:00
parent 6ccb2e74e0
commit 0283af812c
11 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue
View File

@ -286,7 +286,7 @@ export default {
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = { ...queryParams, app_id: this.app_id } this.queryParams = { ...this.queryParams, ...queryParams, app_id: this.app_id }
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },

7
cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue
View File

@ -212,7 +212,12 @@ export default {
// searchForm相关 // searchForm相关
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = { ...queryParams, app_id: this.app_id, scope: this.checked ? 'resource_group' : 'resource' } this.queryParams = {
...this.queryParams,
...queryParams,
app_id: this.app_id,
scope: this.checked ? 'resource_group' : 'resource',
}
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
searchFormReset() { searchFormReset() {

2
cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue
View File

@ -179,7 +179,7 @@ export default {
// searchForm相关 // searchForm相关
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = { ...queryParams, app_id: this.app_id, scope: 'resource_type' } this.queryParams = { ...this.queryParams, ...queryParams, app_id: this.app_id, scope: 'resource_type' }
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
searchFormReset() { searchFormReset() {

7
cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
View File

@ -220,7 +220,12 @@ export default {
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = { ...queryParams, app_id: this.app_id, scope: this.checked ? 'role_relation' : 'role' } this.queryParams = {
...this.queryParams,
...queryParams,
app_id: this.app_id,
scope: this.checked ? 'role_relation' : 'role',
}
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
searchFormReset() { searchFormReset() {

2
cmdb-ui/src/modules/acl/views/module/searchForm.vue
View File

@ -147,7 +147,6 @@ export default {
expand: false, expand: false,
queryParams: { queryParams: {
page: 1, page: 1,
page_size: 50,
}, },
date: undefined, date: undefined,
checked: false, checked: false,
@ -188,7 +187,6 @@ export default {
handleReset() { handleReset() {
this.queryParams = { this.queryParams = {
page: 1, page: 1,
page_size: 50,
} }
this.date = undefined this.date = undefined
this.$emit('searchFormReset') this.$emit('searchFormReset')

2
cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
View File

@ -200,7 +200,7 @@ export default {
// searchForm相关 // searchForm相关
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = queryParams this.queryParams = { ...this.queryParams, ...queryParams }
this.queryParams.app_id = this.app_id this.queryParams.app_id = this.app_id
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },

2
cmdb-ui/src/modules/acl/views/operation_history/modules/permissionTable.vue
View File

@ -348,7 +348,7 @@ export default {
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = queryParams this.queryParams = { ...this.queryParams, ...queryParams }
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
handleExpandChange(expand) { handleExpandChange(expand) {

2
cmdb-ui/src/modules/acl/views/operation_history/modules/resourceHistoryTable.vue
View File

@ -267,7 +267,7 @@ export default {
this.isExpand = expand this.isExpand = expand
}, },
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = { ...queryParams, scope: this.checked ? 'resource_group' : 'resource' } this.queryParams = { ...this.queryParams, ...queryParams, scope: this.checked ? 'resource_group' : 'resource' }
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
searchFormReset() { searchFormReset() {

2
cmdb-ui/src/modules/acl/views/operation_history/modules/resourceTypeHistoryTable.vue
View File

@ -217,7 +217,7 @@ export default {
this.isExpand = expand this.isExpand = expand
}, },
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = { ...queryParams, scope: 'resource_type' } this.queryParams = { ...this.queryParams, ...queryParams, scope: 'resource_type' }
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
searchFormReset() { searchFormReset() {

2
cmdb-ui/src/modules/acl/views/operation_history/modules/roleHistoryTable.vue
View File

@ -231,7 +231,7 @@ export default {
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = { ...queryParams, scope: this.checked ? 'role_relation' : 'role' } this.queryParams = { ...this.queryParams, ...queryParams, scope: this.checked ? 'role_relation' : 'role' }
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
searchFormReset() { searchFormReset() {

2
cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue
View File

@ -241,7 +241,7 @@ export default {
this.isExpand = expand this.isExpand = expand
}, },
handleSearch(queryParams) { handleSearch(queryParams) {
this.queryParams = queryParams this.queryParams = { ...this.queryParams, ...queryParams }
this.getTable(this.queryParams) this.getTable(this.queryParams)
}, },
searchFormReset() { searchFormReset() {