This commit is contained in:
tangjinzhou 2018-01-22 11:15:32 +08:00
parent c328718acb
commit 28866a8eca
2 changed files with 31 additions and 31 deletions

View File

@ -324,35 +324,35 @@ export default {
...mouseProps, ...mouseProps,
}, },
} }
if (!this._component) { if (!this._component) {
const div = document.createElement('div') const div = document.createElement('div')
this._component = new Vue({ this._component = new Vue({
props: {
},
data () { data () {
return {} return {
popupProps: { ...popupProps },
}
}, },
el: div, el: div,
render () { render () {
const { $props } = this const { popupStyle, popupEvents, ...otherProps } = this.popupProps
const { popupStyle, popupEvents, ...otherProps } = $props
const p = { const p = {
props: otherProps, props: otherProps,
on: popupEvents, on: popupEvents,
ref: 'popup', ref: 'popup',
style: popupStyle, style: popupStyle,
} }
return ($props.getContainer ? <Popup return (
{...p} <Popup
> {...p}
{getComponentFromProp(self, 'popup')} >
</Popup> : null) {getComponentFromProp(self, 'popup')}
</Popup>
)
}, },
}) })
} else {
this._component.popupProps = popupProps
} }
Object.assign(this._component.$props, popupProps)
this._component.$forceUpdate()
}, },
getContainer () { getContainer () {

36
package-lock.json generated
View File

@ -4965,6 +4965,15 @@
} }
} }
}, },
"string_decoder": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
"dev": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"string-width": { "string-width": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
@ -4976,15 +4985,6 @@
"strip-ansi": "3.0.1" "strip-ansi": "3.0.1"
} }
}, },
"string_decoder": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.1.tgz",
"integrity": "sha1-YuIA8DmVWmgQ2N8KM//A8BNmLZg=",
"dev": true,
"requires": {
"safe-buffer": "5.0.1"
}
},
"stringstream": { "stringstream": {
"version": "0.0.5", "version": "0.0.5",
"resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz",
@ -11360,6 +11360,15 @@
"integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=",
"dev": true "dev": true
}, },
"string_decoder": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
"dev": true,
"requires": {
"safe-buffer": "5.1.1"
}
},
"string-width": { "string-width": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
@ -11387,15 +11396,6 @@
} }
} }
}, },
"string_decoder": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
"integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
"dev": true,
"requires": {
"safe-buffer": "5.1.1"
}
},
"stringify-entities": { "stringify-entities": {
"version": "1.3.1", "version": "1.3.1",
"resolved": "https://registry.npm.taobao.org/stringify-entities/download/stringify-entities-1.3.1.tgz", "resolved": "https://registry.npm.taobao.org/stringify-entities/download/stringify-entities-1.3.1.tgz",