From f5925bb192307a85e4479382b35660b254b22bab Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Wed, 20 Mar 2024 18:05:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=B8=8D=E5=B1=95=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/zh-CN.ts       |  3 ++-
 .../data/dataset/form/UnionFieldList.vue      |  4 +--
 .../visualized/data/dataset/form/index.vue    | 26 +++++++++++++++++++
 .../views/visualized/data/dataset/index.vue   |  2 +-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts
index 7e179a128b..dd39d879f8 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -1429,7 +1429,8 @@ export default {
     the_running_results: '即可查看运行结果',
     item: '项',
     logic_filter: '条件筛选',
-    enum_filter: '枚举筛选'
+    enum_filter: '枚举筛选',
+    description: '字段备注'
   },
   about: {
     auth_to: '授权给',
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/UnionFieldList.vue b/core/core-frontend/src/views/visualized/data/dataset/form/UnionFieldList.vue
index 51891c1c05..1abc20864b 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/UnionFieldList.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/UnionFieldList.vue
@@ -116,7 +116,7 @@ watch(
             <el-checkbox @change="checkChange" v-model="scope.row.checked" />
           </template>
         </el-table-column>
-        <el-table-column :label="t('panel.column_name')">
+        <el-table-column :label="t('dataset.origin_name')">
           <template #default="scope">
             <el-icon>
               <Icon
@@ -127,7 +127,7 @@ watch(
             {{ scope.row.originName }}
           </template>
         </el-table-column>
-        <el-table-column property="name" :label="t('deDataset.original_name')" />
+        <el-table-column property="description" :label="t('deDataset.description')" />
       </el-table>
     </div>
   </div>
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
index 5335bd54eb..c896677d5b 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/index.vue
@@ -1486,6 +1486,19 @@ const getDsIconName = data => {
                       </template>
                     </el-table-column>
 
+                    <el-table-column
+                      prop="description"
+                      :label="t('deDataset.description')"
+                      width="240"
+                    >
+                      <template #default="scope">
+                        <div class="column-style">
+                          <span v-if="scope.row.extField === 0">{{ scope.row.description }}</span>
+                          <span style="color: #8d9199" v-else>&nbsp;</span>
+                        </div>
+                      </template>
+                    </el-table-column>
+
                     <el-table-column prop="deType" :label="t('dataset.field_type')" width="200">
                       <template #default="scope">
                         <el-cascader
@@ -1633,6 +1646,19 @@ const getDsIconName = data => {
                       </template>
                     </el-table-column>
 
+                    <el-table-column
+                      prop="description"
+                      :label="t('deDataset.description')"
+                      width="240"
+                    >
+                      <template #default="scope">
+                        <div class="column-style">
+                          <span v-if="scope.row.extField === 0">{{ scope.row.description }}</span>
+                          <span style="color: #8d9199" v-else>&nbsp;</span>
+                        </div>
+                      </template>
+                    </el-table-column>
+
                     <el-table-column prop="deType" :label="t('dataset.field_type')" width="200">
                       <template #default="scope">
                         <el-cascader
diff --git a/core/core-frontend/src/views/visualized/data/dataset/index.vue b/core/core-frontend/src/views/visualized/data/dataset/index.vue
index e3de908ac5..2ce8e3a3fb 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/index.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/index.vue
@@ -152,7 +152,7 @@ const allFieldsColumns = [
   {
     key: 'description',
     dataKey: 'description',
-    title: '备注',
+    title: '字段备注',
     width: 250
   }
 ]