diff --git a/modules/material-parser/test/fixtures/ts-component2/package.json b/modules/material-parser/test/fixtures/ts-component2/package.json index 95bb4bd8d..e3fde3e59 100644 --- a/modules/material-parser/test/fixtures/ts-component2/package.json +++ b/modules/material-parser/test/fixtures/ts-component2/package.json @@ -34,7 +34,7 @@ "@alife/build-plugin-lowcode": "^1.0.7", "@alib/build-scripts": "^0.1.3", "@alifd/adaptor-generate": "^0.1.3", - "build-plugin-component": "^0.2.0", + "build-plugin-component": "^1.0.0", "build-plugin-fusion": "^0.1.0", "build-plugin-fusion-cool": "^0.1.0", "build-plugin-moment-locales": "^0.1.0", diff --git a/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx b/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx index 08a44b25d..58ecf505d 100644 --- a/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx +++ b/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx @@ -172,7 +172,8 @@ export class BoxResizingInstance extends Component<{ metadata.configure.advanced.callbacks.onResizeEnd(e, cbNode); } - const editor = globalContext.get(Editor); + const workSpace = globalContext.get('workSpace'); + const editor = workSpace.isActive ? workSpace.window.editor : globalContext.get('editor'); const npm = node?.componentMeta?.npm; const selected = [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || diff --git a/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx b/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx index e5c8ad98a..bb5f288de 100644 --- a/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx +++ b/packages/designer/src/builtin-simulator/bem-tools/border-selecting.tsx @@ -131,7 +131,8 @@ function createAction(content: ReactNode | ComponentType | ActionContentObj className="lc-borders-action" onClick={() => { action && action(node); - const editor = globalContext.get('editor'); + const workSpace = globalContext.get('workSpace'); + const editor = workSpace.isActive ? workSpace.window.editor : globalContext.get('editor'); const npm = node?.componentMeta?.npm; const selected = [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || diff --git a/packages/designer/src/builtin-simulator/create-simulator.ts b/packages/designer/src/builtin-simulator/create-simulator.ts index 007286e9c..e46582180 100644 --- a/packages/designer/src/builtin-simulator/create-simulator.ts +++ b/packages/designer/src/builtin-simulator/create-simulator.ts @@ -22,6 +22,7 @@ export function createSimulator( const doc = iframe.contentDocument!; win.LCSimulatorHost = host; + win._ = window._; const styles: any = {}; const scripts: any = {}; diff --git a/packages/designer/src/builtin-simulator/host-view.tsx b/packages/designer/src/builtin-simulator/host-view.tsx index ff40362d1..ec2616c64 100644 --- a/packages/designer/src/builtin-simulator/host-view.tsx +++ b/packages/designer/src/builtin-simulator/host-view.tsx @@ -23,8 +23,8 @@ export class BuiltinSimulatorHostView extends Component { constructor(props: any) { super(props); - const { project, onMount } = this.props; - this.host = (project.simulator as BuiltinSimulatorHost) || new BuiltinSimulatorHost(project); + const { project, onMount, designer } = this.props; + this.host = (project.simulator as BuiltinSimulatorHost) || new BuiltinSimulatorHost(project, designer); this.host.setProps(this.props); onMount?.(this.host); } @@ -76,7 +76,8 @@ class Content extends Component<{ host: BuiltinSimulatorHost }> { private dispose?: () => void; componentDidMount() { - const editor = globalContext.get('editor'); + const workSpace = globalContext.get('workSpace'); + const editor = workSpace.isActive ? workSpace.window.editor : globalContext.get('editor'); const onEnableEvents = (type: boolean) => { this.setState({ disabledEvents: type, @@ -97,7 +98,7 @@ class Content extends Component<{ host: BuiltinSimulatorHost }> { render() { const sim = this.props.host; const { disabledEvents } = this.state; - const { viewport } = sim; + const { viewport, designer } = sim; const frameStyle: any = { transform: `scale(${viewport.scale})`, height: viewport.contentHeight, @@ -107,10 +108,12 @@ class Content extends Component<{ host: BuiltinSimulatorHost }> { frameStyle.pointerEvents = 'none'; } + const name = designer.name; + return (