From 49d60f759c3208a239c6b7447905fb890a316674 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 25 May 2019 13:45:50 +0800 Subject: [PATCH 01/17] fix: select dropdownRender not close #644 --- components/vc-select/Select.jsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/components/vc-select/Select.jsx b/components/vc-select/Select.jsx index 5494ef9a1..c886b7235 100644 --- a/components/vc-select/Select.jsx +++ b/components/vc-select/Select.jsx @@ -1462,9 +1462,7 @@ const Select = { this.$emit('focus'); }, selectionRefBlur() { - this._focused = false; - this.updateFocusClassName(); - this.$emit('blur'); + this.inputBlur(); }, }, From e9f2858ae0c2a0338acc1a4d487572725f800815 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 25 May 2019 13:54:25 +0800 Subject: [PATCH 02/17] fix: ie9 remove dom error #705 --- components/vc-trigger/Popup.jsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/components/vc-trigger/Popup.jsx b/components/vc-trigger/Popup.jsx index 9821f4bec..8a905606a 100644 --- a/components/vc-trigger/Popup.jsx +++ b/components/vc-trigger/Popup.jsx @@ -49,7 +49,11 @@ export default { }); }, beforeDestroy() { - this.$el.remove(); + if (this.$el.parentNode) { + this.$el.parentNode.removeChild(this.$el); + } else if (this.$el.remove) { + this.$el.remove(); + } }, methods: { onAlign(popupDomNode, align) { From a5bb1918e5269abbb92c0ccc6a9d4a004088201a Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 25 May 2019 15:10:28 +0800 Subject: [PATCH 03/17] fix: search input component replicating id attribute #726 --- components/input/Search.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/components/input/Search.jsx b/components/input/Search.jsx index d5b3aaeae..a96c58632 100644 --- a/components/input/Search.jsx +++ b/components/input/Search.jsx @@ -9,6 +9,7 @@ import PropTypes from '../_util/vue-types'; export default { name: 'AInputSearch', + inheritAttrs: false, model: { prop: 'value', event: 'change.value', From 1790dab16b21bbe9b1f2665adf6f4a083a6507f9 Mon Sep 17 00:00:00 2001 From: tangjinzhou <415800467@qq.com> Date: Sat, 25 May 2019 18:24:22 +0800 Subject: [PATCH 04/17] docs: update upload demo #753 --- .../upload/__tests__/uploadlist.test.js | 6 +-- components/upload/demo/avatar.md | 2 +- components/upload/demo/basic.md | 2 +- components/upload/demo/defaultFileList.md | 2 +- components/upload/demo/directory.md | 2 +- components/upload/demo/drag.md | 2 +- components/upload/demo/fileList.md | 12 +---- components/upload/demo/picture-card.md | 2 +- components/upload/demo/picture-style.md | 4 +- components/upload/demo/upload-manually.md | 2 +- components/vc-upload/demo/asyncAction.jsx | 6 ++- components/vc-upload/demo/beforeUpload.jsx | 10 ++-- components/vc-upload/demo/customRequest.js | 50 ++++++++++--------- components/vc-upload/demo/directoryUpload.js | 11 ++-- components/vc-upload/demo/drag.jsx | 11 ++-- components/vc-upload/demo/simple.jsx | 50 ++++++++++--------- 16 files changed, 92 insertions(+), 82 deletions(-) diff --git a/components/upload/__tests__/uploadlist.test.js b/components/upload/__tests__/uploadlist.test.js index eb2e36dce..e2e6e2d3b 100644 --- a/components/upload/__tests__/uploadlist.test.js +++ b/components/upload/__tests__/uploadlist.test.js @@ -97,7 +97,7 @@ describe('Upload List', () => { it('should be uploading when upload a file', done => { const props = { propsData: { - action: 'http://jsonplaceholder.typicode.com/posts/', + action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76', customRequest: successRequest, }, listeners: { @@ -133,7 +133,7 @@ describe('Upload List', () => { it('handle error', done => { const props = { propsData: { - action: 'http://jsonplaceholder.typicode.com/posts/', + action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76', customRequest: errorRequest, }, listeners: { @@ -166,7 +166,7 @@ describe('Upload List', () => { const handleChange = jest.fn(); const props = { propsData: { - action: 'http://jsonplaceholder.typicode.com/posts/', + action: 'https://www.mocky.io/v2/5cc8019d300000980a055e76', listType: 'picture', defaultFileList: fileList, beforeUpload: () => false, diff --git a/components/upload/demo/avatar.md b/components/upload/demo/avatar.md index 38ce83eb0..b40664590 100644 --- a/components/upload/demo/avatar.md +++ b/components/upload/demo/avatar.md @@ -17,7 +17,7 @@ The return value of function `beforeUpload` can be a Promise to check asynchrono listType="picture-card" class="avatar-uploader" :showUploadList="false" - action="//jsonplaceholder.typicode.com/posts/" + action="https://www.mocky.io/v2/5cc8019d300000980a055e76" :beforeUpload="beforeUpload" @change="handleChange" > diff --git a/components/upload/demo/basic.md b/components/upload/demo/basic.md index a6200463a..bdd39675d 100644 --- a/components/upload/demo/basic.md +++ b/components/upload/demo/basic.md @@ -10,7 +10,7 @@ Classic mode. File selection dialog pops up when upload button is clicked. ```html