From 742cd4ead15d897a819e8dae796bb2ef5df25ce6 Mon Sep 17 00:00:00 2001
From: wang-liang0615 <dhuwl0615@163.com>
Date: Thu, 27 Jul 2023 15:08:25 +0800
Subject: [PATCH] fix acl change page size

---
 .../views/module/permissionHistoryTable.vue    | 17 ++++++++++-------
 .../acl/views/module/resourceHistoryTable.vue  | 18 ++++++++++--------
 .../views/module/resourceTypeHistoryTable.vue  | 18 ++++++++++--------
 .../acl/views/module/roleHistoryTable.vue      | 18 ++++++++++--------
 .../acl/views/module/triggerHistoryTable.vue   | 14 ++++++++------
 .../modules/permissionTable.vue                | 16 +++++++++-------
 .../modules/resourceHistoryTable.vue           | 18 ++++++++++--------
 .../modules/resourceTypeHistoryTable.vue       | 18 ++++++++++--------
 .../modules/roleHistoryTable.vue               | 17 +++++++++--------
 .../modules/triggerHistoryTable.vue            | 14 ++++++++------
 10 files changed, 94 insertions(+), 74 deletions(-)

diff --git a/cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue
index 0811f70..90ada88 100644
--- a/cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue
@@ -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相关
diff --git a/cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue
index 6d12a0a..010a127 100644
--- a/cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue
@@ -245,9 +245,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 +257,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)
diff --git a/cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue
index 090ea98..bbc3610 100644
--- a/cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue
@@ -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)
diff --git a/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
index 91fd9c6..4319f96 100644
--- a/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
@@ -237,9 +237,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 +249,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) {
diff --git a/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
index 6b733cb..2f42bcd 100644
--- a/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
@@ -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)
diff --git a/cmdb-ui/src/modules/acl/views/operation_history/modules/permissionTable.vue b/cmdb-ui/src/modules/acl/views/operation_history/modules/permissionTable.vue
index 0aa3305..853728d 100644
--- a/cmdb-ui/src/modules/acl/views/operation_history/modules/permissionTable.vue
+++ b/cmdb-ui/src/modules/acl/views/operation_history/modules/permissionTable.vue
@@ -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'
@@ -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
     },
   },
 }
diff --git a/cmdb-ui/src/modules/acl/views/operation_history/modules/resourceHistoryTable.vue b/cmdb-ui/src/modules/acl/views/operation_history/modules/resourceHistoryTable.vue
index 7702373..78e0175 100644
--- a/cmdb-ui/src/modules/acl/views/operation_history/modules/resourceHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/operation_history/modules/resourceHistoryTable.vue
@@ -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)
diff --git a/cmdb-ui/src/modules/acl/views/operation_history/modules/resourceTypeHistoryTable.vue b/cmdb-ui/src/modules/acl/views/operation_history/modules/resourceTypeHistoryTable.vue
index 014b118..f741712 100644
--- a/cmdb-ui/src/modules/acl/views/operation_history/modules/resourceTypeHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/operation_history/modules/resourceTypeHistoryTable.vue
@@ -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)
diff --git a/cmdb-ui/src/modules/acl/views/operation_history/modules/roleHistoryTable.vue b/cmdb-ui/src/modules/acl/views/operation_history/modules/roleHistoryTable.vue
index bd3094e..cf9a290 100644
--- a/cmdb-ui/src/modules/acl/views/operation_history/modules/roleHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/operation_history/modules/roleHistoryTable.vue
@@ -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) {
diff --git a/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue b/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue
index a7ee747..a0169ba 100644
--- a/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/operation_history/modules/triggerHistoryTable.vue
@@ -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)