From b016d1eb02dd09fd1ffcd24e4e6ddee72fd1b3d6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 28 二月 2024 10:27:25 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/components/TableSearch/index.jsx |   65 ++++++++++++++++++++++++++++----
 1 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/zy-asrs-flow/src/components/TableSearch/index.jsx b/zy-asrs-flow/src/components/TableSearch/index.jsx
index fec61cd..22c9019 100644
--- a/zy-asrs-flow/src/components/TableSearch/index.jsx
+++ b/zy-asrs-flow/src/components/TableSearch/index.jsx
@@ -7,14 +7,17 @@
 const DATE_FORMAT = 'YYYY-MM-DD HH:mm:ss';
 
 const TextFilter = (props) => {
+    const [condition, setCondition] = React.useState('');
+
     return (
         <div style={{ padding: 8 }}>
             <Input
                 style={{ width: 188, marginBottom: 8, display: 'block' }}
                 placeholder="璇疯緭鍏�"
-                value={props.selectedKeys[0]}
+                value={condition}
                 onChange={e => {
-                    props.setSelectedKeys(e.target.value ? [e.target.value] : [])
+                    props.setSelectedKeys(e.target.value ? [e.target.value] : []);
+                    setCondition(e.target.value)
                 }}
             />
             <Space>
@@ -22,10 +25,18 @@
                     type="primary"
                     onClick={() => {
                         props.confirm();
-                        props.setSearchParam(prevState => ({
-                            ...prevState,
-                            [props.name]: props.selectedKeys[0]
-                        }));
+                        if (condition === '' || condition === null || condition === undefined) {
+                            props.setSearchParam(prevState => {
+                                const state = { ...prevState };
+                                delete state[props.name];
+                                return state;
+                            })
+                        } else {
+                            props.setSearchParam(prevState => ({
+                                ...prevState,
+                                [props.name]: condition
+                            }));
+                        }
                         props.actionRef.current?.reload();
                     }}
                     size="small"
@@ -34,7 +45,19 @@
                     纭畾
                 </Button>
                 <Button
-                    onClick={() => props.clearFilters && props.clearFilters()}
+                    onClick={() => {
+                        setCondition('')
+                        props.setSelectedKeys([]);
+                        props.clearFilters()
+
+                        props.confirm();
+                        props.setSearchParam(prevState => {
+                            const state = { ...prevState };
+                            delete state[props.name];
+                            return state;
+                        })
+                        props.actionRef.current?.reload();
+                    }}
                     size="small"
                     style={{ width: 90 }}
                 >
@@ -96,6 +119,14 @@
                         setCurrentOption(NONE_OPTION)
                         props.setSelectedKeys([]);
                         props.clearFilters();
+
+                        props.confirm();
+                        props.setSearchParam(prevState => {
+                            const state = { ...prevState };
+                            delete state[props.name];
+                            return state;
+                        })
+                        props.actionRef.current?.reload();
                     }}
                     size="small"
                     style={{ width: 90 }}
@@ -160,6 +191,14 @@
                                 setEndDate(null);
                                 props.setSelectedKeys([]);
                                 props.clearFilters();
+
+                                props.confirm();
+                                props.setSearchParam(prevState => {
+                                    const nextState = { ...prevState };
+                                    delete nextState[props.name + 'Range'];
+                                    return nextState;
+                                });
+                                props.actionRef.current?.reload();
                             }}
                             size="small"
                         >
@@ -175,9 +214,9 @@
 const LinkFilter = (props) => {
     const [currentOption, setCurrentOption] = React.useState();
     const [options, setOptions] = React.useState([]);
-
+    
     const fetchData = async (value) => {
-        return await Http.doPostForm(`api/${props.name}/query`, { condition: value });
+        return await Http.doPostForm(`api/${props.major}/query`, { condition: value });
     }
 
     async function initOptions(value) {
@@ -241,6 +280,14 @@
                         props.setSelectedKeys([]);
                         props.clearFilters();
                         initOptions()
+
+                        props.confirm();
+                        props.setSearchParam(prevState => {
+                            const state = { ...prevState };
+                            delete state[props.name];
+                            return state;
+                        })
+                        props.actionRef.current?.reload();
                     }}
                     size="small"
                     style={{ width: 90 }}

--
Gitblit v1.9.1