fix device

This commit is contained in:
kangwei 2020-05-15 16:08:20 +08:00
parent 833f8c70a9
commit 5f0fe40c64
3 changed files with 21 additions and 17 deletions

View File

@ -232,6 +232,7 @@ body {
flex-shrink: 0; flex-shrink: 0;
flex-direction: column; flex-direction: column;
justify-content: space-between; justify-content: space-between;
overflow: hidden;
&.lc-area-visible { &.lc-area-visible {
display: flex; display: flex;
} }

View File

@ -47,22 +47,23 @@ export default class SimulatorRendererView extends Component<{ renderer: Simulat
} }
} }
function getDeviceView(view: any, device: string) { function ucfirst(s: string) {
if (!view || typeof view === 'string' || device === 'default') { return s.charAt(0).toUpperCase() + s.substring(1);
}
function getDeviceView(view: any, device: string, mode: string) {
if (!view || typeof view === 'string') {
return view; return view;
} }
/* // compatible vision Mobile | Preview
const viewport = Viewport.getViewport(); device = ucfirst(device);
if (viewport) { if (device === 'Mobile' && view.hasOwnProperty(device)) {
if (view.hasOwnProperty(device)) {
view = view[device]; view = view[device];
} }
mode = ucfirst(mode);
if (view.hasOwnProperty(mode)) { if (mode === 'Preview' && view.hasOwnProperty(mode)) {
view = view[mode]; view = view[mode];
} }
}*/
return view; return view;
} }
@ -91,14 +92,14 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> {
} }
render() { render() {
const { renderer } = this.props; const { renderer } = this.props;
const device = renderer.designMode const { device, designMode } = renderer;
return ( return (
<LowCodeRenderer <LowCodeRenderer
schema={renderer.schema} schema={renderer.schema}
components={renderer.components} components={renderer.components}
appHelper={renderer.context} appHelper={renderer.context}
// context={renderer.context} // context={renderer.context}
designMode={renderer.designMode} designMode={designMode}
suspended={renderer.suspended} suspended={renderer.suspended}
self={renderer.scope} self={renderer.scope}
customCreateElement={(Component: any, props: any, children: any) => { customCreateElement={(Component: any, props: any, children: any) => {
@ -107,7 +108,7 @@ class Renderer extends Component<{ renderer: SimulatorRenderer }> {
viewProps._leaf = host.document.getNode(__id); viewProps._leaf = host.document.getNode(__id);
return createElement( return createElement(
getDeviceView(Component, device), getDeviceView(Component, device, designMode),
viewProps, viewProps,
children == null ? [] : Array.isArray(children) ? children : [children], children == null ? [] : Array.isArray(children) ? children : [children],
); );

View File

@ -35,6 +35,7 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
} }
// sync designMode // sync designMode
this._designMode = host.designMode;
// sync suspended // sync suspended
@ -84,8 +85,9 @@ export class SimulatorRenderer implements BuiltinSimulatorRenderer {
@computed get context(): any { @computed get context(): any {
return this._appContext; return this._appContext;
} }
@obx.ref private _designMode: string = 'design';
@computed get designMode(): any { @computed get designMode(): any {
return 'preview'; return this._designMode;
} }
@obx.ref private _device: string = 'default'; @obx.ref private _device: string = 'default';
@computed get device() { @computed get device() {