diff --git a/packages/editor-core/src/editor.ts b/packages/editor-core/src/editor.ts index 058241a57..bda15aa8f 100644 --- a/packages/editor-core/src/editor.ts +++ b/packages/editor-core/src/editor.ts @@ -20,6 +20,15 @@ import { AssetsJson, AssetLoader } from '@alilc/lowcode-utils'; EventEmitter.defaultMaxListeners = 100; +// inner instance keys which should not be stored in config +const keyBlacklist = [ + 'designer', + 'skeleton', + 'currentDocument', + 'simulator', + 'plugins', +]; + export declare interface Editor extends StrictEventEmitter { addListener(event: string | symbol, listener: (...args: any[]) => void): this; once(event: string | symbol, listener: (...args: any[]) => void): this; @@ -73,7 +82,9 @@ export class Editor extends (EventEmitter as any) implements IEditor { return; } // store the data to engineConfig while invoking editor.set() - engineConfig.set(key as any, data); + if (!keyBlacklist.includes(key as string)) { + engineConfig.set(key as any, data); + } this.context.set(key, data); this.notifyGot(key); } diff --git a/packages/engine/src/engine-core.ts b/packages/engine/src/engine-core.ts index f08296bc1..c8d3b49c4 100644 --- a/packages/engine/src/engine-core.ts +++ b/packages/engine/src/engine-core.ts @@ -37,14 +37,10 @@ globalContext.register(editor, Editor); globalContext.register(editor, 'editor'); const innerSkeleton = new InnerSkeleton(editor); -editor.set(Skeleton, innerSkeleton); editor.set('skeleton' as any, innerSkeleton); -engineConfig.set('skeleton' as any, innerSkeleton); const designer = new Designer({ editor }); -editor.set(Designer, designer); editor.set('designer' as any, designer); -engineConfig.set('designer' as any, designer); const plugins = new LowCodePluginManager(editor).toProxy(); editor.set('plugins' as any, plugins); diff --git a/packages/engine/src/modules/symbols.ts b/packages/engine/src/modules/symbols.ts index ac469bc26..f40e81654 100644 --- a/packages/engine/src/modules/symbols.ts +++ b/packages/engine/src/modules/symbols.ts @@ -2,6 +2,7 @@ import { projectSymbol, documentSymbol, nodeSymbol, + nodeChildrenSymbol, designerSymbol, skeletonSymbol, editorSymbol, @@ -13,6 +14,7 @@ export default { projectSymbol, documentSymbol, nodeSymbol, + nodeChildrenSymbol, skeletonSymbol, editorSymbol, designerSymbol, diff --git a/packages/renderer-core/tests/renderer/renderer.test.tsx b/packages/renderer-core/tests/renderer/renderer.test.tsx index ba8fa67fe..d1917c5a5 100644 --- a/packages/renderer-core/tests/renderer/renderer.test.tsx +++ b/packages/renderer-core/tests/renderer/renderer.test.tsx @@ -1,5 +1,5 @@ import React from 'react'; -import renderer from 'react-test-renderer/'; +import renderer from 'react-test-renderer'; import schema from '../fixtures/schema/basic'; import '../utils/react-env-init'; import rendererFactory from '../../src/renderer/renderer'; diff --git a/packages/shell/src/hotkey.ts b/packages/shell/src/hotkey.ts index 6e98f4359..a60be7dd9 100644 --- a/packages/shell/src/hotkey.ts +++ b/packages/shell/src/hotkey.ts @@ -2,6 +2,15 @@ import { hotkey, HotkeyCallback } from '@alilc/lowcode-editor-core'; import { Disposable } from '@alilc/lowcode-types'; export default class Hotkey { + get callbacks() { + return hotkey.callBacks; + } + /** + * @deprecated + */ + get callBacks() { + return this.callbacks; + } /** * 绑定快捷键 * @param combos 快捷键,格式如:['command + s'] 、['ctrl + shift + s'] 等