Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3

# Conflicts: # nezha-fronted/src/components/charts/chartDataFormat.js
2022-03-25 14:28:07 +08:00
parent 7283faa72d f2b055f20f
commit 69f061d868
14 changed files with 90 additions and 38 deletions
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -422,7 +422,7 @@ export default {
          index: -1
        },
        assetLabel: {
-          label: 'More',
+          label: this.$t('overall.more'),
          key: 'fieldsDetail',
          type: 'dropdownCheckBox',
          children: [],