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

package/src/service/dto/method.dto.ts

@@ -5,9 +5,8 @@ import {
   IAppDEMethodDTOField,
 } from '@ibiz/model-core';
 import { ModelError } from '@ibiz-template/core';
-import { AppDataEntity } from '../app-data-entity/app-data-entity';
 import { findModelChild } from '../../model';
-import { IAppService } from '../../interface';
+import { IAppDEService, IAppService, IDataEntity } from '../../interface';
 
 interface listMap {
   [key: number]: IData;
@@ -29,6 +28,7 @@ export class MethodDto {
   protected dtoMap: Map<string, MethodDto> = new Map();
 
   constructor(
+    protected service: IAppDEService,
     protected entity: IAppDataEntity,
     protected isLocalMode?: boolean,
     protected dto?: IAppDEMethodDTO,
@@ -41,6 +41,19 @@ export class MethodDto {
     }
   }
 
+  /**
+   * 查找本地 DTO 存储数据
+   *
+   * @author chitanda
+   * @date 2023-12-22 14:12:19
+   * @param {IContext} context
+   * @param {IParams} [params]
+   * @return {*}  {IDataEntity[]}
+   */
+  select(context: IContext, params?: IParams): IDataEntity[] {
+    return this.service.local.select(context, params);
+  }
+
   /**
    * 转换数组成ListMap
    *
@@ -75,11 +88,11 @@ export class MethodDto {
    *
    * @author chitanda
    * @date 2022-10-10 23:10:33
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IData} data
    * @return {*}  {Promise<IData>}
    */
-  async get(context: IParams, data: IData): Promise<IData> {
+  async get(context: IContext, data: IData): Promise<IData> {
     const params: IData = {};
     // 拷贝数据
     for (let i = 0; i < this.fields.length; i++) {
@@ -107,13 +120,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: IParams = {};
+            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++) {
@@ -140,14 +153,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[]>}
+   * @return {*}  {Promise<IDataEntity[]>}
    */
-  async sets(context: IParams, data: IData[]): Promise<AppDataEntity[]> {
-    const service = await this.app!.deService.getService(this.entity.id!);
+  async sets(context: IContext, data: IData[]): Promise<IDataEntity[]> {
     if (this.isLocalMode) {
-      service.local.clear(context);
+      this.service.local.clear();
     }
     return Promise.all(
       data.map(async datum => {
@@ -162,15 +174,16 @@ export class MethodDto {
               if (!field.refAppDataEntityId) {
                 return;
               }
-              const dto = await this.getFieldDto(field);
+              const dto = await this.getFieldDto(context, field);
               const items: IData[] = 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);
+                delete datum[key];
               } else {
                 await dto.sets(context, []);
               }
@@ -179,9 +192,9 @@ export class MethodDto {
         for (let i = 0; i < all.length; i++) {
           await all[i];
         }
-        const entityData = new AppDataEntity(this.entity, datum);
+        const entityData = this.service.createEntity(datum) as IDataEntity;
         if (this.isLocalMode) {
-          await service.local.add(context, entityData);
+          await this.service.local.add(context, entityData);
         }
         return entityData;
       }),
@@ -192,12 +205,16 @@ 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>}
    */
-  protected async getFieldDto(field: IAppDEMethodDTOField): Promise<MethodDto> {
+  protected async getFieldDto(
+    context: IContext,
+    field: IAppDEMethodDTOField,
+  ): Promise<MethodDto> {
     if (this.dtoMap.has(field.codeName!)) {
       return this.dtoMap.get(field.codeName!)!;
     }
@@ -209,7 +226,9 @@ export class MethodDto {
       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/src/service/service/authority/authority.service.ts

@@ -82,7 +82,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: string): Promise<IAppDeAuthorityService> {

package/src/service/service/code-list/code-list.service.ts

@@ -146,7 +146,7 @@ export class CodeListService {
    */
   protected async getDynamicCodeList(
     codeList: IAppCodeList,
-    context: IParams = {},
+    context: IContext,
     params: IParams = {},
   ): Promise<CodeListItem[]> {
     let dynamicCache: DynamicCodeListCache;
@@ -167,13 +167,13 @@ 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[]>}
    */
   async get(
     tag: string,
-    context?: IParams,
+    context: IContext,
     params?: IParams,
   ): Promise<readonly CodeListItem[]> {
     const codeList = this.allCodeLists.get(tag);

package/src/service/service/control/control.service.ts

@@ -62,13 +62,13 @@ export 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>}
    */
   async exec(
     methodName: string,
-    context: IParams,
+    context: IContext,
     data?: IData,
     params?: IParams,
   ): Promise<IHttpResponse> {

package/src/service/service/control/md-control.service.ts

@@ -12,12 +12,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async fetch(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO[]>> {
     const fetchAction =
@@ -32,12 +32,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async get(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     const getAction = this.model.getControlAction?.appDEMethodId || 'get';
@@ -51,12 +51,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-08-31 17:08:41
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}  {Promise<IHttpResponse>}
    */
   async getDraft(
-    context: IParams,
+    context: IContext,
     params: IParams = {},
   ): Promise<IHttpResponse<ControlVO>> {
     const getDraftAction =
@@ -71,11 +71,14 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:48
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {IParams} [params={}] 视图参数
    * @returns {*}
    */
-  async remove(context: IParams, params: IParams = {}): Promise<IHttpResponse> {
+  async remove(
+    context: IContext,
+    params: IParams = {},
+  ): Promise<IHttpResponse> {
     const removeAction =
       this.model.removeControlAction?.appDEMethodId || 'remove';
     const res = await this.exec(removeAction, context, undefined, params);
@@ -87,12 +90,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {ControlVO} data 数据
    * @returns {*}
    */
   async create(
-    context: IParams,
+    context: IContext,
     data: ControlVO,
   ): Promise<IHttpResponse<ControlVO>> {
     const createAction =
@@ -107,12 +110,12 @@ export class MDControlService<
    *
    * @author lxm
    * @date 2022-09-07 19:09:11
-   * @param {IParams} context 上下文
+   * @param {IContext} context 上下文
    * @param {ControlVO} data 数据
    * @returns {*}
    */
   async update(
-    context: IParams,
+    context: IContext,
     data: ControlVO,
   ): Promise<IHttpResponse<ControlVO>> {
     const updateAction =
@@ -122,13 +125,37 @@ export class MDControlService<
     return res as IHttpResponse<ControlVO>;
   }
 
+  /**
+   * 批量更新数据
+   *
+   * @author chitanda
+   * @date 2023-12-21 10:12:09
+   * @param {IContext} context
+   * @param {ControlVO[]} data
+   * @return {*}  {Promise<void>}
+   */
+  async updateBatch(
+    context: IContext,
+    data: ControlVO[],
+  ): Promise<IHttpResponse<ControlVO[]>> {
+    const updateAction =
+      this.model.updateControlAction?.appDEMethodId || 'update';
+    let res = await this.exec(
+      updateAction,
+      context,
+      data.map(item => item.getOrigin()),
+    );
+    res = this.handleResponse(res);
+    return res as 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/src/service/service/counter/counter.service.ts

@@ -34,7 +34,7 @@ export class CounterService {
    */
   static async getCounter(
     model: IAppCounter,
-    context?: IParams,
+    context?: IContext,
     params?: IParams,
   ): Promise<AppCounter> {
     const id = model.id!;
@@ -59,13 +59,13 @@ export class CounterService {
    * @date 2022-10-26 20:10:20
    * @static
    * @param {IAppCounterRef} model
-   * @param {IParams} context
+   * @param {IContext} context
    * @param {IParams} params
    * @return {*}  {Promise<AppCounter>}
    */
   static async getCounterByRef(
     model: IAppCounterRef,
-    context?: IParams,
+    context?: IContext,
     params?: IParams,
   ): Promise<AppCounter> {
     const { appCounter } = model;