From d195d7fed88818541f47b106df403253d9762dfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8A=9B=E7=9A=93?= Date: Mon, 17 Aug 2020 20:31:58 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=8A=A8=E6=80=81=20setter=20=E7=9A=84=E9=80=BB=E8=BE=91=20fix?= =?UTF-8?q?:=20=E4=BF=AE=E5=A4=8D=20Page=20=E4=B8=AD=E5=8C=85=E5=90=AB=20B?= =?UTF-8?q?lock=20=E4=B8=8D=E6=B8=B2=E6=9F=93=E7=9A=84=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/react-renderer/src/engine/base.jsx | 3 +-- packages/types/src/setter-config.ts | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/react-renderer/src/engine/base.jsx b/packages/react-renderer/src/engine/base.jsx index 775e77a9b..0904cd99b 100644 --- a/packages/react-renderer/src/engine/base.jsx +++ b/packages/react-renderer/src/engine/base.jsx @@ -325,8 +325,7 @@ export default class BaseEngine extends PureComponent { return engine.createElement( Comp, props, - (!isFileSchema(schema) && - !!schema.children && + (!!schema.children && this.__createVirtualDom( isJSExpression(schema.children) ? parseExpression(schema.children, self) : schema.children, self, diff --git a/packages/types/src/setter-config.ts b/packages/types/src/setter-config.ts index 19eb46f99..479efd78a 100644 --- a/packages/types/src/setter-config.ts +++ b/packages/types/src/setter-config.ts @@ -47,5 +47,5 @@ export function isCustomView(obj: any): obj is CustomView { } export function isDynamicSetter(obj: any): obj is DynamicSetter { - return obj && typeof obj === 'function' && !obj.displayName; + return obj && typeof obj === 'function' && !isReactClass(obj); }