fix: upgradePropsReducer

This commit is contained in:
mario.gk 2020-08-14 10:06:32 +08:00
parent c287bad37b
commit e68977f7e5

View File

@ -49,38 +49,38 @@ function isVariable(obj: any): obj is Variable {
} }
function upgradePropsReducer(props: any) { function upgradePropsReducer(props: any) {
if (!isPlainObject(props)) { if (!props || !isPlainObject(props)) {
return props; return props;
} }
const newProps: any = {}; if (isJSBlock(props)) {
Object.entries<any>(props).forEach(([key, val]) => { if (props.value.componentName === 'Slot') {
if (/^__slot__/.test(key) && val === true) { return {
return;
}
if (isJSBlock(val)) {
if (val.value.componentName === 'Slot') {
val = {
type: 'JSSlot', type: 'JSSlot',
title: (val.value.props as any)?.slotTitle, title: (props.value.props as any)?.slotTitle,
name: (val.value.props as any)?.slotName, name: (props.value.props as any)?.slotName,
value: val.value.children, value: props.value.children,
}; };
} else { } else {
val = val.value; return props.value;
} }
} }
// todo: deep find if (isVariable(props)) {
if (isVariable(val)) { return {
val = {
type: 'JSExpression', type: 'JSExpression',
value: val.variable, value: props.variable,
mock: val.value, mock: props.value,
}; };
} }
newProps[key] = val; const newProps: any = {};
Object.keys(props).forEach(key => {
if (/^__slot__/.test(key) && props[key] === true) {
return;
}
newProps[key] = upgradePropsReducer(props[key]);
}); });
return newProps; return newProps;
} }
// 升级 Props // 升级 Props
designer.addPropsReducer(upgradePropsReducer, TransformStage.Upgrade); designer.addPropsReducer(upgradePropsReducer, TransformStage.Upgrade);