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

fix: add extraEnv

Browse Source
This commit is contained in:
kangwei 2020-06-22 11:09:01 +08:00
parent b843117fc4
commit 9058ac82d5
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/designer/src/builtin-simulator/host.ts
View File

@ -40,6 +40,7 @@ export interface BuiltinSimulatorProps {
device?: 'mobile' | 'iphone' | string; device?: 'mobile' | 'iphone' | string;
deviceClassName?: string; deviceClassName?: string;
environment?: Asset; environment?: Asset;
extraEnvironment?: Asset;
library?: LibraryItem[]; library?: LibraryItem[];
simulatorUrl?: Asset; simulatorUrl?: Asset;
theme?: Asset; theme?: Asset;
@ -187,6 +188,8 @@ export class BuiltinSimulatorHost implements ISimulatorHost<BuiltinSimulatorProp
// required & use once // required & use once
assetBundle(this.get('environment') || defaultEnvironment, AssetLevel.Environment), assetBundle(this.get('environment') || defaultEnvironment, AssetLevel.Environment),
// required & use once // required & use once
assetBundle(this.get('extraEnvironment'), AssetLevel.Environment),
// required & use once
assetBundle(libraryAsset, AssetLevel.Library), assetBundle(libraryAsset, AssetLevel.Library),
// required & TODO: think of update // required & TODO: think of update
assetBundle(this.theme, AssetLevel.Theme), assetBundle(this.theme, AssetLevel.Theme),

6
packages/editor-preset-vision/src/bundle/bundle.ts
View File

@ -1,6 +1,6 @@
import lg from '@ali/vu-logger'; import lg from '@ali/vu-logger';
import { ComponentClass, ComponentType } from 'react'; import { ComponentClass, ComponentType } from 'react';
import Prototype from './prototype'; import Prototype, { isPrototype } from './prototype';
import { designer } from '../editor'; import { designer } from '../editor';
function basename(name: string) { function basename(name: string) {
@ -141,12 +141,12 @@ export default class Bundle {
private recursivelyRegisterPrototypes(list: any[], cp: ComponentProtoBundle) { private recursivelyRegisterPrototypes(list: any[], cp: ComponentProtoBundle) {
const propList: ComponentProtoBundle[] = list; const propList: ComponentProtoBundle[] = list;
propList.forEach((proto: ComponentProtoBundle, index: number) => { propList.forEach((proto: any, index: number) => {
if (Array.isArray(proto)) { if (Array.isArray(proto)) {
this.recursivelyRegisterPrototypes(proto, cp); this.recursivelyRegisterPrototypes(proto, cp);
return; return;
} }
if (proto instanceof Prototype) { if (isPrototype(proto)) {
const componentName = proto.getComponentName()!; const componentName = proto.getComponentName()!;
if (!proto.getView() && this.viewsMap[componentName]) { if (!proto.getView() && this.viewsMap[componentName]) {
proto.setView(this.viewsMap[componentName]); proto.setView(this.viewsMap[componentName]);

2
packages/editor-preset-vision/src/bundle/prototype.ts
View File

@ -217,7 +217,7 @@ class Prototype {
} }
readonly isPrototype = true; readonly isPrototype = true;
private meta: ComponentMeta; readonly meta: ComponentMeta;
readonly options: OldPrototypeConfig | ComponentMetadata; readonly options: OldPrototypeConfig | ComponentMetadata;
constructor(input: OldPrototypeConfig | ComponentMetadata | ComponentMeta) { constructor(input: OldPrototypeConfig | ComponentMetadata | ComponentMeta) {

2
packages/editor-preset-vision/src/bundle/trunk.ts
View File

@ -35,7 +35,7 @@ export class Trunk {
bundle = this.trunk[i]; bundle = this.trunk[i];
prototype = bundle.get(name); prototype = bundle.get(name);
if (prototype) { if (prototype) {
return prototype; return (prototype.meta as any).prototype;
} }
} }
return this.metaBundle.getFromMeta(name); return this.metaBundle.getFromMeta(name);

8
packages/plugin-designer/src/index.tsx
View File

@ -10,6 +10,7 @@ export interface PluginProps {
interface DesignerPluginState { interface DesignerPluginState {
componentMetadatas?: any[] | null; componentMetadatas?: any[] | null;
library?: any[] | null; library?: any[] | null;
extraEnvironment?: any[] | null;
} }
export default class DesignerPlugin extends PureComponent<PluginProps, DesignerPluginState> { export default class DesignerPlugin extends PureComponent<PluginProps, DesignerPluginState> {
@ -18,6 +19,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
state: DesignerPluginState = { state: DesignerPluginState = {
componentMetadatas: null, componentMetadatas: null,
library: null, library: null,
extraEnvironment: null,
}; };
private _mounted = true; private _mounted = true;
@ -33,10 +35,11 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
if (!this._mounted) { if (!this._mounted) {
return; return;
} }
const { components, packages } = assets; const { components, packages, extraEnvironment } = assets;
const state = { const state = {
componentMetadatas: components || [], componentMetadatas: components || [],
library: packages || [], library: packages || [],
extraEnvironment,
}; };
this.setState(state); this.setState(state);
}; };
@ -56,7 +59,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 } = this.state; const { componentMetadatas, library, extraEnvironment } = this.state;
if (!library || !componentMetadatas) { if (!library || !componentMetadatas) {
// TODO: use a Loading // TODO: use a Loading
@ -72,6 +75,7 @@ export default class DesignerPlugin extends PureComponent<PluginProps, DesignerP
componentMetadatas={componentMetadatas} componentMetadatas={componentMetadatas}
simulatorProps={{ simulatorProps={{
library, library,
extraEnvironment,
}} }}
/> />
); );