@ibiz-template/runtime 0.0.3-beta.6 → 0.0.4-beta.1

package/src/service/service/counter/counter.service.ts

@@ -1,8 +1,5 @@
-import {
-  DefectModelError,
-  IPSAppCounter,
-  IPSAppCounterRef,
-} from '@ibiz-template/model';
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { IAppCounter, IAppCounterRef } from '@ibiz/model-core';
 import { AppCounter } from '../../utils';
 
 /**
@@ -30,24 +27,25 @@ export class CounterService {
    *
    * @author chitanda
    * @date 2022-10-26 19:10:18
-   * @param {IPSAppCounter} model
+   * @param {IAppCounter} model
    * @return {*}  {Promise<AppCounter>}
    */
   static async getCounter(
-    model: IPSAppCounter,
+    model: IAppCounter,
     context?: IParams,
     params?: IParams,
   ): Promise<AppCounter> {
-    if (this.counterMap.has(model.id)) {
-      const counter = this.counterMap.get(model.id)!;
+    const id = model.id!;
+    if (this.counterMap.has(id)) {
+      const counter = this.counterMap.get(id)!;
       if (counter.isDestroyed === false) {
         return counter;
       }
-      this.counterMap.delete(model.id);
+      this.counterMap.delete(id);
     }
     const counter = new AppCounter(model);
     await counter.init(context, params);
-    this.counterMap.set(model.id, counter);
+    this.counterMap.set(id, counter);
     return counter;
   }
 
@@ -57,20 +55,22 @@ export class CounterService {
    * @author chitanda
    * @date 2022-10-26 20:10:20
    * @static
-   * @param {IPSAppCounterRef} model
+   * @param {IAppCounterRef} model
    * @param {IParams} context
    * @param {IParams} params
    * @return {*}  {Promise<AppCounter>}
    */
   static async getCounterByRef(
-    model: IPSAppCounterRef,
+    model: IAppCounterRef,
     context?: IParams,
     params?: IParams,
   ): Promise<AppCounter> {
-    const appCounter = model.getPSAppCounter();
-    if (!appCounter) {
-      throw new DefectModelError(model, `未配置应用计数器!`);
-    }
-    return this.getCounter(appCounter, context, params);
+    // todo
+    // const appCounter = model.getPSAppCounter();
+    // if (!appCounter) {
+    //   throw new RuntimeModelError(model, `未配置应用计数器!`);
+    // }
+    // return this.getCounter(appCounter, context, params);
+    return {} as AppCounter;
   }
 }

package/src/service/service/entity/entity.service.ts

@@ -1,14 +1,8 @@
-import {
-  AppEntityModel,
-  IAppDEMethod,
-  UnsupportedModelError,
-} from '@ibiz-template/model';
-import { IHttpResponse, RuntimeError } from '@ibiz-template/core';
+import { IAppDataEntity } from '@ibiz/model-core';
+import { IHttpResponse, ModelError, RuntimeError } from '@ibiz-template/core';
 import { EntityCache, ServicePathItem } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
-import { DEActionMethod } from './method/de-action';
-import { FetchMethod } from './method/fetch';
 import { FileService } from '../file/file.service';
 
 /**
@@ -62,11 +56,11 @@ export class EntityService {
    *
    * @author chitanda
    * @date 2022-08-24 18:08:44
-   * @param {AppEntityModel} model 应用实体模型
+   * @param {IAppDataEntity} model 应用实体模型
    * @param {ServicePathItem[][]} paths 计算出的资源关系路径
    */
   constructor(
-    protected model: AppEntityModel,
+    protected model: IAppDataEntity,
     protected paths: ServicePathItem[][],
   ) {
     this.wf = new WorkFlowService(model);
@@ -86,24 +80,25 @@ export class EntityService {
     if (this.methodMap.has(methodName)) {
       return this.methodMap.get(methodName)!;
     }
-    const model = this.model.findPSAppDeMethod(methodName) as IAppDEMethod;
-    let method: Method | null = null;
-    switch (model.methodType) {
-      case 'DEACTION':
-        method = new DEActionMethod(this.model, model, this.paths);
-        break;
-      case 'FETCH':
-      case 'FETCHTEMP':
-        method = new FetchMethod(this.model, model, this.paths);
-        break;
-      default:
-        throw new UnsupportedModelError(
-          model,
-          `未支持的服务方法类型: ${model.methodType}`,
-        );
-    }
-    this.methodMap.set(methodName, method);
-    return method;
+    // const model = this.model.findPSAppDeMethod(methodName) as IAppDEMethod;
+    // let method: Method | null = null;
+    // switch (model.methodType) {
+    //   case 'DEACTION':
+    //     method = new DEActionMethod(this.model, model, this.paths);
+    //     break;
+    //   case 'FETCH':
+    //   case 'FETCHTEMP':
+    //     method = new FetchMethod(this.model, model, this.paths);
+    //     break;
+    //   default:
+    //     throw new ModelError(
+    //       model,
+    //       `未支持的服务方法类型: ${model.methodType}`,
+    //     );
+    // }
+    // this.methodMap.set(methodName, method);
+    // return method;
+    throw new ModelError(this.model, `未支持的服务方法: ${methodName}`);
   }
 
   /**
@@ -127,7 +122,7 @@ export class EntityService {
     if (method) {
       return method.exec(context, params, params2);
     }
-    throw new RuntimeError(`${this.model.deName}未支持「${methodName}」方法`);
+    throw new RuntimeError(`${this.model.codeName}未支持「${methodName}」方法`);
   }
 
   getPath(
@@ -140,6 +135,6 @@ export class EntityService {
     if (method) {
       return method.exec(context, params, params2);
     }
-    throw new RuntimeError(`${this.model.deName}未支持「${methodName}」方法`);
+    throw new RuntimeError(`${this.model.codeName}未支持「${methodName}」方法`);
   }
 }

package/src/service/service/entity/method/de-action.ts

@@ -1,5 +1,4 @@
 import { HttpResponse, IHttpResponse } from '@ibiz-template/core';
-import { execDELogic, execDELogicResponse } from '../../../../de-logic';
 import { Entity } from '../../../entity/entity';
 import { Method } from './method';
 
@@ -18,36 +17,36 @@ export class DEActionMethod extends Method {
     data: IData,
     params: IParams,
   ): Promise<HttpResponse<IData>> {
-    // 实体逻辑处理
-    if (this.method.actionType === 'DELOGIC') {
-      const deLogic = this.method.getPSAppDELogic();
-      if (deLogic?.enableFront) {
-        return execDELogicResponse(deLogic, context, data, params);
-      }
-    }
+    // // 实体逻辑处理
+    // if (this.method.actionType === 'DELOGIC') {
+    //   const deLogic = this.method.getPSAppDELogic();
+    //   if (deLogic?.enableFront) {
+    //     return execDELogicResponse(deLogic, context, data, params);
+    //   }
+    // }
 
-    if (!this.entity.isLocalMode) {
-      data = await this.input.handle(context, data);
-    }
+    // if (!this.isLocalMode) {
+    //   data = await this.input.handle(context, data);
+    // }
 
     // 执行变更属性逻辑
-    const { onChange, compute } = this.entity.deFieldLogics;
-    if (onChange.length) {
-      const promiseResult = await Promise.all(
-        onChange.map(logic => {
-          return execDELogic(logic, context, data, params);
-        }),
-      );
-      promiseResult.forEach(value => {
-        Object.assign(data, value);
-      });
-    }
+    // const { onChange, compute } = this.entity.deFieldLogics;
+    // if (onChange.length) {
+    //   const promiseResult = await Promise.all(
+    //     onChange.map(logic => {
+    //       return execDELogic(logic, context, data, params);
+    //     }),
+    //   );
+    //   promiseResult.forEach(value => {
+    //     Object.assign(data, value);
+    //   });
+    // }
 
-    let path = this.calcPath(context);
+    const path = this.calcPath(context);
     if (this.method.needResourceKey) {
-      path = `${path}/${
-        context[this.entity.deName] || data[this.entity.keyName]
-      }`;
+      // path = `${path}/${
+      //   context[this.entity.codeName] || data[this.entity.keyName]
+      // }`;
     }
 
     let result: IHttpResponse<IData>;
@@ -90,16 +89,16 @@ export class DEActionMethod extends Method {
     }
 
     // 计算属性逻辑
-    if (compute.length) {
-      const promiseResult = await Promise.all(
-        compute.map(logic => {
-          return execDELogic(logic, context, data, params);
-        }),
-      );
-      promiseResult.forEach(value => {
-        Object.assign(data, value);
-      });
-    }
+    // if (compute.length) {
+    //   const promiseResult = await Promise.all(
+    //     compute.map(logic => {
+    //       return execDELogic(logic, context, data, params);
+    //     }),
+    //   );
+    //   promiseResult.forEach(value => {
+    //     Object.assign(data, value);
+    //   });
+    // }
 
     return result;
   }
@@ -118,7 +117,7 @@ export class DEActionMethod extends Method {
     data: IData,
     params: IParams,
   ): Promise<IHttpResponse<Entity>> {
-    if (this.entity.isLocalMode) {
+    if (this.isLocalMode) {
       return this.createTemp(context, this.createEntity(data));
     }
     const path = this.calcPath(context);
@@ -140,12 +139,12 @@ export class DEActionMethod extends Method {
     context: IParams,
     params?: IParams,
   ): Promise<IHttpResponse<Entity>> {
-    if (this.entity.isLocalMode) {
+    if (this.isLocalMode) {
       return this.removeTemp(context, params);
     }
     const path = this.calcPath(context);
     const res = await this.app.net.delete(
-      `${path}/${context[this.entity.deName]}`,
+      `${path}/${context[this.entity.codeName!]}`,
       params,
     );
     return res as IHttpResponse<Entity>;
@@ -166,12 +165,12 @@ export class DEActionMethod extends Method {
     data: IData | Entity,
     params: IParams = {},
   ): Promise<IHttpResponse<Entity>> {
-    if (this.entity.isLocalMode) {
+    if (this.isLocalMode) {
       return this.updateTemp(context, this.createEntity(data));
     }
     const path = this.calcPath(context);
     const res = await this.app.net.put(
-      `${path}/${context[this.entity.deName]}`,
+      `${path}/${context[this.entity.codeName!]}`,
       data,
       params,
     );
@@ -192,12 +191,12 @@ export class DEActionMethod extends Method {
     context: IParams,
     params: IParams = {},
   ): Promise<IHttpResponse<Entity>> {
-    if (this.entity.isLocalMode) {
+    if (this.isLocalMode) {
       return this.getTemp(context, params);
     }
     const path = this.calcPath(context);
     const res = await this.app.net.get(
-      `${path}/${context[this.entity.deName]}`,
+      `${path}/${context[this.entity.codeName!]}`,
       params,
     );
     res.data = await this.result.handle(context, res.data);
@@ -217,7 +216,7 @@ export class DEActionMethod extends Method {
     context: IParams,
     params?: IParams,
   ): Promise<IHttpResponse<IData>> {
-    if (this.entity.isLocalMode) {
+    if (this.isLocalMode) {
       return this.getDraftTemp(context, params);
     }
     const path = this.calcPath(context);
@@ -289,10 +288,10 @@ export class DEActionMethod extends Method {
     try {
       let key = null;
       if (params) {
-        key = params[this.entity.keyName];
+        // key = params[this.entity.keyName];
       }
       if (!key && context) {
-        key = context[this.entity.deName];
+        key = context[this.entity.codeName!];
       }
       const s = await this.getService();
       const data = s.local.delete(context, key)!;
@@ -346,10 +345,10 @@ export class DEActionMethod extends Method {
     try {
       let key = null;
       if (params) {
-        key = params[this.entity.keyName];
+        // key = params[this.entity.keyName];
       }
       if (!key && context) {
-        key = context[this.entity.deName];
+        key = context[this.entity.codeName!];
       }
       const s = await this.getService();
       const data = s.local.get(context, key);
@@ -371,20 +370,20 @@ export class DEActionMethod extends Method {
    * @return {*}  {Promise<IHttpResponse>}
    */
   async removeBatchTemp(
-    context: IParams,
-    params?: IParams,
+    _context: IParams,
+    _params?: IParams,
   ): Promise<IHttpResponse> {
-    if (params) {
-      const keys: string[] = params[this.entity.keyName];
-      if (keys) {
-        try {
-          const s = await this.getService();
-          await s.local.deleteBatch(context, keys);
-        } catch (err) {
-          return new HttpResponse(err, 500);
-        }
-      }
-    }
+    // if (params) {
+    //   const keys: string[] = params[this.entity.keyName];
+    //   if (keys) {
+    //     try {
+    //       const s = await this.getService();
+    //       await s.local.deleteBatch(context, keys);
+    //     } catch (err) {
+    //       return new HttpResponse(err, 500);
+    //     }
+    //   }
+    // }
     return new HttpResponse(true);
   }
 }

package/src/service/service/entity/method/fetch.ts

@@ -1,7 +1,6 @@
 import { HttpResponse } from '@ibiz-template/core';
-import { ascSort, descSort, notNilEmpty } from 'qx-util';
+import { ascSort, descSort } from 'qx-util';
 import { clone, equals, isEmpty, isNil, where } from 'ramda';
-import { execDELogic } from '../../../../de-logic';
 import { Entity } from '../../../entity/entity';
 import { PSDEDQCondEngine, SearchFilter } from '../../../utils';
 import { Method } from './method';
@@ -21,35 +20,35 @@ export class FetchMethod extends Method {
     data: IData,
     params: IParams,
   ): Promise<HttpResponse<Entity[]>> {
-    if (this.entity.isLocalMode) {
-      const items = await this.searchLocal(
-        null,
-        new SearchFilter(context, data),
-      );
-      return new HttpResponse<Entity[]>(items, 200);
-    }
+    // if (this.entity.isLocalMode) {
+    //   const items = await this.searchLocal(
+    //     null,
+    //     new SearchFilter(context, data),
+    //   );
+    //   return new HttpResponse<Entity[]>(items, 200);
+    // }
     const path = this.calcPath(context);
     const res = await this.request(path, context, data, params);
     const items: IDatum[] = res.data || [];
     res.data = items.map(item => this.createEntity(item));
 
     // 计算属性逻辑
-    const { compute } = this.entity.deFieldLogics;
-    if (compute.length && res.data && res.data.length > 0) {
-      res.data = await Promise.all(
-        res.data.map(async (item: IDatum) => {
-          const promiseResult = await Promise.all(
-            compute.map(logic => {
-              return execDELogic(logic, context, item, params);
-            }),
-          );
-          promiseResult.forEach(value => {
-            Object.assign(item, value);
-          });
-          return item;
-        }),
-      );
-    }
+    // const { compute } = this.entity.deFieldLogics;
+    // if (compute.length && res.data && res.data.length > 0) {
+    //   res.data = await Promise.all(
+    //     res.data.map(async (item: IDatum) => {
+    //       const promiseResult = await Promise.all(
+    //         compute.map(logic => {
+    //           return execDELogic(logic, context, item, params);
+    //         }),
+    //       );
+    //       promiseResult.forEach(value => {
+    //         Object.assign(item, value);
+    //       });
+    //       return item;
+    //     }),
+    //   );
+    // }
 
     return res;
   }
@@ -70,19 +69,19 @@ export class FetchMethod extends Method {
     items = ascSort(items, 'srfordervalue');
     // 查询数据条件集
     const data: IData = {};
-    if (notNilEmpty(context)) {
-      const map = this.entity.majorKeyMap;
-      if (map) {
-        for (const key in map) {
-          if (Object.prototype.hasOwnProperty.call(map, key)) {
-            const val = map[key];
-            if (notNilEmpty(context[key])) {
-              data[val] = equals(context[key]);
-            }
-          }
-        }
-      }
-    }
+    // if (notNilEmpty(context)) {
+    //   const map = this.entity.majorKeyMap;
+    //   if (map) {
+    //     for (const key in map) {
+    //       if (Object.prototype.hasOwnProperty.call(map, key)) {
+    //         const val = map[key];
+    //         if (notNilEmpty(context[key])) {
+    //           data[val] = equals(context[key]);
+    //         }
+    //       }
+    //     }
+    //   }
+    // }
     const nullData: Record<string, unknown> = {};
     const undefinedData: Record<string, unknown> = {};
     const emptyData: Record<string, unknown> = {};
@@ -138,7 +137,7 @@ export class FetchMethod extends Method {
   protected async searchLocal(
     cond: PSDEDQCondEngine | null,
     filter: SearchFilter,
-    queryParamKeys: string[] = this.entity.quickSearchKeys,
+    queryParamKeys: string[] = this.entity.quickSearchAppDEFieldIds!,
   ): Promise<Entity[]> {
     const service = await this.getService();
     let list = [];

package/src/service/service/entity/method/method-input.ts

@@ -1,4 +1,4 @@
-import { AppEntityModel, IPSAppDEMethodInput } from '@ibiz-template/model';
+import { IAppDataEntity, IAppDEMethodInput } from '@ibiz/model-core';
 import { MethodDto } from '../../../dto/method.dto';
 
 /**
@@ -17,17 +17,17 @@ export class MethodInput {
    *
    * @author chitanda
    * @date 2022-10-11 17:10:59
-   * @param {AppEntityModel} entity
-   * @param {IPSAppDEMethodInput} [input]
+   * @param {IAppDataEntity} entity
+   * @param {IAppDEMethodInput} [input]
    */
   constructor(
-    protected entity: AppEntityModel,
-    protected input?: IPSAppDEMethodInput,
+    protected entity: IAppDataEntity,
+    protected input?: IAppDEMethodInput,
   ) {
-    const methodDto = input?.getPSAppDEMethodDTO();
-    if (methodDto) {
-      this.dto = new MethodDto(methodDto);
-    }
+    // const methodDto = input?.getPSAppDEMethodDTO();
+    // if (methodDto) {
+    //   this.dto = new MethodDto(methodDto);
+    // }
   }
 
   /**

package/src/service/service/entity/method/method-renturn.ts

@@ -1,4 +1,4 @@
-import { AppEntityModel, IPSAppDEMethodReturn } from '@ibiz-template/model';
+import { IAppDataEntity, IAppDEMethodReturn } from '@ibiz/model-core';
 import { Application } from '../../../../application';
 import { MethodDto } from '../../../dto/method.dto';
 import { Entity } from '../../../entity/entity';
@@ -12,7 +12,7 @@ import { Entity } from '../../../entity/entity';
  * @class MethodReturn
  */
 export class MethodReturn {
-  protected app: Application;
+  protected app!: Application;
 
   protected dto?: MethodDto;
 
@@ -21,18 +21,19 @@ export class MethodReturn {
    *
    * @author chitanda
    * @date 2022-10-11 17:10:47
-   * @param {AppEntityModel} entity
-   * @param {IPSAppDEMethodReturn} [output]
+   * @param {IAppDataEntity} entity
+   * @param {IAppDEMethodReturn} [output]
    */
   constructor(
-    protected entity: AppEntityModel,
-    protected output?: IPSAppDEMethodReturn,
+    protected entity: IAppDataEntity,
+    protected output?: IAppDEMethodReturn,
   ) {
-    this.app = ibiz.hub.getApp(entity.modelService.app);
-    const methodDto = output?.getPSAppDEMethodDTO();
-    if (methodDto) {
-      this.dto = new MethodDto(methodDto);
-    }
+    // todo
+    // this.app = ibiz.hub.getApp(entity.modelService.app);
+    // const methodDto = output?.getPSAppDEMethodDTO();
+    // if (methodDto) {
+    //   this.dto = new MethodDto(methodDto);
+    // }
   }
 
   /**
@@ -49,6 +50,6 @@ export class MethodReturn {
       const items = await this.dto.sets(context, [data]);
       return items[0];
     }
-    return new Entity(this.entity.source, data);
+    return new Entity(this.entity, data);
   }
 }