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

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

@@ -1,4 +1,4 @@
-import { ListModel } from '@ibiz-template/model';
+import { IDEList } from '@ibiz/model-core';
 import { MDControlService } from './md-control-service';
 /**
  * 列表服务
@@ -7,9 +7,9 @@ import { MDControlService } from './md-control-service';
  * @date 2022-10-21 14:10:58
  * @export
  * @class ListService
- * @extends {MDControlService<ListModel>}
+ * @extends {MDControlService<IDEList>}
  */
-export declare class ListService extends MDControlService<ListModel> {
+export declare class ListService extends MDControlService<IDEList> {
     /**
      * 初始化属性映射
      *

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

@@ -1 +1 @@
-{"version":3,"file":"list-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/list-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,SAAS,CAAC;IAC1D;;;;;OAKG;IACH,aAAa;CAsBd"}
+{"version":3,"file":"list-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/list-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa;CAsBd"}

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

@@ -1,4 +1,3 @@
-import { UIMapField } from '../../vo/ui-map-field';
 import { MDControlService } from './md-control-service';
 /**
  * 列表服务
@@ -7,7 +6,7 @@ import { MDControlService } from './md-control-service';
  * @date 2022-10-21 14:10:58
  * @export
  * @class ListService
- * @extends {MDControlService<ListModel>}
+ * @extends {MDControlService<IDEList>}
  */
 export class ListService extends MDControlService {
     /**
@@ -17,27 +16,25 @@ export class ListService extends MDControlService {
      * @date 2022-08-31 18:08:37
      */
     initUIDataMap() {
-        var _a;
         super.initUIDataMap();
         // *初始化列表数据项的属性映射
-        (_a = this.model.source.getPSDEListDataItems()) === null || _a === void 0 ? void 0 : _a.forEach(dataItem => {
-            const uiKey = dataItem.name.toLowerCase();
-            const deField = dataItem.getPSAppDEField();
-            let mapField;
-            // 后台实体属性
-            if (deField) {
-                const deFieldKey = deField.codeName.toLowerCase();
-                mapField = new UIMapField(uiKey, deFieldKey, {
-                    isOriginField: true,
-                });
-            }
-            else {
-                // 前台属性
-                mapField = new UIMapField(uiKey, uiKey, {
-                    isRequestNeed: false,
-                });
-            }
-            this.dataUIMap.set(uiKey, mapField);
-        });
+        // this.model.delistDataItems?.forEach(dataItem => {
+        //   const uiKey = dataItem.name!.toLowerCase();
+        //   const deField = dataItem.getPSAppDEField();
+        //   let mapField: UIMapField;
+        //   // 后台实体属性
+        //   if (deField) {
+        //     const deFieldKey = deField.codeName.toLowerCase();
+        //     mapField = new UIMapField(uiKey, deFieldKey, {
+        //       isOriginField: true,
+        //     });
+        //   } else {
+        //     // 前台属性
+        //     mapField = new UIMapField(uiKey, uiKey, {
+        //       isRequestNeed: false,
+        //     });
+        //   }
+        //   this.dataUIMap.set(uiKey, mapField);
+        // });
     }
 }

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

@@ -1,5 +1,5 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { IPSDEDataExport, MDModel } from '@ibiz-template/model';
+import { IDEDataExport, MDModel } 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> {
@@ -68,12 +68,12 @@ export declare class MDControlService<T extends MDModel = MDModel> extends Contr
      *
      * @author lxm
      * @date 2022-11-25 14:11:09
-     * @param {IPSDEDataExport} dataExport 导出模型
+     * @param {IDEDataExport} dataExport 导出模型
      * @param {IParams} context 上下文
      * @param {IParams} [params={}] 请求参数
      * @returns {*}  {Promise<IHttpResponse>}
      */
-    exportData(dataExport: IPSDEDataExport, 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,eAAe,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAEhE,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,eAAe,EAC3B,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,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"}

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

@@ -89,7 +89,7 @@ export class MDControlService extends ControlService {
      *
      * @author lxm
      * @date 2022-11-25 14:11:09
-     * @param {IPSDEDataExport} dataExport 导出模型
+     * @param {IDEDataExport} dataExport 导出模型
      * @param {IParams} context 上下文
      * @param {IParams} [params={}] 请求参数
      * @returns {*}  {Promise<IHttpResponse>}

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

@@ -1,5 +1,5 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { SearchFormModel } from '@ibiz-template/model';
+import { IDESearchForm } from '@ibiz/model-core';
 import { ControlVO } from '../../vo/control.vo';
 import { ControlService } from './control-service';
 /**
@@ -12,7 +12,7 @@ import { ControlService } from './control-service';
  * @extends {ControlService<T>}
  * @template T
  */
-export declare class SearchFormService<T extends SearchFormModel = SearchFormModel> extends ControlService<T> {
+export declare class SearchFormService<T extends IDESearchForm = IDESearchForm> extends ControlService<T> {
     /**
      * 执行获取草稿方法
      *

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,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;;;GASG;AACH,qBAAa,iBAAiB,CAC5B,CAAC,SAAS,eAAe,GAAG,eAAe,CAC3C,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,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"}

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

@@ -1,4 +1,3 @@
-import { UIMapField } from '../../vo/ui-map-field';
 import { ControlService } from './control-service';
 /**
  * 搜索表单服务
@@ -33,12 +32,11 @@ export class SearchFormService extends ControlService {
      * @date 2022-08-31 18:08:37
      */
     initUIDataMap() {
-        var _a;
         // 搜索表单没有属性，配了的表单项就映射到后台请求上
-        (_a = this.model.source.getPSDEFormItems()) === null || _a === void 0 ? void 0 : _a.forEach(item => {
-            const uiKey = item.id.toLowerCase();
-            this.dataUIMap.set(uiKey, new UIMapField(uiKey, uiKey));
-        });
+        // this.model.getPSDEFormItems()?.forEach(item => {
+        //   const uiKey = item.id.toLowerCase();
+        //   this.dataUIMap.set(uiKey, new UIMapField(uiKey, uiKey));
+        // });
     }
     /**
      * 处理响应

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

@@ -1,4 +1,4 @@
-import { TreeModel, TreeNodeRSModel } from '@ibiz-template/model';
+import { IDETree, IDETreeNodeRS } from '@ibiz/model-core';
 import { ITreeNodeData } from '../../interface/i-tree-node-data/i-tree-node-data';
 import { MDControlService } from './md-control-service';
 export interface TreeFetchOpts {
@@ -31,9 +31,9 @@ export interface TreeFetchOpts {
  * @date 2022-10-21 14:10:58
  * @export
  * @class TreeService
- * @extends {MDControlService<TreeModel>}
+ * @extends {MDControlService<IDETree>}
  */
-export declare class TreeService extends MDControlService<TreeModel> {
+export declare class TreeService extends MDControlService<IDETree> {
     /**
      * 初始化属性映射
      *
@@ -54,21 +54,21 @@ export declare class TreeService extends MDControlService<TreeModel> {
      * 获取静态节点数据
      *
      * @protected
-     * @param {TreeStaticNodeModel} nodeModel
+     * @param {IDETreeStaticNode} nodeModel
      * @param {boolean} [hasQuery=false]
      * @returns {*}
      * @memberof TreeService
      */
-    protected getStaticNodeData(nodeRS: TreeNodeRSModel, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): Promise<ITreeNodeData>;
+    protected getStaticNodeData(nodeRS: IDETreeNodeRS, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): Promise<ITreeNodeData>;
     /**
      * 获取节点关系过滤的上下文和视图参数
      *
-     * @param {TreeNodeRSModel} nodeRS 节点关系模型
+     * @param {IDETreeNodeRS} nodeRS 节点关系模型
      * @param {(ITreeNodeData | undefined)} parentNodeData 父节点数据
      * @returns {*}  {(IParams | undefined)}
      * @memberof TreeService
      */
-    getNodeRSFilterParams(nodeRS: TreeNodeRSModel, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): {
+    getNodeRSFilterParams(nodeRS: IDETreeNodeRS, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): {
         context: IParams;
         params: IParams;
     };
@@ -76,12 +76,12 @@ export declare class TreeService extends MDControlService<TreeModel> {
      * 获取实体数据集数据
      *
      * @protected
-     * @param {TreeNodeRSModel} nodeRS
+     * @param {IDETreeNodeRS} nodeRS
      * @param {TreeFetchOpts} opts
      * @returns {*}
      * @memberof TreeService
      */
-    protected getDENodeDatas(nodeRS: TreeNodeRSModel, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): Promise<any>;
+    protected getDENodeDatas(nodeRS: IDETreeNodeRS, parentNodeData: ITreeNodeData | undefined, opts: TreeFetchOpts): Promise<never[]>;
     /**
      * 获取代码表节点数据
      *
@@ -90,6 +90,6 @@ export declare class TreeService extends MDControlService<TreeModel> {
      * @param {TreeFetchOpts} _opts
      * @memberof TreeService
      */
-    protected getCodeListNodeDatas(_nodeRS: TreeNodeRSModel, _parentNodeData: ITreeNodeData | undefined, _opts: TreeFetchOpts): Promise<void>;
+    protected getCodeListNodeDatas(_nodeRS: IDETreeNodeRS, _parentNodeData: ITreeNodeData | undefined, _opts: TreeFetchOpts): Promise<void>;
 }
 //# sourceMappingURL=tree-service.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tree-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/tree-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EACT,eAAe,EAEhB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,SAAS,CAAC;IAC1D;;;;;OAKG;IACH,aAAa;IAKb;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa;IA4CrB;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,MAAM,EAAE,eAAe,EACvB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAiBzB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,eAAe,EACvB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgDxC;;;;;;;;OAQG;cACa,cAAc,CAC5B,MAAM,EAAE,eAAe,EACvB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa;IAgCrB;;;;;;;OAOG;cACa,oBAAoB,CAClC,OAAO,EAAE,eAAe,EACxB,eAAe,EAAE,aAAa,GAAG,SAAS,EAC1C,KAAK,EAAE,aAAa;CAIvB"}
+{"version":3,"file":"tree-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/tree-service.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,OAAO,EACP,aAAa,EAEd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,mDAAmD,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,MAAM,WAAW,aAAa;IAC5B;;;;;OAKG;IACH,QAAQ,EAAE,OAAO,CAAC;IAClB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB;;;;;OAKG;IACH,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,OAAO,CAAC;IACxD;;;;;OAKG;IACH,aAAa;IAKb;;;;;;;OAOG;IACG,eAAe,CACnB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa;IA4CrB;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB,OAAO,CAAC,aAAa,CAAC;IAiBzB;;;;;;;OAOG;IACH,qBAAqB,CACnB,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa,GAClB;QAAE,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE;IAgDxC;;;;;;;;OAQG;cACa,cAAc,CAC5B,MAAM,EAAE,aAAa,EACrB,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE,aAAa;IAgCrB;;;;;;;OAOG;cACa,oBAAoB,CAClC,OAAO,EAAE,aAAa,EACtB,eAAe,EAAE,aAAa,GAAG,SAAS,EAC1C,KAAK,EAAE,aAAa;CAIvB"}

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

@@ -1,5 +1,5 @@
 import { calcNavParams } from '../../../utils';
-import { TreeDataSetNodeData, TreeStaticNodeData } from '../../vo';
+import { TreeStaticNodeData } from '../../vo';
 import { MDControlService } from './md-control-service';
 /**
  * 树部件服务
@@ -8,7 +8,7 @@ import { MDControlService } from './md-control-service';
  * @date 2022-10-21 14:10:58
  * @export
  * @class TreeService
- * @extends {MDControlService<TreeModel>}
+ * @extends {MDControlService<IDETree>}
  */
 export class TreeService extends MDControlService {
     /**
@@ -30,7 +30,7 @@ export class TreeService extends MDControlService {
      * @memberof TreeService
      */
     async fetchChildNodes(parentNodeData, opts) {
-        const childNodeRSs = this.model.getChildNodeRSs((parentNodeData === null || parentNodeData === void 0 ? void 0 : parentNodeData.nodeId) || this.model.rootNode.id, opts.hasQuery);
+        const childNodeRSs = this.model.getChildNodeRSs((parentNodeData === null || parentNodeData === void 0 ? void 0 : parentNodeData.nodeId) || this.model.rootNode.id || '', opts.hasQuery);
         if (childNodeRSs.length === 0) {
             return;
         }
@@ -61,7 +61,7 @@ export class TreeService extends MDControlService {
      * 获取静态节点数据
      *
      * @protected
-     * @param {TreeStaticNodeModel} nodeModel
+     * @param {IDETreeStaticNode} nodeModel
      * @param {boolean} [hasQuery=false]
      * @returns {*}
      * @memberof TreeService
@@ -78,7 +78,7 @@ export class TreeService extends MDControlService {
     /**
      * 获取节点关系过滤的上下文和视图参数
      *
-     * @param {TreeNodeRSModel} nodeRS 节点关系模型
+     * @param {IDETreeNodeRS} nodeRS 节点关系模型
      * @param {(ITreeNodeData | undefined)} parentNodeData 父节点数据
      * @returns {*}  {(IParams | undefined)}
      * @memberof TreeService
@@ -118,25 +118,37 @@ export class TreeService extends MDControlService {
      * 获取实体数据集数据
      *
      * @protected
-     * @param {TreeNodeRSModel} nodeRS
+     * @param {IDETreeNodeRS} nodeRS
      * @param {TreeFetchOpts} opts
      * @returns {*}
      * @memberof TreeService
      */
     async getDENodeDatas(nodeRS, parentNodeData, opts) {
-        const nodeModel = nodeRS.childNode;
-        const { methodName, appEntity } = nodeModel;
-        const service = await this.app.es.getService(appEntity.codeName);
-        // 处理查询参数
-        const { context, params } = this.getNodeRSFilterParams(nodeRS, parentNodeData, opts);
-        // 请求实体数据
-        const response = await service.exec(methodName, context, params);
-        if (response.data.length) {
-            const nodeDatas = response.data.map((item) => {
-                return new TreeDataSetNodeData(nodeModel, Object.assign(Object.assign({}, opts), { data: item }), nodeRS, parentNodeData);
-            });
-            return nodeDatas;
-        }
+        // const nodeModel = nodeRS.childNode as IDETreeDataSetNode;
+        // const { methodName, appEntity } = nodeModel;
+        // const service = await this.app.es.getService(appEntity.codeName);
+        // // 处理查询参数
+        // const { context, params } = this.getNodeRSFilterParams(
+        //   nodeRS,
+        //   parentNodeData,
+        //   opts,
+        // );
+        // // 请求实体数据
+        // const response = await service.exec(methodName, context, params);
+        // if (response.data.length) {
+        //   const nodeDatas = response.data.map((item: IData) => {
+        //     return new TreeDataSetNodeData(
+        //       nodeModel,
+        //       {
+        //         ...opts,
+        //         data: item,
+        //       },
+        //       nodeRS,
+        //       parentNodeData,
+        //     );
+        //   });
+        //   return nodeDatas;
+        // }
         return [];
     }
     /**

package/out/service/service/widget/wizard-panel-service.d.ts

@@ -1,5 +1,5 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { WizardPanelModel } from '@ibiz-template/model';
+import { IDEWizardPanel } from '@ibiz/model-core';
 import { ControlService } from './control-service';
 /**
  * 向导面板服务
@@ -11,7 +11,7 @@ import { ControlService } from './control-service';
  * @extends {ControlService<T>}
  * @template T
  */
-export declare class WizardPanelService<T extends WizardPanelModel = WizardPanelModel> extends ControlService<T> {
+export declare class WizardPanelService<T extends IDEWizardPanel = IDEWizardPanel> extends ControlService<T> {
     /**
      * 执行向导初始化
      * 服务调用之前确认是否有初始化实体行为

package/out/service/service/widget/wizard-panel-service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"wizard-panel-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/wizard-panel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;;;GASG;AACH,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,CAC7C,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAMhC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;CAKjC"}
+{"version":3,"file":"wizard-panel-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/wizard-panel-service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD;;;;;;;;;GASG;AACH,qBAAa,kBAAkB,CAC7B,CAAC,SAAS,cAAc,GAAG,cAAc,CACzC,SAAQ,cAAc,CAAC,CAAC,CAAC;IACzB;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAMhC;;;;;;;;OAQG;IACG,MAAM,CACV,OAAO,EAAE,OAAO,EAChB,IAAI,GAAE,KAAU,EAChB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;CAKjC"}

package/out/service/service/work-flow/work-flow.service.d.ts

@@ -1,5 +1,5 @@
 import { IHttpResponse } from '@ibiz-template/core';
-import { AppEntityModel } from '@ibiz-template/model';
+import { IAppDataEntity } from '@ibiz/model-core';
 /**
  * 工作流服务
  *
@@ -9,7 +9,7 @@ import { AppEntityModel } from '@ibiz-template/model';
  * @class WorkFlowService
  */
 export declare class WorkFlowService {
-    protected model: AppEntityModel;
+    protected model: IAppDataEntity;
     private app;
     /**
      * 常规基础路径
@@ -24,9 +24,9 @@ export declare class WorkFlowService {
      * Creates an instance of WorkFlowService.
      * @author lxm
      * @date 2022-09-29 11:09:54
-     * @param {AppEntityModel} model 应用实体
+     * @param {IAppDataEntity} model 应用实体
      */
-    constructor(model: AppEntityModel);
+    constructor(model: IAppDataEntity);
     /**
      * 获取基础路径
      *
@@ -36,6 +36,16 @@ export declare class WorkFlowService {
      * @returns {*}
      */
     private getBaseUrl;
+    /**
+     * 获取activeData
+     *
+     * @private
+     * @param {IData} data
+     * @param {IParams} context
+     * @returns {*}
+     * @memberof WorkFlowService
+     */
+    private getActiveData;
     /**
      * 根据当前步骤和任务获取工作流步骤数据（如：流程表单等）
      *

package/out/service/service/work-flow/work-flow.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"work-flow.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/work-flow/work-flow.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAGtD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAmBd,SAAS,CAAC,KAAK,EAAE,cAAc;IAlB3C,OAAO,CAAC,GAAG,CAAc;IAEzB;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa,CAAS;IAE9B;;;;;OAKG;gBACmB,KAAK,EAAE,cAAc;IAQ3C;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IAIlB;;;;;;;OAOG;IACG,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAOjE;;;;;;;;OAQG;IACG,SAAS,CACb,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IASnC;;;;;;;OAOG;IACG,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAOpE;;;;;;;OAOG;IACG,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAY3E;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAIpD;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAUjC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAYjC;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAYjC;;;;;;;;;;OAUG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,MAAW,GAChB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;CAWlC"}
+{"version":3,"file":"work-flow.service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/work-flow/work-flow.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAgB,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD;;;;;;;GAOG;AACH,qBAAa,eAAe;IAmBd,SAAS,CAAC,KAAK,EAAE,cAAc;IAlB3C,OAAO,CAAC,GAAG,CAAe;IAE1B;;;;;;;OAOG;IACH,OAAO,CAAC,aAAa,CAAc;IAEnC;;;;;OAKG;gBACmB,KAAK,EAAE,cAAc;IAS3C;;;;;;;OAOG;IACH,OAAO,CAAC,UAAU;IAIlB;;;;;;;;OAQG;IACH,OAAO,CAAC,aAAa;IAOrB;;;;;;;OAOG;IACG,SAAS,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAOjE;;;;;;;;OAQG;IACG,SAAS,CACb,OAAO,EAAE,OAAO,EAChB,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC;IASnC;;;;;;;OAOG;IACG,YAAY,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAOpE;;;;;;;OAOG;IACG,mBAAmB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAY3E;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAIpD;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAUjC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAYjC;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAYjC;;;;;;;;;;OAUG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,OAAO,EAChB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,MAAW,GAChB,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;CAWlC"}

package/out/service/service/work-flow/work-flow.service.js

@@ -12,13 +12,25 @@ export class WorkFlowService {
      * Creates an instance of WorkFlowService.
      * @author lxm
      * @date 2022-09-29 11:09:54
-     * @param {AppEntityModel} model 应用实体
+     * @param {IAppDataEntity} model 应用实体
      */
     constructor(model) {
         this.model = model;
-        this.app = ibiz.hub.getApp(model.modelService.app);
-        const appContext = ibiz.appData.context;
-        this.commonBaseUrl = `/wfcore/${appContext.srfsystemid}-app-${model.modelService.app.codeName.toLowerCase()}/${this.model.source.name.toLowerCase()}`;
+        /**
+         * 常规基础路径
+         *
+         * @author lxm
+         * @date 2022-09-29 14:09:16
+         * @private
+         * @type {string}
+         */
+        this.commonBaseUrl = '';
+        // todo
+        // this.app = ibiz.hub.getApp(model.modelService.app);
+        // const appContext = ibiz.appData!.context;
+        // this.commonBaseUrl = `/wfcore/${
+        //   appContext.srfsystemid
+        // }-app-${model.modelService.app.codeName.toLowerCase()}/${this.model.name.toLowerCase()}`;
     }
     /**
      * 获取基础路径
@@ -31,6 +43,21 @@ export class WorkFlowService {
     getBaseUrl() {
         return this.commonBaseUrl;
     }
+    /**
+     * 获取activeData
+     *
+     * @private
+     * @param {IData} data
+     * @param {IParams} context
+     * @returns {*}
+     * @memberof WorkFlowService
+     */
+    getActiveData(data, context) {
+        if (context.srfprocessinstanceid) {
+            data.srfprocessinstanceid = context.srfprocessinstanceid;
+        }
+        return data;
+    }
     /**
      * 根据当前步骤和任务获取工作流步骤数据（如：流程表单等）
      *
@@ -53,9 +80,9 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IDatum>>}
      */
     async getWFLink(context, data) {
-        const deKeyValue = context[this.model.deName];
+        const deKeyValue = context[this.model.codeName];
         const { taskDefinitionKey } = context;
-        return this.app.net.post(`${this.getBaseUrl()}/${deKeyValue}/usertasks/${taskDefinitionKey}/ways`, { activedata: data });
+        return this.app.net.post(`${this.getBaseUrl()}/${deKeyValue}/usertasks/${taskDefinitionKey}/ways`, { activedata: this.getActiveData(data, context) });
     }
     /**
      * 根据业务主键获取工作流程进度
@@ -66,7 +93,7 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IDatum>>}
      */
     async getWFHistory(context) {
-        const deKeyValue = context[this.model.deName];
+        const deKeyValue = context[this.model.codeName];
         return this.app.net.get(`${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/history`);
     }
     /**
@@ -78,7 +105,7 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IDatum>>}
      */
     async getWFProcessDiagram(context) {
-        const deKeyValue = context[this.model.deName];
+        const deKeyValue = context[this.model.codeName];
         return this.app.net.request(`${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/processdiagram`, {
             method: 'post',
             data: {},
@@ -106,7 +133,7 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IDatum>>}
      */
     async wfStart(context, params, data) {
-        return this.app.net.post(`${this.getBaseUrl()}/${context[this.model.deName]}/process-instances`, Object.assign(Object.assign({}, params), { activedata: data }));
+        return this.app.net.post(`${this.getBaseUrl()}/${context[this.model.codeName]}/process-instances`, Object.assign(Object.assign({}, params), { activedata: this.getActiveData(data, context) }));
     }
     /**
      * 提交工作流
@@ -119,7 +146,7 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IDatum>>}
      */
     async wfSubmit(context, params, data) {
-        return this.app.net.post(`${this.getBaseUrl()}/${context[this.model.deName]}/tasks/${params.taskId}`, Object.assign(Object.assign({}, params), { activedata: data }));
+        return this.app.net.post(`${this.getBaseUrl()}/${context[this.model.codeName]}/tasks/${params.taskId}`, Object.assign(Object.assign({}, params), { activedata: this.getActiveData(data, context) }));
     }
     /**
      * 提交工作流
@@ -132,7 +159,7 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IDatum>>}
      */
     async wfWithdraw(context, params, data) {
-        return this.app.net.post(`${this.getBaseUrl()}/${context[this.model.deName]}/tasks/${params.taskId}/withdraw`, Object.assign(Object.assign({}, params), { activedata: data }));
+        return this.app.net.post(`${this.getBaseUrl()}/${context[this.model.codeName]}/tasks/${params.taskId}/withdraw`, Object.assign(Object.assign({}, params), { activedata: this.getActiveData(data, context) }));
     }
     /**
      * 调用工作流接口

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

@@ -1,4 +1,4 @@
-import { IPSAppDataEntity, ModelService } from '@ibiz-template/model';
+import { IAppDataEntity, IApplication } from '@ibiz/model-core';
 import { EntityService } from './service';
 /**
  * 应用服务工具类
@@ -9,7 +9,7 @@ import { EntityService } from './service';
  * @class ServiceUtil
  */
 export declare class ServiceUtil {
-    protected modelService: ModelService;
+    protected appModel: IApplication;
     /**
      * 实体服务缓存
      *
@@ -25,17 +25,17 @@ export declare class ServiceUtil {
      * @author chitanda
      * @date 2022-08-18 22:08:45
      * @protected
-     * @type {Map<string, IPSAppDataEntity>}
+     * @type {Map<string, IAppDataEntity>}
      */
-    protected allEntities: Map<string, IPSAppDataEntity>;
+    protected allEntities: Map<string, IAppDataEntity>;
     /**
      * Creates an instance of ServiceUtil.
      *
      * @author chitanda
-     * @date 2022-12-23 10:12:24
-     * @param {ModelService} modelService 应用模型服务
+     * @date 2023-04-18 14:04:01
+     * @param {IApplication} appModel
      */
-    constructor(modelService: ModelService);
+    constructor(appModel: IApplication);
     /**
      * 初始化实体缓存
      *

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

@@ -1 +1 @@
-{"version":3,"file":"service-util.d.ts","sourceRoot":"","sources":["../../src/service/service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,gBAAgB,EAChB,YAAY,EACb,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,WAAW;IA4BV,SAAS,CAAC,YAAY,EAAE,YAAY;IA3BhD;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAa;IAEjE;;;;;;OAMG;gBACmB,YAAY,EAAE,YAAY;IAEhD;;;;;;;OAOG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;;;;;OAQG;IACG,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBhE;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAKvC"}
+{"version":3,"file":"service-util.d.ts","sourceRoot":"","sources":["../../src/service/service-util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAE1C;;;;;;;GAOG;AACH,qBAAa,WAAW;IA4BV,SAAS,CAAC,QAAQ,EAAE,YAAY;IA3B5C;;;;;;;OAOG;IACH,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAa;IAExD;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,cAAc,CAAC,CAAa;IAE/D;;;;;;OAMG;gBACmB,QAAQ,EAAE,YAAY;IAE5C;;;;;;;OAOG;cACa,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAWhD;;;;;;;;OAQG;IACG,UAAU,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAkBhE;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAKvC"}