diff --git a/packages/editor-preset-vision/src/pages.ts b/packages/editor-preset-vision/src/pages.ts index 2490b1ef1..33c8751bd 100644 --- a/packages/editor-preset-vision/src/pages.ts +++ b/packages/editor-preset-vision/src/pages.ts @@ -47,36 +47,12 @@ const pages = Object.assign(project, { } } } - + debugger; project.load({ version: '1.0.0', componentsMap: [], componentsTree, - config: { - layout: { - componentName: 'MiniappTabNav', - props: { - logo: '', - name: '测试网站', - tabBars: { - items: [ - { - name: "页面1", - pagePath: "home1", - icon: "https://pre-go.alibaba-inc.com/filehandle?fileName…8e9-ff58-4e7a-bd24-9e5c32244e14.png&type=download", - activeIcon: "" - }, - { - activeIcon: "", - name: "页面2", - icon: "", - pagePath: "home2" - } - ] - } - }, - }, - }, + config: project.config }, true); }, addPage(data: OldPageData | RootSchema) { diff --git a/packages/editor-preset-vision/src/project.ts b/packages/editor-preset-vision/src/project.ts index e6a1ec47d..2d978c748 100644 --- a/packages/editor-preset-vision/src/project.ts +++ b/packages/editor-preset-vision/src/project.ts @@ -10,6 +10,10 @@ Object.assign(project, { setSchema(schema: any) { this.schema = schema; }, + + setConfig(config: any) { + this.set('config', config); + }, }); export default project; diff --git a/packages/rax-simulator-renderer/src/renderer-view.tsx b/packages/rax-simulator-renderer/src/renderer-view.tsx index ff3941a52..6bdcd01ee 100644 --- a/packages/rax-simulator-renderer/src/renderer-view.tsx +++ b/packages/rax-simulator-renderer/src/renderer-view.tsx @@ -120,7 +120,7 @@ class Layout extends Component<{ rendererContainer: SimulatorRendererContainer } if (Component) { return {children}; } - if (componentName) { + if (componentName && rendererContainer.getComponent(componentName)) { return createElement( rendererContainer.getComponent(componentName), { diff --git a/packages/react-simulator-renderer/src/renderer-view.tsx b/packages/react-simulator-renderer/src/renderer-view.tsx index 73073867d..283f07bdc 100644 --- a/packages/react-simulator-renderer/src/renderer-view.tsx +++ b/packages/react-simulator-renderer/src/renderer-view.tsx @@ -95,10 +95,22 @@ class Layout extends Component<{ rendererContainer: SimulatorRendererContainer } render() { const { rendererContainer, children } = this.props; const layout = rendererContainer.layout; - if (layout) { - const { Component, props } = layout; - return {children}; + const { Component, props, componentName } = layout; + if (Component) { + return {children}; + } + if (componentName && rendererContainer.getComponent(componentName)) { + return createElement( + rendererContainer.getComponent(componentName), + { + ...props, + rendererContainer, + key: 'layout', + }, + [children], + ); + } } return {children};