Merge branch 'develop' into release/1.1.11-beta

This commit is contained in:
JackLian 2023-10-13 09:42:12 +08:00
commit 41d3944e68
2 changed files with 3 additions and 2 deletions

View File

@ -64,7 +64,8 @@
"lockfile": "enable" "lockfile": "enable"
}, },
"resolutions": { "resolutions": {
"typescript": "4.6.2" "typescript": "4.6.2",
"react-error-overlay": "6.0.9"
}, },
"repository": "git@github.com:alibaba/lowcode-engine.git" "repository": "git@github.com:alibaba/lowcode-engine.git"
} }

View File

@ -453,7 +453,7 @@ export default function baseRendererFactory(): IBaseRenderComponent {
* @param idx Index * @param idx Index
*/ */
__createVirtualDom = (originalSchema: IPublicTypeNodeData | IPublicTypeNodeData[] | undefined, originalScope: any, parentInfo: INodeInfo, idx: string | number = ''): any => { __createVirtualDom = (originalSchema: IPublicTypeNodeData | IPublicTypeNodeData[] | undefined, originalScope: any, parentInfo: INodeInfo, idx: string | number = ''): any => {
if (!originalSchema) { if (originalSchema === null || originalSchema === undefined) {
return null; return null;
} }
let scope = originalScope; let scope = originalScope;