Skip to content

Commit

Permalink
Merge pull request #131 from veops/dev_ui
Browse files Browse the repository at this point in the history 
前端acl
  • Loading branch information
@pycook
pycook authored Jul 28, 2023
2 parents 2df6e96 + c6b4414 commit a442787
Show file tree
Hide file tree
Showing 13 changed files with 386 additions and 778 deletions.
19 changes: 11 additions & 8 deletions cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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相关
Expand All @@ -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)
},
Expand Down
25 changes: 16 additions & 9 deletions cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -245,26 +250,28 @@ 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' &&
key !== 'app_id' &&
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)
Expand Down
20 changes: 11 additions & 9 deletions cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -206,26 +206,28 @@ 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' &&
key !== 'app_id' &&
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)
Expand Down
25 changes: 16 additions & 9 deletions cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand All @@ -237,26 +242,28 @@ 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' &&
key !== 'app_id' &&
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) {
Expand Down
2 changes: 0 additions & 2 deletions cmdb-ui/src/modules/acl/views/module/searchForm.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ export default {
expand: false,
queryParams: {
page: 1,
page_size: 50,
},
date: undefined,
checked: false,
Expand Down Expand Up @@ -188,7 +187,6 @@ export default {
handleReset() {
this.queryParams = {
page: 1,
page_size: 50,
}
this.date = undefined
this.$emit('searchFormReset')
Expand Down
16 changes: 9 additions & 7 deletions cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
},
Expand Down Expand Up @@ -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)
Expand Down
18 changes: 10 additions & 8 deletions cmdb-ui/src/modules/acl/views/operation_history/modules/permissionTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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
},
},
}
Expand Down
20 changes: 11 additions & 9 deletions cmdb-ui/src/modules/acl/views/operation_history/modules/resourceHistoryTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -317,26 +317,28 @@ 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' &&
key !== 'app_id' &&
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)
Expand Down
20 changes: 11 additions & 9 deletions cmdb-ui/src/modules/acl/views/operation_history/modules/resourceTypeHistoryTable.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down Expand Up @@ -253,26 +253,28 @@ 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' &&
key !== 'app_id' &&
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)
Expand Down
Loading

0 comments on commit a442787

Please sign in to comment.