Merge remote-tracking branch 'origin/develop' into release/1.1.7-beta

This commit is contained in:
JackLian 2023-05-15 18:35:41 +08:00
commit 164d302920

View File

@ -493,6 +493,11 @@ export default function baseRendererFactory(): IBaseRenderComponent {
return schema.map((item, idy) => this.__createVirtualDom(item, scope, parentInfo, (item as IPublicTypeNodeSchema)?.__ctx?.lceKey ? '' : String(idy)));
}
// @ts-expect-error 如果直接转换好了,可以返回
if (schema.$$typeof) {
return schema;
}
const _children = getSchemaChildren(schema);
if (!schema.componentName) {
logger.error('The componentName in the schema is invalid, please check the schema: ', schema);
@ -510,11 +515,6 @@ export default function baseRendererFactory(): IBaseRenderComponent {
schema.children = [text];
}
// @ts-expect-error 如果直接转换好了,可以返回
if (schema.$$typeof) {
return schema;
}
if (!isSchema(schema)) {
return null;
}