From c2cca38f1cbd2d12dd3a11869ec4d400b0eb5bad Mon Sep 17 00:00:00 2001
From: wang-liang0615 <dhuwl0615@163.com>
Date: Thu, 27 Jul 2023 15:30:27 +0800
Subject: [PATCH] acl

---
 .../modules/acl/views/module/permissionHistoryTable.vue    | 2 +-
 .../src/modules/acl/views/module/resourceHistoryTable.vue  | 7 ++++++-
 .../modules/acl/views/module/resourceTypeHistoryTable.vue  | 2 +-
 cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue  | 7 ++++++-
 cmdb-ui/src/modules/acl/views/module/searchForm.vue        | 2 --
 .../src/modules/acl/views/module/triggerHistoryTable.vue   | 2 +-
 .../views/operation_history/modules/permissionTable.vue    | 2 +-
 .../operation_history/modules/resourceHistoryTable.vue     | 2 +-
 .../operation_history/modules/resourceTypeHistoryTable.vue | 2 +-
 .../views/operation_history/modules/roleHistoryTable.vue   | 2 +-
 .../operation_history/modules/triggerHistoryTable.vue      | 2 +-
 11 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue
index 90ada88..2e4e561 100644
--- a/cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/permissionHistoryTable.vue
@@ -286,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)
     },
 
diff --git a/cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue
index 010a127..a0b4d9c 100644
--- a/cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/resourceHistoryTable.vue
@@ -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() {
diff --git a/cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue
index bbc3610..773a2cf 100644
--- a/cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/resourceTypeHistoryTable.vue
@@ -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() {
diff --git a/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
index 4319f96..b11d559 100644
--- a/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/roleHistoryTable.vue
@@ -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() {
diff --git a/cmdb-ui/src/modules/acl/views/module/searchForm.vue b/cmdb-ui/src/modules/acl/views/module/searchForm.vue
index b01448a..c00509e 100644
--- a/cmdb-ui/src/modules/acl/views/module/searchForm.vue
+++ b/cmdb-ui/src/modules/acl/views/module/searchForm.vue
@@ -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')
diff --git a/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue b/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
index 2f42bcd..7018efc 100644
--- a/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
+++ b/cmdb-ui/src/modules/acl/views/module/triggerHistoryTable.vue
@@ -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)
     },
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 853728d..83d52c8 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
@@ -348,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) {
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 78e0175..18e182b 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
@@ -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() {
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 f741712..67a812c 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
@@ -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() {
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 cf9a290..4d9f3f5 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
@@ -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() {
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 a0169ba..75e5ed8 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
@@ -241,7 +241,7 @@ export default {
       this.isExpand = expand
     },
     handleSearch(queryParams) {
-      this.queryParams = queryParams
+      this.queryParams = { ...this.queryParams, ...queryParams }
       this.getTable(this.queryParams)
     },
     searchFormReset() {