@gct-paas/core 0.0.1-dev.18 → 0.0.1-dev.20

package/es/service/gct-platform/file-task.service.d.ts

@@ -0,0 +1,41 @@
+import { IHttpResponse } from '../../interface';
+import { PlatformBaseService } from '../base/platform-base.service';
+import { FileTaskRequest, FileTaskResponse } from './entities';
+export interface deleteQuery {
+    ids: string;
+}
+export interface postBatchQuery {
+    zip?: string;
+}
+export interface getInfoQuery {
+    id: string;
+}
+export interface getListQuery {
+    formTaskName?: string;
+    materialNo?: string;
+    name?: string;
+    relationType?: string;
+    status?: string;
+}
+export interface getPageQuery {
+    formTaskName?: string;
+    materialNo?: string;
+    name?: string;
+    pageNo?: number;
+    pageSize?: number;
+    relationType?: string;
+    status?: string;
+}
+export interface putIdQuery {
+    id: string;
+}
+export declare class FileTaskService extends PlatformBaseService {
+    constructor();
+    post(data: FileTaskRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;
+    delete(query: deleteQuery, config?: Record<string, string>): Promise<IHttpResponse<string>>;
+    postBatch(query: postBatchQuery, config?: Record<string, string>): Promise<IHttpResponse<unknown>>;
+    getInfo(query: getInfoQuery, config?: Record<string, string>): Promise<IHttpResponse<FileTaskResponse>>;
+    getList(query: getListQuery, config?: Record<string, string>): Promise<IHttpResponse<FileTaskResponse>>;
+    getPage(query: getPageQuery, config?: Record<string, string>): Promise<IHttpResponse<FileTaskResponse>>;
+    putId(query: putIdQuery, data: FileTaskRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;
+}

package/es/service/gct-platform/file-task.service.mjs

@@ -0,0 +1,38 @@
+import { PlatformBaseService } from '../base/platform-base.service.mjs';
+
+"use strict";
+class FileTaskService extends PlatformBaseService {
+  constructor() {
+    super("file-task");
+  }
+  // 保存
+  async post(data, config = {}) {
+    return this._post("", data, null, config);
+  }
+  // 删除
+  async delete(query, config = {}) {
+    return this._delete("", null, query, config);
+  }
+  // 批量下载
+  async postBatch(query, config = {}) {
+    return this._post("batch", null, query, config);
+  }
+  // 详情
+  async getInfo(query, config = {}) {
+    return this._get("info", null, query, config);
+  }
+  // 列表
+  async getList(query, config = {}) {
+    return this._get("list", null, query, config);
+  }
+  // 分页列表
+  async getPage(query, config = {}) {
+    return this._get("page", null, query, config);
+  }
+  // 修改
+  async putId(query, data, config = {}) {
+    return this._put("", data, query, config);
+  }
+}
+
+export { FileTaskService };

package/es/service/gct-platform/index.d.ts

@@ -11,6 +11,7 @@ import { DatasourceMoveService } from './datasource-move.service';
 import { DatasourceMoveDataService } from './datasource-move-data.service';
 import { DatasourceMoveDetailService } from './datasource-move-detail.service';
 import { ExternalMessageService } from './external-message.service';
+import { FileTaskService } from './file-task.service';
 import { FileService } from './file.service';
 import { I18NConfigService } from './i18n-config.service';
 import { I18NInfoService } from './i18n-info.service';
@@ -23,6 +24,7 @@ import { LoginLogService } from './login-log.service';
 import { LoginService } from './login.service';
 import { ManagerService } from './manager.service';
 import { MessageSettingService } from './message-setting.service';
+import { MinioFileService } from './minio-file.service';
 import { NavMenuService } from './nav-menu.service';
 import { NavPageService } from './nav-page.service';
 import { OpenapiGroupService } from './openapi-group.service';
@@ -75,6 +77,7 @@ export declare class ApiManage {
     datasourceMoveData: DatasourceMoveDataService;
     datasourceMoveDetail: DatasourceMoveDetailService;
     externalMessage: ExternalMessageService;
+    fileTask: FileTaskService;
     file: FileService;
     i18NConfig: I18NConfigService;
     i18NInfo: I18NInfoService;
@@ -87,6 +90,7 @@ export declare class ApiManage {
     login: LoginService;
     manager: ManagerService;
     messageSetting: MessageSettingService;
+    minioFile: MinioFileService;
     navMenu: NavMenuService;
     navPage: NavPageService;
     openapiGroup: OpenapiGroupService;

package/es/service/gct-platform/index.mjs

@@ -11,6 +11,7 @@ import { DatasourceMoveService } from './datasource-move.service.mjs';
 import { DatasourceMoveDataService } from './datasource-move-data.service.mjs';
 import { DatasourceMoveDetailService } from './datasource-move-detail.service.mjs';
 import { ExternalMessageService } from './external-message.service.mjs';
+import { FileTaskService } from './file-task.service.mjs';
 import { FileService } from './file.service.mjs';
 import { I18NConfigService } from './i18n-config.service.mjs';
 import { I18NInfoService } from './i18n-info.service.mjs';
@@ -23,6 +24,7 @@ import { LoginLogService } from './login-log.service.mjs';
 import { LoginService } from './login.service.mjs';
 import { ManagerService } from './manager.service.mjs';
 import { MessageSettingService } from './message-setting.service.mjs';
+import { MinioFileService } from './minio-file.service.mjs';
 import { NavMenuService } from './nav-menu.service.mjs';
 import { NavPageService } from './nav-page.service.mjs';
 import { OpenapiGroupService } from './openapi-group.service.mjs';
@@ -77,6 +79,7 @@ class ApiManage {
   datasourceMoveData = new DatasourceMoveDataService();
   datasourceMoveDetail = new DatasourceMoveDetailService();
   externalMessage = new ExternalMessageService();
+  fileTask = new FileTaskService();
   file = new FileService();
   i18NConfig = new I18NConfigService();
   i18NInfo = new I18NInfoService();
@@ -89,6 +92,7 @@ class ApiManage {
   login = new LoginService();
   manager = new ManagerService();
   messageSetting = new MessageSettingService();
+  minioFile = new MinioFileService();
   navMenu = new NavMenuService();
   navPage = new NavPageService();
   openapiGroup = new OpenapiGroupService();

package/es/service/gct-platform/minio-file.service.d.ts

@@ -0,0 +1,9 @@
+import { IHttpResponse } from '../../interface';
+import { PlatformBaseService } from '../base/platform-base.service';
+export interface getDownloadQuery {
+    fileUrl: string;
+}
+export declare class MinioFileService extends PlatformBaseService {
+    constructor();
+    getDownload(query: getDownloadQuery, config?: Record<string, string>): Promise<IHttpResponse<unknown>>;
+}

package/es/service/gct-platform/minio-file.service.mjs

@@ -0,0 +1,14 @@
+import { PlatformBaseService } from '../base/platform-base.service.mjs';
+
+"use strict";
+class MinioFileService extends PlatformBaseService {
+  constructor() {
+    super("minio-file");
+  }
+  // minIO获取文件公用接口
+  async getDownload(query, config = {}) {
+    return this._get("download", null, query, config);
+  }
+}
+
+export { MinioFileService };

package/es/service/gct-platform/plat.service.d.ts

@@ -19,6 +19,7 @@ export declare class PlatService extends PlatformBaseService {
     postOrg(data: OrgConfig, config?: Record<string, string>): Promise<IHttpResponse<string>>;
     postSecurity(data: SecurityConfig, config?: Record<string, string>): Promise<IHttpResponse<string>>;
     postTheme(data: SysConfigRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;
+    postUploadCertFile(config?: Record<string, string>): Promise<IHttpResponse<string>>;
     postUserRole(data: UserRoles4Update, config?: Record<string, string>): Promise<IHttpResponse<string>>;
     deleteUserRole(query: deleteUserRoleQuery, config?: Record<string, string>): Promise<IHttpResponse<string>>;
     getUser(config?: Record<string, string>): Promise<IHttpResponse<UserFieldMeta>>;

package/es/service/gct-platform/plat.service.mjs

@@ -45,6 +45,10 @@ class PlatService extends PlatformBaseService {
   async postTheme(data, config = {}) {
     return this._post("theme", data, null, config);
   }
+  // 企微证书文件上传
+  async postUploadCertFile(config = {}) {
+    return this._post("uploadCertFile", null, null, config);
+  }
   // (平台管理)管理员角色编辑
   async postUserRole(data, config = {}) {
     return this._post("user-role", data, null, config);

package/es/service/gct-platform/plugin-version.service.d.ts

@@ -19,7 +19,7 @@ export declare class PluginVersionService extends PlatformBaseService {
     post(data: PluginVersionRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;
     delete(query: deleteQuery, config?: Record<string, string>): Promise<IHttpResponse<string>>;
     getInfo(query: getInfoQuery, config?: Record<string, string>): Promise<IHttpResponse<PluginVersionResponse>>;
-    getList(config?: Record<string, string>): Promise<IHttpResponse<PluginVersionResponse>>;
+    postList(data: PluginVersionRequest, config?: Record<string, string>): Promise<IHttpResponse<PluginVersionResponse>>;
     getPage(query: getPageQuery, config?: Record<string, string>): Promise<IHttpResponse<PluginVersionResponse>>;
     putId(query: putIdQuery, data: PluginVersionRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;
 }

package/es/service/gct-platform/plugin-version.service.mjs

@@ -9,7 +9,7 @@ class PluginVersionService extends PlatformBaseService {
   async post(data, config = {}) {
     return this._post("", data, null, config);
   }
-  // 删除
+  // 删除版本
   async delete(query, config = {}) {
     return this._delete("", null, query, config);
   }
@@ -18,8 +18,8 @@ class PluginVersionService extends PlatformBaseService {
     return this._get("info", null, query, config);
   }
   // 列表
-  async getList(config = {}) {
-    return this._get("list", null, null, config);
+  async postList(data, config = {}) {
+    return this._post("list", data, null, config);
   }
   // 分页列表
   async getPage(query, config = {}) {

package/es/service/gct-platform/plugin.service.d.ts

@@ -1,15 +1,34 @@
 import { IHttpResponse } from '../../interface';
 import { PlatformBaseService } from '../base/platform-base.service';
-import { PluginRequest, PluginResponse, PackageJson } from './entities';
+import { PluginRequest, PackageJson, PluginTenant, PluginResponse } from './entities';
 export interface deleteQuery {
     ids: string;
 }
+export interface getGetImagesQuery {
+    imageUrl: string;
+}
 export interface getInfoQuery {
     id: string;
 }
-export interface getPageQuery {
+export interface postUploadZipQuery {
+    categoryId?: string;
+    client?: string;
+    description?: string;
+    icon?: string;
+    id?: string;
+    key?: string;
+    keyWord?: string;
+    name?: string;
     pageNo?: number;
     pageSize?: number;
+    readMe?: string;
+    screenShot?: string;
+    tag?: string;
+    tenantId?: string;
+    tmpPath?: string;
+    url?: string;
+    version?: string;
+    zipUrl?: string;
 }
 export interface putIdQuery {
     id: string;
@@ -18,9 +37,12 @@ export declare class PluginService extends PlatformBaseService {
     constructor();
     post(data: PluginRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;
     delete(query: deleteQuery, config?: Record<string, string>): Promise<IHttpResponse<string>>;
+    postCancelUpload(data: PackageJson, config?: Record<string, string>): Promise<IHttpResponse<boolean>>;
+    getGetImages(query: getGetImagesQuery, config?: Record<string, string>): Promise<IHttpResponse<unknown>>;
+    getGetTenantCompList(config?: Record<string, string>): Promise<IHttpResponse<PluginTenant>>;
     getInfo(query: getInfoQuery, config?: Record<string, string>): Promise<IHttpResponse<PluginResponse>>;
     getList(config?: Record<string, string>): Promise<IHttpResponse<PluginResponse>>;
-    getPage(query: getPageQuery, config?: Record<string, string>): Promise<IHttpResponse<PluginResponse>>;
-    postUploadZip(config?: Record<string, string>): Promise<IHttpResponse<PackageJson>>;
+    postPage(data: PluginRequest, config?: Record<string, string>): Promise<IHttpResponse<PluginResponse>>;
+    postUploadZip(query: postUploadZipQuery, config?: Record<string, string>): Promise<IHttpResponse<PackageJson>>;
     putId(query: putIdQuery, data: PluginRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;
 }

package/es/service/gct-platform/plugin.service.mjs

@@ -9,10 +9,22 @@ class PluginService extends PlatformBaseService {
   async post(data, config = {}) {
     return this._post("", data, null, config);
   }
-  // 删除
+  // 删除插件及插件版本
   async delete(query, config = {}) {
     return this._delete("", null, query, config);
   }
+  // 取消上传文件
+  async postCancelUpload(data, config = {}) {
+    return this._post("cancelUpload", data, null, config);
+  }
+  // 获取服务器存储的图片
+  async getGetImages(query, config = {}) {
+    return this._get("getImages", null, query, config);
+  }
+  // 获取租户下的所有组件信息
+  async getGetTenantCompList(config = {}) {
+    return this._get("getTenantCompList", null, null, config);
+  }
   // 详情
   async getInfo(query, config = {}) {
     return this._get("info", null, query, config);
@@ -22,12 +34,12 @@ class PluginService extends PlatformBaseService {
     return this._get("list", null, null, config);
   }
   // 分页列表
-  async getPage(query, config = {}) {
-    return this._get("page", null, query, config);
+  async postPage(data, config = {}) {
+    return this._post("page", data, null, config);
   }
   // 上传压缩文件
-  async postUploadZip(config = {}) {
-    return this._post("uploadZip", null, null, config);
+  async postUploadZip(query, config = {}) {
+    return this._post("uploadZip", null, query, config);
   }
   // 修改
   async putId(query, data, config = {}) {

package/es/service/gct-platform/tenant.service.d.ts

@@ -1,6 +1,6 @@
 import { IHttpResponse } from '../../interface';
 import { PlatformBaseService } from '../base/platform-base.service';
-import { Tenant, TenantResponse, UserIdsDTO, UserWithUserExtraDTO, UserSaveRequest, TenantDomainRequest, UserRoles4Update, UserOfTenantDTO, TenantRequest } from './entities';
+import { Tenant, TenantResponse, UserIdsDTO, TenantUserRemoveRequest, UserWithUserExtraDTO, UserSaveRequest, TenantDomainRequest, UserRoles4Update, UserOfTenantDTO, TenantRequest } from './entities';
 export interface getGetTenantIdByAppIdQuery {
     appId: string;
 }
@@ -13,9 +13,6 @@ export interface getListQuery {
     name?: string;
     startTime?: string;
 }
-export interface deleteManagementQuery {
-    ids: string;
-}
 export interface getManagementQuery {
     enabled?: number;
     endTime?: string;
@@ -43,7 +40,7 @@ export declare class TenantService extends PlatformBaseService {
     getInfo(config?: Record<string, string>): Promise<IHttpResponse<TenantResponse>>;
     getList(query: getListQuery, config?: Record<string, string>): Promise<IHttpResponse<TenantResponse>>;
     postManagement(data: UserIdsDTO, config?: Record<string, string>): Promise<IHttpResponse<string>>;
-    deleteManagement(query: deleteManagementQuery, config?: Record<string, string>): Promise<IHttpResponse<string>>;
+    deleteManagement(data: TenantUserRemoveRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;
     getManagement(query: getManagementQuery, config?: Record<string, string>): Promise<IHttpResponse<UserWithUserExtraDTO>>;
     putManagement(data: UserSaveRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;
     putUpdateDomain(data: TenantDomainRequest, config?: Record<string, string>): Promise<IHttpResponse<string>>;

package/es/service/gct-platform/tenant.service.mjs

@@ -34,8 +34,8 @@ class TenantService extends PlatformBaseService {
     return this._post("management", data, null, config);
   }
   // 删除
-  async deleteManagement(query, config = {}) {
-    return this._delete("management", null, query, config);
+  async deleteManagement(data, config = {}) {
+    return this._delete("management", data, null, config);
   }
   // 分页列表
   async getManagement(query, config = {}) {

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/plugin-pkg-util/plugin-pkg-util.mjs

@@ -34,7 +34,7 @@ class PluginPgkUtil {
     if (this.cache.has(tag)) {
       return this.cache.get(tag);
     }
-    const res = await _gct.api.platform.plugin.getList();
+    const res = await _gct.api.platform.plugin.getGetTenantCompList();
     const configs = res.data;
     if (configs.length > 0) {
       this.cache.set(tag, configs);
@@ -51,7 +51,7 @@ class PluginPgkUtil {
   static async loadPlugins(mode, configs) {
     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`
@@ -85,18 +85,30 @@ class PluginPgkUtil {
    * @returns {*}
    */
   static async loadPlugin(app, mode, platform, kit) {
+    kit = ["common", ...kit];
     const tag = `${mode}-${platform}-${kit.join("_")}`;
-    const plugins = await this.loadPluginConfig(mode, platform);
-    if (!this.cacheModule.has(tag)) {
-      const modules = await this.loadPlugins(mode, plugins);
-      modules.forEach((module) => {
-        if (module.default) {
-          app.use(module.default);
-        }
-      });
-      this.cacheModule.set(tag, modules);
+    try {
+      const configs = await this.loadPluginConfig(mode, platform);
+      if (!this.cacheModule.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);
+      }
+      return configs;
+    } catch (error) {
+      console.error(error);
     }
-    return plugins;
+    return [];
   }
   /**
    * 加载设计态插件包

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.0.1-dev.18",
+  "version": "0.0.1-dev.20",
   "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.18",
-    "@gct-paas/cli": "0.0.1-dev.18",
+    "@gct-paas/build": "0.0.1-dev.20",
+    "@gct-paas/cli": "0.0.1-dev.20",
     "@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": "0a61c5593beffb2a893dffde18fc6759983b72cb"
+  "gitHead": "9266f204c9c400c60c3aeffe6981eed0992fc243"
 }