From 061e8e39402e375723b3f4975630d0181cd83c24 Mon Sep 17 00:00:00 2001 From: msidolphin Date: Fri, 16 Aug 2019 09:28:33 +0800 Subject: [PATCH 1/5] fixed#6193 --- src/components/collapse/collapse.vue | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/components/collapse/collapse.vue b/src/components/collapse/collapse.vue index 52016418..75be1d7e 100644 --- a/src/components/collapse/collapse.vue +++ b/src/components/collapse/collapse.vue @@ -42,12 +42,13 @@ methods: { setActive () { const activeKey = this.getActiveKey(); + this.$nextTick(() => { + this.$children.forEach((child, index) => { + const name = child.name || index.toString(); - this.$children.forEach((child, index) => { - const name = child.name || index.toString(); - - child.isActive = activeKey.indexOf(name) > -1; - child.index = index; + child.isActive = activeKey.indexOf(name) > -1; + child.index = index; + }); }); }, getActiveKey () { From ae2d80fbabf52fd9ae414aaa9ecef07d6c0b8bf2 Mon Sep 17 00:00:00 2001 From: huishiyi Date: Sat, 21 Sep 2019 14:09:13 +0800 Subject: [PATCH 2/5] type: improve form type --- types/form.d.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/types/form.d.ts b/types/form.d.ts index 016e9b94..d6e58077 100644 --- a/types/form.d.ts +++ b/types/form.d.ts @@ -35,7 +35,7 @@ export declare class Form extends Vue { /** * 对整个表单进行校验，参数为检验完的回调，会返回一个 Boolean 表示成功与失败 */ - validate(callback?: (valid?: boolean) => void): void; + validate(callback?: (valid?: boolean) => void): Promise; /** * 对部分表单字段进行校验的方法，参数1为需校验的 prop，参数2为检验完回调，返回错误信息 */ From e0ce2527a80739f2943c3bcea0acca44984290e4 Mon Sep 17 00:00:00 2001 From: ZhangMJ <295692590@qq.com> Date: Mon, 23 Sep 2019 16:35:26 +0800 Subject: [PATCH 3/5] fix: #6279 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 关于tabs嵌套，通过判断是否为子节点来避免错乱 --- src/components/tabs/tabs.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue index ed816aa1..4341c306 100644 --- a/src/components/tabs/tabs.vue +++ b/src/components/tabs/tabs.vue @@ -217,7 +217,7 @@ if (item.tab === this.name) { TabPanes.push(item); } - } else { + } else if (this.$children.indexOf(item) !== -1) { TabPanes.push(item); } }); From 551c730771fa88b49ce145e231cfed7d83ba6776 Mon Sep 17 00:00:00 2001 From: "mo.duan" Date: Tue, 24 Sep 2019 12:02:52 +0800 Subject: [PATCH 4/5] optimize Tabs --- examples/routers/tabs.vue | 44 +++++++++++++++++++++++++----------- src/components/tabs/tabs.vue | 2 +- 2 files changed, 32 insertions(+), 14 deletions(-) diff --git a/examples/routers/tabs.vue b/examples/routers/tabs.vue index 390624cf..a82fa940 100644 --- a/examples/routers/tabs.vue +++ b/examples/routers/tabs.vue @@ -55,22 +55,40 @@ + + + + + + + + + + + + + + + + + + + diff --git a/src/components/tabs/tabs.vue b/src/components/tabs/tabs.vue index 4341c306..4ff7531c 100644 --- a/src/components/tabs/tabs.vue +++ b/src/components/tabs/tabs.vue @@ -217,7 +217,7 @@ if (item.tab === this.name) { TabPanes.push(item); } - } else if (this.$children.indexOf(item) !== -1) { + }else if (this.$children.includes(item)) { // #6279 #6299 TabPanes.push(item); } }); From 6b0409622bab8352d2ad639f7913edd15f8b357d Mon Sep 17 00:00:00 2001 From: "mo.duan" Date: Thu, 26 Sep 2019 10:09:24 +0800 Subject: [PATCH 5/5] bug fixed #6305 --- examples/routers/modal.vue | 317 +++++++++++++++++--------------- src/components/modal/confirm.js | 4 +- 2 files changed, 176 insertions(+), 145 deletions(-) diff --git a/examples/routers/modal.vue b/examples/routers/modal.vue index 844ff21b..5b74cae1 100644 --- a/examples/routers/modal.vue +++ b/examples/routers/modal.vue @@ -1,157 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/modal/confirm.js b/src/components/modal/confirm.js index 379e2d6d..0c563c50 100644 --- a/src/components/modal/confirm.js +++ b/src/components/modal/confirm.js @@ -184,7 +184,9 @@ Modal.newInstance = properties => { }, destroy () { this.$destroy(); - document.body.removeChild(this.$el); + if( this.$el ){ + document.body.removeChild(this.$el); + } this.onRemove(); }, onOk () {},