Merge branch 'fix/vision-rax' into 'release/0.9.0'

fix: plugin-desiger 支持从 editor 获取 device 参数



See merge request !919249
This commit is contained in:
高凯 2020-08-04 19:37:05 +08:00
commit a5acc3c230
3 changed files with 10 additions and 7 deletions

View File

@ -12,6 +12,7 @@ interface DesignerPluginState {
library?: any[] | null; library?: any[] | null;
extraEnvironment?: any[] | null; extraEnvironment?: any[] | null;
renderEnv?: string; renderEnv?: string;
device?: string;
} }
export default class DesignerPlugin extends PureComponent<PluginProps, DesignerPluginState> { export default class DesignerPlugin extends PureComponent<PluginProps, DesignerPluginState> {
@ -22,6 +23,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
library: null, library: null,
extraEnvironment: null, extraEnvironment: null,
renderEnv: 'default', renderEnv: 'default',
device: 'default',
}; };
private _mounted = true; private _mounted = true;
@ -36,6 +38,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
try { try {
const assets = await editor.onceGot('assets'); const assets = await editor.onceGot('assets');
const renderEnv = await editor.get('renderEnv'); const renderEnv = await editor.get('renderEnv');
const device = await editor.get('device');
if (!this._mounted) { if (!this._mounted) {
return; return;
} }
@ -45,6 +48,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
library: packages || [], library: packages || [],
extraEnvironment, extraEnvironment,
renderEnv, renderEnv,
device,
}; };
this.setState(state); this.setState(state);
} catch (e) { } catch (e) {
@ -67,7 +71,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
render(): React.ReactNode { render(): React.ReactNode {
const { editor } = this.props; const { editor } = this.props;
const { componentMetadatas, library, extraEnvironment, renderEnv } = this.state; const { componentMetadatas, library, extraEnvironment, renderEnv, device } = this.state;
if (!library || !componentMetadatas) { if (!library || !componentMetadatas) {
// TODO: use a Loading // TODO: use a Loading
@ -85,6 +89,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
library, library,
extraEnvironment, extraEnvironment,
renderEnv, renderEnv,
device,
}} }}
/> />
); );

View File

@ -1,7 +1,5 @@
#!/usr/bin/env bash #!/usr/bin/env bash
lerna run build --stream lerna run build --stream
cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-general/dist # cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-general/dist
cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-vision/dist # cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-vision/dist
cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-general/dist
cp -R ./packages/react-simulator-renderer/dist/* ./packages/editor-preset-vision/dist

View File

@ -23,7 +23,7 @@ echo ""
mkdir packages mkdir packages
cp -r $WORK_DIR/packages/demo packages/demo cp -r $WORK_DIR/packages/demo packages/demo
cp -r $WORK_DIR/packages/react-simulator-renderer packages/react-simulator-renderer cp -r $WORK_DIR/packages/react-simulator-renderer packages/react-simulator-renderer
# cp -r $WORK_DIR/packages/rax-simulator-renderer packages/rax-simulator-renderer cp -r $WORK_DIR/packages/rax-simulator-renderer packages/rax-simulator-renderer
cp -r $WORK_DIR/packages/editor-preset-vision packages/editor-preset-vision cp -r $WORK_DIR/packages/editor-preset-vision packages/editor-preset-vision
# cp -r $WORK_DIR/packages/editor-preset-general packages/editor-preset-general # cp -r $WORK_DIR/packages/editor-preset-general packages/editor-preset-general
lerna bootstrap lerna bootstrap
@ -32,7 +32,7 @@ lerna run cloud-build --stream
cd $WORK_DIR cd $WORK_DIR
mv deploy-space/packages/demo/build $BUILD_DEST mv deploy-space/packages/demo/build $BUILD_DEST
mv deploy-space/packages/react-simulator-renderer/dist/* $BUILD_DEST mv deploy-space/packages/react-simulator-renderer/dist/* $BUILD_DEST
# mv deploy-space/packages/rax-simulator-renderer/dist/* $BUILD_DEST mv deploy-space/packages/rax-simulator-renderer/dist/* $BUILD_DEST
mv deploy-space/packages/editor-preset-vision/dist/* $BUILD_DEST mv deploy-space/packages/editor-preset-vision/dist/* $BUILD_DEST
# mv deploy-space/packages/editor-preset-general/dist/* $BUILD_DEST # mv deploy-space/packages/editor-preset-general/dist/* $BUILD_DEST
# cp deploy-space/static/* $BUILD_DEST # cp deploy-space/static/* $BUILD_DEST