@ibiz-template/runtime 0.0.4-beta.4 → 0.1.0

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

@@ -0,0 +1,3 @@
+export * from './control.service';
+export * from './md-control.service';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/service/control/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC"}

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

@@ -0,0 +1,2 @@
+export * from './control.service';
+export * from './md-control.service';

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

@@ -0,0 +1,87 @@
+import { IHttpResponse } from '@ibiz-template/core';
+import { IDEDataExport, IMDControl } from '@ibiz/model-core';
+import { ControlVO } from '../../vo/control.vo';
+import { ControlService } from './control.service';
+export declare class MDControlService<T extends IMDControl = IMDControl> extends ControlService<T> {
+    /**
+     * 执行查询多条数据的方法
+     *
+     * @author lxm
+     * @date 2022-08-31 17:08:41
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    fetch(context: IParams, params?: IParams): Promise<IHttpResponse<ControlVO[]>>;
+    /**
+     * 执行获取单条数据方法
+     *
+     * @author lxm
+     * @date 2022-08-31 17:08:41
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    get(context: IParams, params?: IParams): Promise<IHttpResponse<ControlVO>>;
+    /**
+     * 执行获取草稿方法
+     *
+     * @author lxm
+     * @date 2022-08-31 17:08:41
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    getDraft(context: IParams, params?: IParams): Promise<IHttpResponse<ControlVO>>;
+    /**
+     * 删除单条数据
+     *
+     * @author lxm
+     * @date 2022-09-07 19:09:48
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @returns {*}
+     */
+    remove(context: IParams, params?: IParams): Promise<IHttpResponse>;
+    /**
+     * 新建数据
+     *
+     * @author lxm
+     * @date 2022-09-07 19:09:11
+     * @param {IParams} context 上下文
+     * @param {ControlVO} data 数据
+     * @returns {*}
+     */
+    create(context: IParams, data: ControlVO): Promise<IHttpResponse<ControlVO>>;
+    /**
+     * 更新数据
+     *
+     * @author lxm
+     * @date 2022-09-07 19:09:11
+     * @param {IParams} context 上下文
+     * @param {ControlVO} data 数据
+     * @returns {*}
+     */
+    update(context: IParams, data: ControlVO): Promise<IHttpResponse<ControlVO>>;
+    /**
+     * 导出数据
+     *
+     * @author lxm
+     * @date 2022-11-25 14:11:09
+     * @param {IPSDEDataExport} dataExport 导出模型
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 请求参数
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    exportData(_dataExport: IDEDataExport, _context: IParams, _params?: IParams): Promise<IHttpResponse<Blob>>;
+    /**
+     * 处理响应
+     *
+     * @author lxm
+     * @date 2022-08-31 17:08:13
+     * @param {IHttpResponse} res
+     * @returns {*}  {IHttpResponse}
+     */
+    handleResponse(response: IHttpResponse): IHttpResponse;
+}
+//# sourceMappingURL=md-control.service.d.ts.map

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

@@ -0,0 +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"}

package/out/service/service/control/md-control.service.js

@@ -0,0 +1,150 @@
+import { RuntimeError } from '@ibiz-template/core';
+import { isArray } from 'qx-util';
+import { ControlService } from './control.service';
+export class MDControlService extends ControlService {
+    /**
+     * 执行查询多条数据的方法
+     *
+     * @author lxm
+     * @date 2022-08-31 17:08:41
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    async fetch(context, params = {}) {
+        var _a;
+        const fetchAction = ((_a = this.model.fetchControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'fetchdefault';
+        let res = await this.exec(fetchAction, context, params);
+        res = this.handleResponse(res);
+        return res;
+    }
+    /**
+     * 执行获取单条数据方法
+     *
+     * @author lxm
+     * @date 2022-08-31 17:08:41
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    async get(context, params = {}) {
+        var _a;
+        const getAction = ((_a = this.model.getControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'get';
+        let res = await this.exec(getAction, context, undefined, params);
+        res = this.handleResponse(res);
+        return res;
+    }
+    /**
+     * 执行获取草稿方法
+     *
+     * @author lxm
+     * @date 2022-08-31 17:08:41
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    async getDraft(context, params = {}) {
+        var _a;
+        const getDraftAction = ((_a = this.model.getDraftControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'getdraft';
+        let res = await this.exec(getDraftAction, context, undefined, params);
+        res = this.handleResponse(res);
+        return res;
+    }
+    /**
+     * 删除单条数据
+     *
+     * @author lxm
+     * @date 2022-09-07 19:09:48
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 视图参数
+     * @returns {*}
+     */
+    async remove(context, params = {}) {
+        var _a;
+        const removeAction = ((_a = this.model.removeControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'remove';
+        const res = await this.exec(removeAction, context, undefined, params);
+        return res;
+    }
+    /**
+     * 新建数据
+     *
+     * @author lxm
+     * @date 2022-09-07 19:09:11
+     * @param {IParams} context 上下文
+     * @param {ControlVO} data 数据
+     * @returns {*}
+     */
+    async create(context, data) {
+        var _a;
+        const createAction = ((_a = this.model.createControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'create';
+        let res = await this.exec(createAction, context, data.getOrigin());
+        res = this.handleResponse(res);
+        return res;
+    }
+    /**
+     * 更新数据
+     *
+     * @author lxm
+     * @date 2022-09-07 19:09:11
+     * @param {IParams} context 上下文
+     * @param {ControlVO} data 数据
+     * @returns {*}
+     */
+    async update(context, data) {
+        var _a;
+        const updateAction = ((_a = this.model.updateControlAction) === null || _a === void 0 ? void 0 : _a.appDEMethodId) || 'update';
+        let res = await this.exec(updateAction, context, data.getOrigin());
+        res = this.handleResponse(res);
+        return res;
+    }
+    /**
+     * 导出数据
+     *
+     * @author lxm
+     * @date 2022-11-25 14:11:09
+     * @param {IPSDEDataExport} dataExport 导出模型
+     * @param {IParams} context 上下文
+     * @param {IParams} [params={}] 请求参数
+     * @returns {*}  {Promise<IHttpResponse>}
+     */
+    async exportData(_dataExport, _context, _params = {}) {
+        // return this.entityService.file.exportData(
+        //   dataExport,
+        //   this.model.fetchControlAction!.appDEMethodId!,
+        //   context,
+        //   params,
+        // );
+        throw new RuntimeError('未实现');
+    }
+    /**
+     * 处理响应
+     *
+     * @author lxm
+     * @date 2022-08-31 17:08:13
+     * @param {IHttpResponse} res
+     * @returns {*}  {IHttpResponse}
+     */
+    handleResponse(response) {
+        const res = super.handleResponse(response);
+        if (res.headers) {
+            if (res.headers['x-page']) {
+                res.page = Number(res.headers['x-page']);
+            }
+            if (res.headers['x-per-page']) {
+                res.size = Number(res.headers['x-per-page']);
+            }
+            if (res.headers['x-total']) {
+                res.total = Number(res.headers['x-total']);
+            }
+        }
+        if (res.ok) {
+            if (isArray(res.data)) {
+                res.data = res.data.map(item => this.toUIData(item));
+            }
+            else {
+                res.data = this.toUIData(res.data);
+            }
+        }
+        return res;
+    }
+}

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

@@ -1 +1 @@
-{"version":3,"file":"counter.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/counter/counter.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEjE;;;;;;;OAOG;WACU,UAAU,CACrB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;IAetB;;;;;;;;;;OAUG;WACU,eAAe,CAC1B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;CASvB"}
+{"version":3,"file":"counter.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/counter/counter.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC;;;;;;;GAOG;AACH,qBAAa,cAAc;IACzB;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAa;IAEjE;;;;;;;OAOG;WACU,UAAU,CACrB,KAAK,EAAE,WAAW,EAClB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;IAetB;;;;;;;;;;OAUG;WACU,eAAe,CAC1B,KAAK,EAAE,cAAc,EACrB,OAAO,CAAC,EAAE,OAAO,EACjB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,UAAU,CAAC;CAOvB"}

package/out/service/service/counter/counter.service.js

@@ -1,3 +1,5 @@
+/* eslint-disable @typescript-eslint/no-unused-vars */
+import { RuntimeModelError } from '@ibiz-template/core';
 import { AppCounter } from '../../utils';
 /**
  * 计数器服务，用来获取计数器实例
@@ -7,7 +9,7 @@ import { AppCounter } from '../../utils';
  * @export
  * @class CounterService
  */
-class CounterService {
+export class CounterService {
     /**
      * 获取计数器
      *
@@ -42,13 +44,11 @@ class CounterService {
      * @return {*}  {Promise<AppCounter>}
      */
     static async getCounterByRef(model, context, params) {
-        // todo
-        // const appCounter = model.getPSAppCounter();
-        // if (!appCounter) {
-        //   throw new RuntimeModelError(model, `未配置应用计数器!`);
-        // }
-        // return this.getCounter(appCounter, context, params);
-        return {};
+        const { appCounter } = model;
+        if (!appCounter) {
+            throw new RuntimeModelError(model, `未配置应用计数器!`);
+        }
+        return this.getCounter(appCounter, context, params);
     }
 }
 /**
@@ -61,4 +61,3 @@ class CounterService {
  * @type {Map<string, AppCounter>}
  */
 CounterService.counterMap = new Map();
-export { CounterService };

package/out/service/service/entity/de.service.d.ts

@@ -4,7 +4,7 @@ import { DECache } from '../../utils';
 import { WorkFlowService } from '../work-flow/work-flow.service';
 import { Method } from './method/method';
 import { FileService } from '../file/file.service';
-import { IAppDEService } from '../../interface';
+import { IAppDEService } from '../../../interface';
 /**
  * 实体服务
  *

package/out/service/service/entity/de.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IA6CjC,SAAS,CAAC,KAAK,EAAE,cAAc;IA5C3C;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAK3C;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAwBvC;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,KAAU,EAClB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;CAO1B"}
+{"version":3,"file":"de.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/entity/de.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAA4B,MAAM,qBAAqB,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAInD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,aAAa;IA6CjC,SAAS,CAAC,KAAK,EAAE,cAAc;IA5C3C;;;;;;OAMG;IACH,QAAQ,CAAC,EAAE,EAAE,eAAe,CAAC;IAE7B;;;;;;OAMG;IACH,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAa;IAE9D;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAiB;IAExC;;;;;;OAMG;gBACmB,KAAK,EAAE,cAAc;IAK3C;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAwBvC;;;;;;;;;;OAUG;IACH,IAAI,CACF,EAAE,EAAE,MAAM,EACV,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,KAAU,EAClB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC;CAO1B"}

package/out/service/service/entity/method/de-action.d.ts

@@ -1,6 +1,7 @@
 import { HttpResponse, IHttpResponse } from '@ibiz-template/core';
-import { AppDataEntity } from '../../../app-data-entity/app-data-entity';
+import { IAppDEAction } from '@ibiz/model-core';
 import { Method } from './method';
+import { IDataEntity } from '../../../../interface';
 /**
  * 实体行为方法
  *
@@ -11,6 +12,7 @@ import { Method } from './method';
  * @extends {Method}
  */
 export declare class DEActionMethod extends Method {
+    method: IAppDEAction;
     exec(context: IParams, data: IData, params: IParams): Promise<HttpResponse<IData>>;
     /**
      * 创建数据
@@ -21,7 +23,7 @@ export declare class DEActionMethod extends Method {
      * @param {IData} data
      * @return {*}  {Promise<IHttpResponse<IData>>}
      */
-    create(context: IParams, data: IData, params: IParams): Promise<IHttpResponse<AppDataEntity>>;
+    create(context: IParams, data: IData, params: IParams): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 删除数据
      *
@@ -29,20 +31,20 @@ export declare class DEActionMethod extends Method {
      * @date 2022-08-24 20:08:56
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    remove(context: IParams, params?: IParams): Promise<IHttpResponse<AppDataEntity>>;
+    remove(context: IParams, params?: IParams): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 更新数据
      *
      * @author chitanda
      * @date 2022-09-13 19:09:39
      * @param {IParams} context
-     * @param {(IData | AppDataEntity)} data
+     * @param {(IData | IDataEntity)} data
      * @param {IParams} [params={}]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    update(context: IParams, data: IData | AppDataEntity, params?: IParams): Promise<IHttpResponse<AppDataEntity>>;
+    update(context: IParams, data: IData | IDataEntity, params?: IParams): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 获取数据
      *
@@ -50,9 +52,9 @@ export declare class DEActionMethod extends Method {
      * @date 2022-08-24 20:08:07
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    get(context: IParams, params?: IParams): Promise<IHttpResponse<AppDataEntity>>;
+    get(context: IParams, params?: IParams): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 获取默认数据
      *
@@ -70,9 +72,9 @@ export declare class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:45
      * @param {IParams} context
      * @param {IData} entity
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    createTemp(context: IParams, entity: IData): Promise<IHttpResponse<AppDataEntity>>;
+    createTemp(context: IParams, entity: IData): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 获取临时数据默认值
      *
@@ -80,9 +82,9 @@ export declare class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:56
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    getDraftTemp(_context: IParams, _params?: IParams): Promise<IHttpResponse<AppDataEntity>>;
+    getDraftTemp(_context: IParams, _params?: IParams): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 删除临时数据
      *
@@ -90,9 +92,9 @@ export declare class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:11
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    removeTemp(context: IParams, params?: IParams): Promise<IHttpResponse<AppDataEntity>>;
+    removeTemp(context: IParams, params?: IParams): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 更新临时数据
      *
@@ -100,9 +102,9 @@ export declare class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:17
      * @param {IParams} context
      * @param {IData} entity
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    updateTemp(context: IParams, entity: IData): Promise<IHttpResponse<AppDataEntity>>;
+    updateTemp(context: IParams, entity: IData): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 获取临时数据
      *
@@ -110,9 +112,9 @@ export declare class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:23
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
-    getTemp(context: IParams, params?: IParams): Promise<IHttpResponse<AppDataEntity>>;
+    getTemp(context: IParams, params?: IParams): Promise<IHttpResponse<IDataEntity>>;
     /**
      * 批量删除本地数据
      *

package/out/service/service/entity/method/de-action.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AACzE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAClC,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAuF/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAUxC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAYxC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,aAAa,EAC3B,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAcxC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAaxC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAUxC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAaxC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAoBxC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAaxC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAqBxC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}
+{"version":3,"file":"de-action.d.ts","sourceRoot":"","sources":["../../../../../src/service/service/entity/method/de-action.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,YAAY,EACZ,aAAa,EAEd,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAIpD;;;;;;;;GAQG;AACH,qBAAa,cAAe,SAAQ,MAAM;IAChC,MAAM,EAAE,YAAY,CAAC;IAEvB,IAAI,CACR,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;IAwE/B;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAYtC;;;;;;;;;OASG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,KAAK,GAAG,WAAW,EACzB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IActC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAUtC;;;;;;;;OAQG;IACG,YAAY,CAChB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAoBtC;;;;;;;;OAQG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,KAAK,GACZ,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAatC;;;;;;;;OAQG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,CAAC,EAAE,OAAO,GACf,OAAO,CAAC,aAAa,CAAC,WAAW,CAAC,CAAC;IAqBtC;;;;;;OAMG;IACG,eAAe,CACnB,QAAQ,EAAE,OAAO,EACjB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,aAAa,CAAC;CAc1B"}

package/out/service/service/entity/method/de-action.js

@@ -1,5 +1,7 @@
-import { HttpResponse } from '@ibiz-template/core';
+import { HttpResponse, RuntimeModelError, } from '@ibiz-template/core';
 import { Method } from './method';
+import { findDELogic } from '../../../../model';
+import { execDELogicAction, execFieldLogics } from '../../../../de-logic';
 /**
  * 实体行为方法
  *
@@ -11,33 +13,20 @@ import { Method } from './method';
  */
 export class DEActionMethod extends Method {
     async exec(context, data, params) {
-        // // 实体逻辑处理
-        // if (this.method.actionType === 'DELOGIC') {
-        //   const deLogic = this.method.getPSAppDELogic();
-        //   if (deLogic?.enableFront) {
-        //     return execDELogicResponse(deLogic, context, data, params);
-        //   }
-        // }
-        // if (!this.isLocalMode) {
-        //   data = await this.input.handle(context, data);
-        // }
+        // 实体逻辑处理
+        if (this.method.actionType === 'DELOGIC') {
+            const deLogic = findDELogic(this.method.appDELogicId, this.entity);
+            if (!deLogic) {
+                throw new RuntimeModelError(this.method, '缺少实体处理逻辑');
+            }
+            return execDELogicAction(deLogic, context, data, params);
+        }
+        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 path = this.calcPath(context);
-        if (this.method.needResourceKey) {
-            // path = `${path}/${
-            //   context[this.entity.codeName] || data[this.entity.keyName]
-            // }`;
+        if (!['READ', 'GETDRAFT'].includes(this.method.actionMode)) {
+            await execFieldLogics(this.entity, 'change', context, data, params);
         }
         let result;
         switch (this.method.codeName) {
@@ -72,22 +61,18 @@ export class DEActionMethod extends Method {
                 result = await this.updateTemp(context, data);
                 break;
             default: {
+                let path = this.calcPath(context);
+                if (this.method.needResourceKey) {
+                    path = `${path}/${context[this.entity.codeName.toLowerCase()] ||
+                        data[this.entity.keyAppDEFieldId]}`;
+                }
                 const res = await this.request(path, context, data, params);
                 res.data = await this.result.handle(context, res.data);
                 result = res;
             }
         }
         // 计算属性逻辑
-        // if (compute.length) {
-        //   const promiseResult = await Promise.all(
-        //     compute.map(logic => {
-        //       return execDELogic(logic, context, data, params);
-        //     }),
-        //   );
-        //   promiseResult.forEach(value => {
-        //     Object.assign(data, value);
-        //   });
-        // }
+        await execFieldLogics(this.entity, 'compute', context, result.data, params);
         return result;
     }
     /**
@@ -115,14 +100,14 @@ export class DEActionMethod extends Method {
      * @date 2022-08-24 20:08:56
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
     async remove(context, params) {
         if (this.isLocalMode) {
             return this.removeTemp(context, params);
         }
         const path = this.calcPath(context);
-        const res = await this.app.net.delete(`${path}/${context[this.entity.codeName]}`, params);
+        const res = await this.app.net.delete(`${path}/${context[this.entity.codeName.toLowerCase()]}`, params);
         return res;
     }
     /**
@@ -131,16 +116,16 @@ export class DEActionMethod extends Method {
      * @author chitanda
      * @date 2022-09-13 19:09:39
      * @param {IParams} context
-     * @param {(IData | AppDataEntity)} data
+     * @param {(IData | IDataEntity)} data
      * @param {IParams} [params={}]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
     async update(context, data, params = {}) {
         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.codeName]}`, data, params);
+        const res = await this.app.net.put(`${path}/${context[this.entity.codeName.toLowerCase()]}`, data, params);
         res.data = await this.result.handle(context, res.data);
         return res;
     }
@@ -151,14 +136,14 @@ export class DEActionMethod extends Method {
      * @date 2022-08-24 20:08:07
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
     async get(context, params = {}) {
         if (this.isLocalMode) {
             return this.getTemp(context, params);
         }
         const path = this.calcPath(context);
-        const res = await this.app.net.get(`${path}/${context[this.entity.codeName]}`, params);
+        const res = await this.app.net.get(`${path}/${context[this.entity.codeName.toLowerCase()]}`, params);
         res.data = await this.result.handle(context, res.data);
         return res;
     }
@@ -187,7 +172,7 @@ export class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:45
      * @param {IParams} context
      * @param {IData} entity
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
     async createTemp(context, entity) {
         try {
@@ -206,7 +191,7 @@ export class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:56
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
     async getDraftTemp(_context, _params) {
         try {
@@ -228,7 +213,7 @@ export class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:11
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
     async removeTemp(context, params) {
         try {
@@ -237,7 +222,7 @@ export class DEActionMethod extends Method {
                 // key = params[this.entity.keyName];
             }
             if (!key && context) {
-                key = context[this.entity.codeName];
+                key = context[this.entity.codeName.toLowerCase()];
             }
             const s = await this.getService();
             const data = s.local.delete(context, key);
@@ -257,7 +242,7 @@ export class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:17
      * @param {IParams} context
      * @param {IData} entity
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
     async updateTemp(context, entity) {
         try {
@@ -279,7 +264,7 @@ export class DEActionMethod extends Method {
      * @date 2022-08-21 17:08:23
      * @param {IParams} context
      * @param {IParams} [params]
-     * @return {*}  {Promise<IHttpResponse<AppDataEntity>>}
+     * @return {*}  {Promise<IHttpResponse<IDataEntity>>}
      */
     async getTemp(context, params) {
         try {
@@ -288,7 +273,7 @@ export class DEActionMethod extends Method {
                 // key = params[this.entity.keyName];
             }
             if (!key && context) {
-                key = context[this.entity.codeName];
+                key = context[this.entity.codeName.toLowerCase()];
             }
             const s = await this.getService();
             const data = s.local.get(context, key);