From 9589e0e1bfd14f2297563fa9a9b3bdcbc7723b74 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 16 二月 2024 21:12:52 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/components/TableSearch/index.jsx |   37 ++++++++++++++++---------------------
 1 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/zy-asrs-flow/src/components/TableSearch/index.jsx b/zy-asrs-flow/src/components/TableSearch/index.jsx
index 9fbb760..fec61cd 100644
--- a/zy-asrs-flow/src/components/TableSearch/index.jsx
+++ b/zy-asrs-flow/src/components/TableSearch/index.jsx
@@ -1,8 +1,10 @@
 import React from 'react';
 import { Input, Button, Space, Select, DatePicker } from 'antd';
 import Http from '@/utils/http';
+import moment from 'moment';
 
 const NONE_OPTION = -9999;
+const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 
 const TextFilter = (props) => {
     return (
@@ -120,9 +122,9 @@
                         onChange={changeDates => {
                             setDates(changeDates);
                             if (changeDates && changeDates[0] && changeDates[1]) {
-                                const changeStartStr = changeDates[0]?.toISOString()
+                                const changeStartStr = moment(changeDates[0]).format(DATE_FORMAT);
                                 setStartDate(changeStartStr);
-                                const changeEndStr = changeDates[1]?.toISOString()
+                                const changeEndStr = moment(changeDates[1]).format(DATE_FORMAT);
                                 setEndDate(changeEndStr);
                                 props.setSelectedKeys([changeStartStr + '-' + changeEndStr]);
                             }
@@ -175,25 +177,20 @@
     const [options, setOptions] = React.useState([]);
 
     const fetchData = async (value) => {
-        const resp = await Http.doPostForm(`api/${props.name}/query`, { condition: value });
-        return resp.data;
+        return await Http.doPostForm(`api/${props.name}/query`, { condition: value });
+    }
+
+    async function initOptions(value) {
+        const { data } = await fetchData(value);
+        setOptions(data);
     }
 
     React.useEffect(() => {
-        async function init() {
-            const data = await fetchData();
-            setOptions(data);
-        }
-        init()
+        initOptions()
     }, []);
 
-    const handleSearch = async (value) => {
-        if (value) {
-            const data = await fetchData(value);
-            setOptions(data);
-        } else {
-            setOptions([]);
-        }
+    const handleSearch = (value) => {
+        initOptions(value)
     }
 
     return (
@@ -208,13 +205,10 @@
                         props.setSelectedKeys(value !== undefined && value !== null ? [value] : []);
                     }}
                     onSearch={handleSearch}
+                    options={options.map(item => ({ value: item.value, label: item.label }))}
+                    filterOption={false}
                     showSearch={true}
                 >
-                    {options.map(item => (
-                        <Select.Option key={item.value} value={item.value}>
-                            {item.label}
-                        </Select.Option>
-                    ))}
                 </Select>
             </div>
             <Space>
@@ -246,6 +240,7 @@
                         setCurrentOption(NONE_OPTION)
                         props.setSelectedKeys([]);
                         props.clearFilters();
+                        initOptions()
                     }}
                     size="small"
                     style={{ width: 90 }}

--
Gitblit v1.9.1