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 b870aef7d..f47b52c94 100644 --- a/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx +++ b/packages/designer/src/builtin-simulator/bem-tools/border-resizing.tsx @@ -180,7 +180,7 @@ export class BoxResizingInstance extends Component<{ metaData.experimental.callbacks.onResizeEnd(e, node); } - const editor = globalContext.get(Editor); + const 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/live-editing/live-editing.ts b/packages/designer/src/builtin-simulator/live-editing/live-editing.ts index 58cc17739..443639ed2 100644 --- a/packages/designer/src/builtin-simulator/live-editing/live-editing.ts +++ b/packages/designer/src/builtin-simulator/live-editing/live-editing.ts @@ -52,7 +52,7 @@ export class LiveEditing { const targetElement = event.target as HTMLElement; const { liveTextEditing } = node.componentMeta; - const editor = globalContext.get(Editor); + const editor = globalContext.get('editor'); const npm = node?.componentMeta?.npm; const selected = [npm?.package, npm?.componentName].filter((item) => !!item).join('-') || node?.componentMeta?.componentName || ''; diff --git a/packages/designer/src/builtin-simulator/node-selector/index.tsx b/packages/designer/src/builtin-simulator/node-selector/index.tsx index e4140f49f..1bf5a2405 100644 --- a/packages/designer/src/builtin-simulator/node-selector/index.tsx +++ b/packages/designer/src/builtin-simulator/node-selector/index.tsx @@ -62,7 +62,7 @@ export default class InstanceNodeSelector extends React.Component !!item).join('-') || diff --git a/packages/designer/src/designer/builtin-hotkey.ts b/packages/designer/src/designer/builtin-hotkey.ts index 5d187a6b2..949ac3386 100644 --- a/packages/designer/src/designer/builtin-hotkey.ts +++ b/packages/designer/src/designer/builtin-hotkey.ts @@ -7,7 +7,7 @@ import clipboard from './clipboard'; function isInLiveEditing() { if (globalContext.has(Editor)) { return Boolean( - globalContext.get(Editor).get('designer')?.project?.simulator?.liveEditing?.editing, + globalContext.get('editor').get('designer')?.project?.simulator?.liveEditing?.editing, ); } } diff --git a/packages/designer/src/document/history.ts b/packages/designer/src/document/history.ts index ef25dfb92..a3abd6e0c 100644 --- a/packages/designer/src/document/history.ts +++ b/packages/designer/src/document/history.ts @@ -115,7 +115,7 @@ export class History { } const cursor = this.session.cursor - 1; this.go(cursor); - const editor = globalContext.get(Editor); + const editor = globalContext.get('editor'); if (!editor) { return; } @@ -128,7 +128,7 @@ export class History { } const cursor = this.session.cursor + 1; this.go(cursor); - const editor = globalContext.get(Editor); + const editor = globalContext.get('editor'); if (!editor) { return; } diff --git a/packages/editor-core/src/hotkey.ts b/packages/editor-core/src/hotkey.ts index 6bf9dda5e..91aefc6a3 100644 --- a/packages/editor-core/src/hotkey.ts +++ b/packages/editor-core/src/hotkey.ts @@ -330,6 +330,7 @@ function getKeyInfo(combination: string, action?: string): KeyInfo { */ function fireCallback(callback: HotkeyCallback, e: KeyboardEvent, combo?: string, sequence?: string): void { try { + // 这里不能简化成 editor,单测时没有注册 const editor = globalContext.get(Editor); const designer = editor.get('designer'); const node = designer?.currentSelection?.getNodes()?.[0]; diff --git a/packages/editor-skeleton/src/components/widget-views/index.tsx b/packages/editor-skeleton/src/components/widget-views/index.tsx index 87280fbfc..8afa240f8 100644 --- a/packages/editor-skeleton/src/components/widget-views/index.tsx +++ b/packages/editor-skeleton/src/components/widget-views/index.tsx @@ -116,12 +116,12 @@ export class DraggableLineView extends Component<{ panel: Panel }> { } // 抛出事件,对于有些需要 panel 插件随着 度变化进行再次渲染的,由panel插件内部监听事件实现 - const editor = globalContext.get(Editor); + const editor = globalContext.get('editor'); editor?.emit('dockpane.drag', width); } onDragChange(type: 'start' | 'end') { - const editor = globalContext.get(Editor); + const editor = globalContext.get('editor'); editor?.emit('dockpane.dragchange', type); // builtinSimulator 屏蔽掉 鼠标事件 editor?.emit('designer.builtinSimulator.disabledEvents', type === 'start'); @@ -185,7 +185,7 @@ export class TitledPanelView extends Component<{ panel: Panel; area?: string }> if (!panel.inited) { return null; } - const editor = globalContext.get(Editor); + const editor = globalContext.get('editor'); const panelName = area ? `${area}-${panel.name}` : panel.name; editor?.emit('skeleton.panel.toggle', { name: panelName || '', @@ -247,7 +247,7 @@ export class PanelView extends Component<{ if (!panel.inited) { return null; } - const editor = globalContext.get(Editor); + const editor = globalContext.get('editor'); const panelName = area ? `${area}-${panel.name}` : panel.name; editor?.emit('skeleton.panel.toggle', { name: panelName || '', diff --git a/packages/editor-skeleton/src/layouts/workbench.tsx b/packages/editor-skeleton/src/layouts/workbench.tsx index 74424192d..680d0d019 100644 --- a/packages/editor-skeleton/src/layouts/workbench.tsx +++ b/packages/editor-skeleton/src/layouts/workbench.tsx @@ -23,7 +23,7 @@ export class Workbench extends Component<{ skeleton: Skeleton; config?: EditorCo } // componentDidCatch(error: any) { - // globalContext.get(Editor).emit('editor.skeleton.workbench.error', error); + // globalContext.get('editor').emit('editor.skeleton.workbench.error', error); // } render() { diff --git a/packages/plugin-outline-pane/src/views/tree-title.tsx b/packages/plugin-outline-pane/src/views/tree-title.tsx index c9afb8e41..a504e3f3b 100644 --- a/packages/plugin-outline-pane/src/views/tree-title.tsx +++ b/packages/plugin-outline-pane/src/views/tree-title.tsx @@ -16,7 +16,7 @@ import { IconLock, IconUnlock } from '../icons'; function emitOutlineEvent(type: string, treeNode: TreeNode, rest?: Record) { - const editor = globalContext.get(Editor); + const editor = globalContext.get('editor'); const node = treeNode?.node; const npm = node?.componentMeta?.npm; const selected = diff --git a/packages/plugin-outline-pane/src/views/tree.tsx b/packages/plugin-outline-pane/src/views/tree.tsx index 9559d793a..fa74cb0a0 100644 --- a/packages/plugin-outline-pane/src/views/tree.tsx +++ b/packages/plugin-outline-pane/src/views/tree.tsx @@ -66,7 +66,7 @@ export default class TreeView extends Component<{ tree: Tree }> { } } else { selection.select(id); - const editor = globalContext.get(Editor); + const editor = globalContext.get('editor'); const selectedNode = designer.currentSelection?.getNodes()?.[0]; const npm = selectedNode?.componentMeta?.npm; const selected =