chore: fix conflicts

This commit is contained in:
力皓 2020-09-18 15:12:48 +08:00
commit 91fdb160f3
2 changed files with 14 additions and 14 deletions

View File

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

View File

@ -54,5 +54,5 @@
"publishConfig": {
"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"
}