@ibiz-template/runtime 0.0.4-beta.2 → 0.0.4-beta.3

package/out/service/service/file/file.service.js

@@ -5,11 +5,9 @@ export class FileService {
      * @author lxm
      * @date 2022-11-25 13:11:49
      * @param {IAppDataEntity} model 应用实体
-     * @param {ServicePathItem[][]} paths 计算出的资源关系路径
      */
-    constructor(model, paths) {
+    constructor(model) {
         this.model = model;
-        this.paths = paths;
     }
     /**
      * 后台导出数据，返回文件流
@@ -23,9 +21,8 @@ export class FileService {
      * @returns {*}  {Promise<IHttpResponse<Blob>>}
      */
     exportData(dataExport, fetchAction, context, params) {
-        const resPath = calcResPath(context, this.paths);
-        const exportUrl = `${resPath}/${this.model
-            .codeName2}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${dataExport.codeName}`;
+        const resPath = calcResPath(context, this.model);
+        const exportUrl = `${resPath}/${this.model.codeName2.toLowerCase()}/exportdata/${fetchAction.toLowerCase()}/?srfexporttag=${dataExport.codeName}`;
         return ibiz.net.request(exportUrl, {
             method: 'post',
             data: params,

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

@@ -1,5 +1,6 @@
 export { CodeListService } from './code-list/code-list.service';
 export { CounterService } from './counter/counter.service';
-export { EntityService } from './entity/entity.service';
+export { DEService } from './entity/de.service';
 export { WorkFlowService } from './work-flow/work-flow.service';
+export * from './widget';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/service/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,cAAc,UAAU,CAAC"}

package/out/service/service/index.js

@@ -1,4 +1,5 @@
 export { CodeListService } from './code-list/code-list.service';
 export { CounterService } from './counter/counter.service';
-export { EntityService } from './entity/entity.service';
+export { DEService } from './entity/de.service';
 export { WorkFlowService } from './work-flow/work-flow.service';
+export * from './widget';

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

@@ -1,11 +1,11 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { IAppDataEntity, ControlModel } from '@ibiz/model-core';
+import { IControl } from '@ibiz/model-core';
 import { Application } from '../../../application';
 import { ControlVO } from '../../vo/control.vo';
 import { UIMapField } from '../../vo/ui-map-field';
-import { EntityService } from '../entity/entity.service';
-export declare class ControlService<T extends ControlModel = ControlModel> {
-    readonly app: Application;
+import { IAppDEService } from '../../interface';
+export declare class ControlService<T extends IControl = IControl> {
+    app: Application;
     /**
      * 部件模型
      *
@@ -14,22 +14,14 @@ export declare class ControlService<T extends ControlModel = ControlModel> {
      * @type {T}
      */
     readonly model: T;
-    /**
-     * 应用实体模型
-     *
-     * @author lxm
-     * @date 2022-08-29 18:08:38
-     * @type {IAppDataEntity}
-     */
-    get appEntity(): IAppDataEntity;
     /**
      * 实体服务
      *
      * @author lxm
      * @date 2022-08-29 18:08:19
-     * @type {EntityService}
+     * @type {IAppDEService}
      */
-    entityService: EntityService;
+    entityService: IAppDEService;
     /**
      * UI数据和实体数据的属性名映射
      * key：UI数据属性名
@@ -53,7 +45,7 @@ export declare class ControlService<T extends ControlModel = ControlModel> {
      * @date 2022-08-18 22:08:30
      * @returns {*}  {Promise<void>}
      */
-    init(_context?: IParams): Promise<void>;
+    init(context?: IContext): Promise<void>;
     /**
      * 初始化属性映射
      *

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

@@ -1 +1 @@
-{"version":3,"file":"control-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,qBAAa,cAAc,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY;IAC/D,QAAQ,CAAC,GAAG,EAAG,WAAW,CAAC;IAE3B;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,IAAI,SAAS,IAAI,cAAc,CAE9B;IAED;;;;;;OAMG;IACH,aAAa,EAAG,aAAa,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAO7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa;IAkBvB;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAUzB;;;;;;;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/widget/control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,qBAAa,cAAc,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ;IACvD,GAAG,EAAG,WAAW,CAAC;IAElB;;;;;;OAMG;IACH,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;IAElB;;;;;;OAMG;IACH,aAAa,EAAG,aAAa,CAAC;IAE9B;;;;;;;OAOG;IACH,SAAS,0BAAiC;IAE1C;;;;;OAKG;gBACS,KAAK,EAAE,CAAC;IAIpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAK7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa;IAevB;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,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/widget/control-service.js

@@ -1,15 +1,5 @@
 import { ControlVO } from '../../vo/control.vo';
 export class ControlService {
-    /**
-     * 应用实体模型
-     *
-     * @author lxm
-     * @date 2022-08-29 18:08:38
-     * @type {IAppDataEntity}
-     */
-    get appEntity() {
-        return this.model.appEntity;
-    }
     /**
      * Creates an instance of ControlService.
      * @author lxm
@@ -35,10 +25,8 @@ export class ControlService {
      * @date 2022-08-18 22:08:30
      * @returns {*}  {Promise<void>}
      */
-    async init(_context) {
-        // this.entityService = await this.app.es.getService(
-        //   this.appEntity.source.codeName,
-        // );
+    async init(context) {
+        this.app = ibiz.hub.getApp(context === null || context === void 0 ? void 0 : context.srfappid);
         this.initUIDataMap();
     }
     /**
@@ -48,14 +36,11 @@ export class ControlService {
      * @date 2022-08-31 18:08:37
      */
     initUIDataMap() {
-        // todo
-        // 默认提供实体名称主键和srfkey的主键
-        // 实体名称
-        // const deName = this.model.appEntity.deName.toLowerCase();
-        // 主键key
-        // const keyField = this.model
-        //   .getPSAppDataEntity()!
-        //   .getKeyPSAppDEField()?.codeName;
+        // // 默认提供实体名称主键和srfkey的主键
+        // // 实体名称
+        // const deName = this.appEntity.codeName!.toLowerCase();
+        // // 主键key
+        // const keyField = this.appEntity.keyAppDEFieldId;
         // if (keyField) {
         //   const mapField = new UIMapField(deName, keyField.toLowerCase(), {
         //     isOriginField: true,
@@ -75,7 +60,7 @@ export class ControlService {
      * @returns {*}  {Promise<IHttpResponse>}
      */
     async exec(methodName, context, data = {}, params = {}) {
-        const res = await this.entityService.exec(methodName, context, data, params);
+        const res = await this.app.deService.exec(this.model.appDataEntityId, methodName, context, data, params);
         return res;
     }
     /**

package/out/service/service/widget/grid-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"grid-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/grid-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAe,MAAM,kBAAkB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa;IAkCb;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAKrC"}
+{"version":3,"file":"grid-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/grid-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa;IAkCb;;;;;;;;;OASG;IACG,kBAAkB,CACtB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;CAKrC"}

package/out/service/service/widget/grid-service.js

@@ -12,13 +12,13 @@ export class GridService extends MDControlService {
         super.initUIDataMap();
         // *初始化表格数据项的属性映射
         (_a = this.model.degridDataItems) === null || _a === void 0 ? void 0 : _a.forEach(column => {
-            const uiKey = column.name.toLowerCase();
-            // const deField = column.getPSAppDEField();
-            let deField;
+            const uiKey = column.id.toLowerCase();
+            // todo
+            const deField = column.appDEFieldId;
             let mapField;
             // 后台实体属性
             if (deField) {
-                const deFieldKey = deField.codeName.toLowerCase();
+                const deFieldKey = deField.toLowerCase();
                 mapField = new UIMapField(uiKey, deFieldKey, {
                     isOriginField: true,
                 });
@@ -32,14 +32,14 @@ export class GridService extends MDControlService {
             this.dataUIMap.set(uiKey, mapField);
         });
         //* 如果属性列和表格数据列名称不一致，补充不一致的属性列的名称映射
-        this.model.fieldColumns.forEach(fieldColumn => {
-            if (fieldColumn.source.dataItemName !== fieldColumn.codeName) {
-                const value = this.dataUIMap.get(fieldColumn.source.dataItemName);
-                if (value) {
-                    this.dataUIMap.set(fieldColumn.codeName, value);
-                }
-            }
-        });
+        // this.model.fieldColumns.forEach(fieldColumn => {
+        //   if (fieldColumn.source.dataItemName !== fieldColumn.codeName) {
+        //     const value = this.dataUIMap.get(fieldColumn.source.dataItemName);
+        //     if (value) {
+        //       this.dataUIMap.set(fieldColumn.codeName, value);
+        //     }
+        //   }
+        // });
     }
     /**
      * 编辑列更新

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

@@ -1,11 +1,5 @@
 export * from './control-service';
 export * from './md-control-service';
 export * from './grid-service';
-export * from './list-service';
-export * from './tree-service';
-export * from './edit-form-service';
 export * from './search-form-service';
-export * from './dataview-service';
-export * from './wizard-panel-service';
-export * from './kanban-service';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/index.ts"],"names":[],"mappings":"AAAA,cAAc,mBAAmB,CAAC;AAClC,cAAc,sBAAsB,CAAC;AACrC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,uBAAuB,CAAC"}

package/out/service/service/widget/index.js

@@ -1,10 +1,4 @@
 export * from './control-service';
 export * from './md-control-service';
 export * from './grid-service';
-export * from './list-service';
-export * from './tree-service';
-export * from './edit-form-service';
 export * from './search-form-service';
-export * from './dataview-service';
-export * from './wizard-panel-service';
-export * from './kanban-service';

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

@@ -1,8 +1,8 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { IDEDataExport, MDModel } from '@ibiz/model-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 MDModel = MDModel> extends ControlService<T> {
+export declare class MDControlService<T extends IMDControl = IMDControl> extends ControlService<T> {
     /**
      * 执行查询多条数据的方法
      *
@@ -68,12 +68,12 @@ export declare class MDControlService<T extends MDModel = MDModel> extends Contr
      *
      * @author lxm
      * @date 2022-11-25 14:11:09
-     * @param {IDEDataExport} dataExport 导出模型
+     * @param {IPSDEDataExport} dataExport 导出模型
      * @param {IParams} context 上下文
      * @param {IParams} [params={}] 请求参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    exportData(dataExport: IDEDataExport, context: IParams, params?: IParams): Promise<IHttpResponse<Blob>>;
+    exportData(_dataExport: IDEDataExport, _context: IParams, _params?: IParams): Promise<IHttpResponse<Blob>>;
     /**
      * 处理响应
      *

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

@@ -1 +1 @@
-{"version":3,"file":"md-control-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/md-control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE1D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,qBAAa,gBAAgB,CAC3B,CAAC,SAAS,OAAO,GAAG,OAAO,CAC3B,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;IAMtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAMpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAU5E;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAUpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAUpC;;;;;;;;;OASG;IACG,UAAU,CACd,UAAU,EAAE,aAAa,EACzB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAS/B;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa;CAwBvD"}
+{"version":3,"file":"md-control-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/md-control-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,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;IAUtC;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAWpC;;;;;;;;OAQG;IACG,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,GAAE,OAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAU5E;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAUpC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,SAAS,GACd,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAUpC;;;;;;;;;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/widget/md-control-service.js

@@ -11,7 +11,7 @@ export class MDControlService extends ControlService {
      * @returns {*}  {Promise<IHttpResponse>}
      */
     async fetch(context, params = {}) {
-        let res = await this.exec(this.model.fetchAction, context, params);
+        let res = await this.exec(this.model.fetchControlAction.appDEMethodId, context, params);
         res = this.handleResponse(res);
         return res;
     }
@@ -25,7 +25,7 @@ export class MDControlService extends ControlService {
      * @returns {*}  {Promise<IHttpResponse>}
      */
     async get(context, params = {}) {
-        let res = await this.exec(this.model.getAction, context, undefined, params);
+        let res = await this.exec(this.model.getControlAction.appDEMethodId, context, undefined, params);
         res = this.handleResponse(res);
         return res;
     }
@@ -39,7 +39,7 @@ export class MDControlService extends ControlService {
      * @returns {*}  {Promise<IHttpResponse>}
      */
     async getDraft(context, params = {}) {
-        let res = await this.exec(this.model.getDraftAction, context, undefined, params);
+        let res = await this.exec(this.model.getDraftControlAction.appDEMethodId, context, undefined, params);
         res = this.handleResponse(res);
         return res;
     }
@@ -53,7 +53,7 @@ export class MDControlService extends ControlService {
      * @returns {*}
      */
     async remove(context, params = {}) {
-        const res = await this.exec(this.model.removeAction, context, undefined, params);
+        const res = await this.exec(this.model.fetchControlAction.appDEMethodId, context, undefined, params);
         return res;
     }
     /**
@@ -66,7 +66,7 @@ export class MDControlService extends ControlService {
      * @returns {*}
      */
     async create(context, data) {
-        let res = await this.exec(this.model.createAction, context, data.getRequestData());
+        let res = await this.exec(this.model.createControlAction.appDEMethodId, context, data.getRequestData());
         res = this.handleResponse(res);
         return res;
     }
@@ -80,7 +80,7 @@ export class MDControlService extends ControlService {
      * @returns {*}
      */
     async update(context, data) {
-        let res = await this.exec(this.model.updateAction, context, data.getRequestData());
+        let res = await this.exec(this.model.updateControlAction.appDEMethodId, context, data.getRequestData());
         res = this.handleResponse(res);
         return res;
     }
@@ -89,13 +89,19 @@ export class MDControlService extends ControlService {
      *
      * @author lxm
      * @date 2022-11-25 14:11:09
-     * @param {IDEDataExport} dataExport 导出模型
+     * @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.fetchAction, context, params);
+    async exportData(_dataExport, _context, _params = {}) {
+        // return this.entityService.file.exportData(
+        //   dataExport,
+        //   this.model.fetchControlAction!.appDEMethodId!,
+        //   context,
+        //   params,
+        // );
+        throw new Error('未实现');
     }
     /**
      * 处理响应

package/out/service/service/widget/search-form-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-form-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/search-form-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;;;GASG;AACH,qBAAa,iBAAiB,CAC5B,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,QAAQ,CACZ,QAAQ,EAAE,OAAO,EACjB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;OAKG;IACH,SAAS,CAAC,aAAa;IAQvB;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;CAOlE"}
+{"version":3,"file":"search-form-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/search-form-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAiB,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEhE,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAGnD;;;;;;;;;GASG;AACH,qBAAa,iBAAiB,CAC5B,CAAC,SAAS,aAAa,GAAG,aAAa,CACvC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;OAQG;IACG,QAAQ,CACZ,QAAQ,EAAE,OAAO,EACjB,OAAO,GAAE,OAAY,GACpB,OAAO,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;IAOpC;;;;;OAKG;IACH,SAAS,CAAC,aAAa;IAgBvB;;;;;;;OAOG;IACH,cAAc,CAAC,QAAQ,EAAE,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC;CAOlE"}

package/out/service/service/widget/search-form-service.js

@@ -1,4 +1,6 @@
+import { UIMapField } from '../../vo/ui-map-field';
 import { ControlService } from './control-service';
+import { recursiveIterate } from '../../../model';
 /**
  * 搜索表单服务
  *
@@ -33,10 +35,14 @@ export class SearchFormService extends ControlService {
      */
     initUIDataMap() {
         // 搜索表单没有属性，配了的表单项就映射到后台请求上
-        // this.model.getPSDEFormItems()?.forEach(item => {
-        //   const uiKey = item.id.toLowerCase();
-        //   this.dataUIMap.set(uiKey, new UIMapField(uiKey, uiKey));
-        // });
+        recursiveIterate(this.model, (item) => {
+            if (item.detailType === 'FORMITEM') {
+                const uiKey = item.id.toLowerCase();
+                this.dataUIMap.set(uiKey, new UIMapField(uiKey, uiKey));
+            }
+        }, {
+            childrenFields: ['deformPages', 'deformDetails'],
+        });
     }
     /**
      * 处理响应

package/out/service/utils/app-counter/app-counter.d.ts

@@ -1,7 +1,7 @@
 import { IAppCounter, IAppDataEntity } from '@ibiz/model-core';
 import { QXEvent } from 'qx-util';
 import { Application } from '../../../application';
-import { EntityService } from '../../service';
+import { IAppDEService } from '../../interface';
 /**
  * 应用实体计数器
  *
@@ -14,7 +14,7 @@ export declare class AppCounter {
     model: IAppCounter;
     protected app: Application;
     protected entity: IAppDataEntity;
-    protected service: EntityService;
+    protected service: IAppDEService;
     protected action: string;
     protected intervalTimer: unknown;
     protected destroyed: boolean;

package/out/service/utils/app-counter/app-counter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,UAAU;IAgDF,KAAK,EAAE,WAAW;IA/CrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,cAAc,CAAC;IAElC,SAAS,CAAC,OAAO,EAAG,aAAa,CAAC;IAElC,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,OAAO,CAAwB;IAElD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAErC;;;;;;;OAOG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO;IAehD;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS9D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAStC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK5D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}
+{"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,UAAU;IAgDF,KAAK,EAAE,WAAW;IA/CrC,SAAS,CAAC,GAAG,EAAG,WAAW,CAAC;IAE5B,SAAS,CAAC,MAAM,EAAG,cAAc,CAAC;IAElC,SAAS,CAAC,OAAO,EAAG,aAAa,CAAC;IAElC,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC;IAE1B,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC;IAEjC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAS;IAErC;;;;;;;OAOG;IACH,IAAI,WAAW,IAAI,OAAO,CAEzB;IAED,SAAS,CAAC,OAAO,EAAE,OAAO,CAAwB;IAElD,SAAS,CAAC,MAAM,EAAE,OAAO,CAAM;IAE/B,SAAS,CAAC,GAAG,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,CAAA;KAAE,CAAC,CAAiB;IAE1E;;;;;;;OAOG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,CAAM;IAE3B;;;;;;OAMG;gBACgB,KAAK,EAAE,WAAW;IAErC;;;;;;;OAOG;IACG,IAAI,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,EAAE,OAAO;IAehD;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS9D;;;;;;OAMG;IACH,SAAS,CAAC,QAAQ,IAAI,IAAI;IAU1B;;;;;;OAMG;IACH,SAAS,CAAC,eAAe,IAAI,IAAI;IAOjC;;;;;;;OAOG;cACa,IAAI,IAAI,OAAO,CAAC,KAAK,CAAC;IAStC;;;;;;;;OAQG;IACH,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK5D;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,EAAE,SAAS,GAAE,OAAc,GAAG,IAAI;IAOpE;;;;;;OAMG;IACH,SAAS,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,KAAK,KAAK,IAAI,GAAG,IAAI;IAI1C;;;;;;;OAOG;IACH,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAI/B;;;;;OAKG;IACH,OAAO,IAAI,IAAI;CAMhB"}

package/out/service/utils/de-cache/de-cache.d.ts

@@ -0,0 +1,159 @@
+import { AppDataEntity } from '../../app-data-entity/app-data-entity';
+/**
+ * 实体缓存工具类
+ *
+ * @author chitanda
+ * @date 2022-08-17 23:08:56
+ * @export
+ * @class DECache
+ */
+export declare class DECache {
+    /**
+     * 数据缓存
+     *
+     * @author chitanda
+     * @date 2022-08-17 23:08:08
+     * @type {Map<string, Map<string, AppDataEntity>>}
+     */
+    readonly cacheMap: Map<string, Map<string, AppDataEntity>>;
+    /**
+     * 强制设置数据，忽略其他逻辑
+     *
+     * @author chitanda
+     * @date 2022-05-10 17:05:45
+     * @param {IParams} context
+     * @param {AppDataEntity} entity
+     */
+    forceAdd(context: IParams, entity: AppDataEntity): void;
+    /**
+     * 强制更新数据，非合并，忽略其他逻辑
+     *
+     * @author chitanda
+     * @date 2022-05-10 17:05:27
+     * @param {IParams} context
+     * @param {AppDataEntity} entity
+     */
+    forceUpdate(context: IParams, entity: AppDataEntity): void;
+    /**
+     * 强制删除数据，忽略其他逻辑
+     *
+     * @author chitanda
+     * @date 2022-05-10 17:05:08
+     * @param {IParams} context
+     * @param {string} srfKey
+     */
+    forceDelete(context: IParams, srfKey: string): void;
+    /**
+     * 新增数据
+     *
+     * @param {*} context
+     * @param {AppDataEntity} entity
+     * @return {*}  {boolean}
+     * @memberof EntityCache
+     */
+    add(context: IParams, entity: AppDataEntity): AppDataEntity | null;
+    /**
+     * 查找数据
+     *
+     * @param {*} context
+     * @param {string} srfKey
+     * @return {*}  {AppDataEntity}
+     * @memberof EntityCache
+     */
+    get(context: IParams, srfKey: string): AppDataEntity | null;
+    /**
+     * 更新数据
+     *
+     * @param {IParams} context
+     * @param {AppDataEntity} entity
+     * @return {*}  {AppDataEntity}
+     * @memberof EntityCache
+     */
+    update(context: IParams, entity: AppDataEntity): AppDataEntity | null;
+    /**
+     * 删除数据
+     *
+     * @param {IParams} context
+     * @param {string} srfKey
+     * @return {*}  {(AppDataEntity | null)}
+     * @memberof EntityCache
+     */
+    delete(context: IParams, srfKey: string): AppDataEntity | null;
+    /**
+     * 批量创建临时数据
+     *
+     * @author chitanda
+     * @date 2022-03-23 11:03:52
+     * @param {IParams} context
+     * @param {AppDataEntity[]} entities
+     * @return {*}  {AppDataEntity[]}
+     */
+    createBatch(context: IParams, entities: AppDataEntity[]): AppDataEntity[];
+    /**
+     * 批量更新数据
+     *
+     * @author chitanda
+     * @date 2022-03-23 10:03:17
+     * @param {IParams} context
+     * @param {AppDataEntity[]} entities
+     * @return {*}  {AppDataEntity[]}
+     */
+    updateBatch(context: IParams, entities: AppDataEntity[]): AppDataEntity[];
+    /**
+     * 批量删除数据
+     *
+     * @author chitanda
+     * @date 2022-03-23 10:03:40
+     * @param {IParams} context 上下文
+     * @param {string[]} srfKeys 需要删除的数据主键
+     * @return {*}  {string[]} 未能删除的数据主键
+     */
+    deleteBatch(context: IParams, srfKeys: string[]): string[];
+    /**
+     * 检查数据是否已经存在
+     *
+     * @author chitanda
+     * @date 2022-08-17 23:08:06
+     * @param {IParams} context
+     * @param {string} srfkey
+     * @return {*}  {boolean}
+     */
+    checkData(context: IParams, srfkey: string): boolean;
+    /**
+     * 根据条件查找数据，未设置条件默认返回全部
+     *
+     * @author chitanda
+     * @date 2022-08-17 23:08:56
+     * @param {IParams} context
+     * @return {*}  {AppDataEntity[]}
+     */
+    getList(context: IParams): AppDataEntity[];
+    /**
+     * 根据条件生成查询
+     *
+     * @author chitanda
+     * @date 2022-08-17 23:08:33
+     * @param {IParams} [params={}]
+     * @return {*}  {<U>(testObj: U) => boolean}
+     */
+    generatePred(params?: IParams): <U>(testObj: U) => boolean;
+    /**
+     * 清除缓存
+     *
+     * @author chitanda
+     * @date 2022-08-17 23:08:54
+     * @param {IParams} context
+     */
+    clear(context: IParams): void;
+    /**
+     * 根据标识获取map组
+     *
+     * @author chitanda
+     * @date 2022-08-17 23:08:47
+     * @private
+     * @param {IParams} context
+     * @return {*}  {Map<string, AppDataEntity>}
+     */
+    private getCacheByTag;
+}
+//# sourceMappingURL=de-cache.d.ts.map

package/out/service/utils/de-cache/de-cache.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"de-cache.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/de-cache/de-cache.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAEtE;;;;;;;GAOG;AACH,qBAAa,OAAO;IAClB;;;;;;OAMG;IACH,QAAQ,CAAC,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAa;IAEvE;;;;;;;OAOG;IACH,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IASvD;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,IAAI;IAM1D;;;;;;;OAOG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,IAAI;IAMnD;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,aAAa,GAAG,IAAI;IAiBlE;;;;;;;OAOG;IACH,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAa3D;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,GAAG,aAAa,GAAG,IAAI;IAoBrE;;;;;;;OAOG;IACH,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,IAAI;IAmB9D;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE;IAsBzE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,GAAG,aAAa,EAAE;IA2BzE;;;;;;;;OAQG;IACH,WAAW,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE;IA4B1D;;;;;;;;OAQG;IACH,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO;IAMpD;;;;;;;OAOG;IACH,OAAO,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,EAAE;IAe1C;;;;;;;OAOG;IACH,YAAY,CAAC,MAAM,GAAE,OAAY,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,KAAK,OAAO;IAgB9D;;;;;;OAMG;IACH,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO7B;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;CAOtB"}