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

package/out/register/helper/grid-column-register.js

@@ -26,7 +26,6 @@ function getProvider(key) {
 export async function getGridColumnProvider(model) {
     let provider;
     const { columnType, enableRowEdit, sysPFPluginId, appId } = model;
-    const { renderSysPFPluginId } = model;
     // 找插件适配器
     if (sysPFPluginId) {
         const pluginKey = await getPluginRegisterKey(sysPFPluginId, appId);
@@ -40,19 +39,6 @@ export async function getGridColumnProvider(model) {
             return provider;
         }
     }
-    // 树表格列插件
-    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/out/service/de-service-util.d.ts

@@ -1,6 +1,10 @@
 import { IAppDataEntity, IApplication } from '@ibiz/model-core';
 import { IHttpResponse } from '@ibiz-template/core';
 import { IAppDEService } from '../interface';
+/**
+ * 实体服务构造方法
+ */
+export type DEServiceConstructor = (srfSessionId: string, entityModel: IAppDataEntity) => Promise<IAppDEService>;
 /**
  * 应用服务工具类
  *
@@ -17,16 +21,16 @@ export declare 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>;
+    protected cache: Map<string, Map<string, IAppDEService>>;
     /**
      * 实体服务构造方法缓存
      * @author lxm
      * @date 2023-05-15 08:37:13
      * @protected
      */
-    protected constructorCache: Map<string, (entityModel: IAppDataEntity) => Promise<IAppDEService>>;
+    protected constructorCache: Map<string, DEServiceConstructor>;
     /**
      * Creates an instance of DEServiceUtil.
      *
@@ -40,40 +44,49 @@ export declare 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;
     /**
      * 根据实体标识获取实体服务
      *
      * @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>}
      */
-    getService(id: string): Promise<IAppDEService>;
+    getService(context: IContext, id: string): Promise<IAppDEService>;
+    /**
+     * 重置服务, 删除指定域下的所有服务缓存
+     *
+     * @author chitanda
+     * @date 2023-12-22 13:12:47
+     * @param {IContext} context
+     * @return {*}  {void}
+     */
+    reset(context: IContext): void;
     /**
      * 清理所有服务, 当前临时域下的所有临时数据缓存
      *
      * @description 根据 srfsessionid 作为临时数据域
      * @author chitanda
      * @date 2022-08-18 14:08:48
-     * @param {IParams} context
+     * @param {IContext} context
      */
-    clearTempCache(context: IParams): void;
+    clearTempCache(context: IContext): void;
     /**
      * 执行服务方法
      * @author lxm
      * @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>>}
      */
-    exec(appDataEntityId: string, methodName: string, context: IParams, params?: IData | IData[] | undefined, params2?: IParams | undefined): Promise<IHttpResponse<IData>>;
+    exec(appDataEntityId: string, methodName: string, context: IContext, params?: IData | IData[] | undefined, params2?: IParams | undefined): Promise<IHttpResponse<IData>>;
 }
 //# sourceMappingURL=de-service-util.d.ts.map

package/out/service/de-service-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-service-util.d.ts","sourceRoot":"","sources":["../../src/service/de-service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C;;;;;;;GAOG;AACH,qBAAa,aAAa;IA6BZ,SAAS,CAAC,QAAQ,EAAE,YAAY;IA5B5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IAExD;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAC7B,MAAM,EACN,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,aAAa,CAAC,CACxD,CAAa;IAEd;;;;;;OAMG;gBACmB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,QAAQ,CACN,EAAE,EAAE,MAAM,EACV,WAAW,EAAE,CAAC,WAAW,EAAE,cAAc,KAAK,OAAO,CAAC,aAAa,CAAC,GACnE,IAAI;IAIP;;;;;;;;OAQG;IACG,UAAU,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAqBpD;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAMtC;;;;;;;;;;OAUG;IACG,IAAI,CACR,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS,EACpC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,GAC5B,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;CAIjC"}
+{"version":3,"file":"de-service-util.d.ts","sourceRoot":"","sources":["../../src/service/de-service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAG7C;;GAEG;AACH,MAAM,MAAM,oBAAoB,GAAG,CACjC,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,cAAc,KACxB,OAAO,CAAC,aAAa,CAAC,CAAC;AAE5B;;;;;;;GAOG;AACH,qBAAa,aAAa;IA0BZ,SAAS,CAAC,QAAQ,EAAE,YAAY;IAzB5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAa;IAErE;;;;;OAKG;IACH,SAAS,CAAC,gBAAgB,EAAE,GAAG,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAa;IAE1E;;;;;;OAMG;gBACmB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,oBAAoB,GAAG,IAAI;IAI7D;;;;;;;;OAQG;IACG,UAAU,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IA0BvE;;;;;;;OAOG;IACH,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAY9B;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;IAWvC;;;;;;;;;;OAUG;IACG,IAAI,CACR,eAAe,EAAE,MAAM,EACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,KAAK,GAAG,KAAK,EAAE,GAAG,SAAS,EACpC,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,GAC5B,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;CAIjC"}

package/out/service/de-service-util.js

@@ -24,7 +24,7 @@ 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<实体标识, 实体服务>>
          */
         this.cache = new Map();
         /**
@@ -40,8 +40,8 @@ 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, constructor) {
         this.constructorCache.set(id, constructor);
@@ -50,13 +50,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) {
-        if (!this.cache.has(id)) {
+    async getService(context, id) {
+        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);
             if (!entityModel) {
                 throw new RuntimeError(`未找到应用实体[${id}]`);
@@ -64,14 +69,33 @@ export class DEServiceUtil {
             const constructor = this.constructorCache.get(id);
             let service;
             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) {
+        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);
     }
     /**
      * 清理所有服务, 当前临时域下的所有临时数据缓存
@@ -79,11 +103,16 @@ export class DEServiceUtil {
      * @description 根据 srfsessionid 作为临时数据域
      * @author chitanda
      * @date 2022-08-18 14:08:48
-     * @param {IParams} context
+     * @param {IContext} context
      */
     clearTempCache(context) {
-        this.cache.forEach(service => {
-            service.local.clear(context);
+        const sandboxId = context.srfsessionid;
+        if (!this.cache.has(sandboxId)) {
+            return;
+        }
+        const map = this.cache.get(sandboxId);
+        map.forEach(service => {
+            service.local.clear();
         });
     }
     /**
@@ -92,13 +121,13 @@ 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>>}
      */
     async exec(appDataEntityId, methodName, context, params, params2) {
-        const service = await this.getService(appDataEntityId);
+        const service = await this.getService(context, appDataEntityId);
         return service.exec(methodName, context, params, params2);
     }
 }

package/out/service/dto/method.dto.d.ts

@@ -1,6 +1,6 @@
 import { IAppDataEntity, IAppDEMethodDTO, IAppDEMethodDTOField } from '@ibiz/model-core';
 import { AppDataEntity } from '../app-data-entity/app-data-entity';
-import { IAppService } from '../../interface';
+import { IAppDEService, IAppService, IDataEntity } from '../../interface';
 /**
  * 应用实体服务方法转换 DTO
  *
@@ -10,13 +10,24 @@ import { IAppService } from '../../interface';
  * @class MethodDto
  */
 export declare class MethodDto {
+    protected service: IAppDEService;
     protected entity: IAppDataEntity;
     protected isLocalMode?: boolean | undefined;
     protected dto?: IAppDEMethodDTO | undefined;
     protected app?: IAppService;
     protected fields: IAppDEMethodDTOField[];
     protected dtoMap: Map<string, MethodDto>;
-    constructor(entity: IAppDataEntity, isLocalMode?: boolean | undefined, dto?: IAppDEMethodDTO | undefined);
+    constructor(service: IAppDEService, entity: IAppDataEntity, isLocalMode?: boolean | undefined, dto?: IAppDEMethodDTO | undefined);
+    /**
+     * 查找本地 DTO 存储数据
+     *
+     * @author chitanda
+     * @date 2023-12-22 14:12:19
+     * @param {IContext} context
+     * @param {IParams} [params]
+     * @return {*}  {IDataEntity[]}
+     */
+    select(context: IContext, params?: IParams): IDataEntity[];
     /**
      * 转换数组成ListMap
      *
@@ -36,30 +47,31 @@ export declare class MethodDto {
      *
      * @author chitanda
      * @date 2022-10-10 23:10:33
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IData} data
      * @return {*}  {Promise<IData>}
      */
-    get(context: IParams, data: IData): Promise<IData>;
+    get(context: IContext, data: IData): Promise<IData>;
     /**
      * 设置本地 DTO 存储
      *
      * @author chitanda
      * @date 2022-10-10 23:10:50
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IData[]} data
      * @return {*}  {Promise<AppDataEntity[]>}
      */
-    sets(context: IParams, data: IData[]): Promise<AppDataEntity[]>;
+    sets(context: IContext, data: IData[]): Promise<AppDataEntity[]>;
     /**
      * 获取子属性 DTO
      *
      * @author chitanda
-     * @date 2022-10-17 16:10:47
+     * @date 2023-12-22 13:12:06
      * @protected
+     * @param {IContext} context
      * @param {IAppDEMethodDTOField} field
      * @return {*}  {Promise<MethodDto>}
      */
-    protected getFieldDto(field: IAppDEMethodDTOField): Promise<MethodDto>;
+    protected getFieldDto(context: IContext, field: IAppDEMethodDTOField): Promise<MethodDto>;
 }
 //# sourceMappingURL=method.dto.d.ts.map

package/out/service/dto/method.dto.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM9C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAQlB,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IAThB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;gBAGzC,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB;IAUjC;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAwDxD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA4CrE;;;;;;;;OAQG;cACa,WAAW,CAAC,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,SAAS,CAAC;CAgB7E"}
+{"version":3,"file":"method.dto.d.ts","sourceRoot":"","sources":["../../../src/service/dto/method.dto.ts"],"names":[],"mappings":"AACA,OAAO,EACL,cAAc,EACd,eAAe,EACf,oBAAoB,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AAEnE,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAM1E;;;;;;;GAOG;AACH,qBAAa,SAAS;IAQlB,SAAS,CAAC,OAAO,EAAE,aAAa;IAChC,SAAS,CAAC,MAAM,EAAE,cAAc;IAChC,SAAS,CAAC,WAAW,CAAC;IACtB,SAAS,CAAC,GAAG,CAAC;IAVhB,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,oBAAoB,EAAE,CAAC;IAE1C,SAAS,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAa;gBAGzC,OAAO,EAAE,aAAa,EACtB,MAAM,EAAE,cAAc,EACtB,WAAW,CAAC,qBAAS,EACrB,GAAG,CAAC,6BAAiB;IAUjC;;;;;;;;OAQG;IACH,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,WAAW,EAAE;IAI1D;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAQ7B;;;;;OAKG;IACH,OAAO,CAAC,qBAAqB;IAS7B;;;;;;;;OAQG;IACG,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC;IAwDzD;;;;;;;;OAQG;IACG,IAAI,CAAC,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC;IA4CtE;;;;;;;;;OASG;cACa,WAAW,CACzB,OAAO,EAAE,QAAQ,EACjB,KAAK,EAAE,oBAAoB,GAC1B,OAAO,CAAC,SAAS,CAAC;CAkBtB"}

package/out/service/dto/method.dto.js

@@ -10,7 +10,8 @@ import { findModelChild } from '../../model';
  * @class MethodDto
  */
 export class MethodDto {
-    constructor(entity, isLocalMode, dto) {
+    constructor(service, entity, isLocalMode, dto) {
+        this.service = service;
         this.entity = entity;
         this.isLocalMode = isLocalMode;
         this.dto = dto;
@@ -23,6 +24,18 @@ export class MethodDto {
             this.fields = [];
         }
     }
+    /**
+     * 查找本地 DTO 存储数据
+     *
+     * @author chitanda
+     * @date 2023-12-22 14:12:19
+     * @param {IContext} context
+     * @param {IParams} [params]
+     * @return {*}  {IDataEntity[]}
+     */
+    select(context, params) {
+        return this.service.local.select(context, params);
+    }
     /**
      * 转换数组成ListMap
      *
@@ -55,7 +68,7 @@ export class MethodDto {
      *
      * @author chitanda
      * @date 2022-10-10 23:10:33
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IData} data
      * @return {*}  {Promise<IData>}
      */
@@ -88,11 +101,13 @@ export class MethodDto {
                         if (!field.refAppDataEntityId) {
                             break;
                         }
-                        const dto = await this.getFieldDto(field);
-                        const service = await this.app.deService.getService(field.refAppDataEntityId);
-                        const items = await service.selectLocal(context, {
-                        // srfpkey: data[this.entity.keyAppDEFieldId!],
-                        });
+                        const dto = await this.getFieldDto(context, field);
+                        // 子数据过滤参数
+                        const filterParams = {};
+                        if (field.refPickupAppDEFieldId) {
+                            filterParams[field.refPickupAppDEFieldId] = data.srfkey;
+                        }
+                        const items = await dto.select(context, filterParams);
                         if (items) {
                             const arr = [];
                             for (let j = 0; j < items.length; j++) {
@@ -115,14 +130,13 @@ export class MethodDto {
      *
      * @author chitanda
      * @date 2022-10-10 23:10:50
-     * @param {IParams} context
+     * @param {IContext} context
      * @param {IData[]} data
      * @return {*}  {Promise<AppDataEntity[]>}
      */
     async sets(context, data) {
-        const service = await this.app.deService.getService(this.entity.id);
         if (this.isLocalMode) {
-            service.local.clear(context);
+            this.service.local.clear();
         }
         return Promise.all(data.map(async (datum) => {
             const all = this.fields
@@ -137,13 +151,14 @@ export class MethodDto {
                     if (!field.refAppDataEntityId) {
                         return;
                     }
-                    const dto = await this.getFieldDto(field);
+                    const dto = await this.getFieldDto(context, field);
                     const items = datum[key];
                     if (items) {
                         const pKey = datum[this.entity.keyAppDEFieldId];
                         // 特殊处理，在子包内设置父对象标识
                         items.forEach(item => {
                             item.srfpkey = pKey;
+                            item[field.refPickupAppDEFieldId] = pKey;
                         });
                         await dto.sets(context, items);
                     }
@@ -157,7 +172,7 @@ export class MethodDto {
             }
             const entityData = new AppDataEntity(this.entity, datum);
             if (this.isLocalMode) {
-                await service.local.add(context, entityData);
+                await this.service.local.add(context, entityData);
             }
             return entityData;
         }));
@@ -166,18 +181,21 @@ export class MethodDto {
      * 获取子属性 DTO
      *
      * @author chitanda
-     * @date 2022-10-17 16:10:47
+     * @date 2023-12-22 13:12:06
      * @protected
+     * @param {IContext} context
      * @param {IAppDEMethodDTOField} field
      * @return {*}  {Promise<MethodDto>}
      */
-    async getFieldDto(field) {
+    async getFieldDto(context, field) {
         if (this.dtoMap.has(field.codeName)) {
             return this.dtoMap.get(field.codeName);
         }
         const entity = await ibiz.hub.getAppDataEntity(field.refAppDataEntityId, this.entity.appId);
         const methodDto = findModelChild(entity.appDEMethodDTOs || [], field.refAppDEMethodDTOId);
-        const dto = new MethodDto(entity, true, methodDto);
+        const service = await this.app.deService.getService(context, entity.id);
+        service.isLocalMode = true;
+        const dto = new MethodDto(service, entity, true, methodDto);
         this.dtoMap.set(field.codeName, dto);
         return dto;
     }

package/out/service/service/authority/authority.service.d.ts

@@ -63,7 +63,7 @@ export declare class AuthorityService {
      * @author chitanda
      * @date 2022-12-23 10:12:24
      * @param {string} id 实体标识
-     * @param {IParams} [context] 上下文,用于计算模型所属沙箱环境
+     * @param {IContext} [context] 上下文,用于计算模型所属沙箱环境
      * @return {*}  {Promise<IAppDEService>}
      */
     getService(id: string): Promise<IAppDeAuthorityService>;

package/out/service/service/authority/authority.service.js

@@ -67,7 +67,7 @@ export class AuthorityService {
      * @author chitanda
      * @date 2022-12-23 10:12:24
      * @param {string} id 实体标识
-     * @param {IParams} [context] 上下文,用于计算模型所属沙箱环境
+     * @param {IContext} [context] 上下文,用于计算模型所属沙箱环境
      * @return {*}  {Promise<IAppDEService>}
      */
     async getService(id) {

package/out/service/service/code-list/code-list.service.d.ts

@@ -77,17 +77,17 @@ export declare class CodeListService {
      * @param {IAppCodeList} codeList
      * @returns {*}  {IData[]}
      */
-    protected getDynamicCodeList(codeList: IAppCodeList, context?: IParams, params?: IParams): Promise<CodeListItem[]>;
+    protected getDynamicCodeList(codeList: IAppCodeList, context: IContext, params?: IParams): Promise<CodeListItem[]>;
     /**
      * 获取代码表
      *
      * @author chitanda
      * @date 2022-08-25 15:08:45
      * @param {string} tag
-     * @param {IParams} [context]
+     * @param {IContext} [context]
      * @param {IParams} [params]
      * @return {*}  {Promise<CodeListItem[]>}
      */
-    get(tag: string, context?: IParams, params?: IParams): Promise<readonly CodeListItem[]>;
+    get(tag: string, context: IContext, params?: IParams): Promise<readonly CodeListItem[]>;
 }
 //# sourceMappingURL=code-list.service.d.ts.map

package/out/service/service/code-list/code-list.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IAsC3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,GAAE,OAAY,EACrB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}
+{"version":3,"file":"code-list.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/code-list/code-list.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACzE,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAoBd,SAAS,CAAC,QAAQ,EAAE,YAAY;IAnB5C;;;;;OAKG;IACH,SAAS,CAAC,YAAY,4BAAmC;IAEzD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,YAAY,EAAE,GAAG,oBAAoB,CAAC,CAChE;gBAEU,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;IACH,SAAS,CAAC,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,YAAY,EAAE;IAc3D;;;;;;;;OAQG;IACH,WAAW,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAMzC;;;;;;;;OAQG;IACH,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS;IAIlD;;;;;;;;;OASG;IACH,SAAS,CAAC,iBAAiB,CACzB,SAAS,EAAE,SAAS,EAAE,EACtB,aAAa,EAAE,OAAO,GACrB,QAAQ,CAAC,YAAY,CAAC,EAAE;IAsC3B;;;;;;;;OAQG;cACa,kBAAkB,CAChC,QAAQ,EAAE,YAAY,EACtB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IAa1B;;;;;;;;;OASG;IACG,GAAG,CACP,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,QAAQ,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,SAAS,YAAY,EAAE,CAAC;CAcpC"}

package/out/service/service/code-list/code-list.service.js

@@ -127,7 +127,7 @@ export class CodeListService {
      * @param {IAppCodeList} codeList
      * @returns {*}  {IData[]}
      */
-    async getDynamicCodeList(codeList, context = {}, params = {}) {
+    async getDynamicCodeList(codeList, context, params = {}) {
         let dynamicCache;
         const codeName = codeList.codeName;
         if (this.cache.has(codeName)) {
@@ -146,7 +146,7 @@ export class CodeListService {
      * @author chitanda
      * @date 2022-08-25 15:08:45
      * @param {string} tag
-     * @param {IParams} [context]
+     * @param {IContext} [context]
      * @param {IParams} [params]
      * @return {*}  {Promise<CodeListItem[]>}
      */

package/out/service/service/control/control.service.d.ts

@@ -50,11 +50,11 @@ export declare class ControlService<T extends IControl = IControl> {
      * @author lxm
      * @date 2022-08-31 17:08:41
      * @param {string} methodName 方法名
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数或数据
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    exec(methodName: string, context: IParams, data?: IData, params?: IParams): Promise<IHttpResponse>;
+    exec(methodName: string, context: IContext, data?: IData, params?: IParams): Promise<IHttpResponse>;
     /**
      * 处理响应
      *

package/out/service/service/control/control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}
+{"version":3,"file":"control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAS,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK9C;;;;;OAKG;IACH,SAAS,CAAC,aAAa,IAAI,IAAI;IAE/B;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,IAAI,CAAC,EAAE,KAAK,EACZ,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC;IAWzB;;;;;;;OAOG;IACH,cAAc,CAAC,GAAG,EAAE,aAAa,GAAG,aAAa;IAKjD;;;;;;;OAOG;IACH,QAAQ,CAAC,UAAU,EAAE,KAAK,GAAG,SAAS;CAGvC"}

package/out/service/service/control/control.service.js

@@ -43,7 +43,7 @@ export class ControlService {
      * @author lxm
      * @date 2022-08-31 17:08:41
      * @param {string} methodName 方法名
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数或数据
      * @returns {*}  {Promise<IHttpResponse>}
      */

package/out/service/service/control/md-control.service.d.ts

@@ -8,68 +8,78 @@ export declare class MDControlService<T extends IMDControl = IMDControl> extends
      *
      * @author lxm
      * @date 2022-08-31 17:08:41
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    fetch(context: IParams, params?: IParams): Promise<IHttpResponse<ControlVO[]>>;
+    fetch(context: IContext, params?: IParams): Promise<IHttpResponse<ControlVO[]>>;
     /**
      * 执行获取单条数据方法
      *
      * @author lxm
      * @date 2022-08-31 17:08:41
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    get(context: IParams, params?: IParams): Promise<IHttpResponse<ControlVO>>;
+    get(context: IContext, params?: IParams): Promise<IHttpResponse<ControlVO>>;
     /**
      * 执行获取草稿方法
      *
      * @author lxm
      * @date 2022-08-31 17:08:41
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    getDraft(context: IParams, params?: IParams): Promise<IHttpResponse<ControlVO>>;
+    getDraft(context: IContext, params?: IParams): Promise<IHttpResponse<ControlVO>>;
     /**
      * 删除单条数据
      *
      * @author lxm
      * @date 2022-09-07 19:09:48
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {IParams} [params={}] 视图参数
      * @returns {*}
      */
-    remove(context: IParams, params?: IParams): Promise<IHttpResponse>;
+    remove(context: IContext, params?: IParams): Promise<IHttpResponse>;
     /**
      * 新建数据
      *
      * @author lxm
      * @date 2022-09-07 19:09:11
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {ControlVO} data 数据
      * @returns {*}
      */
-    create(context: IParams, data: ControlVO): Promise<IHttpResponse<ControlVO>>;
+    create(context: IContext, data: ControlVO): Promise<IHttpResponse<ControlVO>>;
     /**
      * 更新数据
      *
      * @author lxm
      * @date 2022-09-07 19:09:11
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {ControlVO} data 数据
      * @returns {*}
      */
-    update(context: IParams, data: ControlVO): Promise<IHttpResponse<ControlVO>>;
+    update(context: IContext, data: ControlVO): Promise<IHttpResponse<ControlVO>>;
+    /**
+     * 批量更新数据
+     *
+     * @author chitanda
+     * @date 2023-12-21 10:12:09
+     * @param {IContext} context
+     * @param {ControlVO[]} data
+     * @return {*}  {Promise<void>}
+     */
+    updateBatch(context: IContext, data: ControlVO[]): Promise<IHttpResponse<ControlVO[]>>;
     /**
      * 导出数据
      *
      * @author lxm
      * @date 2022-11-25 14:11:09
      * @param {IPSDEDataExport} dataExport 导出模型
-     * @param {IParams} context 上下文
+     * @param {IContext} context 上下文
      * @param {IParams} [params={}] 请求参数
      * @returns {*}  {Promise<IHttpResponse>}
      */

package/out/service/service/control/md-control.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAO5E;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;;OASG;IACG,UAAU,CACd,WAAW,EAAE,aAAa,EAC1B,QAAQ,EAAE,OAAO,EACjB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAU/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CAwBvD"}
+{"version":3,"file":"md-control.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/md-control.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,UAAU,GAAG,UAAU,CACjC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAQtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAOzB;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAQpC;;;;;;;;OAQG;IACG,WAAW,CACf,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,SAAS,EAAE,GAChB,OAAO,CAAC,aAAa,CAAC,SAAS,EAAE,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,UAAU,CACd,WAAW,EAAE,aAAa,EAC1B,QAAQ,EAAE,OAAO,EACjB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAU/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CAwBvD"}