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

nezha-fronted/src/components/page/asset/asset.vue

@@ -558,7 +558,7 @@ export default {
         })
       })
     },
-    getSearchableMetaData () {
+    getSearchableMetaData (metaData) {
       return new Promise(resolve => {
         this.$get('asset/field/meta', { pageSize: -1 }).then(response => {
           if (response.code === 200) {
@@ -571,7 +571,20 @@ export default {
               if (m.param) {
                 const param = JSON.parse(m.param)
                 if (param.items) {
-                  data.push({ ...m, children: param.items.map(p => { return { ...p, id: p.name, metaId: m.id } }) })
+                  // param.items.map(p => { return { ...p, id: p.name, metaId: m.id, num: metaData.find(meta => meta.id === m.id && meta.option === p.name).num } })
+                  data.push({
+                    ...m,
+                    children: param.items.map(p => {
+                      const metaFind = metaData.find(meta => meta.id === m.id && meta.option === p.name)
+                      return {
+                        ...p,
+                        id: p.name,
+                        name: p.name,
+                        metaId: m.id,
+                        num: metaFind ? metaFind.num : 0
+                      }
+                    })
+                  })
                 }
               }
             })
@@ -604,7 +617,7 @@ export default {
           // const titleSearchData = {}
           this.modelData.forEach(m => {
             m.value = []
-            arr.push({ ...m, name: m.brand.name + '/' + m.name, value: m.id })
+            arr.push({ ...m, name: m.brand.name + '/' + m.name, value: m.id, num: m.num })
             // if (titleSearchData[m.brand.name]) {
             //   titleSearchData[m.brand.name].children.push(m)
             // } else {