From 4ee52a502452b4c79300cbebef60b6b388d3260a Mon Sep 17 00:00:00 2001 From: msidolphin Date: Thu, 15 Aug 2019 16:31:17 +0800 Subject: [PATCH 1/3] fix#6187 --- src/components/transfer/transfer.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/transfer/transfer.vue b/src/components/transfer/transfer.vue index 4983549d..0f27e53b 100644 --- a/src/components/transfer/transfer.vue +++ b/src/components/transfer/transfer.vue @@ -235,9 +235,11 @@ }, handleLeftCheckedKeysChange (keys) { this.leftCheckedKeys = keys; + this.handleCheckedKeys(); }, handleRightCheckedKeysChange (keys) { this.rightCheckedKeys = keys; + this.handleCheckedKeys(); }, handleCheckedKeys () { const sourceSelectedKeys = this.getValidKeys('left'); From 67ddfcb7ed042b43c8b76c5636957fe019a52f18 Mon Sep 17 00:00:00 2001 From: msidolphin Date: Thu, 22 Aug 2019 16:38:24 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E4=BA=86checkbox-?= =?UTF-8?q?group=E5=A4=9A=E5=B1=82=E5=B5=8C=E5=A5=97=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=9B=B8=E4=BA=92=E5=B9=B2=E6=89=B0=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/checkbox/checkbox-group.vue | 2 +- src/utils/assist.js | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/components/checkbox/checkbox-group.vue b/src/components/checkbox/checkbox-group.vue index f010d587..1750102d 100644 --- a/src/components/checkbox/checkbox-group.vue +++ b/src/components/checkbox/checkbox-group.vue @@ -49,7 +49,7 @@ }, methods: { updateModel (update) { - this.childrens = findComponentsDownward(this, 'Checkbox'); + this.childrens = findComponentsDownward(this, 'Checkbox', 'CheckboxGroup'); if (this.childrens) { const { value } = this; this.childrens.forEach(child => { diff --git a/src/utils/assist.js b/src/utils/assist.js index 49929cea..a5a72097 100644 --- a/src/utils/assist.js +++ b/src/utils/assist.js @@ -212,11 +212,18 @@ export function findComponentDownward (context, componentName) { } // Find components downward -export function findComponentsDownward (context, componentName) { +export function findComponentsDownward (context, componentName, ignoreComponetNames = []) { + if (!Array.isArray(ignoreComponetNames)) { + ignoreComponetNames = [ignoreComponetNames] + } return context.$children.reduce((components, child) => { if (child.$options.name === componentName) components.push(child); - const foundChilds = findComponentsDownward(child, componentName); - return components.concat(foundChilds); + if (ignoreComponetNames.indexOf(child.$options.name) < 0) { + const foundChilds = findComponentsDownward(child, componentName); + return components.concat(foundChilds); + } else { + return components + } }, []); } From 9e694e96611f2fafe0b193070776f43be64bd4cd Mon Sep 17 00:00:00 2001 From: msidolphin Date: Fri, 23 Aug 2019 21:46:45 +0800 Subject: [PATCH 3/3] fix: typo --- src/utils/assist.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utils/assist.js b/src/utils/assist.js index a5a72097..c39da765 100644 --- a/src/utils/assist.js +++ b/src/utils/assist.js @@ -212,13 +212,13 @@ export function findComponentDownward (context, componentName) { } // Find components downward -export function findComponentsDownward (context, componentName, ignoreComponetNames = []) { - if (!Array.isArray(ignoreComponetNames)) { - ignoreComponetNames = [ignoreComponetNames] +export function findComponentsDownward (context, componentName, ignoreComponentNames = []) { + if (!Array.isArray(ignoreComponentNames)) { + ignoreComponentNames = [ignoreComponentNames] } return context.$children.reduce((components, child) => { if (child.$options.name === componentName) components.push(child); - if (ignoreComponetNames.indexOf(child.$options.name) < 0) { + if (ignoreComponentNames.indexOf(child.$options.name) < 0) { const foundChilds = findComponentsDownward(child, componentName); return components.concat(foundChilds); } else {