From cd141e06e13b057773c68dcb8cefde290dbcf789 Mon Sep 17 00:00:00 2001
From: caichuanming <caichuanming@mttop.cn>
Date: Mon, 10 Feb 2020 22:47:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/DataView/index.js   | 8 ++++----
 components/SearchView/index.js | 6 ++++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/DataView/index.js b/components/DataView/index.js
index 167cce8..008fbab 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 (
             <SearchView
                 searchForm={searchForm}
                 searchCols={searchCols}
-                advancedCols={advancedCols}
+                advancedSearchCols={advancedSearchCols}
                 search={this.search}
                 onChangeParams={this._changeSearchForm}
             />
@@ -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 730e1b6..403452a 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 (
             <BIForm className={styles.view} style={style}>
+                {/* 基础搜索 */}
                 {searchCols.map((arr, index) => {
                     return this._renderRow(arr, index);
                 })}
+                {/* 高级搜索 */}
                 <SearchViewAdvanced>
-                    {advancedCols.map((arr, index) => {
+                    {advancedSearchCols.map((arr, index) => {
                         return this._renderRow(arr, index);
                     })}
                 </SearchViewAdvanced>
-- 
2.21.0