Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix: do not parse props when condition is false or loop data is empty #2477

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liujuping merged 2 commits into from
Sep 14, 2023
Merged

fix: do not parse props when condition is false or loop data is empty #2477

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d36a037
fix: do not parse children props when condition is falsy
rainke Sep 13, 2023
8e0ffc9
fix: skip parsing children when loop data is empty
rainke Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions packages/renderer-core/src/renderer/base.tsx
View file
Open in desktop
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