From 52272c020fec3eb497dabb79e9e9311b0ab412ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BE=99=E5=BD=A6?= Date: Wed, 24 May 2023 19:05:22 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E6=B8=B2=E6=9F=93=E9=80=BB=E8=BE=91=20to=20#?= =?UTF-8?q?48596877?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/renderer-core/src/renderer/base.tsx | 17 ++++++------ .../renderer-core/src/renderer/renderer.tsx | 27 ++++++++++++------- 2 files changed, 26 insertions(+), 18 deletions(-) diff --git a/packages/renderer-core/src/renderer/base.tsx b/packages/renderer-core/src/renderer/base.tsx index d41414030..1ef2b938a 100644 --- a/packages/renderer-core/src/renderer/base.tsx +++ b/packages/renderer-core/src/renderer/base.tsx @@ -421,14 +421,15 @@ export default function baseRendererFactory() { if (!Comp) { console.error(`${schema.componentName} is not found! component list is:`, components || this.props.__container?.components); - return engine.createElement( - engine.getNotFoundComponent(), - { - componentName: schema.componentName, - componentId: schema.id, - }, - this.__getSchemaChildrenVirtualDom(schema, scope, Comp), - ); + // return engine.createElement( + // engine.getNotFoundComponent(), + // { + // componentName: schema.componentName, + // componentId: schema.id, + // }, + // this.__getSchemaChildrenVirtualDom(schema, scope, Comp), + // ); + Comp = engine.getNotFoundComponent(); } if (schema.hidden && (engine?.props?.designMode && engine?.props?.designMode !== 'design')) { diff --git a/packages/renderer-core/src/renderer/renderer.tsx b/packages/renderer-core/src/renderer/renderer.tsx index 119f97ff3..1affde747 100644 --- a/packages/renderer-core/src/renderer/renderer.tsx +++ b/packages/renderer-core/src/renderer/renderer.tsx @@ -18,27 +18,34 @@ export default function rendererFactory() { const debug = Debug('renderer:entry'); + const exceptionStyle = { + width: '100%', + height: '50px', + lineHeight: '50px', + textAlign: 'center', + fontSize: '15px', + color: '#ff0000', + border: '2px solid #ff0000', + borderRadius: '4px', + }; + class FaultComponent extends PureComponent { render() { console.error(this.props.error); console.error('render error', this.props); return createElement(Div, { - style: { - width: '100%', - height: '50px', - lineHeight: '50px', - textAlign: 'center', - fontSize: '15px', - color: '#ff0000', - border: '2px solid #ff0000', - }, + className: 'engine-fault-component', + style: exceptionStyle, }, '组件渲染异常,请查看控制台日志'); } } class NotFoundComponent extends PureComponent { render() { - return createElement(Div, this.props, this.props.children || 'Component Not Found'); + return createElement(Div, { + className: 'engine-unknown-component', + style: exceptionStyle, + }, this.props.children || '组件未找到'); } }