Merge remote-tracking branch 'origin/dev-3.1' into dev-3.1.1_theme

# Conflicts:
#	nezha-fronted/src/components/common/alert/alertLabel.vue
#	nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue
#	nezha-fronted/src/components/common/i18n.js
#	nezha-fronted/src/components/common/labelFilter/clickSearch.vue
#	nezha-fronted/src/components/common/login.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue

nezha-fronted/src/components/common/table/alert/alertMessageTable.vue

@@ -91,7 +91,7 @@
               :id="scope.row[item.label].id"
               :that="scope.row[item.label]"
               :type="item.label"
-              :alert-table-dialog="true"
+              :alert-table-dialog="chartAlertList"
             ></alertLabel>
           </span>
         </template>
@@ -160,7 +160,8 @@ export default {
       default: true
     },
     alertMessageTabNew: Boolean,
-    loading: Boolean
+    loading: Boolean,
+    chartAlertList: Boolean
   },
   mixins: [table, bus],
   data () {