fix: Select[multiple|tags] should support allowClear, close: #4843 (#5478)

This commit is contained in:
Benjy Cui 2017-03-27 17:37:39 +08:00 committed by 偏右
parent c004001a5f
commit cb555fc30d
4 changed files with 20 additions and 3 deletions

View File

@ -26,7 +26,7 @@ A Selector similar to Select2.
| value | Current selected option. | string\|string[] | - |
| defaultValue | Initial selected option. | string\|string[] | - |
| multiple | Allow multiple select. | boolean | false |
| allowClear | Show clear button, working in single mode only. | boolean | false |
| allowClear | Show clear button. | boolean | false |
| filterOption | If true, filter options by input, if function, filter options against it. The function will receive two arguments, `inputValue` and `option`, if the function returns `true`, the option will be included in the filtered set; Otherwise, it will be excluded. | boolean or function(inputValue, option) | true |
| tags | When tagging is enabled the user can select from pre-existing options or create a new tag by picking the first choice, which is what the user has typed into the search box so far. | boolean |false |
| onSelect | Called when a option is selected, the params are option's value (or key) and option instance. | function(value, option) | - |

View File

@ -27,7 +27,7 @@ title: Select
| value | 指定当前选中的条目 | string\|string[] | - |
| defaultValue | 指定默认选中的条目 | string\|string[] | - |
| multiple | 支持多选 | boolean | false |
| allowClear | 支持清除, 单选模式有效 | boolean | false |
| allowClear | 支持清除 | boolean | false |
| filterOption | 是否根据输入项进行筛选。当其为一个函数时,会接收 `inputValue` `option` 两个参数,当 `option` 符合筛选条件时,应返回 `true`,反之则返回 `false`。 | boolean or function(inputValue, option) | true |
| tags | 可以把随意输入的条目作为 tag输入项不需要与下拉选项匹配 | boolean |false |
| onSelect | 被选中时调用,参数为选中项的 value (或 key) 值 | function(value, option) | - |

View File

@ -173,6 +173,9 @@
line-height: @input-height-lg - 8px;
}
}
.@{select-prefix-cls}-selection__clear {
top: @input-height-lg / 2;
}
}
}
@ -191,6 +194,9 @@
line-height: @input-height-sm - 8px;
}
}
.@{select-prefix-cls}-selection__clear {
top: @input-height-sm / 2;
}
}
}
@ -335,6 +341,14 @@
content: "\e633";
}
}
.@{select-prefix-cls}-selection__clear {
top: @input-height-base / 2;
}
}
&-allow-clear &-selection--multiple &-selection__rendered {
margin-right: 20px; // In case that clear button will overlap content
}
&-open {
@ -372,6 +386,9 @@
box-shadow: none;
}
}
&-combobox&-allow-clear &-selection:hover &-selection__rendered {
margin-right: 20px; // In case that clear button will overlap content
}
}
.@{select-prefix-cls}-dropdown {

View File

@ -58,7 +58,7 @@
"rc-progress": "~2.0.1",
"rc-radio": "~2.0.0",
"rc-rate": "~2.1.0",
"rc-select": "~6.7.1",
"rc-select": "~6.8.0",
"rc-slider": "~6.1.0",
"rc-steps": "~2.4.0",
"rc-switch": "~1.4.2",