From d3d4ea44a12fa1c3501d3567cf8e8cb25b715284 Mon Sep 17 00:00:00 2001
From: manzhenhua <manzhenhua@mttop.cn>
Date: Tue, 19 May 2020 22:43:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/dataView-V2/_components/searchView/index.tsx | 3 +++
 components/dataView-V2/index.tsx                        | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/components/dataView-V2/_components/searchView/index.tsx b/components/dataView-V2/_components/searchView/index.tsx
index 22cd59b..566cbf3 100644
--- a/components/dataView-V2/_components/searchView/index.tsx
+++ b/components/dataView-V2/_components/searchView/index.tsx
@@ -73,6 +73,7 @@ const SearchForm = (props: Props) => {
                 return (
                     <DatePicker
                         {...componentAttr}
+                        allowClear
                         className={classnames(styles.timeStyle, className || styles.itemContent)}
                         placeholder={placeholder}
                         disabled={disabled}
@@ -82,6 +83,7 @@ const SearchForm = (props: Props) => {
                 return (
                     <RangePicker
                         {...componentAttr}
+                        allowClear
                         placeholder={placeholder}
                         className={classnames(styles.timeStyle, className || styles.itemContent)}
                         disabled={disabled}
@@ -91,6 +93,7 @@ const SearchForm = (props: Props) => {
                 return (
                     <Search
                         {...componentAttr}
+                        allowClear
                         request={col.request}
                         optionsKey={col.optionsKey}
                         placeholder={placeholder}
diff --git a/components/dataView-V2/index.tsx b/components/dataView-V2/index.tsx
index 9abd1c2..fc0fc23 100644
--- a/components/dataView-V2/index.tsx
+++ b/components/dataView-V2/index.tsx
@@ -59,7 +59,8 @@ const DataView = (props: Props, ref: Ref<any>) => {
             pageNum: state.pagination.pageNum,
         }, (pagination || {}));
     }
-    const _afterFetch = ({ dataSource, pagination }: any) => {
+    const _afterFetch = (params: any) => {
+        const { dataSource = [], pagination = {} } = params || {}
         return {
             pagination: { ...state.pagination, ...(pagination || {}) },
             dataSource: Array.isArray(dataSource) ? dataSource.slice() : [],
-- 
2.21.0