diff --git a/components/DataView/index.js b/components/DataView/index.js index 167cce8c1265bc1e9ef7675a1deb1d62a9c91371..008fbab05f575dcf0c81b26af152723f97702365 100644 --- a/components/DataView/index.js +++ b/components/DataView/index.js @@ -569,14 +569,14 @@ export default class DataView extends React.Component { // 渲染搜索栏 _renderSearchForm = () => { - const { searchCols, advancedCols } = this.props; + const { searchCols, advancedSearchCols } = this.props; const { searchForm } = this.state; if (searchCols === null || searchCols.length <= 0) return null; return ( @@ -617,8 +617,8 @@ export default class DataView extends React.Component { // 渲染查询条件按钮组件 _renderFilterBtn = () => { - let { searchCols, advancedCols } = this.props; - searchCols = [...searchCols, ...advancedCols]; + let { searchCols, advancedSearchCols } = this.props; + searchCols = [...searchCols, ...advancedSearchCols]; const { searchForm, siftDataArr, currentSiftNum } = this.state; if (searchCols === null || searchCols.length <= 0) return null; const chooseItems = formatForm(searchForm, searchCols); diff --git a/components/SearchView/index.js b/components/SearchView/index.js index 730e1b6c8797f972e2fa99e35a3e883590e7228b..403452a0290f1485b295ee9218f611ccb8ce1485 100644 --- a/components/SearchView/index.js +++ b/components/SearchView/index.js @@ -353,14 +353,16 @@ class SearchView extends React.Component { }; render() { - const { style, searchCols = [], advancedCols = [] } = this.props; + const { style, searchCols = [], advancedSearchCols = [] } = this.props; return ( + {/* 基础搜索 */} {searchCols.map((arr, index) => { return this._renderRow(arr, index); })} + {/* 高级搜索 */} - {advancedCols.map((arr, index) => { + {advancedSearchCols.map((arr, index) => { return this._renderRow(arr, index); })}