@gct-paas/core 0.0.1-dev.19 → 0.0.1-dev.21

package/es/constants/editor-type/editor-type.d.ts

@@ -109,6 +109,10 @@ export declare enum EditorTypeOld {
      * 下拉选择编辑器
      */
     MODEL_SELECT = "model-editor",
+    /**
+     * 下拉字段编辑器
+     */
+    Field_SELECT = "field-editor",
     /**
      * 单选框编辑器
      */

package/es/constants/editor-type/editor-type.mjs

@@ -27,6 +27,7 @@ var EditorTypeOld = /* @__PURE__ */ ((EditorTypeOld2) => {
   EditorTypeOld2["INFO"] = "info-editor";
   EditorTypeOld2["SELECT"] = "select-editor";
   EditorTypeOld2["MODEL_SELECT"] = "model-editor";
+  EditorTypeOld2["Field_SELECT"] = "field-editor";
   EditorTypeOld2["RADIO"] = "radio-editor";
   EditorTypeOld2["PICKER"] = "picker-editor";
   EditorTypeOld2["I18N"] = "i18n-editor";

package/es/constants/index.d.ts

@@ -5,7 +5,7 @@ export declare const STYLE_NAMESPACE_TAG = "gct";
 /**
  * 插件基础路径
  */
-export declare const PLUGIN_BASE_URL = "/minio/plugins";
+export declare const PLUGIN_BASE_URL = "/minio";
 export { EditorRegisterConst } from './editor-register/editor-register';
 export { EditorType, EditorTypeOld } from './editor-type/editor-type';
 export { FormContainerType } from './form-container-type/form-container-type';

package/es/constants/index.mjs

@@ -5,6 +5,6 @@ export { CoreConst } from './core.mjs';
 
 "use strict";
 const STYLE_NAMESPACE_TAG = "gct";
-const PLUGIN_BASE_URL = "/minio/plugins";
+const PLUGIN_BASE_URL = "/minio";
 
 export { PLUGIN_BASE_URL, STYLE_NAMESPACE_TAG };

package/es/interface/low-code-types/widget-basic-types.d.ts

@@ -56,6 +56,8 @@ export declare namespace LowCodeWidget {
         isReadonlyWidget?: boolean;
         /**部分组件嵌套在某个父组件内部 */
         parentComponent?: FormComponents;
+        /** 如果是插件，此处是拖入时插件的配置信息 */
+        _plugin?: IObject;
     }
     interface FieldSchema extends BasicSchema {
         props: FormItemProps & WidgetProps;

package/es/utils/axios/axios.mjs

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import * as qs from 'qs';
+import qs from 'qs';
 import { deepMerge } from '../tools/tools.mjs';
 import { interceptors } from './interceptors.mjs';
 import '../../enums/index.mjs';

package/es/utils/index.d.ts

@@ -1,7 +1,7 @@
 export { HttpUtil } from './axios/axios';
 export { DictionaryUtil } from './dictionary/dictionary';
 export { Namespace } from './namespace/namespace';
-export { PluginPgkUtil } from './plugin-pkg-util/plugin-pkg-util';
+export { PluginPgkUtil, type IModuleMap, type LoadPluginResult, } from './plugin-pkg-util/plugin-pkg-util';
 export { PluginStaticResource } from './plugin-static-resource/plugin-static-resource';
 export { deepMerge, getToken, setToken } from './tools/tools';
 export { widthEditorInstall } from './width-install/width-install';

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

@@ -1,5 +1,7 @@
 import { App } from 'vue';
 import { Platform } from '../../enums';
+export type IModuleMap = Record<string, System.Module>;
+export type LoadPluginResult = [IObject, IModuleMap];
 /**
  * 插件包处理工具类
  *
@@ -20,7 +22,13 @@ export declare class PluginPgkUtil {
      * @private
      * @static
      */
-    private static cacheModule;
+    private static cacheModules;
+    /**
+     * 已经加载的插件与模块的映射
+     *
+     * @static
+     */
+    static readonly module: Map<string, System.Module>;
     /**
      * 加载插件包配置
      *
@@ -44,7 +52,6 @@ export declare class PluginPgkUtil {
      *
      * @private
      * @static
-     * @param {App} app
      * @param {PluginModeEnum} mode
      * @param {Platform} platform
      * @returns {*}
@@ -56,23 +63,23 @@ export declare class PluginPgkUtil {
      * @static
      * @param {App} app
      * @param {Platform} platform
-     * @returns {*}  {Promise<IObject[]>}
+     * @returns {*}  {Promise<LoadPluginResult>}
      */
-    static loadDesignPlugin(app: App, platform: Platform, kit?: string[]): Promise<IObject[]>;
+    static loadDesignPlugin(_app: App, platform: Platform, kit?: string[]): Promise<LoadPluginResult>;
     /**
      * 加载绘制态移动端插件包
      *
      * @static
      * @param {App} app
-     * @returns {*}  {Promise<IObject[]>}
+     * @returns {*}  {Promise<LoadPluginResult>}
      */
-    static loadMobilePlugin(app: App, kit?: string[]): Promise<IObject[]>;
+    static loadMobilePlugin(app: App, kit?: string[]): Promise<LoadPluginResult>;
     /**
      * 加载绘制态网页端端插件包
      *
      * @static
      * @param {App} app
-     * @returns {*}  {Promise<IObject[]>}
+     * @returns {*}  {Promise<LoadPluginResult>}
      */
-    static loadWebPlugin(app: App, kit?: string[]): Promise<IObject[]>;
+    static loadWebPlugin(app: App, kit?: string[]): Promise<LoadPluginResult>;
 }

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

@@ -19,7 +19,13 @@ class PluginPgkUtil {
    * @private
    * @static
    */
-  static cacheModule = /* @__PURE__ */ new Map();
+  static cacheModules = /* @__PURE__ */ new Map();
+  /**
+   * 已经加载的插件与模块的映射
+   *
+   * @static
+   */
+  static module = /* @__PURE__ */ new Map();
   /**
    * 加载插件包配置
    *
@@ -49,15 +55,16 @@ class PluginPgkUtil {
    * @returns {*}  {Promise<System.Module[]>}
    */
   static async loadPlugins(mode, configs) {
+    const moduleMap = {};
     if (configs.length > 0) {
       const plugins = configs.map((plugin) => {
-        const baseUrl = path.join(PLUGIN_BASE_URL, plugin.name, "latest/dist");
+        const baseUrl = path.join(PLUGIN_BASE_URL, plugin.url, "dist");
         return {
           imports: {
-            [plugin.name]: `${baseUrl}/${mode}.system.min.js`
+            [plugin.key]: `${baseUrl}/${mode}.system.min.js`
           },
           styles: {
-            [plugin.name]: `${baseUrl}/${mode}.min.css`
+            [plugin.key]: `${baseUrl}/${mode}.min.css`
           }
         };
       });
@@ -66,48 +73,48 @@ class PluginPgkUtil {
         System.addImportMap(plugin);
         if (plugin.imports) {
           Object.keys(plugin.imports).forEach((key) => {
-            all.push(System.import(key));
+            const load = async () => {
+              const module = await System.import(key);
+              moduleMap[key] = module;
+              this.module.set(key, module);
+            };
+            all.push(load());
           });
         }
       });
-      return Promise.all(all);
+      await Promise.all(all);
     }
-    return [];
+    return moduleMap;
   }
   /**
    * 加载插件包
    *
    * @private
    * @static
-   * @param {App} app
    * @param {PluginModeEnum} mode
    * @param {Platform} platform
    * @returns {*}
    */
-  static async loadPlugin(app, mode, platform, kit) {
+  static async loadPlugin(mode, platform, kit) {
+    kit = ["common", ...kit];
     const tag = `${mode}-${platform}-${kit.join("_")}`;
     try {
       const configs = await this.loadPluginConfig(mode, platform);
-      if (!this.cacheModule.has(tag)) {
+      if (!this.cacheModules.has(tag)) {
         const plugins = [];
         configs.forEach((cfg) => {
           if (cfg.plugins) {
             plugins.push(...cfg.plugins);
           }
         });
-        const modules = await this.loadPlugins(mode, plugins);
-        modules.forEach((module) => {
-          if (module.default) {
-            app.use(module.default);
-          }
-        });
-        this.cacheModule.set(tag, modules);
+        const moduleMap = await this.loadPlugins(mode, plugins);
+        this.cacheModules.set(tag, moduleMap);
       }
-      return configs;
+      return [configs, this.cacheModules.get(tag)];
     } catch (error) {
       console.error(error);
     }
-    return [];
+    return [[], {}];
   }
   /**
    * 加载设计态插件包
@@ -115,30 +122,92 @@ class PluginPgkUtil {
    * @static
    * @param {App} app
    * @param {Platform} platform
-   * @returns {*}  {Promise<IObject[]>}
+   * @returns {*}  {Promise<LoadPluginResult>}
    */
-  static loadDesignPlugin(app, platform, kit = []) {
-    return this.loadPlugin(app, PluginModeEnum.DESIGN, platform, kit);
+  static async loadDesignPlugin(_app, platform, kit = []) {
+    try {
+      const result = await this.loadPlugin(
+        PluginModeEnum.DESIGN,
+        platform,
+        kit
+      );
+      const [configs, moduleMap] = result;
+      configs.forEach((config) => {
+        const plugins = config.plugins;
+        plugins.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()
+            );
+          }
+        });
+      });
+      return result;
+    } catch (error) {
+      console.error(error);
+    }
+    return [[], {}];
   }
   /**
    * 加载绘制态移动端插件包
    *
    * @static
    * @param {App} app
-   * @returns {*}  {Promise<IObject[]>}
+   * @returns {*}  {Promise<LoadPluginResult>}
    */
-  static loadMobilePlugin(app, kit = []) {
-    return this.loadPlugin(app, PluginModeEnum.MOBILE, Platform.MOBILE, kit);
+  static async loadMobilePlugin(app, kit = []) {
+    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);
+        });
+      });
+      return result;
+    } catch (error) {
+      console.error(error);
+    }
+    return [[], {}];
   }
   /**
    * 加载绘制态网页端端插件包
    *
    * @static
    * @param {App} app
-   * @returns {*}  {Promise<IObject[]>}
+   * @returns {*}  {Promise<LoadPluginResult>}
    */
-  static loadWebPlugin(app, kit = []) {
-    return this.loadPlugin(app, PluginModeEnum.WEB, Platform.WEB, kit);
+  static async loadWebPlugin(app, kit = []) {
+    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);
+        });
+      });
+      return result;
+    } catch (error) {
+      console.error(error);
+    }
+    return [[], {}];
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.0.1-dev.19",
+  "version": "0.0.1-dev.21",
   "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.19",
-    "@gct-paas/cli": "0.0.1-dev.19",
+    "@gct-paas/build": "0.0.1-dev.21",
+    "@gct-paas/cli": "0.0.1-dev.21",
     "@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": "37f06cee9864d6c619044900360504c50c865e89"
+  "gitHead": "37b40934f0d80ca67b4dba1c0259e8ca02f9dba5"
 }