tianzixuan/Doric
Archived
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

web:fix cannot execute hookAfter in web promise,use setTimeout instead

Browse Source
This commit is contained in:
pengfei.zhou
2021-04-13 18:28:45 +08:00
committed by osborn
parent ace3d30e73
commit 4873ff535d
18 changed files with 140 additions and 1640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
doric-web/dist/index.js vendored
View File

@@ -2443,9 +2443,26 @@ class Panel {
}
}
}
if (this.__rendering__) {
//skip
Promise.all(promises).then(_ => {
});
}
else {
this.__rendering__ = true;
Promise.all(promises).then(_ => {
this.__rendering__ = false;
this.onRenderFinished();
});
}
}
else {
Promise.resolve().then(() => {
if (this.__rendering__) {
//skip
return;
}
this.__rendering__ = true;
Function("return this")().setTimeout(() => {
if (this.__root__.isDirty()) {
const model = this.__root__.toModel();
promises.push(this.nativeRender(model));
@@ -2460,19 +2477,11 @@ class Panel {
}
}
}
});
}
if (this.__rendering__) {
//skip
Promise.all(promises).then(_ => {
});
}
else {
this.__rendering__ = true;
Promise.all(promises).then(_ => {
this.__rendering__ = false;
this.onRenderFinished();
});
Promise.all(promises).then(_ => {
this.onRenderFinished();
});
}, 0);
}
}
onRenderFinished() {
@@ -5689,7 +5698,7 @@ ${content}
}
function initDoric() {
injectGlobalObject("Environment", {
platform: "h5"
platform: "web"
});
injectGlobalObject("nativeEmpty", () => undefined);
injectGlobalObject('nativeLog', (type, message) => {