Merge pull request #21 from binjie09/master

[IMP] upgrade to 0.4.0
open-hand · Sep 29, 2018 · 6553fa4 · 6553fa4
2 parents 5e5098e + 2732202
commit 6553fa4
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md
@@ -15,6 +15,14 @@ timeline: true
 
 ---
 
+## 0.4.0
+
+`2018-09-28`
+
+- 🌟 `Select`: Improve the customization ability of `maxTagCount`.
+- 💄 `Input`: Adjust the style.
+- 💄 `Select`: Adjust the style.
+
 ## 0.3.10
 
 `2018-09-21`

diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md
@@ -15,6 +15,14 @@ timeline: true
 
 ---
 
+## 0.4.0
+
+`2018-09-28`
+
+- 🌟 `Select`: select有maxTagCount且超出限制时显示的标签可以自定样式,且去除默认的背景颜色。
+- 💄 `Input`: 修复input的showLengthInfo为false时在某些情况下仍显示字数限制信息的问题。
+- 💄 `Select`: 回滚select的部分样式至0.3.4版本。
+
 ## 0.3.10
 
 `2018-09-14`

diff --git a/components/input/Input.tsx b/components/input/Input.tsx
@@ -142,11 +142,12 @@ export default class Input extends React.Component<InputProps, any> {
 
   componentDidMount() {
     const { inputLength } = this.state;
-    const { focused } = this.props;
+    const { focused, showLengthInfo } = this.props;
     const inputValueLength = this.input.value.length;
     if (inputValueLength !== inputLength) {
       this.setState({
         inputLength: inputValueLength,
+        showLengthInfo,
       });
     }
     if (this.props.autoFocus) {

diff --git a/components/rc-components/select/Select.jsx b/components/rc-components/select/Select.jsx
@@ -1226,7 +1226,7 @@ export default class Select extends React.Component {
           style={UNSELECTABLE_STYLE}
           {...UNSELECTABLE_ATTRIBUTE}
           onMouseDown={preventDefaultEvent}
-          className={`${prefixCls}-selection__choice ${prefixCls}-selection__choice__disabled`}
+          className={`${prefixCls}-selection__choice ${prefixCls}-selection__choice__disabled ${prefixCls}-selection__max`}
           key={'maxTagPlaceholder'}
           title={content}
         >

diff --git a/components/select/style/index.less b/components/select/style/index.less
@@ -375,8 +375,8 @@
 
       > ul > li,
       .@{select-prefix-cls}-selection__rendered > ul > li { // for tree-select
-        height: 20px;
-        line-height: 20px;
+        height: @input-height-base - 8px;
+        line-height: @input-height-base - 8px;
         box-sizing: content-box;
       }
 
@@ -409,8 +409,8 @@
           margin-left: 8px;
           > i.icon {
             float: right;
-            height: 20px;
-            line-height: 19px;
+            height: @input-height-base - 8px;
+            line-height: @input-height-base - 8px;
           }
         }
       }
@@ -425,6 +425,9 @@
         &__remove {
           color: rgba(0, 0, 0, 0.54);
         }
+        &.@{select-prefix-cls}-selection__max {
+          background-color: rgba(0, 0, 0, 0);
+        }
       }
     }
     &.@{select-prefix-cls}-allow-clear {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "choerodon-ui",
-  "version": "0.3.10",
+  "version": "0.4.0",
   "title": "Choerodon UI",
   "description": "An enterprise-class UI design language and React-based implementation",
   "homepage": "",