diff --git a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
index c6c9e7a3f0..000b1e1588 100644
--- a/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
+++ b/frontend/src/business/components/api/automation/scenario/ApiScenarioList.vue
@@ -19,6 +19,7 @@
         <ms-table-header-select-popover v-show="total>0"
                                         :page-size="pageSize>total?total:pageSize"
                                         :total="total"
+                                        :select-data-counts="selectDataCounts"
                                         @selectPageAll="isSelectDataAll(false)"
                                         @selectAll="isSelectDataAll(true)"/>
 
@@ -617,7 +618,7 @@ export default {
       });
     },
     handleSelectAll(selection) {
-      _handleSelectAll(this, selection, this.tableData, this.selectRows);
+      _handleSelectAll(this, selection, this.tableData, this.selectRows, this.condition);
       setUnSelectIds(this.tableData, this.condition, this.selectRows);
       this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
       this.$emit('selection', selection);
diff --git a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
index da43f454f7..bd7348697c 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiCaseSimpleList.vue
@@ -23,6 +23,7 @@
         <ms-table-header-select-popover v-show="total>0"
                                         :page-size="pageSize>total?total:pageSize"
                                         :total="total"
+                                        :select-data-counts="selectDataCounts"
                                         @selectPageAll="isSelectDataAll(false)"
                                         @selectAll="isSelectDataAll(true)"/>
 
@@ -411,7 +412,7 @@ export default {
       this.initTable();
     },
     handleSelectAll(selection) {
-      _handleSelectAll(this, selection, this.tableData, this.selectRows);
+      _handleSelectAll(this, selection, this.tableData, this.selectRows, this.condition);
       this.selectRowsCount(this.selectRows)
     },
     search() {
diff --git a/frontend/src/business/components/api/definition/components/list/ApiList.vue b/frontend/src/business/components/api/definition/components/list/ApiList.vue
index 8844291a23..c5bdf66657 100644
--- a/frontend/src/business/components/api/definition/components/list/ApiList.vue
+++ b/frontend/src/business/components/api/definition/components/list/ApiList.vue
@@ -22,6 +22,7 @@
         <ms-table-header-select-popover v-show="total>0"
                                         :page-size="pageSize>total?total:pageSize"
                                         :total="total"
+                                        :select-data-counts="selectDataCounts"
                                         @selectPageAll="isSelectDataAll(false)"
                                         @selectAll="isSelectDataAll(true)"/>
 
@@ -547,7 +548,7 @@ export default {
       });
     },
     handleSelectAll(selection) {
-      _handleSelectAll(this, selection, this.tableData, this.selectRows);
+      _handleSelectAll(this, selection, this.tableData, this.selectRows, this.condition);
       setUnSelectIds(this.tableData, this.condition, this.selectRows);
       this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
     },
diff --git a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
index f5ee7b6f64..52f1f37074 100644
--- a/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
+++ b/frontend/src/business/components/common/components/table/MsTableHeaderSelectPopover.vue
@@ -1,9 +1,21 @@
 <template>
-  <el-table-column width="1" :resizable="false" align="center">
+  <el-table-column v-if="isShow" width="1" :resizable="false" align="center">
     <el-popover slot="header" placement="right" trigger="click" style="margin-right: 0px;">
-      <el-link @click.native.stop="$emit('selectAll')">{{$t('api_test.batch_menus.select_all_data',[total])}}</el-link>
+      <el-link
+        :class="{'selected-link': selectDataCounts === this.total}"
+        @click.native.stop="click('selectAll')"
+        ref="selectAllLink">
+        {{$t('api_test.batch_menus.select_all_data',[total])}}
+      </el-link>
+
       <br/>
-      <el-link @click.native.stop="$emit('selectPageAll')">{{$t('api_test.batch_menus.select_show_data',[pageSize])}}</el-link>
+        <el-link
+          :class="{'selected-link': selectDataCounts === this.pageSize}"
+          @click.native.stop="click('selectPageAll')"
+          ref="selectPageAllLink">
+          {{$t('api_test.batch_menus.select_show_data',[pageSize])}}
+      </el-link>
+
       <i class="el-icon-arrow-down" slot="reference"></i>
     </el-popover>
   </el-table-column>
@@ -12,14 +24,35 @@
 <script>
     export default {
       name: "MsTableSelectAll",
-      props: ['total', 'pageSize'],
+      props: ['total', 'pageSize', 'selectDataCounts'],
       data() {
         return {
+          isShow: true
         };
+      },
+      watch: {
+        selectDataCounts() {
+          this.reload();
+        }
+      },
+      methods: {
+        click(even) {
+          this.$emit(even);
+        },
+        reload() {
+          this.isShow = false;
+          this.$nextTick(() => {
+            this.isShow = true;
+          })
+        }
       }
     }
 </script>
 
 <style scoped>
 
+.selected-link{
+  color: #783887 !important;
+}
+
 </style>
diff --git a/frontend/src/business/components/settings/organization/OrganizationMember.vue b/frontend/src/business/components/settings/organization/OrganizationMember.vue
index 85f5db6fb6..e6182503f8 100644
--- a/frontend/src/business/components/settings/organization/OrganizationMember.vue
+++ b/frontend/src/business/components/settings/organization/OrganizationMember.vue
@@ -13,6 +13,7 @@
         <ms-table-header-select-popover v-show="total>0"
                                         :page-size="pageSize>total?total:pageSize"
                                         :total="total"
+                                        :select-data-counts="selectDataCounts"
                                         @selectPageAll="isSelectDataAll(false)"
                                         @selectAll="isSelectDataAll(true)"/>
         <el-table-column v-if="!referenced" width="30" min-width="30" :resizable="false" align="center">
@@ -365,7 +366,7 @@
         });
       },
       handleSelectAll(selection) {
-        _handleSelectAll(this, selection, this.tableData, this.selectRows);
+        _handleSelectAll(this, selection, this.tableData, this.selectRows, this.condition);
         setUnSelectIds(this.tableData, this.condition, this.selectRows);
         this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
         this.$emit('selection', selection);
diff --git a/frontend/src/business/components/settings/system/User.vue b/frontend/src/business/components/settings/system/User.vue
index 277a125398..6f6eb26d70 100644
--- a/frontend/src/business/components/settings/system/User.vue
+++ b/frontend/src/business/components/settings/system/User.vue
@@ -16,6 +16,7 @@
         <ms-table-header-select-popover v-show="total>0"
                                         :page-size="pageSize>total?total:pageSize"
                                         :total="total"
+                                        :select-data-counts="selectDataCounts"
                                         @selectPageAll="isSelectDataAll(false)"
                                         @selectAll="isSelectDataAll(true)"/>
         <el-table-column v-if="!referenced" width="30" min-width="30" :resizable="false" align="center">
@@ -746,7 +747,7 @@ export default {
       });
     },
     handleSelectAll(selection) {
-      _handleSelectAll(this, selection, this.tableData, this.selectRows);
+      _handleSelectAll(this, selection, this.tableData, this.selectRows, this.condition);
       setUnSelectIds(this.tableData, this.condition, this.selectRows);
       this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
       this.$emit('selection', selection);
diff --git a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
index 7c65d2997d..704594e005 100644
--- a/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
+++ b/frontend/src/business/components/settings/workspace/WorkspaceMember.vue
@@ -14,6 +14,7 @@
         <ms-table-header-select-popover v-show="total>0"
                                         :page-size="pageSize>total?total:pageSize"
                                         :total="total"
+                                        :select-data-counts="selectDataCounts"
                                         @selectPageAll="isSelectDataAll(false)"
                                         @selectAll="isSelectDataAll(true)"/>
         <el-table-column v-if="!referenced" width="30" min-width="30" :resizable="false" align="center">
@@ -361,7 +362,7 @@
         });
       },
       handleSelectAll(selection) {
-        _handleSelectAll(this, selection, this.tableData, this.selectRows);
+        _handleSelectAll(this, selection, this.tableData, this.selectRows, this.condition);
         setUnSelectIds(this.tableData, this.condition, this.selectRows);
         this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
         this.$emit('selection', selection);
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index 7130ded9c2..466fe8db83 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -23,6 +23,7 @@
       <ms-table-header-select-popover v-show="total>0"
                                       :page-size="pageSize > total ? total : pageSize"
                                       :total="total"
+                                      :select-data-counts="selectDataCounts"
                                       @selectPageAll="isSelectDataAll(false)"
                                       @selectAll="isSelectDataAll(true)"/>
 
@@ -494,7 +495,7 @@ export default {
       this.$emit('testCaseDetail', row);
     },
     handleSelectAll(selection) {
-      _handleSelectAll(this, selection, this.tableData, this.selectRows);
+      _handleSelectAll(this, selection, this.tableData, this.selectRows, this.condition);
       setUnSelectIds(this.tableData, this.condition, this.selectRows);
       this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
     },
diff --git a/frontend/src/common/js/tableUtils.js b/frontend/src/common/js/tableUtils.js
index 4d5c536279..6eecc9bac1 100644
--- a/frontend/src/common/js/tableUtils.js
+++ b/frontend/src/common/js/tableUtils.js
@@ -1,7 +1,6 @@
 import {getCurrentProjectID, getCurrentUser, humpToLine} from "@/common/js/utils";
-import {TEST_CASE_LIST} from "@/common/js/constants";
 
-export function _handleSelectAll(component, selection, tableData, selectRows) {
+export function _handleSelectAll(component, selection, tableData, selectRows, condition) {
   if (selection.length > 0) {
     if (selection.length === 1) {
       selection.hashTree = [];
@@ -19,6 +18,9 @@ export function _handleSelectAll(component, selection, tableData, selectRows) {
       component.$set(item, "showMore", false);
     })
   }
+  if (selectRows.size < 1 && condition) {
+    condition.selectAll = false;
+  }
 }
 
 export function _handleSelect(component, selection, row, selectRows) {