fix: pluginContext

alibaba · Dec 22, 2022 · fa20830 · fa20830
1 parent 51628cd
commit fa20830
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/packages/designer/src/plugin/plugin-manager.ts b/packages/designer/src/plugin/plugin-manager.ts
@@ -29,6 +29,7 @@ export class LowCodePluginManager implements ILowCodePluginManager {
   private plugins: ILowCodePluginRuntime[] = [];
 
   pluginsMap: Map<string, ILowCodePluginRuntime> = new Map();
+  pluginContextMap: Map<string, LowCodePluginContext> = new Map();
 
   private pluginPreference?: PluginPreference = new Map();
 
@@ -39,7 +40,13 @@ export class LowCodePluginManager implements ILowCodePluginManager {
   }
 
   _getLowCodePluginContext = (options: IPluginContextOptions) => {
-    return new LowCodePluginContext(options, this.contextApiAssembler);
+    const { pluginName } = options;
+    let context = this.pluginContextMap.get(pluginName);
+    if (!context) {
+      context = new LowCodePluginContext(options, this.contextApiAssembler);
+      this.pluginContextMap.set(pluginName, context);
+    }
+    return context;
   };
 
   isEngineVersionMatched(versionExp: string): boolean {

diff --git a/packages/editor-skeleton/src/skeleton.ts b/packages/editor-skeleton/src/skeleton.ts
@@ -372,7 +372,7 @@ export class Skeleton {
     };
     parsedConfig.contentProps = {
       pluginContext: this.editor.get('innerPlugins')?._getLowCodePluginContext({
-        pluginName: 'any',
+        pluginName: parsedConfig.pluginName,
       }),
       ...(parsedConfig.contentProps || {}),
     };

diff --git a/packages/engine/src/engine-core.ts b/packages/engine/src/engine-core.ts
@@ -77,7 +77,7 @@ const { project: innerProject } = designer;
 const innerHotkey = new InnerHotkey();
 const hotkey = new Hotkey(innerHotkey);
 const project = new Project(innerProject);
-const skeleton = new Skeleton(innerSkeleton);
+const skeleton = new Skeleton(innerSkeleton, 'any', false);
 const innerSetters = new InnerSetters();
 const setters = new Setters(innerSetters);
 
@@ -98,7 +98,7 @@ const pluginContextApiAssembler: ILowCodePluginContextApiAssembler = {
   assembleApis: (context: ILowCodePluginContextPrivate, pluginName: string, meta: IPublicTypePluginMeta) => {
     context.hotkey = hotkey;
     context.project = project;
-    context.skeleton = skeleton;
+    context.skeleton = new Skeleton(innerSkeleton, pluginName, false);
     context.setters = setters;
     context.material = material;
     const eventPrefix = meta?.eventPrefix || 'common';

diff --git a/packages/shell/src/api/skeleton.ts b/packages/shell/src/api/skeleton.ts
@@ -9,6 +9,7 @@ import { IPublicApiSkeleton, IPublicTypeWidgetBaseConfig, IPublicTypeWidgetConfi
 const innerSkeletonSymbol = Symbol('skeleton');
 export class Skeleton implements IPublicApiSkeleton {
   private readonly [innerSkeletonSymbol]: InnerSkeleton;
+  private readonly pluginName: string;
 
   get [skeletonSymbol]() {
     if (this.workspaceMode) {
@@ -22,8 +23,9 @@ export class Skeleton implements IPublicApiSkeleton {
     return this[innerSkeletonSymbol];
   }
 
-  constructor(skeleton: InnerSkeleton, readonly workspaceMode: boolean = false) {
+  constructor(skeleton: InnerSkeleton, pluginName: string, readonly workspaceMode: boolean = false) {
     this[innerSkeletonSymbol] = skeleton;
+    this.pluginName = pluginName;
   }
 
   /**
@@ -33,7 +35,11 @@ export class Skeleton implements IPublicApiSkeleton {
    * @returns
    */
   add(config: IPublicTypeWidgetBaseConfig, extraConfig?: Record<string, any>) {
-    return this[skeletonSymbol].add(config, extraConfig);
+    const configWithName = {
+      ...config,
+      pluginName: this.pluginName,
+    };
+    return this[skeletonSymbol].add(configWithName, extraConfig);
   }
 
   /**

diff --git a/packages/workspace/src/base-context.ts b/packages/workspace/src/base-context.ts
@@ -82,7 +82,7 @@ export class BasicContext {
     const config = engineConfig;
     const event = new Event(editor, { prefix: 'common' });
     const logger = getLogger({ level: 'warn', bizName: 'common' });
-    const skeleton = new Skeleton(innerSkeleton, true);
+    const skeleton = new Skeleton(innerSkeleton, 'any', true);
     editor.set('setters', setters);
     editor.set('project', project);
     editor.set('material', material);
@@ -110,7 +110,7 @@ export class BasicContext {
         context.workspace = workspace;
         context.hotkey = hotkey;
         context.project = project;
-        context.skeleton = skeleton;
+        context.skeleton = new Skeleton(innerSkeleton, pluginName, true);
         context.setters = setters;
         context.material = material;
         const eventPrefix = meta?.eventPrefix || 'common';