From a6a21d312dd6356200bdd51d9b8856fec6abd76a Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Mon, 9 Oct 2023 16:09:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20"=E8=90=A5=E6=94=B6"=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BulletWithSort.jsx | 4 ++--
 src/components/DataFieldRadio.jsx | 2 +-
 src/libs/ht.js                    | 1 +
 src/views/Home.jsx                | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/components/BulletWithSort.jsx b/src/components/BulletWithSort.jsx
index 6e1ff6e..a4176d4 100644
--- a/src/components/BulletWithSort.jsx
+++ b/src/components/BulletWithSort.jsx
@@ -13,12 +13,12 @@ export default observer((props) => {
   // 处理进度图的数据格式, number -> array
   const dataParser = (origin) => {
     const { measureField, rangeField, targetField } = extProps;
-    const maxKPI = Math.max(...(origin || []).map((ele) => ele[targetField]));
+    const maxKPI = Math.max(...(origin || []).map((ele) => (ele?.[targetField] || 0)));
     const maxValue = Math.max(...(origin || []).map((ele) => ele[measureField]));
     const _max = Math.max(maxKPI, maxValue);
     const sortData = origin.sort(sortBy(measureField)).slice(-itemLength);
     // 顶格的值定在更远
-    const _parseData = sortData?.map((ele) => ({ ...ele, [rangeField]: [0, Math.ceil(_max / 0.9)], [measureField]: [ele[measureField]] }));
+    const _parseData = sortData?.map((ele) => ({ ...ele, [rangeField]: [0, Math.ceil(_max / 0.9)], [measureField]: [ele[measureField]], [targetField]: (ele?.targetField || 0) }));
     return _parseData;
   };
 
diff --git a/src/components/DataFieldRadio.jsx b/src/components/DataFieldRadio.jsx
index 773ec5d..3ad5d63 100644
--- a/src/components/DataFieldRadio.jsx
+++ b/src/components/DataFieldRadio.jsx
@@ -13,7 +13,7 @@ export default observer((props) => {
   const defaultVal = dataFieldOptions[0].value;
 
   const Component = () =>
-    dataFieldOptions.length < 5 ? (
+    dataFieldOptions.length < 6 ? (
       <Radio.Group options={dataFieldOptions} optionType="button" onChange={(e) => handleChange(e.target.value)} defaultValue={defaultVal} {...extProps} />
     ) : (
       <Select showSearch options={dataFieldOptions} onChange={handleChange} defaultValue={defaultVal} {...extProps} />
diff --git a/src/libs/ht.js b/src/libs/ht.js
index 167a2b7..b3e840a 100644
--- a/src/libs/ht.js
+++ b/src/libs/ht.js
@@ -95,6 +95,7 @@ export const dateTypes = [
  * 结果字段
  */
 export const dataFieldOptions = [
+  { label: '营收', value: 'transactions', formatter: (v) => `${v / 10000} 万`, nestkey: { p: 'transactionsKPIrates', v: 'transactionsKPIvalue' } },
   { label: '毛利', value: 'SumML', formatter: (v) => `${v / 10000} 万`, nestkey: { p: 'MLKPIrates', v: 'MLKPIvalue' } },
   { label: '订单数', value: 'SumOrder', formatter: (v) => v, nestkey: { p: 'OrderKPIrates', v: 'OrderKPIvalue' } },
   { label: '成交数', value: 'ConfirmOrder', formatter: (v) => v, nestkey: { p: 'ConfirmOrderKPIrates', v: 'ConfirmOrderKPIvalue' } },
diff --git a/src/views/Home.jsx b/src/views/Home.jsx
index e9c8f0b..6033c83 100644
--- a/src/views/Home.jsx
+++ b/src/views/Home.jsx
@@ -226,7 +226,7 @@ export default observer(() => {
         </Spin>
       </section>
       <section>
-        <h3>目标客户
+        <h3>英语区目标客户
           <Spin spinning={topData?.GuestGroupType?.loading || false}>
             <Table {...targetTableProps} pagination={false} />
           </Spin>