@ibiz-template/runtime 0.4.16 → 0.4.17-dev.0

package/src/interface/service/service/i-app-de.service.ts

@@ -3,7 +3,6 @@ import { DECache } from '../../../service/utils';
 import { IFileService } from './i-file.service';
 import { IWorkFlowService } from './i-wf.service';
 import { IConfigService } from './i-config.service';
-import { IDataEntity } from '../i-data-entity/i-data-entity';
 
 /**
  * 实体服务
@@ -14,6 +13,16 @@ import { IDataEntity } from '../i-data-entity/i-data-entity';
  * @interface IAppDEService
  */
 export interface IAppDEService {
+  /**
+   * 是否本地模式(临时数据模式)
+   *
+   * @description 由 method.dto.ts 在 DTO 填充，根据是否为子嵌套数据进行设置
+   * @author chitanda
+   * @date 2023-12-22 16:12:57
+   * @type {boolean}
+   */
+  isLocalMode: boolean;
+
   /**
    * 实体本地缓存工具
    *
@@ -56,14 +65,14 @@ export interface IAppDEService {
    * @author chitanda
    * @date 2023-04-23 09:04:16
    * @param {string} id 执行标识
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IData} [params] 参数
    * @param {IParams} [params2] 参数2
    * @return {*}  {Promise<IHttpResponse>}
    */
   exec(
     id: string,
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -73,13 +82,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:34
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   getDraft(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -89,13 +98,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:34
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   getDraftTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -105,13 +114,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:50
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   create(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -121,13 +130,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:50
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   createTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -137,13 +146,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:00
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   get(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -153,13 +162,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:00
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   getTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -169,13 +178,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:09
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   update(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -185,13 +194,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:09
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   updateTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -201,13 +210,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:12
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   remove(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -217,13 +226,13 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:12
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   removeTemp(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -233,40 +242,29 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-11-21 16:11:06
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   fetchDefault(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
 
-  /**
-   * 查询临时数据本地缓存
-   *
-   * @author chitanda
-   * @date 2023-12-18 11:12:11
-   * @param {IParams} context
-   * @param {IParams} [params]
-   * @return {*}  {Promise<IDataEntity[]>}
-   */
-  selectLocal(context: IParams, params?: IParams): Promise<IDataEntity[]>;
-
   /**
    * 获取默认数据集[系统预置](临时数据)
    *
    * @author chitanda
    * @date 2023-11-21 16:11:06
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   fetchTempDefault(
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -277,14 +275,14 @@ export interface IAppDEService {
    * @author chitanda
    * @date 2023-10-12 17:10:27
    * @param {string} id
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {(IData | IData[])} [params]
    * @param {IParams} [params2]
    * @return {*}  {Promise<IHttpResponse>}
    */
   execAc(
     id: string,
-    context: IParams,
+    context: IContext,
     params?: IData | IData[],
     params2?: IParams,
   ): Promise<IHttpResponse>;
@@ -295,14 +293,14 @@ export interface IAppDEService {
    * @author chitanda
    * @date 2023-10-12 16:10:03
    * @param {(data: IPortalAsyncAction) => void} onmessage
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params]
    * @param {IData} [data]
    * @return {*}  {Promise<void>}
    */
   aiChatSse(
     onmessage: (data: IPortalAsyncAction) => void,
-    context: IParams,
+    context: IContext,
     params?: IParams,
     data?: IData,
   ): Promise<void>;
@@ -312,14 +310,23 @@ export interface IAppDEService {
    *
    * @author chitanda
    * @date 2023-10-26 14:10:40
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} [params]
    * @param {IData} [data]
    * @return {*}  {Promise<IHttpResponse>}
    */
   aiChatHistory(
-    context: IParams,
+    context: IContext,
     params?: IParams,
     data?: IData,
   ): Promise<IHttpResponse>;
+
+  /**
+   * 当前实体服务销毁时调用
+   *
+   * @author chitanda
+   * @date 2023-12-22 13:12:42
+   * @return {*}  {void}
+   */
+  destroy(): void;
 }

package/src/interface/service/service/i-file.service.ts

@@ -16,14 +16,14 @@ export interface IFileService {
    * @date 2022-11-25 14:11:53
    * @param {IDEDataExport} dataExport 导出模型
    * @param {string} fetchAction 查询方法
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} params 请求参数
    * @returns {*}  {Promise<IHttpResponse<Blob>>}
    */
   exportData(
     dataExport: IDEDataExport,
     fetchAction: string,
-    context: IParams,
+    context: IContext,
     params: IParams,
   ): Promise<IHttpResponse<Blob>>;
 }

package/src/interface/service/service/i-wf.service.ts

@@ -6,41 +6,41 @@ export interface IWorkFlowService {
    *
    * @author lxm
    * @date 2022-09-29 14:09:45
-   * @param {IParams} context
+   * @param {IContext} context
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  getWFStep(context: IParams): Promise<IHttpResponse<IData>>;
+  getWFStep(context: IContext): Promise<IHttpResponse<IData>>;
 
   /**
    * 根据业务主键和当前步骤获取操作路径
    *
    * @author lxm
    * @date 2022-09-29 14:09:52
-   * @param {IParams} context 路径参数
+   * @param {IContext} context 路径参数
    * @param {IData} data 数据
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  getWFLink(context: IParams, data: IData): Promise<IHttpResponse<IData[]>>;
+  getWFLink(context: IContext, data: IData): Promise<IHttpResponse<IData[]>>;
 
   /**
    * 根据业务主键获取工作流程进度
    *
    * @author lxm
    * @date 2022-09-29 14:09:45
-   * @param {IParams} context
+   * @param {IContext} context
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  getWFHistory(context: IParams): Promise<IHttpResponse<IData>>;
+  getWFHistory(context: IContext): Promise<IHttpResponse<IData>>;
 
   /**
    * 根据业务主键获取工作流流程图片
    *
    * @author lxm
    * @date 2022-10-27 16:10:13
-   * @param {IParams} context
+   * @param {IContext} context
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
-  getWFProcessDiagram(context: IParams): Promise<IHttpResponse<IData>>;
+  getWFProcessDiagram(context: IContext): Promise<IHttpResponse<IData>>;
 
   /**
    * 获取标准工作流版本信息
@@ -56,13 +56,13 @@ export interface IWorkFlowService {
    *
    * @author lxm
    * @date 2022-09-30 17:09:51
-   * @param {IParams} context 路径参数
+   * @param {IContext} context 路径参数
    * @param {IParams} params 请求参数
    * @param {IData} data 数据
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   wfWithdraw(
-    context: IParams,
+    context: IContext,
     params: IParams,
     data: IData,
   ): Promise<IHttpResponse<IData>>;
@@ -73,14 +73,14 @@ export interface IWorkFlowService {
    * @author lxm
    * @date 2022-09-30 17:09:38
    * @param {string} methodName 接口名称
-   * @param {IParams} context 路径参数
+   * @param {IContext} context 路径参数
    * @param {IParams} [params={}] 查询参数
    * @param {IData} [data={}] 主数据数据
    * @returns {*}  {Promise<IHttpResponse<IData>>}
    */
   exec(
     methodName: string,
-    context: IParams,
+    context: IContext,
     params?: IParams,
     data?: IData,
   ): Promise<IHttpResponse<IData>>;

package/src/register/helper/grid-column-register.ts

@@ -1,4 +1,4 @@
-import { IDEGridColumn, IDETreeColumn } from '@ibiz/model-core';
+import { IDEGridColumn } from '@ibiz/model-core';
 import { IGridColumnProvider } from '../../interface';
 import { getPluginRegisterKey } from './common-register';
 
@@ -35,14 +35,12 @@ function getProvider(key: string): IGridColumnProvider | undefined {
  * @return {*}  {Promise<IGridColumnProvider>}
  */
 export async function getGridColumnProvider(
-  model: IDEGridColumn | IDETreeColumn,
+  model: IDEGridColumn,
 ): Promise<IGridColumnProvider | undefined> {
   let provider: IGridColumnProvider | undefined;
   const { columnType, enableRowEdit, sysPFPluginId, appId } =
     model as Required<IDEGridColumn>;
 
-  const { renderSysPFPluginId } = model as Required<IDETreeColumn>;
-
   // 找插件适配器
   if (sysPFPluginId) {
     const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
@@ -56,19 +54,6 @@ export async function getGridColumnProvider(
     }
   }
 
-  // 树表格列插件
-  if (renderSysPFPluginId) {
-    const pluginKey = await getPluginRegisterKey(renderSysPFPluginId, appId);
-    if (pluginKey) {
-      provider = getProvider(pluginKey);
-    }
-    if (!provider) {
-      ibiz.log.error(`找不到树表格列插件${pluginKey}对应的适配器`);
-    } else {
-      return provider;
-    }
-  }
-
   const key = enableRowEdit ? `${columnType!}_EDIT` : columnType!;
   // 找表格列类型
   provider = getProvider(key);

package/src/service/de-service-util.ts

@@ -3,6 +3,14 @@ import { IHttpResponse, RuntimeError } from '@ibiz-template/core';
 import { IAppDEService } from '../interface';
 import { DEService } from './service';
 
+/**
+ * 实体服务构造方法
+ */
+export type DEServiceConstructor = (
+  srfSessionId: string,
+  entityModel: IAppDataEntity,
+) => Promise<IAppDEService>;
+
 /**
  * 应用服务工具类
  *
@@ -18,9 +26,9 @@ export class DEServiceUtil {
    * @author chitanda
    * @date 2022-08-17 23:08:36
    * @protected
-   * @type {Map<string, IAppDEService>}
+   * @type {Map<string, Map<string, IAppDEService>>} Map<域标识, Map<实体标识, 实体服务>>
    */
-  protected cache: Map<string, IAppDEService> = new Map();
+  protected cache: Map<string, Map<string, IAppDEService>> = new Map();
 
   /**
    * 实体服务构造方法缓存
@@ -28,10 +36,7 @@ export class DEServiceUtil {
    * @date 2023-05-15 08:37:13
    * @protected
    */
-  protected constructorCache: Map<
-    string,
-    (entityModel: IAppDataEntity) => Promise<IAppDEService>
-  > = new Map();
+  protected constructorCache: Map<string, DEServiceConstructor> = new Map();
 
   /**
    * Creates an instance of DEServiceUtil.
@@ -47,13 +52,10 @@ export class DEServiceUtil {
    *
    * @author chitanda
    * @date 2023-06-14 10:06:31
-   * @param {string} id
-   * @param {(entityModel: IAppDataEntity) => Promise<IAppDEService>} constructor
+   * @param {string} id 实体标识
+   * @param {DEServiceConstructor} constructor
    */
-  register(
-    id: string,
-    constructor: (entityModel: IAppDataEntity) => Promise<IAppDEService>,
-  ): void {
+  register(id: string, constructor: DEServiceConstructor): void {
     this.constructorCache.set(id, constructor);
   }
 
@@ -61,13 +63,18 @@ export class DEServiceUtil {
    * 根据实体标识获取实体服务
    *
    * @author chitanda
-   * @date 2022-12-23 10:12:24
+   * @date 2023-12-22 10:12:47
+   * @param {IContext} context 上下文,用于计算模型所属沙箱环境
    * @param {string} id 实体标识
-   * @param {IParams} [context] 上下文,用于计算模型所属沙箱环境
    * @return {*}  {Promise<IAppDEService>}
    */
-  async getService(id: string): Promise<IAppDEService> {
-    if (!this.cache.has(id)) {
+  async getService(context: IContext, id: string): Promise<IAppDEService> {
+    const sandboxId = context.srfsessionid;
+    if (!this.cache.has(sandboxId)) {
+      this.cache.set(sandboxId, new Map());
+    }
+    const map = this.cache.get(sandboxId)!;
+    if (!map.has(id)) {
       const entityModel = await ibiz.hub.getAppDataEntity(
         id,
         this.appModel.appId,
@@ -78,13 +85,33 @@ export class DEServiceUtil {
       const constructor = this.constructorCache.get(id);
       let service: IAppDEService;
       if (constructor) {
-        service = await constructor(entityModel);
+        service = await constructor(sandboxId, entityModel);
       } else {
-        service = new DEService(entityModel);
+        service = new DEService(sandboxId, entityModel);
       }
-      this.cache.set(id, service);
+      map.set(id, service);
+    }
+    return map.get(id)!;
+  }
+
+  /**
+   * 重置服务, 删除指定域下的所有服务缓存
+   *
+   * @author chitanda
+   * @date 2023-12-22 13:12:47
+   * @param {IContext} context
+   * @return {*}  {void}
+   */
+  reset(context: IContext): void {
+    const sandboxId = context.srfsessionid;
+    if (!this.cache.has(sandboxId)) {
+      return;
     }
-    return this.cache.get(id)!;
+    const map = this.cache.get(sandboxId)!;
+    map.forEach(service => {
+      service.destroy();
+    });
+    this.cache.delete(sandboxId);
   }
 
   /**
@@ -93,11 +120,16 @@ export class DEServiceUtil {
    * @description 根据 srfsessionid 作为临时数据域
    * @author chitanda
    * @date 2022-08-18 14:08:48
-   * @param {IParams} context
+   * @param {IContext} context
    */
-  clearTempCache(context: IParams): void {
-    this.cache.forEach(service => {
-      service.local.clear(context);
+  clearTempCache(context: IContext): void {
+    const sandboxId = context.srfsessionid;
+    if (!this.cache.has(sandboxId)) {
+      return;
+    }
+    const map = this.cache.get(sandboxId)!;
+    map.forEach(service => {
+      service.local.clear();
     });
   }
 
@@ -107,7 +139,7 @@ export class DEServiceUtil {
    * @date 2023-04-26 02:02:43
    * @param {string} appDataEntityId 实体名称
    * @param {string} methodName 方法名
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {(IData | undefined)} [params] 数据
    * @param {(IParams | undefined)} [params2] 视图参数
    * @return {*}  {Promise<IHttpResponse<IData>>}
@@ -115,11 +147,11 @@ export class DEServiceUtil {
   async exec(
     appDataEntityId: string,
     methodName: string,
-    context: IParams,
+    context: IContext,
     params?: IData | IData[] | undefined,
     params2?: IParams | undefined,
   ): Promise<IHttpResponse<IData>> {
-    const service = await this.getService(appDataEntityId);
+    const service = await this.getService(context, appDataEntityId);
     return service.exec(methodName, context, params, params2);
   }
 }