From 73bf4fae50ea839244b40c4ca89dab05a14b8eb6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 17 Apr 2025 09:53:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20=E6=96=B0?=
 =?UTF-8?q?=E5=BB=BA=E5=88=86=E7=BB=84=E5=AD=97=E6=AE=B5=E5=90=8E=EF=BC=8C?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E8=BD=AC=E6=8D=A2=E6=8C=87=E6=A0=87/?=
 =?UTF-8?q?=E7=BA=AC=E5=BA=A6=E6=8C=89=E9=92=AE=EF=BC=8C=E4=B8=94=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E9=87=8C=E4=BF=AE=E6=94=B9=E4=BA=86?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8E=E4=B8=8D=E7=94=9F=E6=95=88=20#15854?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/dataset/form/index.vue    | 20 +++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

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 2bde1c0ef1..fb5d2a622e 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
@@ -2137,6 +2137,7 @@ const getIconNameCalc = (deType, extField, dimension = false) => {
                           :class="
                             !!scope.row.deTypeArr && !!scope.row.deTypeArr.length && 'select-type'
                           "
+                          v-if="scope.row.extField !== 3"
                           popper-class="cascader-panel"
                           v-model="scope.row.deTypeArr"
                           @change="val => cascaderChange(scope.row, val)"
@@ -2157,6 +2158,7 @@ const getIconNameCalc = (deType, extField, dimension = false) => {
                             <span>{{ data.label }}</span>
                           </template>
                         </el-cascader>
+                        <div style="padding-left: 30px" v-else>{{ $t('data_set.text') }}</div>
                         <span class="select-svg-icon">
                           <el-icon>
                             <Icon
@@ -2180,7 +2182,13 @@ const getIconNameCalc = (deType, extField, dimension = false) => {
                     >
                       <template #default="scope">
                         <div class="column-style">
-                          <span class="flex-align-center icon" v-if="scope.row.extField === 0">
+                          <span style="color: #8d9199" v-if="scope.row.extField === 2">{{
+                            t('dataset.calc_field')
+                          }}</span>
+                          <span style="color: #8d9199" v-else-if="scope.row.extField === 3">{{
+                            t('dataset.grouping_field')
+                          }}</span>
+                          <span class="flex-align-center icon" v-else-if="scope.row.extField === 0">
                             <el-icon>
                               <Icon className="primary-color"
                                 ><component
@@ -2191,7 +2199,6 @@ const getIconNameCalc = (deType, extField, dimension = false) => {
                             </el-icon>
                             {{ fieldTypes(scope.row.deExtractType) }}
                           </span>
-                          <span v-else style="color: #8d9199">{{ t('dataset.calc_field') }}</span>
                         </div>
                       </template>
                     </el-table-column>
@@ -2374,7 +2381,13 @@ const getIconNameCalc = (deType, extField, dimension = false) => {
                     >
                       <template #default="scope">
                         <div class="column-style">
-                          <span class="flex-align-center icon" v-if="scope.row.extField === 0">
+                          <span style="color: #8d9199" v-if="scope.row.extField === 2">{{
+                            t('dataset.calc_field')
+                          }}</span>
+                          <span style="color: #8d9199" v-else-if="scope.row.extField === 3">{{
+                            t('dataset.grouping_field')
+                          }}</span>
+                          <span class="flex-align-center icon" v-else-if="scope.row.extField === 0">
                             <el-icon>
                               <Icon className="green-color"
                                 ><component
@@ -2385,7 +2398,6 @@ const getIconNameCalc = (deType, extField, dimension = false) => {
                             </el-icon>
                             {{ fieldTypes(scope.row.deExtractType) }}
                           </span>
-                          <span v-else style="color: #8d9199">{{ t('dataset.calc_field') }}</span>
                         </div>
                       </template>
                     </el-table-column>