From 9ee8b0f7ba2930b6bcf63d6e2a4f735c6437a72c Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Wed, 2 Jun 2021 16:55:17 +0800
Subject: [PATCH] =?UTF-8?q?NEX-717=20fix=EF=BC=9Abug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/rightBox/asset/assetBox.vue        | 22 +++++++++++++++++--
 .../common/rightBox/assetMetaBox.vue          |  1 +
 .../common/table/asset/assetTable.vue         |  9 +++++++-
 .../common/table/settings/dcTable.vue         |  2 +-
 .../src/components/page/asset/asset.vue       |  2 +-
 .../src/components/page/config/dc.vue         |  1 +
 .../components/page/dashboard/chartBox.vue    |  6 ++++-
 7 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
index 7e14ba2e3..27164c408 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
@@ -103,7 +103,7 @@
                   </el-radio-group>
                 </template>
                 <template v-else-if="label.type.toUpperCase() === assetConstants.labelTypeData.CHECKBOX">
-                  <el-checkbox-group v-model="label.value[0]">
+                  <el-checkbox-group v-model="label.value">
                     <el-checkbox v-for="item in JSON.parse(label.param).items" :key="item.name" :label="item.name" :value="item.name"></el-checkbox>
                   </el-checkbox-group>
                 </template>
@@ -481,9 +481,27 @@ export default {
     },
     blankLabelValue (label) {
       if (label.type.toUpperCase() === this.assetConstants.labelTypeData.CHECKBOX) {
-        return []
+        const arr = []
+        if (label.param && JSON.parse(label.param).items) {
+          JSON.parse(label.param).items.forEach(item => {
+            if (item.check) {
+              arr.push(item.name)
+            }
+          })
+        }
+        return arr
       } else if (label.type.toUpperCase() === this.assetConstants.labelTypeData.MULTITEXT || label.type.toUpperCase() === assetConstants.labelTypeData.TEXT || label.type.toUpperCase() === assetConstants.labelTypeData.TEXTAREA) {
         return ['']
+      } else if (label.type.toUpperCase() === this.assetConstants.labelTypeData.RADIO || label.type.toUpperCase() === assetConstants.labelTypeData.SELECT) {
+        const arr = ['']
+        if (label.param && JSON.parse(label.param).items) {
+          JSON.parse(label.param).items.forEach(item => {
+            if (item.check) {
+              arr[0] = item.name
+            }
+          })
+        }
+        return arr
       } else {
         return ['']
       }
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
index c0a2e7522..ad2c0183e 100644
--- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue
@@ -279,6 +279,7 @@ export default {
           t.disabled = false
         })
       }
+      this.selectType(this.editAssetMeta.type, false)
     },
     clickOutside () {
       this.esc(false)
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index 8f2e1fb0a..3f4abf167 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -60,7 +60,14 @@
         <template v-else-if="item.prop === 'parent'">{{scope.row.parent ? scope.row.parent.name : '-'}}</template>
         <template v-else-if="item.prop === 'brand'">{{scope.row.brand ? scope.row.brand.name : '-'}}</template>
         <template v-else-if="item.prop === 'purchaseDate'">{{scope.row.purchaseDate ? scope.row.purchaseDate : '--'}}</template>
-        <template v-else>{{scope.row[item.prop]}}</template>
+        <template v-else>
+          <span v-if="scope.row.fields&&scope.row.fields.find(field => field.name === item.prop)">
+            {{scope.row.fields.find(field => field.name === item.prop).value.join(',')}}
+          </span>
+          <span v-else>
+             {{scope.row[item.prop]}}
+          </span>
+        </template>
       </template>
     </el-table-column>
     <el-table-column
diff --git a/nezha-fronted/src/components/common/table/settings/dcTable.vue b/nezha-fronted/src/components/common/table/settings/dcTable.vue
index 45b7dcc8e..8bd2c3767 100644
--- a/nezha-fronted/src/components/common/table/settings/dcTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/dcTable.vue
@@ -49,7 +49,7 @@
             active-color="#ee9d3f"
             active-value="ON"
             inactive-value="OFF"
-            @change="(val)=>{statusChange(scope.row)}"
+            @change="(val)=>{$emit('statusChange', scope.row)}"
           />
         </template>
         <template v-else-if="item.prop === 'longitude'">
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index 117ca2a8e..e16442cdb 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -362,7 +362,7 @@ export default {
             const data = []
             const searchableData = response.data.list.filter(d => d.search === 1)
             const showData = response.data.list.filter(d => d.display === 1).map(item => {
-              return { label: item.name, prop: 'Label', show: false, allowed: true, type: 'label' }
+              return { label: item.name, prop: item.name, show: false, allowed: true, type: 'label' }
             })
             searchableData.forEach(m => {
               if (m.param) {
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index e7b70fd68..65f3f72ff 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -29,6 +29,7 @@
           @orderBy="tableDataSort"
           @reload="getTableData"
           @selectionChange="selectionChange"
+          @statusChange='statusChange'
           @showBottomBox="(targetTab, object) => { $refs.dataList.showBottomBox(targetTab, object) }"></dc-table>
       </template>
       <!-- 分页组件 -->
diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue
index a71429815..d5ace87c2 100644
--- a/nezha-fronted/src/components/page/dashboard/chartBox.vue
+++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue
@@ -248,7 +248,7 @@
             <el-form-item v-show="editChart.type !='text' && editChart.type !=='url'&& editChart.type !=='group'" :label="$t('dashboard.panel.chartForm.unit')" class="form-item--half-width" prop="unit">
               <el-cascader id="chart-box-unit" v-model="editChart.unit" :options="unitOptions" :props="{ expandTrigger: 'hover',emitPath:false }"  :show-all-levels="false" filterable
                            placeholder=""
-                           popper-class="dc-dropdown prevent-clickoutside"
+                           popper-class="dc-dropdown prevent-clickoutside chart-box-unit"
                            size="small"
                            style="width: 100%"
                            @change="unitSelected"
@@ -1787,4 +1787,8 @@ export default {
   .el-color-dropdown{
     z-index: 2200!important;
   }
+  .chart-box-unit .el-scrollbar{
+    height: 195px;
+    overflow-y: auto;
+  }
 </style>