提交 d0e4f5b0 编写于 作者: Q qiang

fix(vue): setScope ignore uni-app web components

上级 a6d21955
......@@ -6139,10 +6139,13 @@ function createPatchFunction (backend) {
}
}
// for slot content they should also get the scopeId from the host instance.
// ignore uni-app web components
if (isDef(i = activeInstance) &&
i !== vnode.context &&
i !== vnode.fnContext &&
isDef(i = i.$options._scopeId)
isDef(i = i.$options._scopeId) &&
// TODO use other flag
!activeInstance._vnode.elm.__uniDataset
) {
nodeOps.setStyleScope(vnode.elm, i);
}
......
......@@ -6171,10 +6171,13 @@ function createPatchFunction (backend) {
}
}
// for slot content they should also get the scopeId from the host instance.
// ignore uni-app web components
if (isDef(i = activeInstance) &&
i !== vnode.context &&
i !== vnode.fnContext &&
isDef(i = i.$options._scopeId)
isDef(i = i.$options._scopeId) &&
// TODO use other flag
!activeInstance._vnode.elm.__uniDataset
) {
nodeOps.setStyleScope(vnode.elm, i);
}
......
......@@ -6159,10 +6159,13 @@ function createPatchFunction (backend) {
}
}
// for slot content they should also get the scopeId from the host instance.
// ignore uni-app web components
if (isDef(i = activeInstance) &&
i !== vnode.context &&
i !== vnode.fnContext &&
isDef(i = i.$options._scopeId)
isDef(i = i.$options._scopeId) &&
// TODO use other flag
!activeInstance._vnode.elm.__uniDataset
) {
nodeOps.setStyleScope(vnode.elm, i);
}
......
......@@ -6143,10 +6143,13 @@
}
}
// for slot content they should also get the scopeId from the host instance.
// ignore uni-app web components
if (isDef(i = activeInstance) &&
i !== vnode.context &&
i !== vnode.fnContext &&
isDef(i = i.$options._scopeId)
isDef(i = i.$options._scopeId) &&
// TODO use other flag
!activeInstance._vnode.elm.__uniDataset
) {
nodeOps.setStyleScope(vnode.elm, i);
}
......
......@@ -6128,10 +6128,13 @@ function createPatchFunction (backend) {
}
}
// for slot content they should also get the scopeId from the host instance.
// ignore uni-app web components
if (isDef(i = activeInstance) &&
i !== vnode.context &&
i !== vnode.fnContext &&
isDef(i = i.$options._scopeId)
isDef(i = i.$options._scopeId) &&
// TODO use other flag
!activeInstance._vnode.elm.__uniDataset
) {
nodeOps.setStyleScope(vnode.elm, i);
}
......
......@@ -6148,10 +6148,13 @@ function createPatchFunction (backend) {
}
}
// for slot content they should also get the scopeId from the host instance.
// ignore uni-app web components
if (isDef(i = activeInstance) &&
i !== vnode.context &&
i !== vnode.fnContext &&
isDef(i = i.$options._scopeId)
isDef(i = i.$options._scopeId) &&
// TODO use other flag
!activeInstance._vnode.elm.__uniDataset
) {
nodeOps.setStyleScope(vnode.elm, i);
}
......
......@@ -6132,10 +6132,13 @@
}
}
// for slot content they should also get the scopeId from the host instance.
// ignore uni-app web components
if (isDef(i = activeInstance) &&
i !== vnode.context &&
i !== vnode.fnContext &&
isDef(i = i.$options._scopeId)
isDef(i = i.$options._scopeId) &&
// TODO use other flag
!activeInstance._vnode.elm.__uniDataset
) {
nodeOps.setStyleScope(vnode.elm, i);
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册