From d6265daf739aec93c02e469a117683035182871a Mon Sep 17 00:00:00 2001 From: Leopoldthecoder <Leopoldthecuber@gmail.com> Date: Wed, 3 May 2017 12:28:52 +0800 Subject: [PATCH] fix datepicker test, revert emitter-removing attempt --- build/release.sh | 14 ++++++++++++-- examples/docs/zh-CN/tag.md | 2 +- packages/theme-default/src/input.css | 6 +++--- packages/theme-default/src/table-column.css | 2 +- test/unit/specs/date-picker.spec.js | 6 ------ 5 files changed, 17 insertions(+), 13 deletions(-) diff --git a/build/release.sh b/build/release.sh index 0b98683bd..0a38339b3 100644 --- a/build/release.sh +++ b/build/release.sh @@ -19,7 +19,12 @@ then echo "Releasing theme-default $VERSION ..." cd packages/theme-default npm version $VERSION --message "[release] $VERSION" - npm publish --tag beta + if [[ $VERSION =~ "beta" ]] + then + npm publish --tag beta + else + npm publish + fi cd ../.. # commit @@ -34,5 +39,10 @@ then git rebase master git push eleme dev - npm publish --tag beta + if [[ $VERSION =~ "beta" ]] + then + npm publish --tag beta + else + npm publish + fi fi diff --git a/examples/docs/zh-CN/tag.md b/examples/docs/zh-CN/tag.md index 8b33d09a5..fe79de182 100644 --- a/examples/docs/zh-CN/tag.md +++ b/examples/docs/zh-CN/tag.md @@ -87,7 +87,7 @@ ```html <el-tag v-for="tag in tags" - :key="item.name" + :key="tag.name" :closable="true" :type="tag.type" > diff --git a/packages/theme-default/src/input.css b/packages/theme-default/src/input.css index 9ced767bc..6539c6c9d 100644 --- a/packages/theme-default/src/input.css +++ b/packages/theme-default/src/input.css @@ -143,9 +143,9 @@ margin: -10px; } - & .el-button, - & .el-select .el-input__inner, - & .el-select:hover .el-input__inner { + & button.el-button, + & div.el-select .el-input__inner, + & div.el-select:hover .el-input__inner { border-color: transparent; background-color: transparent; color: inherit; diff --git a/packages/theme-default/src/table-column.css b/packages/theme-default/src/table-column.css index e8cc13d84..7e4a38c9e 100644 --- a/packages/theme-default/src/table-column.css +++ b/packages/theme-default/src/table-column.css @@ -78,7 +78,7 @@ @e checkbox-group { padding: 10px; - .el-checkbox { + label.el-checkbox { display: block; margin-bottom: 8px; margin-left: 5px; diff --git a/test/unit/specs/date-picker.spec.js b/test/unit/specs/date-picker.spec.js index 501abe054..ac375cbe8 100644 --- a/test/unit/specs/date-picker.spec.js +++ b/test/unit/specs/date-picker.spec.js @@ -702,7 +702,6 @@ describe('DatePicker', () => { const currentMonth = new Date(new Date().getTime()); currentMonth.setDate(1); - const FirstDayOfCurrentMonth = currentMonth.getDay(); const chineseWeek = ['一', '二', '三', '四', '五', '六', '日']; const testWeek = (i) => it('picker-options:firstDayOfWeek ' + i, done => { @@ -718,13 +717,8 @@ describe('DatePicker', () => { input.focus(); setTimeout(_ => { - const prevMonthLen = vm.picker.$el.querySelectorAll('.prev-month').length; 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(prevMonthLen - day).to.equal(offset); done(); }); });