From a672d3c2bbbcb96c1caacd61709c887cbfe0b87f Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 22 May 2024 15:00:59 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E9=9B=86=E6=8A=8A=E8=A1=A8=E7=9A=84comment=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=B9=9F=E6=90=BA=E5=B8=A6=E8=BF=87=E6=9D=A5=20#9301?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/editor/index.vue   |  6 +++-
 .../data/dataset/form/DatasetUnion.vue        | 32 +++++++++++++++----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/chart/components/editor/index.vue b/core/core-frontend/src/views/chart/components/editor/index.vue
index c6c2332292..69e2d17faf 100644
--- a/core/core-frontend/src/views/chart/components/editor/index.vue
+++ b/core/core-frontend/src/views/chart/components/editor/index.vue
@@ -2173,7 +2173,7 @@ const drop = (ev: MouseEvent, type = 'xAxis') => {
                       </div>
                       <div
                         class="tree-btn"
-                        :class="isFilterActive && 'active'"
+                        :class="{ 'tree-btn--dark': themes === 'dark', active: isFilterActive }"
                         @click="openTreeFilter"
                       >
                         <el-icon>
@@ -3489,6 +3489,10 @@ span {
       cursor: pointer;
       justify-content: center;
       font-size: 12px;
+      &.tree-btn--dark {
+        background: rgba(235, 235, 235, 0.05);
+        border-color: #5f5f5f;
+      }
 
       &.active {
         color: #3370ff;
diff --git a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
index 8358dfd05f..67f99ef35f 100644
--- a/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
+++ b/core/core-frontend/src/views/visualized/data/dataset/form/DatasetUnion.vue
@@ -708,12 +708,13 @@ const dragenter_handler = ev => {
 const drop_handler = ev => {
   ev.preventDefault()
   let data = ev.dataTransfer.getData('text')
-  const { tableName, type, datasourceId } = JSON.parse(data) as Table
+  const { tableName, type, datasourceId, name: noteName } = JSON.parse(data) as Table
   const extraData = {
     info: JSON.stringify({
       table: tableName,
       sql: ''
     }),
+    noteName,
     unionType: 'left',
     unionFields: [],
     currentDsFields: [],
@@ -1029,10 +1030,19 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields', 'chan
     direction="rtl"
   >
     <template #header v-if="currentNode">
-      <div class="info">
-        <span :title="currentNode.tableName" class="name ellipsis">{{
-          currentNode.tableName
-        }}</span>
+      <div class="info-content">
+        <div class="info">
+          <span class="label">表名</span>
+          <span :title="currentNode.tableName" class="name ellipsis">{{
+            currentNode.tableName
+          }}</span>
+        </div>
+        <div class="info">
+          <span class="label">表备注</span>
+          <span :title="currentNode.noteName" class="name ellipsis">{{
+            currentNode.noteName || '-'
+          }}</span>
+        </div>
         <span :title="getDsName(currentNode.datasourceId)" class="ds ellipsis"
           >{{ t('auth.datasource') }}:{{ getDsName(currentNode.datasourceId) }}</span
         >
@@ -1082,15 +1092,25 @@ const emits = defineEmits(['addComplete', 'joinEditor', 'updateAllfields', 'chan
       top: 26px;
     }
 
+    .info-content {
+      display: flex;
+      flex-wrap: wrap;
+    }
+
     .info {
       display: flex;
       flex-direction: column;
-      .name {
+      width: 50%;
+      .label {
         font-weight: 500;
         font-size: 16px;
         color: #1f2329;
         max-width: 500px;
       }
+      .name {
+        font-weight: 400;
+        font-size: 14px;
+      }
       .ds {
         font-weight: 400;
         font-size: 14px;