From 2fdb443514302b1adef8ea7417c809f295a03e7c Mon Sep 17 00:00:00 2001
From: Lei OT <lyt@hainatravel.com>
Date: Tue, 26 Sep 2023 15:47:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/search/BusinessSelect.jsx     |  2 +-
 src/components/search/BusinessUnitSelect.jsx |  2 +-
 src/components/search/DataTypeSelect.jsx     |  5 +++--
 src/components/search/GroupSelect.jsx        |  2 +-
 src/components/search/SearchForm.jsx         | 12 ++++++------
 src/components/search/SiteSelect.jsx         |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/components/search/BusinessSelect.jsx b/src/components/search/BusinessSelect.jsx
index cb94770..c84eb5e 100644
--- a/src/components/search/BusinessSelect.jsx
+++ b/src/components/search/BusinessSelect.jsx
@@ -20,7 +20,7 @@ const Business_unit = (props) => {
                   }
                   store?.bu_handleChange(value);
                 }}
-                labelInValue={true}
+                labelInValue={false}
                 {...extProps}
             >
                 {props.show_all ? <Select.Option key="-1" value="ALL">ALL 事业部</Select.Option> : ''}
diff --git a/src/components/search/BusinessUnitSelect.jsx b/src/components/search/BusinessUnitSelect.jsx
index 1b0738c..2c24c78 100644
--- a/src/components/search/BusinessUnitSelect.jsx
+++ b/src/components/search/BusinessUnitSelect.jsx
@@ -21,7 +21,7 @@ const Business_unit = (props) => {
                   }
                   // store?.bu_handleChange(value);
                 }}
-                labelInValue={true}
+                labelInValue={false}
                 {...extProps}
             >
                 {_show_all ? <Select.Option key="-1" value="ALL">ALL 事业部</Select.Option> : ''}
diff --git a/src/components/search/DataTypeSelect.jsx b/src/components/search/DataTypeSelect.jsx
index 731c81b..9d199ba 100644
--- a/src/components/search/DataTypeSelect.jsx
+++ b/src/components/search/DataTypeSelect.jsx
@@ -23,15 +23,16 @@ class DataTypeSelect extends Component {
   };
 
   render() {
-    const store = this.props.store;
+    const { store, ...extProps } = this.props;
     return (
-        <Select labelInValue={true}
+        <Select labelInValue={false}
           // value={store.date_type}
           value={this.props?.value || store?.date_type}
           style={{ width: '100%' }}
           placeholder="选择日期类型"
           // onChange={(value) => store.onChange_datetype(value)}
           onChange={this.handleChange}
+          {...extProps}
         >
           {dateTypes.map((ele) => (
             <Select.Option key={ele.key} value={ele.key}>
diff --git a/src/components/search/GroupSelect.jsx b/src/components/search/GroupSelect.jsx
index edfb5a4..ba897bc 100644
--- a/src/components/search/GroupSelect.jsx
+++ b/src/components/search/GroupSelect.jsx
@@ -26,7 +26,7 @@ class GroupSelect extends Component {
             }
             store?.group_handleChange(value);
           }}
-          labelInValue={true}
+          labelInValue={false}
           maxTagCount={1}
           maxTagPlaceholder={(omittedValues) => ` + ${omittedValues.length} 更多...`}
           allowClear={_mode != null}
diff --git a/src/components/search/SearchForm.jsx b/src/components/search/SearchForm.jsx
index e1abb50..e8051c4 100644
--- a/src/components/search/SearchForm.jsx
+++ b/src/components/search/SearchForm.jsx
@@ -175,7 +175,7 @@ export default observer((props) => {
   };
   const onValuesChange = (...args) => {
     const [changedValues, allValues] = args;
-    console.log('form onValuesChange', Object.keys(changedValues), args);
+    // console.log('form onValuesChange', Object.keys(changedValues), args);
 
     const dest = formValuesMapper(allValues);
     searchFormStore.setFormValues(allValues);
@@ -232,28 +232,28 @@ function getFields(props) {
       'HTBusinessUnits',
       99,
       <Form.Item name={`HTBusinessUnits`} initialValue={at(props, 'initialValue.HTBusinessUnits')[0] || undefined}>
-        <BusinessUnitSelect {...fieldProps.HTBusinessUnits} />
+        <BusinessUnitSelect {...fieldProps.HTBusinessUnits} labelInValue={true} />
       </Form.Item>
     ),
     item(
       'businessUnits',
       99,
       <Form.Item name={`businessUnits`} initialValue={at(props, 'initialValue.businessUnits')[0] || undefined}>
-        <BusinessSelect {...fieldProps.businessUnits} />
+        <BusinessSelect {...fieldProps.businessUnits} labelInValue={true} />
       </Form.Item>
     ),
     item(
       'DepartmentList',
       99,
       <Form.Item name={`DepartmentList`} initialValue={at(props, 'initialValue.DepartmentList')[0] || (fieldProps?.DepartmentList?.show_all ? { key: 'ALL', label: '所有小组' } : undefined)}>
-        <GroupSelect {...fieldProps.DepartmentList} />
+        <GroupSelect {...fieldProps.DepartmentList} labelInValue={true} />
       </Form.Item>
     ),
     item(
       'WebCode',
       99,
       <Form.Item name={`WebCode`} initialValue={at(props, 'initialValue.WebCode')[0] || (fieldProps?.WebCode?.show_all ? { key: 'ALL', label: '所有来源' } : undefined)}>
-        <SiteSelect {...fieldProps.WebCode} />
+        <SiteSelect {...fieldProps.WebCode} labelInValue={true} />
       </Form.Item>
     ),
     item(
@@ -277,7 +277,7 @@ function getFields(props) {
       'DateType',
       99,
       <Form.Item name={`DateType`} initialValue={at(props, 'initialValue.DateType')[0] || { key: 'applyDate', label: '提交日期' }}>
-        <DateTypeSelect />
+        <DateTypeSelect labelInValue={true} />
       </Form.Item>,
       2
     ),
diff --git a/src/components/search/SiteSelect.jsx b/src/components/search/SiteSelect.jsx
index 3d22f93..2e25905 100644
--- a/src/components/search/SiteSelect.jsx
+++ b/src/components/search/SiteSelect.jsx
@@ -26,7 +26,7 @@ class SiteSelect extends Component {
                       }
                       store?.handleChange_webcode(value);
                     }}
-                    labelInValue={true}
+                    labelInValue={false}
                     maxTagCount={1}
                     maxTagPlaceholder={(omittedValues) => ` + ${omittedValues.length} 更多...`}
                     allowClear={_mode != null}