Merge pull request #2203 from kazekage605/dev-0.3

fix: 🐛 修复透视驱动数据格式设置问题#1697
edp963 · May 25, 2021 · f57ad5f · f57ad5f
2 parents dc9bd2b + 6660306
commit f57ad5f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/webapp/app/containers/Widget/components/Pivot/Cell.tsx b/webapp/app/containers/Widget/components/Pivot/Cell.tsx
@@ -4,6 +4,7 @@ import { ILegend } from './Pivot'
 import { IDataParamProperty } from '../Workbench/OperatingPanel'
 import { DEFAULT_SPLITER } from 'app/globalConstants'
 import { decodeMetricName } from 'containers/Widget/components/util'
+import { getFormattedValue } from '../Config/Format';
 
 const styles = require('./Pivot.less')
 
@@ -113,7 +114,7 @@ export class Cell extends React.PureComponent <ICellProps, ICellState> {
             className={styles.cellContent}
             style={{...styleColor}}
           >
-            {d[`${m.agg}(${decodedMetricName})`]}
+            {getFormattedValue(d[`${m.agg}(${decodedMetricName})`], m.format)}
           </p>
         )
       })

diff --git a/webapp/app/containers/Widget/components/util.ts b/webapp/app/containers/Widget/components/util.ts
@@ -698,7 +698,7 @@ export function getPivotTooltipLabel(
             ? record.reduce((sum, r) => sum + r[`${mc.agg}(${decodedName})`], 0)
             : record[`${mc.agg}(${decodedName})`]
           : 0
-        return `${decodedName}: ${value}`
+        return `${decodedName}: ${getFormattedValue(value, mc.format)}`
       })
       .concat(
         dimetionColumns.map((dc) => {
@@ -707,7 +707,7 @@ export function getPivotTooltipLabel(
               ? record[0][dc]
               : record[dc]
             : ''
-          return `${dc}: ${value}`
+          return `${dc}: ${getFormattedValue(value, dc.format)}`
         })
       )
       .join('<br/>')