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

This commit is contained in:
力皓 2021-04-02 12:07:55 +08:00
commit ff4c48b9c9
3 changed files with 12 additions and 5 deletions

View File

@ -54,6 +54,7 @@ class Canvas extends Component<{ host: BuiltinSimulatorHost }> {
render() {
const sim = this.props.host;
let className = 'lc-simulator-canvas';
const { canvas = {}, viewport = {} } = sim.deviceStyle || {};
if (sim.deviceClassName) {
className += ` ${sim.deviceClassName}`;
} else if (sim.device) {
@ -61,8 +62,8 @@ class Canvas extends Component<{ host: BuiltinSimulatorHost }> {
}
return (
<div className={className}>
<div ref={(elmt) => sim.mountViewport(elmt)} className="lc-simulator-canvas-viewport">
<div className={className} style={canvas}>
<div ref={(elmt) => sim.mountViewport(elmt)} className="lc-simulator-canvas-viewport" style={viewport}>
<BemTools host={sim} />
<Content host={sim} />
</div>

View File

@ -48,6 +48,11 @@ export interface LibraryItem {
urls?: Asset;
}
export interface DeviceStyleProps {
canvas?: object;
viewport?: object;
}
export interface BuiltinSimulatorProps {
// 从 documentModel 上获取
// suspended?: boolean;
@ -178,6 +183,10 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
return this.designer.componentsMap;
}
@computed get deviceStyle(): DeviceStyleProps | undefined {
return this.get('deviceStyle');
}
@obx.ref _props: BuiltinSimulatorProps = {};
/**

View File

@ -4,9 +4,6 @@ body, html {
padding: 0;
margin: 0;
}
html.engine-design-mode {
padding-bottom: 30px;
}
html.engine-cursor-move, html.engine-cursor-move * {
cursor: grabbing !important;