From 61aa773a3f13c211fb88c3be910b5f215a30fef7 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 19 Apr 2022 15:44:34 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=98=8E=E7=BB=86=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E5=80=BC=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/table/table-info.js   | 12 ++++++++----
 .../chart/components/drag-item/DimensionItem.vue     |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js
index a5c183c2ae..faae7547ef 100644
--- a/frontend/src/views/chart/chart/table/table-info.js
+++ b/frontend/src/views/chart/chart/table/table-info.js
@@ -63,9 +63,11 @@ export function baseTableInfo(s2, container, chart, action, tableData) {
                 return value
               } else {
                 if (f.formatterCfg) {
-                  return valueFormatter(value, f.formatterCfg)
+                  const v = valueFormatter(value, f.formatterCfg)
+                  return v === 'NaN' ? value : v
                 } else {
-                  return valueFormatter(value, formatterItem)
+                  const v = valueFormatter(value, formatterItem)
+                  return v === 'NaN' ? value : v
                 }
               }
             }
@@ -88,9 +90,11 @@ export function baseTableInfo(s2, container, chart, action, tableData) {
             return value
           } else {
             if (f.formatterCfg) {
-              return valueFormatter(value, f.formatterCfg)
+              const v = valueFormatter(value, f.formatterCfg)
+              return v === 'NaN' ? value : v
             } else {
-              return valueFormatter(value, formatterItem)
+              const v = valueFormatter(value, formatterItem)
+              return v === 'NaN' ? value : v
             }
           }
         }
diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index fb115c4a35..c76c6c22db 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -77,7 +77,7 @@
             </el-dropdown>
           </el-dropdown-item>
 
-          <el-dropdown-item v-if="chart.render === 'antv' && chart.type.includes('table')" icon="el-icon-notebook-2" divided :command="beforeClickItem('formatter')">
+          <el-dropdown-item v-if="chart.render === 'antv' && chart.type.includes('table') && item.groupType === 'q'" icon="el-icon-notebook-2" divided :command="beforeClickItem('formatter')">
             <span>{{ $t('chart.value_formatter') }}...</span>
           </el-dropdown-item>
           <el-dropdown-item icon="el-icon-edit-outline" divided :command="beforeClickItem('rename')">