@gct-paas/core 0.0.1-dev.27 → 0.0.1-dev.29

package/es/register/designer-register/designer-register.d.ts

@@ -15,8 +15,8 @@ export declare class DesignerRegister {
     protected map: Map<string, () => IDesignerProvider>;
     private providers;
     readonly hooks: {
-        register: SyncSeriesHook<IDesignerProvider, null>;
-        unregister: SyncSeriesHook<IDesignerProvider, null>;
+        register: SyncSeriesHook<[string, IDesignerProvider], null>;
+        unregister: SyncSeriesHook<[string, IDesignerProvider], null>;
     };
     /**
      * 设计器项适配器注册

package/es/register/designer-register/designer-register.mjs

@@ -24,7 +24,7 @@ class DesignerRegister {
     this.map.set(tag, provider);
     const instance = provider();
     this.providers.set(tag, instance);
-    this.hooks.register.callSync(null, instance);
+    this.hooks.register.callSync(null, tag, instance);
   }
   /**
    * 设计器项适配器注销
@@ -35,7 +35,7 @@ class DesignerRegister {
     this.map.delete(tag);
     const instance = this.providers.get(tag);
     if (instance) {
-      this.hooks.unregister.callSync(null, instance);
+      this.hooks.unregister.callSync(null, tag, instance);
       this.providers.delete(tag);
     }
   }

package/es/utils/plugin-pkg-util/plugin-pkg-util.d.ts

@@ -67,19 +67,30 @@ export declare class PluginPgkUtil {
      */
     static loadDesignPlugin(_app: App, platform: Platform, kit?: string[]): Promise<LoadPluginResult>;
     /**
-     * 加载绘制态移动端插件包
+     * 加载设计态中，已经被从配置中移除的插件
+     *
+     * @static
+     * @param {Platform} platform
+     * @param {IObject[]} configs
+     * @returns {*}  {Promise<void>}
+     */
+    static loadDesignDeletedPlugins(platform: Platform, configs?: IObject[]): Promise<void>;
+    /**
+     * 加载设计态移动端插件包
      *
      * @static
      * @param {App} app
-     * @returns {*}  {Promise<LoadPluginResult>}
+     * @param {IObject[]} configs 界面用到的插件集合
+     * @returns {*}  {Promise<void>}
      */
-    static loadMobilePlugin(app: App, kit?: string[]): Promise<LoadPluginResult>;
+    static loadMobilePlugin(configs?: IObject[]): Promise<void>;
     /**
-     * 加载绘制态网页端端插件包
+     * 加载设计态网页端插件包
      *
      * @static
      * @param {App} app
-     * @returns {*}  {Promise<LoadPluginResult>}
+     * @param {IObject[]} configs 界面用到的插件集合
+     * @returns {*}  {Promise<void>}
      */
-    static loadWebPlugin(app: App, kit?: string[]): Promise<LoadPluginResult>;
+    static loadWebPlugin(configs?: IObject[]): Promise<void>;
 }

package/es/utils/plugin-pkg-util/plugin-pkg-util.mjs

@@ -60,17 +60,17 @@ class PluginPgkUtil {
    * @param {IStyleIMportMap[]} plugins
    * @returns {*}  {Promise<System.Module[]>}
    */
-  static async loadPlugins(mode, configs) {
+  static async loadPlugins(mode, configs = []) {
     const moduleMap = {};
     if (configs.length > 0) {
       const plugins = configs.map((plugin) => {
         const baseUrl = path.join(PLUGIN_BASE_URL, plugin.url, "dist");
         return {
           imports: {
-            [plugin.key]: `${baseUrl}/${mode}.system.min.js`
+            [plugin.key]: `${baseUrl}/${mode}.system.min.js?version=${plugin.version}`
           },
           styles: {
-            [plugin.key]: `${baseUrl}/${mode}.min.css`
+            [plugin.key]: `${baseUrl}/${mode}.min.css?version=${plugin.version}`
           }
         };
       });
@@ -162,58 +162,75 @@ class PluginPgkUtil {
     return [[], {}];
   }
   /**
-   * 加载绘制态移动端插件包
+   * 加载设计态中，已经被从配置中移除的插件
+   *
+   * @static
+   * @param {Platform} platform
+   * @param {IObject[]} configs
+   * @returns {*}  {Promise<void>}
+   */
+  static async loadDesignDeletedPlugins(platform, configs = []) {
+    try {
+      const moduleMap = await this.loadPlugins(PluginModeEnum.DESIGN, configs);
+      configs.forEach((plugin) => {
+        const module = moduleMap[plugin.key];
+        if (platform === Platform.WEB) {
+          _gct.register.designer.web.register(
+            plugin.key,
+            () => new module.default()
+          );
+        } else {
+          _gct.register.designer.mobile.register(
+            plugin.key,
+            () => new module.default()
+          );
+        }
+      });
+    } catch (error) {
+      console.error(error);
+    }
+  }
+  /**
+   * 加载设计态移动端插件包
    *
    * @static
    * @param {App} app
-   * @returns {*}  {Promise<LoadPluginResult>}
+   * @param {IObject[]} configs 界面用到的插件集合
+   * @returns {*}  {Promise<void>}
    */
-  static async loadMobilePlugin(app, kit = []) {
+  static async loadMobilePlugin(configs = []) {
     try {
-      const result = await this.loadPlugin(
-        PluginModeEnum.MOBILE,
-        Platform.MOBILE,
-        kit
-      );
-      const [configs, moduleMap] = result;
-      configs.forEach((config) => {
-        const plugins = config.plugins;
-        plugins.forEach((plugin) => {
-          app.use(moduleMap[plugin.key].default);
-        });
+      const moduleMap = await this.loadPlugins(PluginModeEnum.MOBILE, configs);
+      configs.forEach((plugin) => {
+        _gct.register.render.mobile.register(
+          plugin.key,
+          moduleMap[plugin.key].default
+        );
       });
-      return result;
     } catch (error) {
       console.error(error);
     }
-    return [[], {}];
   }
   /**
-   * 加载绘制态网页端端插件包
+   * 加载设计态网页端插件包
    *
    * @static
    * @param {App} app
-   * @returns {*}  {Promise<LoadPluginResult>}
+   * @param {IObject[]} configs 界面用到的插件集合
+   * @returns {*}  {Promise<void>}
    */
-  static async loadWebPlugin(app, kit = []) {
+  static async loadWebPlugin(configs = []) {
     try {
-      const result = await this.loadPlugin(
-        PluginModeEnum.WEB,
-        Platform.WEB,
-        kit
-      );
-      const [configs, moduleMap] = result;
-      configs.forEach((config) => {
-        const plugins = config.plugins;
-        plugins.forEach((plugin) => {
-          app.use(moduleMap[plugin.key].default);
-        });
+      const moduleMap = await this.loadPlugins(PluginModeEnum.WEB, configs);
+      configs.forEach((plugin) => {
+        _gct.register.render.web.register(
+          plugin.key,
+          moduleMap[plugin.key].default
+        );
       });
-      return result;
     } catch (error) {
       console.error(error);
     }
-    return [[], {}];
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.0.1-dev.27",
+  "version": "0.0.1-dev.29",
   "type": "module",
   "description": "paas 平台核心包",
   "main": "dist/index.min.cjs",
@@ -56,8 +56,8 @@
     "vue-i18n": "9.6.5"
   },
   "devDependencies": {
-    "@gct-paas/build": "0.0.1-dev.27",
-    "@gct-paas/cli": "0.0.1-dev.27",
+    "@gct-paas/build": "0.0.1-dev.29",
+    "@gct-paas/cli": "0.0.1-dev.29",
     "@types/path-browserify": "^1.0.3",
     "@types/qs": "^6.9.18",
     "fs-extra": "^11.3.0"
@@ -65,5 +65,5 @@
   "peerDependencies": {
     "vue": "^3.x"
   },
-  "gitHead": "cb595953f2d72e28c5e4a4b515969075140c61df"
+  "gitHead": "884374c8d6a2997b5138ac65d12e8dd2672cbcfa"
 }