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

This commit is contained in:
kangwei 2020-06-16 17:35:58 +08:00
commit 396a9ef65e
3 changed files with 30 additions and 20 deletions

View File

@ -1,6 +1,6 @@
import { ReactElement, ComponentType } from 'react';
import { EventEmitter } from 'events';
import { registerSetter, RegisteredSetter } from '@ali/lowcode-editor-core';
import { registerSetter, RegisteredSetter, getSetter } from '@ali/lowcode-editor-core';
import Bundle from './bundle';
import { CustomView } from '@ali/lowcode-types';
@ -104,6 +104,14 @@ export class Trunk {
setPackages() {
console.warn('Trunk.setPackages is deprecated');
}
getSetter(type: string): any{
const setter = getSetter(type);
if (setter?.component) {
return setter.component;
}
return setter;
}
}
export default new Trunk();

View File

@ -213,7 +213,9 @@ export function upgradePropConfig(config: OldPropConfig, collector: ConfigCollec
liveTextEditing,
} = config;
const extraProps: any = {};
const extraProps: any = {
display: DISPLAY_TYPE.BLOCK,
};
const newConfig: any = {
type: type === 'group' ? 'group' : 'field',
name,

View File

@ -67,16 +67,16 @@
}
}
&.lc-plain-field {
// for top-level style
// padding: 8px 10px;
> .lc-field-body {
flex: 1;
min-width: 0;
display: flex;
align-items: center;
}
}
// &.lc-plain-field {
// // for top-level style
// // padding: 8px 10px;
// > .lc-field-body {
// flex: 1;
// min-width: 0;
// display: flex;
// align-items: center;
// }
// }
&.lc-inline-field {
display: flex;
@ -211,14 +211,14 @@
}
// 3rd level field title width should short
.lc-field-body .lc-inline-field {
> .lc-field-head {
width: 50px;
.lc-title-label {
width: 50px;
}
}
}
// .lc-field-body .lc-inline-field {
// > .lc-field-head {
// width: 50px;
// .lc-title-label {
// width: 50px;
// }
// }
// }
>.lc-block-setter {
flex: 1;
}