Merge branch 'master' of http://apollo.mttop.cn/gitlab/web_component/submodule

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}

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() : [],