From f70ae799ab23089f5e4f4d3d92e08fe2835363a2 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 26 Apr 2021 10:28:01 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9=E5=85=AC?=
 =?UTF-8?q?=E7=94=A8=E7=A9=BF=E6=A2=AD=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/nzTransfer.vue      | 27 +++++++++----------
 .../rightBox/asset/assetBatchEditBox.vue      | 13 +++++++++
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/nezha-fronted/src/components/common/nzTransfer.vue b/nezha-fronted/src/components/common/nzTransfer.vue
index 2ada5bea8..7f3268b60 100644
--- a/nezha-fronted/src/components/common/nzTransfer.vue
+++ b/nezha-fronted/src/components/common/nzTransfer.vue
@@ -28,14 +28,12 @@
             width="36">
           </el-table-column>
           <el-table-column
-            :label="$t('overall.name')"
+            :label="item.label"
+            v-for="(item,index) in tableTitle"
+            :key="index"
           >
-           <template slot-scope="scope">{{scope.row.name}}</template>
-          </el-table-column>
-          <el-table-column
-            :label="$t('asset.host')"
-          >
-            <template slot-scope="scope">{{scope.row.manageIp}}</template>
+            <template slot-scope="scope" v-if="!item.slot">{{scope.row[item.prop]}}</template>
+            <slot :name="item.prop" v-else></slot>
           </el-table-column>
         </el-table>
       </div>
@@ -79,14 +77,12 @@
             width="36">
           </el-table-column>
           <el-table-column
-            :label="$t('overall.name')"
+            :label="item.label"
+            v-for="(item,index) in tableTitle"
+            :key="index"
           >
-            <template slot-scope="scope">{{scope.row.name}}</template>
-          </el-table-column>
-          <el-table-column
-            :label="$t('asset.host')"
-          >
-            <template slot-scope="scope">{{scope.row.host}}</template>
+            <template slot-scope="scope" v-if="!item.slot">{{scope.row[item.prop]}}</template>
+            <slot :name="item.prop" v-else></slot>
           </el-table-column>
         </el-table>
       </div>
@@ -131,6 +127,9 @@ export default {
     },
     pageObj: {
       type: Object
+    },
+    tableTitle: {
+      type: Array,
     }
   },
   data () {
diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
index 5bfa5154c..a97a9c253 100644
--- a/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/asset/assetBatchEditBox.vue
@@ -193,6 +193,7 @@
                        :search-msg="transfer.searchMsg"
                        :table-data="transfer.tableData"
                        style="margin-bottom: 20px;"
+                       :tableTitle="transfer.tableTitle"
                        @leftToRight="addAsset"
                        @rightToLeft="removeAsset">
             <template v-slot:title>Selected</template>
@@ -309,6 +310,18 @@ export default {
             }
           ]
         },
+        tableTitle: [
+          {
+            label: this.$t('overall.name'),
+            prop: 'name',
+            show: true
+          },
+          {
+            label: this.$t('asset.host'),
+            prop: 'host',
+            show: true
+          }
+        ],
         pageObj: {
           pageNo: 1,
           pageSize: 10,