Skip to content

U
uni-app

DCloud / uni-app
3 个月 前同步成功

通知 725
Star 38705
Fork 3642
U
uni-app

体验新版 GitCode，发现更多精彩内容 >>

提交 4f490366 编写于 作者: fxy060608's avatar fxy060608
浏览文件
操作

fix(mp): pre flush watchers (#3057)

上级 0ced70cc
隐藏空白更改
内联 并排
Showing with 16 addition and 0 deletion
packages/uni-mp-vue/dist/vue.runtime.esm.js
浏览文件 @ 4f490366
...@@ -4778,6 +4778,13 @@ function renderComponentRoot(instance) { ...@@ -4778,6 +4778,13 @@ function renderComponentRoot(instance) {
setCurrentRenderingInstance(prev); setCurrentRenderingInstance(prev);
return result; return result;
} }
const updateComponentPreRender = (instance) => {
pauseTracking();
// props update may have triggered pre-flush watchers.
// flush them before the render update.
flushPreFlushCbs(undefined, instance.update);
resetTracking();
};
function setupRenderEffect(instance) { function setupRenderEffect(instance) {
const componentUpdateFn = () => { const componentUpdateFn = () => {
if (!instance.isMounted) { if (!instance.isMounted) {
...@@ -4787,6 +4794,7 @@ function setupRenderEffect(instance) { ...@@ -4787,6 +4794,7 @@ function setupRenderEffect(instance) {
// updateComponent // updateComponent
const { bu, u } = instance; const { bu, u } = instance;
effect.allowRecurse = false; effect.allowRecurse = false;
updateComponentPreRender(instance);
// beforeUpdate hook // beforeUpdate hook
if (bu) { if (bu) {
invokeArrayFns(bu); invokeArrayFns(bu);
......
packages/uni-mp-vue/lib/vue.runtime.esm.js
浏览文件 @ 4f490366
...@@ -4778,6 +4778,13 @@ function renderComponentRoot(instance) { ...@@ -4778,6 +4778,13 @@ function renderComponentRoot(instance) {
setCurrentRenderingInstance(prev); setCurrentRenderingInstance(prev);
return result; return result;
} }
const updateComponentPreRender = (instance) => {
pauseTracking();
// props update may have triggered pre-flush watchers.
// flush them before the render update.
flushPreFlushCbs(undefined, instance.update);
resetTracking();
};
function setupRenderEffect(instance) { function setupRenderEffect(instance) {
const componentUpdateFn = () => { const componentUpdateFn = () => {
if (!instance.isMounted) { if (!instance.isMounted) {
...@@ -4787,6 +4794,7 @@ function setupRenderEffect(instance) { ...@@ -4787,6 +4794,7 @@ function setupRenderEffect(instance) {
// updateComponent // updateComponent
const { bu, u } = instance; const { bu, u } = instance;
effect.allowRecurse = false; effect.allowRecurse = false;
updateComponentPreRender(instance);
// beforeUpdate hook // beforeUpdate hook
if (bu) { if (bu) {
invokeArrayFns(bu); invokeArrayFns(bu);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或