github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-03-11 10:26:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: fix conflicts

Browse Source
This commit is contained in:
力皓 2020-09-18 15:12:48 +08:00
commit 91fdb160f3
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/editor-preset-vision/src/editor.ts
View File

@ -189,19 +189,19 @@ function compatiableReducer(props: any) {
if (!props || !isPlainObject(props)) { if (!props || !isPlainObject(props)) {
return props; return props;
} }
if (isJSSlot(props)) { // if (isJSSlot(props)) {
return { // return {
type: 'JSBlock', // type: 'JSBlock',
value: { // value: {
componentName: 'Slot', // componentName: 'Slot',
children: props.value, // children: props.value,
props: { // props: {
slotTitle: props.title, // slotTitle: props.title,
slotName: props.name, // slotName: props.name,
}, // },
}, // },
}; // };
} // }
// 为了能降级到老版本，建议在后期版本去掉以下代码 // 为了能降级到老版本，建议在后期版本去掉以下代码
if (isJSExpression(props) && !props.events) { if (isJSExpression(props) && !props.events) {
return { return {

2
packages/react-renderer/package.json
View File

@ -54,5 +54,5 @@
"publishConfig": { "publishConfig": {
"registry": "http://registry.npm.alibaba-inc.com" "registry": "http://registry.npm.alibaba-inc.com"
}, },
"homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-react-renderer@1.0.9-5/build/index.html" "homepage": "https://unpkg.alibaba-inc.com/@ali/lowcode-react-renderer@1.0.9-7/build/index.html"
} }