Skip to content

Commit

Permalink
fix: do not parse props when condition is false or loop data is empty (
Browse files Browse the repository at this point in the history
…#2477)

* fix: do not parse children props when condition is falsy

* fix: skip parsing children when loop data is empty
  • Loading branch information
rainke authored Sep 14, 2023
1 parent 1072ff3 commit cf2f5c2
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions packages/renderer-core/src/renderer/base.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,7 @@ export default function baseRendererFactory(): IBaseRenderComponent {

if (schema.loop != null) {
const loop = this.__parseData(schema.loop, scope);
if (Array.isArray(loop) && loop.length === 0) return null;
const useLoop = isUseLoop(loop, this.__designModeIsDesign);
if (useLoop) {
return this.__createLoopVirtualDom(
Expand Down Expand Up @@ -649,7 +650,7 @@ export default function baseRendererFactory(): IBaseRenderComponent {
props.key = props.__id;
}

let child = this.__getSchemaChildrenVirtualDom(schema, scope, Comp);
let child = this.__getSchemaChildrenVirtualDom(schema, scope, Comp, condition);
const renderComp = (innerProps: any) => engine.createElement(Comp, innerProps, child);
// 设计模式下的特殊处理
if (engine && [DESIGN_MODE.EXTEND, DESIGN_MODE.BORDER].includes(engine.props.designMode)) {
Expand Down Expand Up @@ -709,8 +710,8 @@ export default function baseRendererFactory(): IBaseRenderComponent {
return [];
}

__getSchemaChildrenVirtualDom = (schema: IPublicTypeNodeSchema | undefined, scope: any, Comp: any) => {
let children = getSchemaChildren(schema);
__getSchemaChildrenVirtualDom = (schema: IPublicTypeNodeSchema | undefined, scope: any, Comp: any, condition = true) => {
let children = condition ? getSchemaChildren(schema) : null;

// @todo 补完这里的 Element 定义 @承虎
let result: any = [];
Expand Down

0 comments on commit cf2f5c2

Please sign in to comment.