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

Merge branch 'fix/slot-initial' into 'release/0.9.0'

Browse Source 
fix: 修复 slot 获取初始值异常的 bug



See merge request !920699
This commit is contained in:
高凯 2020-08-04 20:01:53 +08:00
commit 66d0ed4b93
2 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
packages/editor-preset-vision/src/bundle/upgrade-metadata.ts
View File

@ -1,6 +1,6 @@
import { ComponentType, ReactElement, isValidElement, ComponentClass } from 'react';
import { isPlainObject, uniqueId } from '@ali/lowcode-utils';
import { isI18nData, SettingTarget, InitialItem, FilterItem, isJSSlot, ProjectSchema, AutorunItem } from '@ali/lowcode-types';
import { isI18nData, SettingTarget, InitialItem, FilterItem, isJSSlot, ProjectSchema, AutorunItem, isJSBlock } from '@ali/lowcode-types';
import { untracked } from '@ali/lowcode-editor-core';
import { editor, designer } from '../editor';
import { SettingField } from '@ali/lowcode-designer';
@ -281,24 +281,19 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec
}
let initialFn = (slotName ? null : initial) || initialValue;
// 在 upgrade reducer 做了 JSBlock ——> JSSlot
// if (slotName && initialValue === true) {
// initialFn = (value: any, defaultValue: any) => {
// if (isJSSlot(value)) {
// return {
// title: slotTitle || title,
// name: slotName,
// ...value,
// };
// }
// return {
// type: 'JSSlot',
// title: slotTitle || title,
// name: slotName,
// value: initialChildren,
// };
// };
// }
if (slotName && initialValue === true) {
initialFn = (value: any, defaultValue: any) => {
if (isJSBlock(value)) {
return value;
}
return {
type: 'JSSlot',
title: slotTitle || title,
name: slotName,
value: initialChildren,
};
};
}
if (!slotName) {
if (accessor) {
@ -347,22 +342,22 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec
initial: (field: Field, currentValue: any) => {
// FIXME! read from prototype.defaultProps
const defaults = extraProps.defaultValue;
if (typeof initialFn !== 'function') {
initialFn = defaultInitial;
}
const v = initialFn.call(field, currentValue, defaults);
if (setterInitial) {
return setterInitial.call(field, v, defaults);
}
return v;
},
});
}
if (ignore != null || disabled != null) {
collector.addFilter({
// FIXME! name should be "xxx.xxx"

2
packages/types/src/value-type.ts
View File

@ -55,5 +55,5 @@ export function isJSSlot(data: any): data is JSSlot {
}
export function isJSBlock(data: any): data is JSBlock {
return data && data.type === 'JSBlock'
return data && data.type === 'JSBlock';
}