提交 9b232b8d 编写于 作者: fxy060608's avatar fxy060608

fix(ts): merge components #1400

上级 26271d66
......@@ -23,7 +23,15 @@ export default function normalizeComponent (
// fixed by xxxxxx auto components
if (components) {
options.components = Object.assign(components, options.components || {})
if (!options.components) {
options.components = {}
}
var hasOwn = Object.prototype.hasOwnProperty
for (var name in components) {
if (hasOwn.call(components, name) && !hasOwn.call(options.components, name)) {
options.components[name] = components[name]
}
}
}
// fixed by xxxxxx renderjs
if (renderjs) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册