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

fix acl change page size

This commit is contained in:
wang-liang0615 2023-07-27 15:08:25 +08:00
parent 7715d52e33
commit 742cd4ead1
10 changed files with 94 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -245,9 +245,11 @@ export default {
}, },
handleQueryParams(queryParams) { handleQueryParams(queryParams) {
const _queryParams = _.cloneDeep(queryParams)
let flag = false let flag = false
let q = queryParams.q ? queryParams.q : '' let q = _queryParams.q ? _queryParams.q : ''
for (const key in queryParams) { for (const key in _queryParams) {
if ( if (
key !== 'page' && key !== 'page' &&
key !== 'page_size' && key !== 'page_size' &&
@ -255,16 +257,16 @@ export default {
key !== 'q' && key !== 'q' &&
key !== 'start' && key !== 'start' &&
key !== 'end' && key !== 'end' &&
queryParams[key] !== undefined _queryParams[key] !== undefined
) { ) {
flag = true flag = true
if (q) q += `,${key}:${queryParams[key]}` if (q) q += `,${key}:${_queryParams[key]}`
else q += `${key}:${queryParams[key]}` else q += `${key}:${_queryParams[key]}`
delete queryParams[key] delete _queryParams[key]
} }
} }
const newQueryParams = { ...queryParams, q } const newQueryParams = { ..._queryParams, q }
return flag ? newQueryParams : queryParams return flag ? newQueryParams : _queryParams
}, },
handleTagColor(operateType) { handleTagColor(operateType) {
return this.colorMap.get(operateType) return this.colorMap.get(operateType)

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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