diff --git a/components/_util/Clone.vue b/components/_util/Clone.vue
new file mode 100644
index 000000000..96ba840df
--- /dev/null
+++ b/components/_util/Clone.vue
@@ -0,0 +1,19 @@
+
diff --git a/components/_util/vnode.js b/components/_util/vnode.js
index de21cefba..e3225d29a 100644
--- a/components/_util/vnode.js
+++ b/components/_util/vnode.js
@@ -1,5 +1,31 @@
import clonedeep from 'lodash.clonedeep'
+// export function cloneVNode (vnode, deep) {
+// const cloned = new vnode.constructor(
+// vnode.tag,
+// clonedeep(vnode.data),
+// vnode.children,
+// vnode.text,
+// vnode.elm,
+// vnode.context,
+// clonedeep(vnode.componentOptions),
+// vnode.asyncFactory
+// )
+// cloned.ns = vnode.ns
+// cloned.isStatic = vnode.isStatic
+// cloned.key = vnode.key
+// cloned.isComment = vnode.isComment
+// cloned.isCloned = true
+// if (deep && vnode.children) {
+// cloned.children = cloneVNodes(vnode.children, deep)
+// }
+// return cloned
+// }
export function cloneVNode (vnode, deep) {
+ const componentOptions = vnode.componentOptions
+ // if (componentOptions) {
+ // componentOptions.propsData = componentOptions.propsData ? clonedeep(componentOptions.propsData) : componentOptions.propsData
+ // }
+
const cloned = new vnode.constructor(
vnode.tag,
clonedeep(vnode.data),
@@ -7,16 +33,24 @@ export function cloneVNode (vnode, deep) {
vnode.text,
vnode.elm,
vnode.context,
- clonedeep(vnode.componentOptions),
+ componentOptions,
vnode.asyncFactory
)
cloned.ns = vnode.ns
cloned.isStatic = vnode.isStatic
cloned.key = vnode.key
cloned.isComment = vnode.isComment
+ cloned.fnContext = vnode.fnContext
+ cloned.fnOptions = vnode.fnOptions
+ cloned.fnScopeId = vnode.fnScopeId
cloned.isCloned = true
- if (deep && vnode.children) {
- cloned.children = cloneVNodes(vnode.children)
+ if (deep) {
+ if (vnode.children) {
+ cloned.children = cloneVNodes(vnode.children, true)
+ }
+ if (componentOptions && componentOptions.children) {
+ componentOptions.children = cloneVNodes(componentOptions.children, true)
+ }
}
return cloned
}
@@ -30,7 +64,8 @@ export function cloneVNodes (vnodes, deep) {
return res
}
-export function cloneElement (node, nodeProps) {
+export function cloneElement (n, nodeProps, clone) {
+ const node = clone ? cloneVNode(n, true) : n
const { props = {}, key, on = {}} = nodeProps
if (node.componentOptions) {
node.componentOptions.propsData = node.componentOptions.propsData || {}
diff --git a/components/menu/demo/antd.vue b/components/menu/demo/antd.vue
index 6713959c2..962af1f3e 100644
--- a/components/menu/demo/antd.vue
+++ b/components/menu/demo/antd.vue
@@ -1,8 +1,8 @@