From 45236c6bfa17e9540fca8751dcc8ed5b25a5bba7 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Wed, 27 Sep 2023 11:20:55 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E6=AF=8F=E6=9C=88?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BAKPI=0B?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LineWithKPI.jsx             | 4 ++--
 src/components/kpi/SubjectTable/Profit.jsx | 2 +-
 src/components/search/Input.jsx            | 2 +-
 src/views/Home.jsx                         | 7 +------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/components/LineWithKPI.jsx b/src/components/LineWithKPI.jsx
index 35bb1dd..ee8a813 100644
--- a/src/components/LineWithKPI.jsx
+++ b/src/components/LineWithKPI.jsx
@@ -29,14 +29,14 @@ export default observer((props) => {
   const _data = dataSource.reduce((r, v) => {
     r.push(v);
     if ( ! isEmpty(v[kpiKey])) { // 有设目标才多显示一条虚线 颜色: #F4664A
-      r.push({...v, [config.yField]: v[kpiKey], [config.seriesField]: dataFieldAlias[kpiKey].label});
+      r.push({...v, [config.yField]: v[kpiKey], [config.seriesField]: dataFieldAlias[kpiKey].label, extraLine: true,});
     }
     return r;
   }, []);
   const mergeLineConfig = merge({
     color: ['#598cf3', '#F4664A', '#FAAD14'],
     lineStyle: (data) => {
-      console.log(data);
+      // console.log(data);
       if (data[config.seriesField].includes('目标')) {
         return {
           lineDash: [4, 4],
diff --git a/src/components/kpi/SubjectTable/Profit.jsx b/src/components/kpi/SubjectTable/Profit.jsx
index be76b4a..d4446f0 100644
--- a/src/components/kpi/SubjectTable/Profit.jsx
+++ b/src/components/kpi/SubjectTable/Profit.jsx
@@ -155,7 +155,7 @@ export default observer((props) => {
       }))(curObj);
       return r.concat(allMonth, yearRow);
     }, []);
-    console.log('sub', tableData, 'del:', delKpiIds);
+    // console.log('sub', tableData, 'del:', delKpiIds);
     // return false; // debug:
     KPIStore.onSubmit(tableData, { delQueue: delKpiIds }).then((res) => {
       if (res) {
diff --git a/src/components/search/Input.jsx b/src/components/search/Input.jsx
index c561f82..ec92225 100644
--- a/src/components/search/Input.jsx
+++ b/src/components/search/Input.jsx
@@ -99,7 +99,7 @@ class SearchInput extends React.Component {
   };
 
   handleChange = (value, option) => {
-    console.log('invoke denpendencies change', value);
+    // console.log('invoke denpendencies change', value);
     this.setState({ value }, () => this.props.onChange(value, option));
   };
 
diff --git a/src/views/Home.jsx b/src/views/Home.jsx
index e844003..6605fb0 100644
--- a/src/views/Home.jsx
+++ b/src/views/Home.jsx
@@ -130,11 +130,6 @@ export default observer(() => {
     legend: false,
     meta: {
       ...cloneDeep(dataFieldAlias),
-      // [extProps.yField]: {
-      //   alias: dataFieldAlias[extProps.yField]?.alias || extProps.yField,
-      //   formatter: (v) => dataFieldAlias[extProps.yField]?.formatter(v) || v,
-      //   max: Math.ceil(yMax / 0.95),
-      // },
     },
   };
   const [timeDataField, setTimeDataField] = useState('SumML');
@@ -147,7 +142,7 @@ export default observer(() => {
       tooltip: {
         customItems: (originalItems) => {
           // process originalItems,
-          const items = originalItems.map((ele) => ({ ...ele, name: dataFieldAlias[key]?.alias || key }));
+          const items = originalItems.map((ele) => ({ ...ele, name: ele.data?.extraLine ? ele.name : (dataFieldAlias[key]?.alias || key) }));
           return items;
         },
       },