Commit d3d4ea44 authored by 满振华's avatar 满振华

修改组件

parent 4188bc4d
...@@ -73,6 +73,7 @@ const SearchForm = (props: Props) => { ...@@ -73,6 +73,7 @@ const SearchForm = (props: Props) => {
return ( return (
<DatePicker <DatePicker
{...componentAttr} {...componentAttr}
allowClear
className={classnames(styles.timeStyle, className || styles.itemContent)} className={classnames(styles.timeStyle, className || styles.itemContent)}
placeholder={placeholder} placeholder={placeholder}
disabled={disabled} disabled={disabled}
...@@ -82,6 +83,7 @@ const SearchForm = (props: Props) => { ...@@ -82,6 +83,7 @@ const SearchForm = (props: Props) => {
return ( return (
<RangePicker <RangePicker
{...componentAttr} {...componentAttr}
allowClear
placeholder={placeholder} placeholder={placeholder}
className={classnames(styles.timeStyle, className || styles.itemContent)} className={classnames(styles.timeStyle, className || styles.itemContent)}
disabled={disabled} disabled={disabled}
...@@ -91,6 +93,7 @@ const SearchForm = (props: Props) => { ...@@ -91,6 +93,7 @@ const SearchForm = (props: Props) => {
return ( return (
<Search <Search
{...componentAttr} {...componentAttr}
allowClear
request={col.request} request={col.request}
optionsKey={col.optionsKey} optionsKey={col.optionsKey}
placeholder={placeholder} placeholder={placeholder}
......
...@@ -59,7 +59,8 @@ const DataView = (props: Props, ref: Ref<any>) => { ...@@ -59,7 +59,8 @@ const DataView = (props: Props, ref: Ref<any>) => {
pageNum: state.pagination.pageNum, pageNum: state.pagination.pageNum,
}, (pagination || {})); }, (pagination || {}));
} }
const _afterFetch = ({ dataSource, pagination }: any) => { const _afterFetch = (params: any) => {
const { dataSource = [], pagination = {} } = params || {}
return { return {
pagination: { ...state.pagination, ...(pagination || {}) }, pagination: { ...state.pagination, ...(pagination || {}) },
dataSource: Array.isArray(dataSource) ? dataSource.slice() : [], dataSource: Array.isArray(dataSource) ? dataSource.slice() : [],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment