@gct-paas/core 0.0.1-dev.9 → 0.1.0

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

@@ -1,8 +1,8 @@
 import path from '../../_virtual/index.mjs';
 import { PLUGIN_BASE_URL } from '../../constants/index.mjs';
 import '../../enums/index.mjs';
-import { PluginModeEnum } from '../../enums/plugin-enum.mjs';
 import { Platform } from '../../enums/page-designer/widget.mjs';
+import { PluginModeEnum } from '../../enums/plugin-enum.mjs';
 
 "use strict";
 class PluginPgkUtil {
@@ -19,40 +19,13 @@ class PluginPgkUtil {
    * @private
    * @static
    */
-  static cacheModule = /* @__PURE__ */ new Map();
+  static cacheModules = /* @__PURE__ */ new Map();
   /**
-   * todo: 临时获取插件包列表
+   * 已经加载的插件与模块的映射
    *
-   * @private
    * @static
-   * @returns {*}
    */
-  static async loadList() {
-    const headers = new Headers();
-    headers.append(
-      "Token",
-      "eyJhbGciOiJIUzUxMiJ9.eyJpc3MiOiJHQ1QiLCJ1c2VySWQiOiJFZ3lMQnpjbVF0ODhGdldNIiwidXNlcm5hbWUiOiJnY3QtYWRtaW4iLCJmdWxsbmFtZSI6IueuoeeQhuWRmCIsImlhdCI6MTczOTE1ODExNSwiZXhwIjoxNzQwMzY3NzE1fQ.mJo58rfQ266UqAQYFvSMlmJii-LxXHrFpL-HHokWOxk4eJzGmRX_REpLK5ZHmdUmmYkz57vsDtgrquDGtAeM6A"
-    );
-    headers.append("tenant-id", "HcWBpsZxX5LkiGzT");
-    headers.append("source", "501");
-    headers.append("App-Tag", "__platform__");
-    headers.append("Branch-Id", "ibxt");
-    headers.append("Lang", "zh-CN");
-    headers.append("timezone", "UTC+08:00");
-    try {
-      const response = await fetch(
-        "http://paas.paasdev.gct-paas.com/gct-platform/api/plugin/list",
-        {
-          method: "GET",
-          headers,
-          redirect: "follow"
-        }
-      );
-      return response.json();
-    } catch (error) {
-      console.error(error);
-    }
-  }
+  static module = /* @__PURE__ */ new Map();
   /**
    * 加载插件包配置
    *
@@ -67,7 +40,14 @@ class PluginPgkUtil {
     if (this.cache.has(tag)) {
       return this.cache.get(tag);
     }
-    const configs = await this.loadList();
+    const cfg = {
+      client: platform === Platform.WEB ? "WEB" : "MOBILE"
+    };
+    if (kit.length > 0) {
+      cfg.tag = kit.join(",");
+    }
+    const res = await _gct.api.platform.plugin.postGetTenantCompList(cfg);
+    const configs = res.data;
     if (configs.length > 0) {
       this.cache.set(tag, configs);
     }
@@ -80,16 +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.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?version=${plugin.version}`
           },
           styles: {
-            [plugin.name]: `${baseUrl}/${mode}.min.css`
+            [plugin.key]: `${baseUrl}/${mode}.min.css?version=${plugin.version}`
           }
         };
       });
@@ -98,35 +79,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) {
-    const plugins = await this.loadPluginConfig(mode, platform);
-    const modules = await this.loadPlugins(mode, plugins);
-    modules.forEach((module) => {
-      if (module.default) {
-        app.use(module.default);
-      }
-    });
+  static async loadPlugin(mode, platform, kit) {
+    kit = ["common", ...kit];
     const tag = `${mode}-${platform}-${kit.join("_")}`;
-    this.cacheModule.set(tag, modules);
-    return plugins;
+    try {
+      const configs = await this.loadPluginConfig(mode, platform, kit);
+      if (!this.cacheModules.has(tag)) {
+        const plugins = [];
+        configs.forEach((cfg) => {
+          if (cfg.plugins) {
+            plugins.push(...cfg.plugins);
+          }
+        });
+        const moduleMap = await this.loadPlugins(mode, plugins);
+        this.cacheModules.set(tag, moduleMap);
+      }
+      return [configs, this.cacheModules.get(tag)];
+    } catch (error) {
+      console.error(error);
+    }
+    return [[], {}];
   }
   /**
    * 加载设计态插件包
@@ -134,30 +128,101 @@ 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) {
+            const cls = module.web ?? module.default;
+            _gct.register.designer.web.register(plugin.key, () => new cls());
+          } else {
+            const cls = module.mobile ?? module.default;
+            _gct.register.designer.mobile.register(plugin.key, () => new cls());
+          }
+        });
+      });
+      return result;
+    } catch (error) {
+      console.error(error);
+    }
+    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) {
+          const cls = module.web ?? module.default;
+          _gct.register.designer.web.register(plugin.key, () => new cls());
+        } else {
+          const cls = module.mobile ?? module.default;
+          _gct.register.designer.mobile.register(plugin.key, () => new cls());
+        }
+      });
+    } catch (error) {
+      console.error(error);
+    }
   }
   /**
-   * 加载绘制态移动端插件包
+   * 加载设计态移动端插件包
    *
    * @static
    * @param {App} app
-   * @returns {*}  {Promise<IObject[]>}
+   * @param {IObject[]} configs 界面用到的插件集合
+   * @returns {*}  {Promise<void>}
    */
-  static loadMobilePlugin(app, kit = []) {
-    return this.loadPlugin(app, PluginModeEnum.MOBILE, Platform.MOBILE, kit);
+  static async loadMobilePlugin(configs = []) {
+    try {
+      const moduleMap = await this.loadPlugins(PluginModeEnum.MOBILE, configs);
+      configs.forEach((plugin) => {
+        _gct.register.render.mobile.register(
+          plugin.key,
+          moduleMap[plugin.key].default
+        );
+      });
+    } catch (error) {
+      console.error(error);
+    }
   }
   /**
-   * 加载绘制态网页端端插件包
+   * 加载设计态网页端插件包
    *
    * @static
    * @param {App} app
-   * @returns {*}  {Promise<IObject[]>}
+   * @param {IObject[]} configs 界面用到的插件集合
+   * @returns {*}  {Promise<void>}
    */
-  static loadWebPlugin(app, kit = []) {
-    return this.loadPlugin(app, PluginModeEnum.WEB, Platform.WEB, kit);
+  static async loadWebPlugin(configs = []) {
+    try {
+      const moduleMap = await this.loadPlugins(PluginModeEnum.WEB, configs);
+      configs.forEach((plugin) => {
+        _gct.register.render.web.register(
+          plugin.key,
+          moduleMap[plugin.key].default
+        );
+      });
+    } catch (error) {
+      console.error(error);
+    }
   }
 }
 

package/es/utils/plugin-static-resource/plugin-static-resource.d.ts

@@ -1,8 +1,6 @@
 /**
  * 插件静态资源工具类
  *
- * @author chitanda
- * @date 2022-11-03 10:11:08
  * @export
  * @class PluginStaticResource
  */
@@ -18,8 +16,6 @@ export declare class PluginStaticResource {
     /**
      * mete 路径解析对象
      *
-     * @author chitanda
-     * @date 2023-07-06 20:07:36
      * @protected
      * @type {URL}
      */

package/es/utils/plugin-static-resource/plugin-static-resource.mjs

@@ -23,8 +23,6 @@ class PluginStaticResource {
   /**
    * mete 路径解析对象
    *
-   * @author chitanda
-   * @date 2023-07-06 20:07:36
    * @protected
    * @type {URL}
    */

package/es/utils/tools/tools.d.ts

@@ -0,0 +1,60 @@
+/**
+ * 递归合并两个对象
+ *
+ * @export
+ * @template T
+ * @template U
+ * @param {T} target 目标对象，合并后结果存放于此。The target object to merge into.
+ * @param {U} source 要合并的源对象。The source object to merge from.
+ * @returns {*}  {(T & U)} 合并后的对象。The merged object.
+ */
+export declare function deepMerge<T extends object | null | undefined, U extends object | null | undefined>(target: T, source: U): T & U;
+/**
+ * 获取认证令牌
+ *
+ * @export
+ * @returns {*}  {(string | null)}
+ */
+export declare function getToken(): string | null;
+/**
+ * 设置认证令牌（目前只有 session 级别生效）
+ *
+ * @export
+ * @param {string} token
+ */
+export declare function setToken(token: string): void;
+/**
+ * 从 cookie 获取租户标识
+ *
+ * @export
+ * @returns {*}  {(string | null)}
+ */
+export declare function getTenant(): string | null;
+/**
+ * 设置租户标识至 cookie
+ *
+ * @export
+ * @param {string} tenant
+ */
+export declare function setTenant(tenant: string): void;
+/**
+ * 获取路径参数
+ *
+ * @export
+ * @returns {*}  {{ aid: string; pid: string }}
+ */
+export declare function getPathQuery(): {
+    aid: string;
+    pid: string;
+};
+/**
+ * 是否为移动端设备
+ */
+export declare const isMobile: boolean;
+/**
+ * 获取时区，默认: UTC+08:00
+ *
+ * @export
+ * @returns {*}
+ */
+export declare function getTimezone(): string;

package/es/utils/tools/tools.mjs

@@ -0,0 +1,62 @@
+import { mergeWith, cloneDeep, unionWith, isEqual } from 'lodash-es';
+import '../../node_modules/.pnpm/qx-util@0.4.8/node_modules/qx-util/out/index.mjs';
+import '../../constants/index.mjs';
+import '../../enums/index.mjs';
+import { isObject, isArray } from '../../node_modules/.pnpm/qx-util@0.4.8/node_modules/qx-util/out/utils/type-util/type-util.mjs';
+import { getCookie, setCookie, clearCookie } from '../../node_modules/.pnpm/qx-util@0.4.8/node_modules/qx-util/out/utils/util/util.mjs';
+import { CoreConst } from '../../constants/core.mjs';
+import { TIMEZONE_KEY } from '../../enums/cacheEnum.mjs';
+
+"use strict";
+function deepMerge(target, source) {
+  return mergeWith(cloneDeep(target), source, (objValue, srcValue) => {
+    if (isObject(objValue) && isObject(srcValue)) {
+      return mergeWith(
+        cloneDeep(objValue),
+        srcValue,
+        (prevValue, nextValue) => {
+          return isArray(prevValue) ? unionWith(prevValue, nextValue, isEqual) : void 0;
+        }
+      );
+    }
+  });
+}
+function getToken() {
+  return getCookie(CoreConst.TOKEN);
+}
+function setToken(token) {
+  if (token) {
+    setCookie(CoreConst.TOKEN, token, 0, true);
+  } else {
+    clearCookie(CoreConst.TOKEN);
+  }
+}
+function getTenant() {
+  return getCookie(CoreConst.TENANT);
+}
+function setTenant(tenant) {
+  if (tenant) {
+    setCookie(CoreConst.TENANT, tenant, 0, true);
+  } else {
+    clearCookie(CoreConst.TENANT);
+  }
+}
+function getPathQuery() {
+  const params = location.pathname.replace("/src/projects", "").split("/");
+  return {
+    aid: params[2],
+    pid: params[3]
+  };
+}
+const isMobile = (() => {
+  const ua = navigator.userAgent;
+  const mobileRegex = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/;
+  const isSmallScreen = window.innerWidth <= 768;
+  const isTouch = "ontouchstart" in window || navigator.maxTouchPoints > 0;
+  return mobileRegex.test(ua) || isSmallScreen && isTouch;
+})();
+function getTimezone() {
+  return localStorage.getItem(TIMEZONE_KEY) || "UTC+08:00";
+}
+
+export { deepMerge, getPathQuery, getTenant, getTimezone, getToken, isMobile, setTenant, setToken };

package/es/utils/width-install/width-install.d.ts

@@ -0,0 +1,17 @@
+import { App } from 'vue';
+import { IEditorProvider } from '../../interface';
+/**
+ * 表单编辑器注册器
+ *
+ * @author zhanghanrui
+ * @date 2024-04-17 13:04:06
+ * @export
+ * @param {string} providerTag
+ * @param {() => IEditorProvider} provider
+ * @param {*} [com]
+ * @param {string} [comName]
+ * @return {*}
+ */
+export declare function widthEditorInstall(providerTag: string, provider: () => IEditorProvider, com?: any, comName?: string): {
+    install(app: App): void;
+};

package/es/utils/width-install/width-install.mjs

@@ -0,0 +1,21 @@
+import '../../constants/index.mjs';
+import { EditorRegisterConst } from '../../constants/editor-register/editor-register.mjs';
+
+"use strict";
+function widthEditorInstall(providerTag, provider, com, comName) {
+  return {
+    install(app) {
+      if (providerTag && provider) {
+        _gct.register.editor.register(
+          EditorRegisterConst.PREFIX + providerTag,
+          provider
+        );
+      }
+      if (com) {
+        app.component(comName ?? com.name, com);
+      }
+    }
+  };
+}
+
+export { widthEditorInstall };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.0.1-dev.9",
+  "version": "0.1.0",
   "type": "module",
   "description": "paas 平台核心包",
   "main": "dist/index.min.cjs",
@@ -39,24 +39,31 @@
     "publish:alpha": "npm run build && npm publish --access public --tag=alpha --registry=https://registry.npmjs.org/",
     "publish:beta": "npm run build && npm publish --access public --tag=beta --registry=https://registry.npmjs.org/",
     "publish:npm": "npm run build && npm publish --access public --registry=https://registry.npmjs.org/",
-    "apis": "node ./src/service/index.js"
+    "gen-api": "npm run gen-api:apaas && npm run gen-api:platform",
+    "gen-api:apaas": "gct-paas gen-api --url=http://paas.paasdev.gct-paas.com --tag=apaas -t ../cli/hbs-temp -o ./src/service/gct-apaas && prettier './src/service/gct-apaas' --write",
+    "gen-api:platform": "gct-paas gen-api --url=http://paas.paasdev.gct-paas.com --tag=platform -t ../cli/hbs-temp -o ./src/service/gct-platform && prettier './src/service/gct-platform' --write"
   },
   "dependencies": {
-    "axios": "^1.7.9",
+    "async-validator": "^4.2.5",
+    "axios": "^1.8.1",
+    "lodash-es": "^4.17.21",
     "path-browserify": "^1.0.1",
     "pinia": "^2.3.1",
+    "qs": "^6.14.0",
     "qx-util": "^0.4.8",
     "systemjs": "^6.15.1",
     "vue": "^3.5.13",
     "vue-i18n": "9.6.5"
   },
   "devDependencies": {
-    "@gct-paas/build": "0.0.1-dev.9",
+    "@gct-paas/build": "0.1.0",
+    "@gct-paas/cli": "0.1.0",
     "@types/path-browserify": "^1.0.3",
+    "@types/qs": "^6.9.18",
     "fs-extra": "^11.3.0"
   },
   "peerDependencies": {
     "vue": "^3.x"
   },
-  "gitHead": "5b6a55913fb534d713b2726839ac7b365b551c84"
+  "gitHead": "96fcf21faa16ee10f8a5e0d023aae38641d91d36"
 }