From 4c3d8d3046471cda949e6e453faae8b436461597 Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Thu, 19 Oct 2023 11:25:46 +0800
Subject: [PATCH] =?UTF-8?q?perf:=20KPI=E8=AE=BE=E7=BD=AE=E6=93=8D=E4=BD=9C?=
 =?UTF-8?q?:=20=E5=8F=96=E6=B6=88;=20=E8=A1=A8=E5=A4=B4;=20=E7=9B=AE?=
 =?UTF-8?q?=E6=A0=87=E7=B1=BB=E5=9E=8B=E5=88=87=E6=8D=A2=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/kpi/KPISettings.jsx         | 2 +-
 src/components/kpi/SubjectTable/Count.jsx  | 4 ++--
 src/components/kpi/SubjectTable/Profit.jsx | 4 ++--
 src/components/kpi/SubjectTable/Rates.jsx  | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/kpi/KPISettings.jsx b/src/components/kpi/KPISettings.jsx
index d586de0..6abb666 100644
--- a/src/components/kpi/KPISettings.jsx
+++ b/src/components/kpi/KPISettings.jsx
@@ -64,7 +64,7 @@ export default observer((props) => {
       <Row gutter={16} className="mb-1 p-s1">
         <Col className="gutter-row mb-n1 p-none" span={24} style={{ backgroundColor: '#ffffff' }}>
           <Tabs
-            tabPosition={'left'}
+            tabPosition={'left'} defaultActiveKey={KPIStore.settingSubject} activeKey={KPIStore.settingSubject}
             onChange={(sub) => {
               KPIStore.setSettingSubject(sub);
               onSearchSubmit(searchFormStore.formValuesToSub);
diff --git a/src/components/kpi/SubjectTable/Count.jsx b/src/components/kpi/SubjectTable/Count.jsx
index 233e2d8..2f1f69d 100644
--- a/src/components/kpi/SubjectTable/Count.jsx
+++ b/src/components/kpi/SubjectTable/Count.jsx
@@ -106,7 +106,7 @@ export default observer((props) => {
             // defaultChecked={true}
             checked={editOpen}
             onChange={(e) => {
-              makeInitialTable(e);
+              e ? makeInitialTable(e) : resetTable();
             }}
           />
         </Space>
@@ -226,7 +226,7 @@ export default observer((props) => {
     <>
       <Row gutter={16} className="mb-1 ">
         <Col className="gutter-row mb-n1 p-none" span={24}>
-          <EditableProTable
+          <EditableProTable sticky
             key={KPIStore.settingYear}
             // headerTitle={`毛利`}
             columns={columns}
diff --git a/src/components/kpi/SubjectTable/Profit.jsx b/src/components/kpi/SubjectTable/Profit.jsx
index 465a46f..6e2007e 100644
--- a/src/components/kpi/SubjectTable/Profit.jsx
+++ b/src/components/kpi/SubjectTable/Profit.jsx
@@ -105,7 +105,7 @@ export default observer((props) => {
             // defaultChecked={true}
             checked={editOpen}
             onChange={(e) => {
-              makeInitialTable(e);
+              e ? makeInitialTable(e) : resetTable();
             }}
           />
         </Space>
@@ -226,7 +226,7 @@ export default observer((props) => {
     <>
       <Row gutter={16} className="mb-1 ">
         <Col className="gutter-row mb-n1 p-none" span={24}>
-          <EditableProTable
+          <EditableProTable sticky
             key={KPIStore.settingYear}
             // headerTitle={`毛利`}
             columns={columns}
diff --git a/src/components/kpi/SubjectTable/Rates.jsx b/src/components/kpi/SubjectTable/Rates.jsx
index d874c9a..ab7d727 100644
--- a/src/components/kpi/SubjectTable/Rates.jsx
+++ b/src/components/kpi/SubjectTable/Rates.jsx
@@ -100,7 +100,7 @@ export default observer((props) => {
             // defaultChecked={true}
             checked={editOpen}
             onChange={(e) => {
-              makeInitialTable(e);
+              e ? makeInitialTable(e) : resetTable();
             }}
           />
         </Space>
@@ -224,7 +224,7 @@ export default observer((props) => {
     <>
       <Row gutter={16} className="mb-1 ">
         <Col className="gutter-row mb-n1 p-none" span={24}>
-          <EditableProTable
+          <EditableProTable sticky
             key={KPIStore.settingYear}
             // headerTitle={`毛利`}
             columns={columns}