Merge branch 'dev' of gitlab.corp.qunar.com:mfe/yapi into dev

This commit is contained in:
suxiaoxin 2017-09-13 17:09:09 +08:00
commit 5893962361
4 changed files with 3 additions and 10 deletions

View File

@ -91,15 +91,8 @@ class UsernameAutoComplete extends Component {
dataSource: userList dataSource: userList
}); });
if (userList.length) { if (userList.length) {
userList.forEach((item) => {
if (item.username === this.state.changeName) {
// 每次取回搜索值后,没选择时默认选择第一位 // 每次取回搜索值后,没选择时默认选择第一位
this.changeState(userList[0].id, userList[0].username); this.changeState(userList[0].id, userList[0].username);
} else {
// 有候选词但没有对应输入框中的字符串,此时应清空候选 uid 和 username
this.changeState(-1, '');
}
});
} else { } else {
// 如果没有搜索结果,则清空候选 uid 和 username // 如果没有搜索结果,则清空候选 uid 和 username
this.changeState(-1, ''); this.changeState(-1, '');

View File

@ -403,7 +403,7 @@ class ProjectMessage extends Component {
{getFieldDecorator('desc', { {getFieldDecorator('desc', {
initialValue: initFormValues.desc, initialValue: initFormValues.desc,
rules: [{ rules: [{
required: false, message: '描述不超过50字!', max: 50 required: false, message: '描述不超过100字!', max: 100
}] }]
})( })(
<TextArea rows={4} /> <TextArea rows={4} />

BIN
static/image/avatar-1.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 58 KiB