lxm_front/tmagic-editor
1
0
Fork 0
mirror of synced 2026-03-23 02:58:34 +08:00
Code Issues Projects Releases Wiki Activity

fix(stage,runtime,ui-react): tmagicRuntimeReady时机修改

Browse Source 
fix #198
This commit is contained in:
roymondchen
2022-07-29 12:48:09 +08:00
committed by jia000
parent 0a1cf060a5
commit 9858327eb8
5 changed files with 152 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
packages/stage/src/StageRender.ts
View File

@@ -72,20 +72,22 @@ export default class StageRender extends EventEmitter {
* @param el 将页面挂载到该Dom节点上
*/
public async mount(el: HTMLDivElement) {
if (this.iframe) {
if (!isSameDomain(this.runtimeUrl) && this.runtimeUrl) {
// 不同域，使用srcdoc发起异步请求，需要目标地址支持跨域
let html = await fetch(this.runtimeUrl).then((res) => res.text());
// 使用base, 解决相对路径或绝对路径的问题
const base = `${location.protocol}//${getHost(this.runtimeUrl)}`;
html = html.replace('<head>', `<head>\n<base href="${base}">`);
this.iframe.srcdoc = html;
}
el.appendChild<HTMLIFrameElement>(this.iframe);
} else {
if (!this.iframe) {
throw Error('mount 失败');
}
if (!isSameDomain(this.runtimeUrl) && this.runtimeUrl) {
// 不同域，使用srcdoc发起异步请求，需要目标地址支持跨域
let html = await fetch(this.runtimeUrl).then((res) => res.text());
// 使用base, 解决相对路径或绝对路径的问题
const base = `${location.protocol}//${getHost(this.runtimeUrl)}`;
html = html.replace('<head>', `<head>\n<base href="${base}">`);
this.iframe.srcdoc = html;
}
el.appendChild<HTMLIFrameElement>(this.iframe);
this.postTmagicRuntimeReady();
}
public getRuntime = (): Promise<Runtime> => {
@@ -111,26 +113,34 @@ export default class StageRender extends EventEmitter {
}
private loadHandler = async () => {
this.contentWindow = this.iframe?.contentWindow as RuntimeWindow;
if (!this.contentWindow?.magic) {
this.postTmagicRuntimeReady();
}
this.contentWindow.magic = this.getMagicApi();
if (!this.contentWindow) return;
if (this.render) {
const el = await this.render(this.core);
if (el) {
this.iframe?.contentDocument?.body?.appendChild(el);
this.contentWindow.document?.body?.appendChild(el);
}
}
this.emit('onload');
injectStyle(this.contentWindow.document, style);
};
private postTmagicRuntimeReady() {
this.contentWindow = this.iframe?.contentWindow as RuntimeWindow;
this.contentWindow.magic = this.getMagicApi();
this.contentWindow.postMessage(
{
tmagicRuntimeReady: true,
},
'*',
);
injectStyle(this.contentWindow.document, style);
};
}
}

1
packages/ui-react/src/useApp.ts
View File

@@ -43,6 +43,7 @@ export default ({ config, methods }: UseAppOptions) => {
useEffect(() => {
const emitData = {
config,
...methods,
};