mirror of
https://github.com/alibaba/lowcode-engine.git
synced 2026-01-13 09:41:57 +00:00
chore: fix conflicts
This commit is contained in:
commit
91fdb160f3
@ -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 {
|
||||
|
||||
@ -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"
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user