github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

fix datepicker test, revert emitter-removing attempt

pull/4626/head
Leopoldthecoder 2017-05-03 12:28:52 +08:00 committed by 杨奕
parent 0da3967d3a
commit d6265daf73
5 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build/release.sh
View File

@ -19,7 +19,12 @@ then
echo "Releasing theme-default $VERSION ..." echo "Releasing theme-default $VERSION ..."
cd packages/theme-default cd packages/theme-default
npm version $VERSION --message "[release] $VERSION" npm version $VERSION --message "[release] $VERSION"
npm publish --tag beta if [[ $VERSION =~ "beta" ]]
then
npm publish --tag beta
else
npm publish
fi
cd ../.. cd ../..
# commit # commit
@ -34,5 +39,10 @@ then
git rebase master git rebase master
git push eleme dev git push eleme dev
npm publish --tag beta if [[ $VERSION =~ "beta" ]]
then
npm publish --tag beta
else
npm publish
fi
fi fi

2
examples/docs/zh-CN/tag.md
View File

@ -87,7 +87,7 @@
```html ```html
<el-tag <el-tag
v-for="tag in tags" v-for="tag in tags"
:key="item.name" :key="tag.name"
:closable="true" :closable="true"
:type="tag.type" :type="tag.type"
> >

6
packages/theme-default/src/input.css
View File

@ -143,9 +143,9 @@
margin: -10px; margin: -10px;
} }
& .el-button, & button.el-button,
& .el-select .el-input__inner, & div.el-select .el-input__inner,
& .el-select:hover .el-input__inner { & div.el-select:hover .el-input__inner {
border-color: transparent; border-color: transparent;
background-color: transparent; background-color: transparent;
color: inherit; color: inherit;

2
packages/theme-default/src/table-column.css
View File

@ -78,7 +78,7 @@
@e checkbox-group { @e checkbox-group {
padding: 10px; padding: 10px;
.el-checkbox { label.el-checkbox {
display: block; display: block;
margin-bottom: 8px; margin-bottom: 8px;
margin-left: 5px; margin-left: 5px;

6
test/unit/specs/date-picker.spec.js
View File

@ -702,7 +702,6 @@ describe('DatePicker', () => {
const currentMonth = new Date(new Date().getTime()); const currentMonth = new Date(new Date().getTime());
currentMonth.setDate(1); currentMonth.setDate(1);
const FirstDayOfCurrentMonth = currentMonth.getDay();
const chineseWeek = ['一', '二', '三', '四', '五', '六', '日']; const chineseWeek = ['一', '二', '三', '四', '五', '六', '日'];
const testWeek = (i) => it('picker-options:firstDayOfWeek ' + i, done => { const testWeek = (i) => it('picker-options:firstDayOfWeek ' + i, done => {
@ -718,13 +717,8 @@ describe('DatePicker', () => {
input.focus(); input.focus();
setTimeout(_ => { setTimeout(_ => {
const prevMonthLen = vm.picker.$el.querySelectorAll('.prev-month').length;
const firstWeek = vm.picker.$el.querySelector('tr th'); const firstWeek = vm.picker.$el.querySelector('tr th');
const offset = i > 3 ? 7 - i : -i;
const day = FirstDayOfCurrentMonth === 0 ? 7 : FirstDayOfCurrentMonth;
expect(firstWeek.innerText).to.equal(chineseWeek[i - 1]); expect(firstWeek.innerText).to.equal(chineseWeek[i - 1]);
expect(prevMonthLen - day).to.equal(offset);
done(); done();
}); });
}); });