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

Merge branch 'release/0.9.0' of gitlab.alibaba-inc.com:ali-lowcode/ali-lowcode-engine into release/0.9.0

Browse Source
This commit is contained in:
mario.gk 2020-08-04 19:30:36 +08:00
commit 3ba58bcdd0
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/editor-skeleton/src/components/settings/settings-pane.tsx
View File

@ -16,8 +16,9 @@ class SettingFieldView extends Component<{ field: SettingField }> {
render() {
const { field } = this.props;
const { extraProps } = field;
const { extraProps, componentMeta } = field;
const { condition, defaultValue, display } = extraProps;
const { prototype } = componentMeta;
let visible;
try {
visible = field.isSingle && typeof condition === 'function' ? condition(field) !== false : true;
@ -33,6 +34,8 @@ class SettingFieldView extends Component<{ field: SettingField }> {
let setterProps: any = {};
let setterType: any;
let initialValue: any = null;
const isReactComponent = prototype === null || prototype === undefined;
console.log(111, this.props);
if (Array.isArray(setter)) {
setterType = 'MixedSetter';
setterProps = {
@ -49,9 +52,15 @@ class SettingFieldView extends Component<{ field: SettingField }> {
if (setter.initialValue != null) {
initialValue = setter.initialValue;
}
} else if (isReactComponent) {
setterType = 'MixedSetter';
setterProps = {
setters: [setter, 'VariableSetter'],
};
} else if (setter) {
setterType = setter;
}
let value = null;
if (defaultValue != null && !('defaultValue' in setterProps)) {
setterProps.defaultValue = defaultValue;