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

Merge pull request #131 from veops/dev_ui 

前端acl
This commit is contained in:
pycook 2023-07-28 18:03:36 +08:00 committed by GitHub
parent b787bd9b7b 928149f2a0
commit 252003f76d
13 changed files with 386 additions and 778 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,6 +78,7 @@
</template>
<script>
import _ from 'lodash'
import Pager from './pager.vue'
import SearchForm from './searchForm.vue'
import { searchPermissonHistory } from '@/modules/acl/api/history'
@ -251,23 +252,25 @@ export default {
},
// 处理查询参数
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let q = ''
for (const key in queryParams) {
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
key !== 'app_id' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
if (q) q += `,${key}:${queryParams[key]}`
else q += `${key}:${queryParams[key]}`
delete queryParams[key]
if (q) q += `,${key}:${_queryParams[key]}`
else q += `${key}:${_queryParams[key]}`
delete _queryParams[key]
}
}
const newQueryParams = { ...queryParams, q }
return q ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return q ? newQueryParams : _queryParams
},
// searchForm相关
@ -283,7 +286,7 @@ export default {
this.getTable(this.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)
},

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

@ -212,7 +212,12 @@ export default {
// searchForm相关
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)
},
searchFormReset() {
@ -245,9 +250,11 @@ export default {
},
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let flag = false
let q = queryParams.q ? queryParams.q : ''
for (const key in queryParams) {
let q = _queryParams.q ? _queryParams.q : ''
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
@ -255,16 +262,16 @@ export default {
key !== 'q' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
flag = true
if (q) q += `,${key}:${queryParams[key]}`
else q += `${key}:${queryParams[key]}`
delete queryParams[key]
if (q) q += `,${key}:${_queryParams[key]}`
else q += `${key}:${_queryParams[key]}`
delete _queryParams[key]
}
}
const newQueryParams = { ...queryParams, q }
return flag ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return flag ? newQueryParams : _queryParams
},
handleTagColor(operateType) {
return this.colorMap.get(operateType)

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

@ -179,7 +179,7 @@ export default {
// searchForm相关
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)
},
searchFormReset() {
@ -206,9 +206,11 @@ export default {
},
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let flag = false
let q = queryParams.q ? queryParams.q : ''
for (const key in queryParams) {
let q = _queryParams.q ? _queryParams.q : ''
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
@ -216,16 +218,16 @@ export default {
key !== 'q' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
flag = true
if (q) q += `,${key}:${queryParams[key]}`
else q += `${key}:${queryParams[key]}`
delete queryParams[key]
if (q) q += `,${key}:${_queryParams[key]}`
else q += `${key}:${_queryParams[key]}`
delete _queryParams[key]
}
}
const newQueryParams = { ...queryParams, q }
return flag ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return flag ? newQueryParams : _queryParams
},
handleTagColor(operateType) {
return this.colorMap.get(operateType)

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

@ -220,7 +220,12 @@ export default {
this.getTable(this.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)
},
searchFormReset() {
@ -237,9 +242,11 @@ export default {
// 处理查询参数
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let flag = false
let q = queryParams.q ? queryParams.q : ''
for (const key in queryParams) {
let q = _queryParams.q ? _queryParams.q : ''
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
@ -247,16 +254,16 @@ export default {
key !== 'q' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
flag = true
if (q) q += `,${key}:${queryParams[key]}`
else q += `${key}:${queryParams[key]}`
delete queryParams[key]
if (q) q += `,${key}:${_queryParams[key]}`
else q += `${key}:${_queryParams[key]}`
delete _queryParams[key]
}
}
const newQueryParams = { ...queryParams, q }
return flag ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return flag ? newQueryParams : _queryParams
},
// 处理tag颜色
handleTagColor(operateType) {

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

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

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

@ -200,7 +200,7 @@ export default {
// searchForm相关
handleSearch(queryParams) {
this.queryParams = queryParams
this.queryParams = { ...this.queryParams, ...queryParams }
this.queryParams.app_id = this.app_id
this.getTable(this.queryParams)
},
@ -281,25 +281,27 @@ export default {
}
},
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let q = ''
for (const key in queryParams) {
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
key !== 'app_id' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
if (q) {
q += `,${key}:${queryParams[key]}`
q += `,${key}:${_queryParams[key]}`
} else {
q += `${key}:${queryParams[key]}`
q += `${key}:${_queryParams[key]}`
}
}
}
const newQueryParams = { ...queryParams, q }
return q ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return q ? newQueryParams : _queryParams
},
handleTagColor(operateType) {
return this.colorMap.get(operateType)

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

@ -79,6 +79,7 @@
</template>
<script>
import _ from 'lodash'
import debounce from 'lodash/debounce'
import Pager from '../../module/pager.vue'
import SearchForm from '../../module/searchForm.vue'
@ -347,7 +348,7 @@ export default {
this.getTable(this.queryParams)
},
handleSearch(queryParams) {
this.queryParams = queryParams
this.queryParams = { ...this.queryParams, ...queryParams }
this.getTable(this.queryParams)
},
handleExpandChange(expand) {
@ -387,23 +388,24 @@ export default {
},
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let q = ''
for (const key in queryParams) {
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
key !== 'app_id' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
if (q) q += `,${key}:${queryParams[key]}`
else q += `${key}:${queryParams[key]}`
delete queryParams[key]
if (q) q += `,${key}:${_queryParams[key]}`
else q += `${key}:${_queryParams[key]}`
delete _queryParams[key]
}
}
const newQueryParams = { ...queryParams, q }
return q ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return q ? newQueryParams : _queryParams
},
},
}

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

@ -267,7 +267,7 @@ export default {
this.isExpand = expand
},
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)
},
searchFormReset() {
@ -317,9 +317,11 @@ export default {
},
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let flag = false
let q = queryParams.q ? queryParams.q : ''
for (const key in queryParams) {
let q = _queryParams.q ? _queryParams.q : ''
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
@ -327,16 +329,16 @@ export default {
key !== 'q' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
flag = true
if (q) q += `,${key}:${queryParams[key]}`
else q += `${key}:${queryParams[key]}`
delete queryParams[key]
if (q) q += `,${key}:${_queryParams[key]}`
else q += `${key}:${_queryParams[key]}`
delete _queryParams[key]
}
}
const newQueryParams = { ...queryParams, q }
return flag ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return flag ? newQueryParams : _queryParams
},
handleTagColor(operateType) {
return this.colorMap.get(operateType)

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

@ -217,7 +217,7 @@ export default {
this.isExpand = expand
},
handleSearch(queryParams) {
this.queryParams = { ...queryParams, scope: 'resource_type' }
this.queryParams = { ...this.queryParams, ...queryParams, scope: 'resource_type' }
this.getTable(this.queryParams)
},
searchFormReset() {
@ -253,9 +253,11 @@ export default {
},
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let flag = false
let q = queryParams.q ? queryParams.q : ''
for (const key in queryParams) {
let q = _queryParams.q ? _queryParams.q : ''
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
@ -263,16 +265,16 @@ export default {
key !== 'q' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
flag = true
if (q) q += `,${key}:${queryParams[key]}`
else q += `${key}:${queryParams[key]}`
delete queryParams[key]
if (q) q += `,${key}:${_queryParams[key]}`
else q += `${key}:${_queryParams[key]}`
delete _queryParams[key]
}
}
const newQueryParams = { ...queryParams, q }
return flag ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return flag ? newQueryParams : _queryParams
},
handleTagColor(operateType) {
return this.colorMap.get(operateType)

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

@ -231,7 +231,7 @@ export default {
this.getTable(this.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)
},
searchFormReset() {
@ -247,9 +247,10 @@ export default {
// 处理查询参数
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let flag = false
let q = queryParams.q ? queryParams.q : ''
for (const key in queryParams) {
let q = _queryParams.q ? _queryParams.q : ''
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
@ -257,16 +258,16 @@ export default {
key !== 'q' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
flag = true
if (q) q += `,${key}:${queryParams[key]}`
else q += `${key}:${queryParams[key]}`
delete queryParams[key]
if (q) q += `,${key}:${_queryParams[key]}`
else q += `${key}:${_queryParams[key]}`
delete _queryParams[key]
}
}
const newQueryParams = { ...queryParams, q }
return flag ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return flag ? newQueryParams : _queryParams
},
// 处理tag颜色
handleTagColor(operateType) {

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

@ -241,7 +241,7 @@ export default {
this.isExpand = expand
},
handleSearch(queryParams) {
this.queryParams = queryParams
this.queryParams = { ...this.queryParams, ...queryParams }
this.getTable(this.queryParams)
},
searchFormReset() {
@ -326,25 +326,27 @@ export default {
}
},
handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let q = ''
for (const key in queryParams) {
for (const key in _queryParams) {
if (
key !== 'page' &&
key !== 'page_size' &&
key !== 'app_id' &&
key !== 'start' &&
key !== 'end' &&
queryParams[key] !== undefined
_queryParams[key] !== undefined
) {
if (q) {
q += `,${key}:${queryParams[key]}`
q += `,${key}:${_queryParams[key]}`
} else {
q += `${key}:${queryParams[key]}`
q += `${key}:${_queryParams[key]}`
}
}
}
const newQueryParams = { ...queryParams, q }
return q ? newQueryParams : queryParams
const newQueryParams = { ..._queryParams, q }
return q ? newQueryParams : _queryParams
},
handleTagColor(operateType) {
return this.colorMap.get(operateType)

6
cmdb-ui/src/views/setting/companyStructure/index.vue
View File

@ -534,7 +534,7 @@ export default {
})
},
getAllFlatEmployees() {
getEmployeeList({ block_status: 0, page_size: 99999 }).then((res) => {
getEmployeeList({ block_status: -1, page_size: 99999 }).then((res) => {
this.allFlatEmployees = res.data_list
})
},
@ -721,7 +721,7 @@ export default {
this.loading = false
},
updateAll() {
this.expression = []
// this.expression = []
this.updateCount()
this.updateTableDataByFilter()
},
@ -774,7 +774,7 @@ export default {
},
reset() {
this.filterName = ''
this.$refs.filterComp.expression = ''
this.$refs.filterComp.expression = []
this.updateTableDataByFilter()
},
handleSearch(expression) {

958
cmdb-ui/src/views/setting/components/employeeTable.vue
View File

File diff suppressed because it is too large Load Diff