Skip to content
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

Jump to bottom

fix(canvas): add placeholder for empty container #365 #436

Merged
merged 2 commits into from
May 11, 2024
Merged

fix(canvas): add placeholder for empty container #365 #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68ff972
fix(canvas): add placeholder for empty container
chilingling Apr 22, 2024
796452e
feat(canvas-render): optimize by review comment
chilingling May 9, 2024
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
32 changes: 20 additions & 12 deletions packages/canvas/src/components/render/render.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -598,6 +598,20 @@ const getLoopScope = ({ scope, index, item, loopArgs }) => {
}
}

const injectPlaceHolder = (componentName, children) => {
const isEmptyArr = Array.isArray(children) && !children.length

if (configure[componentName]?.isContainer && (!children || isEmptyArr)) {
return [
{
componentName: 'CanvasPlaceholder'
}
]
}

return children
}

const renderGroup = (children, scope, parent) => {
return children.map?.((schema) => {
const { componentName, children, loop, loopArgs, condition, id } = schema
Expand All @@ -617,30 +631,24 @@ const renderGroup = (children, scope, parent) => {
return null
}

const renderChildren = injectPlaceHolder(componentName, children)
chilingling marked this conversation as resolved.
Show resolved Hide resolved

return h(
getComponent(componentName),
getBindProps(schema, mergeScope),
Array.isArray(children) ? renderSlot(children, mergeScope, schema) : parseData(children, mergeScope)
Array.isArray(renderChildren)
? renderSlot(renderChildren, mergeScope, schema)
: parseData(renderChildren, mergeScope)
)
}

return loopList?.length ? loopList.map(renderElement) : renderElement()
})
}

const ContainerComponent = ['CanvasCol', 'CanvasRow', 'CanvasRowColContainer']

const getChildren = (schema, mergeScope) => {
const { componentName, children } = schema
let renderChildren = children

if (ContainerComponent.includes(componentName) && !renderChildren?.length) {
renderChildren = [
{
componentName: 'CanvasPlaceholder'
}
]
}
const renderChildren = injectPlaceHolder(componentName, children)

const component = getComponent(componentName)
const isNative = typeof component === 'string'
Expand Down
24 changes: 16 additions & 8 deletions packages/design-core/public/mock/bundle.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@
"loop": true,
"condition": true,
"styles": true,
"isContainer": false,
"isContainer": true,
"isModal": false,
"isPopper": false,
"nestingRule": {
Expand Down Expand Up @@ -632,7 +632,7 @@
"loop": true,
"condition": true,
"styles": true,
"isContainer": false,
"isContainer": true,
"isModal": false,
"isPopper": false,
"nestingRule": {
Expand Down Expand Up @@ -1089,7 +1089,7 @@
"loop": true,
"condition": true,
"styles": true,
"isContainer": false,
"isContainer": true,
"isModal": false,
"isPopper": false,
"nestingRule": {
Expand Down Expand Up @@ -4139,6 +4139,9 @@
"contentMenu": {
"actions": []
}
},
"configure": {
"isContainer": true
}
},
{
Expand Down Expand Up @@ -4497,6 +4500,9 @@
"contentMenu": {
"actions": []
}
},
"configure": {
"isContainer": true
}
},
{
Expand Down Expand Up @@ -5979,7 +5985,7 @@
"loop": true,
"condition": true,
"styles": true,
"isContainer": true,
"isContainer": false,
"isModal": false,
"nestingRule": {
"childWhitelist": "",
Expand Down Expand Up @@ -6394,7 +6400,7 @@
"loop": true,
"condition": true,
"styles": true,
"isContainer": true,
"isContainer": false,
"isModal": false,
"nestingRule": {
"childWhitelist": "",
Expand Down Expand Up @@ -8183,7 +8189,7 @@
"loop": true,
"condition": true,
"styles": true,
"isContainer": true,
"isContainer": false,
"isModal": false,
"nestingRule": {
"childWhitelist": "",
Expand Down Expand Up @@ -8950,7 +8956,9 @@
"cols": 12,
"widget": {
"component": "MetaCodeEditor",
"props": {}
"props": {
"language": "json"
}
},
"description": {
"zh_CN": ""
Expand Down Expand Up @@ -8996,7 +9004,7 @@
"loop": true,
"condition": true,
"styles": true,
"isContainer": true,
"isContainer": false,
"clickCapture": false,
"isModal": false,
"nestingRule": {
Expand Down
Loading