From d574f59111c564599045aff3f027840622c1b01d Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Fri, 22 Sep 2023 10:53:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6=E7=9A=84?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/search/SearchForm.jsx | 11 ++++++++---
 src/stores/DatePickerStore.js        | 18 ++++++++++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/components/search/SearchForm.jsx b/src/components/search/SearchForm.jsx
index 1a4a40a..9dca78c 100644
--- a/src/components/search/SearchForm.jsx
+++ b/src/components/search/SearchForm.jsx
@@ -1,4 +1,4 @@
-import { createContext, useContext } from 'react';
+import { createContext, useContext, useEffect } from 'react';
 import { toJS } from 'mobx';
 import { observer } from 'mobx-react';
 import { DATE_FORMAT, stores_Context } from './../../config';
@@ -14,7 +14,7 @@ import DateTypeSelect from './DataTypeSelect';
 import DatePickerCharts from './DatePickerCharts';
 import YearPickerCharts from './YearPickerCharts';
 import SearchInput from './Input';
-import { objectMapper, at } from './../../utils/commons';
+import { objectMapper, at, empty } from './../../utils/commons';
 
 import './search.css';
 
@@ -44,7 +44,7 @@ export default observer((props) => {
   };
   const { onSubmit, confirmText } = props;
 
-  const onFinish = (values) => {
+  const formValuesMapper = (values) => {
     console.log('Received values of form, origin form value: ', values);
     const destinationObject = {
       'DateType': {
@@ -155,6 +155,11 @@ export default observer((props) => {
     // omit empty
     Object.keys(dest).forEach((key) => (dest[key] == null || dest[key] === '' || dest[key].length === 0) && delete dest[key]);
     console.log('form value send to onSubmit:', dest);
+    return dest;
+  };
+
+  const onFinish = (values) => {
+    const dest = formValuesMapper(values);
     const str = new URLSearchParams(dest).toString();
     searchFormStore.setFormValues(values);
     searchFormStore.setFormValuesToSub(dest);
diff --git a/src/stores/DatePickerStore.js b/src/stores/DatePickerStore.js
index 9735607..d4f24eb 100644
--- a/src/stores/DatePickerStore.js
+++ b/src/stores/DatePickerStore.js
@@ -10,8 +10,22 @@ class DatePickerStore {
         makeAutoObservable(this);
     }
 
-    formValues = {};
-    formValuesToSub = {};
+    formValues = {
+      'DepartmentList': { 'key': 'ALL', 'label': '所有小组' },
+      'WebCode': { 'key': 'ALL', 'label': '所有来源' },
+      'IncludeTickets': { 'key': '1', 'label': '含门票' },
+      'DateType': { 'key': 'applyDate', 'label': '提交日期' },
+      'year': moment(),
+    };
+
+    formValuesToSub = {
+      DepartmentList: 'ALL',
+      WebCode: 'ALL',
+      IncludeTickets: '1',
+      DateType: 'applyDate',
+      Date1: moment().startOf('year').format('YYYY-MM-DD'),
+      Date2: moment().endOf('year').format('YYYY-MM-DD 23:59'),
+    };
 
     start_date = moment().startOf('week').subtract(7, 'days');
     end_date = moment().endOf('week').subtract(7, 'days');