github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: update getSlot

pull/2144/head
tangjinzhou 2020-04-15 22:56:58 +08:00
parent 1836b2e7f4
commit 594256558a
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
antdv-demo

@ -1 +1 @@
Subproject commit 8dca2d2cfcaaf970f494ebfb65ee55dfca69870c Subproject commit f9276815b07efeec931404c2cad4e998eba7af14

2
components/_util/props-util.js
View File

@ -69,7 +69,7 @@ const getSlot = (self, name = 'default', options = {}) => {
return ( return (
(self.$scopedSlots && self.$scopedSlots[name] && self.$scopedSlots[name](options)) || (self.$scopedSlots && self.$scopedSlots[name] && self.$scopedSlots[name](options)) ||
self.$slots[name] || self.$slots[name] ||
[] undefined
); );
}; };

6
components/vc-align/Align.jsx
View File

@ -140,10 +140,10 @@ export default {
render() { render() {
const { childrenProps } = this.$props; const { childrenProps } = this.$props;
const child = getSlot(this)[0]; const child = getSlot(this);
if (child && childrenProps) { if (child && childrenProps) {
return cloneElement(child, { props: childrenProps }); return cloneElement(child[0], { props: childrenProps });
} }
return child; return child && child[0];
}, },
}; };

4
components/vc-cascader/Cascader.jsx
View File

@ -378,11 +378,11 @@ export default {
}, },
ref: 'trigger', ref: 'trigger',
}; };
const children = getSlot(this, 'default')[0]; const children = getSlot(this, 'default');
return ( return (
<Trigger {...triggerProps}> <Trigger {...triggerProps}>
{children && {children &&
cloneElement(children, { cloneElement(children[0], {
on: { on: {
keydown: handleKeyDown, keydown: handleKeyDown,
}, },