Skip to content

Commit

Permalink
Merge branch 'develop' into release/1.1.11-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
JackLian committed Oct 13, 2023
2 parents 691a989 + 30f8066 commit 41d3944
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
"lockfile": "enable"
},
"resolutions": {
"typescript": "4.6.2"
"typescript": "4.6.2",
"react-error-overlay": "6.0.9"
},
"repository": "[email protected]:alibaba/lowcode-engine.git"
}
2 changes: 1 addition & 1 deletion packages/renderer-core/src/renderer/base.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ export default function baseRendererFactory(): IBaseRenderComponent {
* @param idx 为循环渲染的循环Index
*/
__createVirtualDom = (originalSchema: IPublicTypeNodeData | IPublicTypeNodeData[] | undefined, originalScope: any, parentInfo: INodeInfo, idx: string | number = ''): any => {
if (!originalSchema) {
if (originalSchema === null || originalSchema === undefined) {
return null;
}
let scope = originalScope;
Expand Down

0 comments on commit 41d3944

Please sign in to comment.