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

nezha-fronted/src/components/common/language/cn.js

@@ -71,7 +71,7 @@ const cn = {
     createProject: '新增系统',
     createEndpoint: '新增 Endpoint',
     batchEndpoint: '批量修改Endpoint',
-    createAsset: '新增资产',
+    createAsset: '新增图表',
     createAlertRule: '新增告警规则',
     createUser: '新增用户',
     createRole: '新增角色',

nezha-fronted/src/components/common/language/en.js

@@ -77,7 +77,7 @@ const en = {
     createProject: 'New project',
     createEndpoint: 'New endpoint',
     batchEndpoint: 'Batch modify endpoint',
-    createAsset: 'New asset',
+    createAsset: 'New chart',
     createAlertRule: 'New alert rule',
     createUser: 'New user',
     createRole: 'New role',

nezha-fronted/src/components/common/rightBox/asset/assetBox.vue

@@ -330,7 +330,7 @@ export default {
         lazyLoad (node, resolve) {
           const { level } = node
           if (node && node.data) {
-            vm.$get('asset/field/meta', { groupIds: node.data.id }).then(response => {
+            vm.$get('asset/field/meta', { groupIds: node.data.id, pageSize: -1 }).then(response => {
               if (response.code === 200) {
                 const meta = response.data.list.map(item => ({
                   ...item,

nezha-fronted/src/components/page/config/assetMeta.vue

@@ -135,7 +135,7 @@ export default {
         id: '',
         name: '',
         metaKey: '',
-        groupId: '',
+        groupIds: '',
         group: {},
         search: '0',
         display: '0',
@@ -172,8 +172,8 @@ export default {
       this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
       this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
       this.tools.loading = true
-      if (!this.searchLabel.groupId) {
-        delete this.searchLabel.groupId
+      if (!this.searchLabel.groupIds) {
+        delete this.searchLabel.groupIds
       }
       this.$get(this.url, this.searchLabel).then(response => {
         this.tools.loading = false
@@ -217,7 +217,7 @@ export default {
 
             if (selectKey === group.id) {
               this.showGroup = -1
-              this.searchLabel.groupId = ''
+              this.searchLabel.groupIds = ''
               this.getTableData()
               this.$refs.selectGroup.$refs.tree.setCurrentKey(this.showGroup)
             }
@@ -231,7 +231,7 @@ export default {
     },
     groupChange (item) {
       this.showGroup = item
-      this.searchLabel.groupId = item.id !== -1 ? item.id : ''
+      this.searchLabel.groupIds = item.id !== -1 ? item.id : ''
       this.getTableData()
     },
     add () {