github/lowcode-engine
1
0
Fork 0
mirror of https://github.com/alibaba/lowcode-engine.git synced 2026-01-18 21:38:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: variable init bug

Browse Source
This commit is contained in:
kangwei 2020-06-24 12:44:39 +08:00
parent ce86c6d21d
commit 6d55bd37ac
1 changed files with 51 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,6 +31,51 @@ designer.project.onCurrentDocumentChange((doc) => {
}); });
}); });
interface Variable {
type: 'variable';
variable: string;
value: any;
}
function isVariable(obj: any): obj is Variable {
return obj && obj.type === 'variable';
}
function upgradePropsReducer(props: any) {
if (!isPlainObject(props)) {
return props;
}
const newProps: any = {};
Object.entries<any>(props).forEach(([key, val]) => {
if (/^__slot__/.test(key) && val === true) {
return;
}
if (isJSBlock(val)) {
if (val.value.componentName === 'Slot') {
val = {
type: 'JSSlot',
title: (val.value.props as any)?.slotTitle,
value: val.value.children
};
} else {
val = val.value;
}
}
// todo: deep find
if (isVariable(val)) {
val = {
type: 'JSExpression',
value: val.variable,
mock: val.value,
};
}
newProps[key] = val;
});
return newProps;
}
// 升级 Props
designer.addPropsReducer(upgradePropsReducer, TransformStage.Init);
// 节点 props 初始化 // 节点 props 初始化
designer.addPropsReducer((props, node) => { designer.addPropsReducer((props, node) => {
// run initials // run initials
@ -41,9 +86,13 @@ designer.addPropsReducer((props, node) => {
// FIXME! this implements SettingTarget // FIXME! this implements SettingTarget
try { try {
// FIXME! item.name could be 'xxx.xxx' // FIXME! item.name could be 'xxx.xxx'
const v = item.initial(node as any, props[item.name]); const ov = props[item.name];
const v = item.initial(node as any, isJSExpression(ov) ? ov.mock : ov);
if (v !== undefined) { if (v !== undefined) {
newProps[item.name] = v; newProps[item.name] = isJSExpression(ov) ? {
...ov,
mock: v,
} : v;
} }
} catch (e) { } catch (e) {
if (hasOwnProperty(props, item.name)) { if (hasOwnProperty(props, item.name)) {
@ -82,34 +131,6 @@ function filterReducer(props: any, node: Node): any {
designer.addPropsReducer(filterReducer, TransformStage.Save); designer.addPropsReducer(filterReducer, TransformStage.Save);
designer.addPropsReducer(filterReducer, TransformStage.Render); designer.addPropsReducer(filterReducer, TransformStage.Render);
function upgradePropsReducer(props: any) {
if (!isPlainObject(props)) {
return props;
}
const newProps: any = {};
Object.entries<any>(props).forEach(([key, val]) => {
if (/^__slot__/.test(key) && val === true) {
return;
}
if (isJSBlock(val)) {
if (val.value.componentName === 'Slot') {
val = {
type: 'JSSlot',
title: (val.value.props as any)?.slotTitle,
value: val.value.children
};
} else {
val = val.value;
}
}
// todo: type: variable
newProps[key] = val;
});
return newProps;
}
// 升级 Props
designer.addPropsReducer(upgradePropsReducer, TransformStage.Init);
function compatiableReducer(props: any) { function compatiableReducer(props: any) {
if (!isPlainObject(props)) { if (!isPlainObject(props)) {
return props; return props;