🐛 bug: fix toolbar second search doesn't work (#647)

ant-design · Jul 22, 2020 · 4b1307a · 4b1307a
1 parent 57ec2fe
commit 4b1307a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/docs/example/search.tsx b/docs/example/search.tsx
@@ -87,17 +87,14 @@ export default () => {
             if (!params.keyWord) {
               return true;
             }
-            if (item.name.includes(params.keyWord) || item.status.includes(params.keyWord)) {
-              return true;
-            }
-            return false;
+            return item.name.includes(params.keyWord) || item.status.includes(params.keyWord);
           }),
           success: true,
         })
       }
       options={{
         search: {
-          name: 'qixian',
+          name: 'keyWord',
         },
       }}
       rowKey="key"

diff --git a/src/Table.tsx b/src/Table.tsx
@@ -913,8 +913,8 @@ const ProTable = <T extends {}, U extends object>(
                   }
                 : options.search;
             setFormSearch({
-              [name]: keyword,
               ...formSearch,
+              [name]: keyword,
             });
           }
         }}