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

# Conflicts:
#	nezha-fronted/src/components/cli/webSSH.vue
#	nezha-fronted/src/components/common/alert/alertLabel2.vue
#	nezha-fronted/src/components/common/detailView/list/asset/assetDetail.vue
#	nezha-fronted/src/components/common/popBox/topToolMoreOptions.vue
#	nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue
#	nezha-fronted/src/components/common/rightBox/moduleBox.vue
#	nezha-fronted/src/components/page/config/system.vue
#	nezha-fronted/src/components/page/monitor/project/index.vue

nezha-fronted/src/components/common/rightBox/batchAddEndpoint.vue

@@ -163,6 +163,9 @@ export default {
   components: {
     'edit-endpoint-box-new': editEndpointBoxNew
   },
+  computed: {
+    language () { return this.$store.getters.getLanguage }
+  },
   data () {
     return {
       showError: false,
@@ -181,7 +184,6 @@ export default {
       },
       assetDataList: [],
       moduleList: [],
-      language: localStorage.getItem('nz-language'),
       ChartSearchShowFields: [ // ChartSearch 下拉搜索表头
         { title: 'ID', data: 'id' },
         {