From adf5f700f00863af8bde52b79c1fc6475012aed0 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 29 Jul 2021 15:29:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=87?=
 =?UTF-8?q?=E6=8D=A2=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       |  3 ++-
 frontend/src/lang/tw.js                       |  3 ++-
 frontend/src/lang/zh.js                       |  3 ++-
 frontend/src/views/dataset/data/FieldEdit.vue | 10 ++++++++--
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index f791982a32..23a2c11fba 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -987,7 +987,8 @@ export default {
     click_ref_field: 'Click Quote Field',
     click_ref_function: 'Click Quote Function',
     field_manage: 'Field Manage',
-    edit_calc_field: 'Edit calc field'
+    edit_calc_field: 'Edit calc field',
+    calc_field: 'Calc Field'
   },
   datasource: {
     datasource: 'Data Source',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 1c35897828..a7cb619bdc 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -987,7 +987,8 @@ export default {
     click_ref_field: '點擊引用字段',
     click_ref_function: '點擊引用函數',
     field_manage: '字段管理',
-    edit_calc_field: '編輯計算字段'
+    edit_calc_field: '編輯計算字段',
+    calc_field: '計算字段'
   },
   datasource: {
     datasource: '數據源',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 5f7c8262bd..7675d9c116 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -987,7 +987,8 @@ export default {
     click_ref_field: '点击引用字段',
     click_ref_function: '点击引用函数',
     field_manage: '字段管理',
-    edit_calc_field: '编辑计算字段'
+    edit_calc_field: '编辑计算字段',
+    calc_field: '计算字段'
   },
   datasource: {
     datasource: '数据源',
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 82c0b28d32..2aaf671cbc 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -43,9 +43,12 @@
           </el-table-column>
           <el-table-column v-if="!(param.mode === 0 && param.type === 'custom')" property="originName" :label="$t('dataset.field_origin_name')" width="100">
             <template slot-scope="scope">
-              <span :title="scope.row.originName" class="field-class" style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+              <span v-if="scope.row.extField === 0" :title="scope.row.originName" class="field-class" style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
                 <span style="font-size: 12px;">{{ scope.row.originName }}</span>
               </span>
+              <span v-else-if="scope.row.extField === 2" :title="$t('dataset.calc_field')" class="field-class" style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                <span style="font-size: 12px;color: #c0c0c0">{{ $t('dataset.calc_field') }}</span>
+              </span>
             </template>
           </el-table-column>
           <el-table-column property="deType" :label="$t('dataset.field_type')" width="140">
@@ -146,9 +149,12 @@
           </el-table-column>
           <el-table-column v-if="!(param.mode === 0 && param.type === 'custom')" property="originName" :label="$t('dataset.field_origin_name')" width="100">
             <template slot-scope="scope">
-              <span :title="scope.row.originName" class="field-class" style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+              <span v-if="scope.row.extField === 0" :title="scope.row.originName" class="field-class" style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
                 <span style="font-size: 12px;">{{ scope.row.originName }}</span>
               </span>
+              <span v-else-if="scope.row.extField === 2" :title="$t('dataset.calc_field')" class="field-class" style="width: 100%;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                <span style="font-size: 12px;color: #c0c0c0">{{ $t('dataset.calc_field') }}</span>
+              </span>
             </template>
           </el-table-column>
           <el-table-column property="deType" :label="$t('dataset.field_type')" width="140">