From 43b35a88dce4d033b7f4529f320c74481b993389 Mon Sep 17 00:00:00 2001
From: kvkens <kvkens@qq.com>
Date: Wed, 28 Nov 2018 11:53:27 +0800
Subject: [PATCH] =?UTF-8?q?bugfix:=E8=B0=83=E6=95=B4=E8=BF=87=E6=BB=A4?=
=?UTF-8?q?=E8=A1=8C=E7=9A=84wrap=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
build/FilterType.js | 6 +++---
src/FilterType.js | 12 ++++++------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/build/FilterType.js b/build/FilterType.js
index 3a5772f..2da94ee 100644
--- a/build/FilterType.js
+++ b/build/FilterType.js
@@ -230,7 +230,7 @@ var FilterType = function (_Component) {
format: format,
locale: _zh_CN2["default"]
})),
- filterDropdown == 'show' && _react2["default"].createElement(_FilterDropDown2["default"], {
+ _react2["default"].createElement(_FilterDropDown2["default"], {
locale: locale,
onSelectDropdown: onSelectDropdown,
onClickClear: _this.clearDateValue,
@@ -252,7 +252,7 @@ var FilterType = function (_Component) {
dateInputPlaceholder: ['开始', '结束'],
showClear: true
})),
- filterDropdown == 'show' && _react2["default"].createElement(_FilterDropDown2["default"], {
+ _react2["default"].createElement(_FilterDropDown2["default"], {
locale: locale,
onSelectDropdown: onSelectDropdown,
onClickClear: _this.clearDateValue,
@@ -268,7 +268,7 @@ var FilterType = function (_Component) {
className: className,
onChange: onChange
}),
- filterDropdown == 'show' && _react2["default"].createElement(_FilterDropDown2["default"], { locale: locale,
+ _react2["default"].createElement(_FilterDropDown2["default"], { locale: locale,
onSelectDropdown: onSelectDropdown
})
);
diff --git a/src/FilterType.js b/src/FilterType.js
index e9c02e6..e7d98af 100644
--- a/src/FilterType.js
+++ b/src/FilterType.js
@@ -174,14 +174,14 @@ class FilterType extends Component {
open={this.state.open}
format={format}
locale={zhCN}
- />{filterDropdown == 'show' && <FilterDropDown
+ /><FilterDropDown
locale={locale}
onSelectDropdown={onSelectDropdown}
onClickClear={this.clearDateValue}
isShowCondition={filterDropdown}
isShowClear={this.state.dateValue}
>
- </FilterDropDown>}
+ </FilterDropDown>
</div>
case 'daterange':
return <div className={`${clsPrefix} filter-wrap`}>
@@ -195,14 +195,14 @@ class FilterType extends Component {
placeholder={'开始 ~ 结束'}
dateInputPlaceholder={['开始', '结束']}
showClear={true}
- />{filterDropdown == 'show' && <FilterDropDown
+ /><FilterDropDown
locale={locale}
onSelectDropdown={onSelectDropdown}
onClickClear={this.clearDateValue}
isShowCondition={filterDropdown}
isShowClear={this.state.dateValue}
>
- </FilterDropDown>}
+ </FilterDropDown>
</div>
case 'bool':
return <div className={`${clsPrefix} filter-wrap`}>
@@ -210,10 +210,10 @@ class FilterType extends Component {
className={className}
onChange={onChange}
/>
- {filterDropdown == 'show' && <FilterDropDown locale={locale}
+ <FilterDropDown locale={locale}
onSelectDropdown={onSelectDropdown}
>
- </FilterDropDown>}
+ </FilterDropDown>
</div>
default:
return <div></div>;