From e05790b4fa3eda25f4904542a4bc2b037b750adb Mon Sep 17 00:00:00 2001 From: "wuyue.xht" Date: Mon, 28 Sep 2020 17:55:53 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=87=BD=E6=95=B0=E7=AD=BE=E5=90=8D?= =?UTF-8?q?=E5=8F=8A=E6=96=B9=E6=B3=95=E5=90=8D=E6=8B=BC=E5=86=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/rax-provider/src/provider.ts | 9 +++-- packages/rax-simulator-renderer/package.json | 2 +- packages/runtime/src/core/provider.ts | 37 +++++++++++++------- 3 files changed, 30 insertions(+), 18 deletions(-) diff --git a/packages/rax-provider/src/provider.ts b/packages/rax-provider/src/provider.ts index d9e571850..7e8cd9ca2 100644 --- a/packages/rax-provider/src/provider.ts +++ b/packages/rax-provider/src/provider.ts @@ -18,8 +18,7 @@ export default class RaxProvider extends Provider { } const { componentName: layoutName, props: layoutProps } = layoutConfig; const { content: Layout, props: extraLayoutProps } = app.getLayout(layoutName) || {}; - const sectionalRender = this.isSectionalRender(); - if (!sectionalRender && Layout) { + if (!this.isSectionalRender && Layout) { App = (props) => createElement( Layout, { ...layoutProps, ...extraLayoutProps }, @@ -89,8 +88,8 @@ export default class RaxProvider extends Provider { if (!pageId) { return null; } - if (this.getlazyElement(pageId)) { - return this.getlazyElement(pageId); + if (this.getLazyElement(pageId)) { + return this.getLazyElement(pageId); } const lazyElement = createElement(LazyComponent, { // eslint-disable-next-line no-return-await @@ -98,7 +97,7 @@ export default class RaxProvider extends Provider { key: pageId, ...props, }); - this.setlazyElement(pageId, lazyElement); + this.setLazyElement(pageId, lazyElement); return lazyElement; } } diff --git a/packages/rax-simulator-renderer/package.json b/packages/rax-simulator-renderer/package.json index 22af41aaf..af6e971f3 100644 --- a/packages/rax-simulator-renderer/package.json +++ b/packages/rax-simulator-renderer/package.json @@ -55,5 +55,5 @@ "publishConfig": { "registry": "https://registry.npm.alibaba-inc.com" }, - "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@1.0.7-0/build/index.html" + "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-rax-simulator-renderer@1.0.8-0/build/index.html" } diff --git a/packages/runtime/src/core/provider.ts b/packages/runtime/src/core/provider.ts index a65dd5eb3..3c24dd7e5 100644 --- a/packages/runtime/src/core/provider.ts +++ b/packages/runtime/src/core/provider.ts @@ -140,7 +140,17 @@ export default class Provider { if (!appData) { return; } - const { history, layout, routes, containerId, components, componentsMap, utils, constants, i18n } = appData; + const { + history, + layout, + routes, + containerId, + components, + componentsMap, + utils, + constants, + i18n, + } = appData; this.setHistory(history); this.setLayoutConfig(layout); this.setRouterConfig(routes); @@ -181,20 +191,20 @@ export default class Provider { this.emitter.on('ready', cb); } - emitPageReady() { - this.emitter.emit('pageReady'); + emitPageReady(data?: any) { + this.emitter.emit('pageReady', data || ''); } - emitPageEnter() { - this.emitter.emit('pageEnter'); + emitPageEnter(data?: any) { + this.emitter.emit('pageEnter', data || ''); } - emitPageUpdate() { - this.emitter.emit('pageUpdate'); + emitPageUpdate(data?: any) { + this.emitter.emit('pageUpdate', data || ''); } - emitPageLeave() { - this.emitter.emit('pageLeave'); + emitPageLeave(data?: any) { + this.emitter.emit('pageLeave', data || ''); } onPageReady(cb: (params?: any) => void) { @@ -229,11 +239,13 @@ export default class Provider { throw new Error('Method called "getAppData" not implemented.'); } - getPageData(): any { + // eslint-disable-next-line + getPageData(pageId: string): any { throw new Error('Method called "getPageData" not implemented.'); } - getLazyComponent(): any { + // eslint-disable-next-line + getLazyComponent(pageId: string, props: any): any { throw new Error('Method called "getLazyComponent" not implemented.'); } @@ -242,7 +254,8 @@ export default class Provider { throw new Error('Method called "createApp" not implemented.'); } - runApp() { + // eslint-disable-next-line + runApp(App: any, config: IAppConfig) { throw new Error('Method called "runApp" not implemented.'); }