acl

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)
     },
 

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() {

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() {

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() {

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')

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)
     },

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) {

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() {

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() {

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() {

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() {