drip-public/iview
6
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch '2.0' of https://github.com/iview/iview into 2.0

Browse source
This commit is contained in:
mo.duan 2019-09-04 11:17:08 +08:00
commit 88f40c57a6
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/checkbox/checkbox-group.vue
View file

@ -49,7 +49,7 @@
}, },
methods: { methods: {
updateModel (update) { updateModel (update) {
this.childrens = findComponentsDownward(this, 'Checkbox'); this.childrens = findComponentsDownward(this, 'Checkbox', 'CheckboxGroup');
if (this.childrens) { if (this.childrens) {
const { value } = this; const { value } = this;
this.childrens.forEach(child => { this.childrens.forEach(child => {

2
src/components/transfer/transfer.vue
View file

@ -235,9 +235,11 @@
}, },
handleLeftCheckedKeysChange (keys) { handleLeftCheckedKeysChange (keys) {
this.leftCheckedKeys = keys; this.leftCheckedKeys = keys;
this.handleCheckedKeys();
}, },
handleRightCheckedKeysChange (keys) { handleRightCheckedKeysChange (keys) {
this.rightCheckedKeys = keys; this.rightCheckedKeys = keys;
this.handleCheckedKeys();
}, },
handleCheckedKeys () { handleCheckedKeys () {
const sourceSelectedKeys = this.getValidKeys('left'); const sourceSelectedKeys = this.getValidKeys('left');

13
src/utils/assist.js
View file

@ -212,11 +212,18 @@ export function findComponentDownward (context, componentName) {
} }
// Find components downward // Find components downward
export function findComponentsDownward (context, componentName) { export function findComponentsDownward (context, componentName, ignoreComponentNames = []) {
if (!Array.isArray(ignoreComponentNames)) {
ignoreComponentNames = [ignoreComponentNames]
}
return context.$children.reduce((components, child) => { return context.$children.reduce((components, child) => {
if (child.$options.name === componentName) components.push(child); if (child.$options.name === componentName) components.push(child);
const foundChilds = findComponentsDownward(child, componentName); if (ignoreComponentNames.indexOf(child.$options.name) < 0) {
return components.concat(foundChilds); const foundChilds = findComponentsDownward(child, componentName);
return components.concat(foundChilds);
} else {
return components
}
}, []); }, []);
} }