From f0a85b8a6ca2eb496efc52274f197572b38feb5f Mon Sep 17 00:00:00 2001 From: Leopoldthecoder Date: Fri, 20 Oct 2017 13:57:51 +0800 Subject: [PATCH 1/9] update Readme.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index de6da1df2..f27e0fb3a 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ > A Vue.js 2.0 UI Toolkit for Web. - - Sponsor - + + + ## Links - [Home Page](http://element.eleme.io/) From 0099a3f283005843ee7d9cb82c3059714d331a0f Mon Sep 17 00:00:00 2001 From: Leopoldthecoder Date: Fri, 20 Oct 2017 16:52:47 +0800 Subject: [PATCH 2/9] update beta notice --- examples/app.vue | 10 +++++----- examples/index.tpl | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/examples/app.vue b/examples/app.vue index 5b6ad5cc6..bf1521398 100644 --- a/examples/app.vue +++ b/examples/app.vue @@ -200,12 +200,12 @@ this.renderAnchorHref(); this.goAnchor(); setTimeout(() => { - const notified = localStorage.getItem('ALPHA_NOTIFIED'); + const notified = localStorage.getItem('BETA_NOTIFIED'); if (!notified) { const h = this.$createElement; const title = this.lang === 'zh-CN' - ? '2.0.0 Alpha 发布' - : '2.0.0 Alpha released'; + ? '2.0.0 Beta 发布' + : '2.0.0 Beta released'; const messages = this.lang === 'zh-CN' ? ['点击', '这里', '查看详情'] : ['Click ', 'here', ' to learn more']; @@ -217,13 +217,13 @@ h('a', { attrs: { target: '_blank', - href: `https://github.com/ElemeFE/element/issues/${ this.lang === 'zh-CN' ? '7304' : '7305' }` + href: `https://github.com/ElemeFE/element/issues/${ this.lang === 'zh-CN' ? '7612' : '7613' }` } }, messages[1]), messages[2] ]), onClose() { - localStorage.setItem('ALPHA_NOTIFIED', 1); + localStorage.setItem('BETA_NOTIFIED', 1); } }); } diff --git a/examples/index.tpl b/examples/index.tpl index 233c73a84..a33061ce2 100644 --- a/examples/index.tpl +++ b/examples/index.tpl @@ -9,7 +9,7 @@
<% if (process.env.NODE_ENV === 'production') { %> - + <% } %> From 1d90390fa57494203db37497a833c9a68c62fb73 Mon Sep 17 00:00:00 2001 From: DuLinRain Date: Mon, 23 Oct 2017 10:54:12 +0800 Subject: [PATCH 3/9] DateTimePicker: fix hidden last item of sidebar (#7567) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update picker-panel.css fix "last item been overlapped by footbar bug" when sidebar items are two more。even overflow can not resolve this problem, it is not the same thing. the details you can see https://dulinrain.github.io/elementui/ElementUI%E4%B9%8B%E6%97%B6%E9%97%B4%E6%8F%92%E4%BB%B6Bug.html * Update date-picker.css reply to the reviewe of #7567 (https://github.com/ElemeFE/element/pull/7567) * Update picker-panel.css remove the previous fix after the review of #7567(https://github.com/ElemeFE/element/pull/7567) * Update date-picker.css * Update picker-panel.css --- packages/theme-default/src/date-picker/date-picker.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/theme-default/src/date-picker/date-picker.css b/packages/theme-default/src/date-picker/date-picker.css index 9bc4eaa2e..01cd238a6 100644 --- a/packages/theme-default/src/date-picker/date-picker.css +++ b/packages/theme-default/src/date-picker/date-picker.css @@ -16,7 +16,9 @@ &.has-time { min-width: 324px; } - + &.has-time .el-picker-panel__body-wrapper { + position: relative; + } .el-picker-panel__content { min-width: 224px; } From f904e964f2d707b410fdb739364659bf33f7d7a6 Mon Sep 17 00:00:00 2001 From: lltemplar Date: Tue, 24 Oct 2017 12:07:37 +0800 Subject: [PATCH 4/9] Update form.md --- examples/docs/en-US/form.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/docs/en-US/form.md b/examples/docs/en-US/form.md index 83caa1daa..08f6bc125 100644 --- a/examples/docs/en-US/form.md +++ b/examples/docs/en-US/form.md @@ -399,7 +399,7 @@ Depending on your design, there are several different ways to align your label e Form component allows you to verify your data, helping you find and correct errors. -:::demo Just add the `rule` attribute for `Form` component, pass validation rules, and set `prop` attribute for `Form-Item` as a specific key that needs to be validated. See more information at [async-validator](https://github.com/yiminghe/async-validator). +:::demo Just add the `rules` attribute for `Form` component, pass validation rules, and set `prop` attribute for `Form-Item` as a specific key that needs to be validated. See more information at [async-validator](https://github.com/yiminghe/async-validator). ```html From 3b6b9fa5f7c0ee10ac195e0fc3862eca5dd76a4b Mon Sep 17 00:00:00 2001 From: lltemplar Date: Tue, 24 Oct 2017 11:53:06 +0800 Subject: [PATCH 5/9] Update form.md --- examples/docs/zh-CN/form.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/docs/zh-CN/form.md b/examples/docs/zh-CN/form.md index 56970a540..c8491a05f 100644 --- a/examples/docs/zh-CN/form.md +++ b/examples/docs/zh-CN/form.md @@ -391,7 +391,7 @@ 在防止用户犯错的前提下，尽可能让用户更早地发现并纠正错误。 -::: demo Form 组件提供了表单验证的功能，只需要通过 `rule` 属性传入约定的验证规则，并 Form-Item 的 `prop` 属性设置为需校验的字段名即可。校验规则参见 [async-validator](https://github.com/yiminghe/async-validator) +::: demo Form 组件提供了表单验证的功能，只需要通过 `rules` 属性传入约定的验证规则，并 Form-Item 的 `prop` 属性设置为需校验的字段名即可。校验规则参见 [async-validator](https://github.com/yiminghe/async-validator) ```html From 5698e77c72b2d0919a1e3d9e3480f86e5176280b Mon Sep 17 00:00:00 2001 From: phongkt Date: Tue, 24 Oct 2017 16:20:03 +0700 Subject: [PATCH 6/9] Dropdown: allow change show/hide timeout by props (#7621) * Dropdown: Allow change show/hide timeout by props * Dropdown: Fixes for document mistake --- examples/docs/en-US/dropdown.md | 2 ++ packages/dropdown/src/dropdown.vue | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/examples/docs/en-US/dropdown.md b/examples/docs/en-US/dropdown.md index bd9720bad..9309ab2ff 100644 --- a/examples/docs/en-US/dropdown.md +++ b/examples/docs/en-US/dropdown.md @@ -210,6 +210,8 @@ Clicking each dropdown item fires an event whose parameter is assigned by each i | menu-align | horizontal alignment | string | start/end | end | | trigger | how to trigger | string | hover/click | hover | | hide-on-click | whether to hide menu after clicking menu-item | boolean | — | true | +| show-timeout | Delay time before show a dropdown | number | — | 250 | +| hide-timeout | Delay time before hide a dropdown | number | — | 150 | ### Dropdown Events | Event Name | Description | Parameters | diff --git a/packages/dropdown/src/dropdown.vue b/packages/dropdown/src/dropdown.vue index d4dabd021..642176919 100644 --- a/packages/dropdown/src/dropdown.vue +++ b/packages/dropdown/src/dropdown.vue @@ -33,6 +33,14 @@ hideOnClick: { type: Boolean, default: true + }, + showTimeout: { + type: Number, + default: 250 + }, + hideTimeout: { + type: Number, + default: 150 } }, @@ -62,14 +70,14 @@ clearTimeout(this.timeout); this.timeout = setTimeout(() => { this.visible = true; - }, 250); + }, this.showTimeout); }, hide() { if (this.triggerElm.disabled) return; clearTimeout(this.timeout); this.timeout = setTimeout(() => { this.visible = false; - }, 150); + }, this.hideTimeout); }, handleClick() { if (this.triggerElm.disabled) return; From 664f89308680af774551e828e4dae99e14b17527 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E5=A5=95?= Date: Tue, 24 Oct 2017 05:19:04 -0500 Subject: [PATCH 7/9] Changelog: update for 1.4.8 (#7683) * Table: Trigger `doLayout` when display from `none` to others * Changelog: update for 1.4.8 --- CHANGELOG.en-US.md | 8 ++++ CHANGELOG.zh-CN.md | 7 +++ examples/docs/zh-CN/dropdown.md | 2 + examples/index.tpl | 5 +++ packages/table/src/table.vue | 3 ++ test/unit/specs/table.spec.js | 78 --------------------------------- 6 files changed, 25 insertions(+), 78 deletions(-) diff --git a/CHANGELOG.en-US.md b/CHANGELOG.en-US.md index 011544ef3..148532443 100644 --- a/CHANGELOG.en-US.md +++ b/CHANGELOG.en-US.md @@ -1,5 +1,13 @@ ## Changelog +### 1.4.8 + +*2017-10-24* + +- Fixed SubMenu retracting when moving the mouse rapidly on the SubMenu of collapsed Menu, #7579 +- Fixed hidden last shortcut of DateTimePicker when the shortcut menu is long, #7567 (by @DuLinRain) +- Added `show-timeout` and `hide-timeout` attributes for Dropdown, #7621 (by @phongkt-dev) + ### 1.4.7 *2017-10-16* diff --git a/CHANGELOG.zh-CN.md b/CHANGELOG.zh-CN.md index e7e4e92d1..ee2695717 100644 --- a/CHANGELOG.zh-CN.md +++ b/CHANGELOG.zh-CN.md @@ -1,5 +1,12 @@ ## 更新日志 +### 1.4.8 +*2017-10-24* + +- 修复鼠标在折叠的 Menu 子菜单中快速移动时会将菜单收起的问题，#7579 +- 修复 DateTimePicker 的快捷菜单过长时，最后一项会被隐藏的问题，#7567（by @DuLinRain） +- 新增 Dropdown 的 `show-timeout` 和 `hide-timeout` 属性，#7621（by @phongkt-dev） + ### 1.4.7 *2017-10-16* diff --git a/examples/docs/zh-CN/dropdown.md b/examples/docs/zh-CN/dropdown.md index ea4d56f9a..55e73ba64 100644 --- a/examples/docs/zh-CN/dropdown.md +++ b/examples/docs/zh-CN/dropdown.md @@ -210,6 +210,8 @@ | menu-align | 菜单水平对齐方向 | string | start, end | end | | trigger | 触发下拉的行为 | string | hover, click | hover | | hide-on-click | 是否在点击菜单项后隐藏菜单 | boolean | — | true | +| show-timeout | 展开下拉菜单的延时 | number | — | 250 | +| hide-timeout | 收起下拉菜单的延时 | number | — | 150 | ### Dropdown Events | 事件名称 | 说明 | 回调参数 | diff --git a/examples/index.tpl b/examples/index.tpl index a33061ce2..1470f7828 100644 --- a/examples/index.tpl +++ b/examples/index.tpl @@ -10,6 +10,11 @@
<% if (process.env.NODE_ENV === 'production') { %> + <% } %> diff --git a/packages/table/src/table.vue b/packages/table/src/table.vue index d375be839..001d7bc8c 100644 --- a/packages/table/src/table.vue +++ b/packages/table/src/table.vue @@ -296,6 +296,9 @@ } if (this.$el) { this.isHidden = this.$el.clientWidth === 0; + if (this.isHidden && this.layout.bodyWidth) { + setTimeout(() => this.doLayout()); + } } }); } diff --git a/test/unit/specs/table.spec.js b/test/unit/specs/table.spec.js index 13e4c61a8..d8df56779 100644 --- a/test/unit/specs/table.spec.js +++ b/test/unit/specs/table.spec.js @@ -831,84 +831,6 @@ describe('Table', () => { }, DELAY); }); - it('reserve-selection', done => { - const getData = function(page = 0) { - let id = 0; - const rows = []; - const row = () => { - return { - id: ++id + page * 10, - date: new Date().getTime() - }; - }; - let count = 10; - - while (--count) { - rows.push(row()); - } - return rows; - }; - const vm = createVue({ - template: ` - - - - - - `, - - created() { - this.testData = getData(); - }, - - data() { - return { selected: [], testData: [] }; - }, - - methods: { - rowKey(row) { - return row.id; - }, - - change(rows) { - this.selected = rows; - } - } - }, true); - - setTimeout(_ => { - // click first - vm.$el.querySelectorAll('.el-checkbox')[1].click(); - - setTimeout(_ => { - expect(vm.$el.querySelectorAll('.el-checkbox__input.is-checked')).to.length(1); - // go to second page - vm.testData = getData(1); - setTimeout(_ => { - // expect no checked - expect(vm.$el.querySelectorAll('.el-checkbox__input.is-checked')).to.length(0); - // click first checkbox - vm.$el.querySelectorAll('.el-checkbox')[1].click(); - vm.$el.querySelectorAll('.el-checkbox')[2].click(); - setTimeout(_ => { - // back first page - vm.testData = getData(); - setTimeout(_ => { - expect(vm.$el.querySelectorAll('.el-checkbox__input.is-checked')).to.length(1); - // clear - vm.$refs.table.clearSelection(); - setTimeout(_ => { - expect(vm.$el.querySelectorAll('.el-checkbox__input.is-checked')).to.length(0); - destroyVM(vm); - done(); - }, DELAY); - }, DELAY); - }, DELAY); - }, DELAY); - }, DELAY); - }, DELAY); - }); - describe('type', () => { const createTable = function(type) { return createVue({ From ccd36eb01f9c6fe6cd29e608ed55e23e0c43ecbc Mon Sep 17 00:00:00 2001 From: Leopoldthecoder Date: Tue, 24 Oct 2017 18:21:12 +0800 Subject: [PATCH 8/9] [build] 1.4.8 --- examples/versions.json | 2 +- packages/theme-default/package.json | 2 +- src/index.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/versions.json b/examples/versions.json index 34bcb884e..ac0d3de95 100644 --- a/examples/versions.json +++ b/examples/versions.json @@ -1 +1 @@ -{"1.0.9":"1.0","1.1.6":"1.1","1.2.9":"1.2","1.3.7":"1.3","1.4.7":"1.4"} \ No newline at end of file +{"1.0.9":"1.0","1.1.6":"1.1","1.2.9":"1.2","1.3.7":"1.3","1.4.8":"1.4"} \ No newline at end of file diff --git a/packages/theme-default/package.json b/packages/theme-default/package.json index 8365a6a4a..afe07686b 100644 --- a/packages/theme-default/package.json +++ b/packages/theme-default/package.json @@ -1,6 +1,6 @@ { "name": "element-theme-default", - "version": "1.4.7", + "version": "1.4.8", "description": "Element component default theme.", "main": "lib/index.css", "style": "lib/index.css", diff --git a/src/index.js b/src/index.js index 3a55deb8a..7d687a167 100644 --- a/src/index.js +++ b/src/index.js @@ -158,7 +158,7 @@ if (typeof window !== 'undefined' && window.Vue) { }; module.exports = { - version: '1.4.7', + version: '1.4.8', locale: locale.use, i18n: locale.i18n, install, From 762f337b2c8eac32eb1cc85c4af1e7718973cdeb Mon Sep 17 00:00:00 2001 From: Leopoldthecoder Date: Tue, 24 Oct 2017 18:21:12 +0800 Subject: [PATCH 9/9] [release] 1.4.8 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5e122572..37f95750a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "element-ui", - "version": "1.4.7", + "version": "1.4.8", "description": "A Component Library for Vue.js.", "main": "lib/element-ui.common.js", "files": [