From dc57ad8f2733000e1b7381f572aff5f6d2b6d6e2 Mon Sep 17 00:00:00 2001
From: xusongfu <xu.songfu@99cloud.net>
Date: Wed, 31 Aug 2022 09:27:49 +0800
Subject: [PATCH] fix: Fix download data if use unit

Fix download data if use unit in table columns

Change-Id: I830e176317e0472a6a89525a9a78bbdf569ef79e
---
 src/components/Tables/Base/Download/index.jsx | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/components/Tables/Base/Download/index.jsx b/src/components/Tables/Base/Download/index.jsx
index 2aab3e21..ef085b16 100644
--- a/src/components/Tables/Base/Download/index.jsx
+++ b/src/components/Tables/Base/Download/index.jsx
@@ -106,15 +106,10 @@ export default class index extends Component {
   };
 
   getColumnData = (data, column) => {
-    const { dataIndex, render, valueRender, stringify, valueMap } = column;
+    const { dataIndex, render, valueRender, stringify, valueMap, unit } =
+      column;
     const { getValueRenderFunc } = this.props;
     const value = get(data, dataIndex);
-    if (valueMap) {
-      return valueMap[value] || value;
-    }
-    if (!render && !valueRender && !stringify) {
-      return this.getSimpleValue(value, data, dataIndex);
-    }
     if (stringify) {
       return stringify(value, data);
     }
@@ -125,6 +120,13 @@ export default class index extends Component {
     if (render) {
       return this.getSimpleValue(render(value, data), data, dataIndex);
     }
+    if (unit) {
+      return `${value}${unit}`;
+    }
+    if (valueMap) {
+      return valueMap[value] || value;
+    }
+    return this.getSimpleValue(value, data, dataIndex);
   };
 
   getDownloadData() {