@ibiz-template/runtime 0.0.1-beta.17 → 0.0.2-beta.0

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,sBAAsB,CAAC;AACpE,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;;;;;;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,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa;IAiBvB;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAKzB;;;;;;;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,cAAc,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpE,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;IAKpB;;;;;;OAMG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ7C;;;;;OAKG;IACH,SAAS,CAAC,aAAa;IAiBvB;;;;;;;;;OASG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,aAAa,CAAC;IAKzB;;;;;;;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

@@ -27,6 +27,7 @@ export class ControlService {
          * @date 2022-08-31 17:08:35
          */
         this.dataUIMap = new Map();
+        this.app = ibiz.hub.getApp(model.modelService.app);
         this.model = model;
     }
     /**
@@ -37,7 +38,7 @@ export class ControlService {
      * @returns {*}  {Promise<void>}
      */
     async init(context) {
-        this.entityService = await ibiz.entityService.getService(this.appEntity.source.codeName, context);
+        this.entityService = await this.app.es.getService(this.appEntity.source.codeName, context);
         this.initUIDataMap();
     }
     /**

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

@@ -1,7 +1,8 @@
 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 './md-control-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,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC;AACtC,cAAc,sBAAsB,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,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC"}

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

@@ -1,6 +1,7 @@
 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 './md-control-service';

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

@@ -0,0 +1,51 @@
+import { IPSDETreeCodeListNode, IPSDETreeDataSetNode, IPSDETreeStaticNode, TreeModel } from '@ibiz-template/model';
+import { TreeNodeData } from '../../vo/tree-node-data';
+import { MDControlService } from './md-control-service';
+/**
+ * 树部件服务
+ *
+ * @author lxm
+ * @date 2022-10-21 14:10:58
+ * @export
+ * @class TreeService
+ * @extends {MDControlService<TreeModel>}
+ */
+export declare class TreeService extends MDControlService<TreeModel> {
+    /**
+     * 初始化属性映射
+     *
+     * @author lxm
+     * @date 2022-08-31 18:08:37
+     */
+    initUIDataMap(): void;
+    /**
+     * 获取子节点数据
+     *
+     * @param {TreeNodeData} [parentNode] 父节点数据
+     * @param {boolean} [hasQuery=false] 是否搜索
+     * @returns {*}
+     * @memberof TreeService
+     */
+    fetchChildNodes(parentNode?: TreeNodeData, hasQuery?: boolean): Promise<TreeNodeData[] | undefined>;
+    /**
+     * 获取静态节点数据
+     *
+     * @protected
+     * @param {IPSDETreeStaticNode} nodeModel
+     * @param {boolean} [hasQuery=false]
+     * @returns {*}
+     * @memberof TreeService
+     */
+    protected getStaticNodeData(nodeModel: IPSDETreeStaticNode, hasQuery?: boolean): Promise<TreeNodeData>;
+    /**
+     * 获取实体数据集数据
+     *
+     * @protected
+     * @param {IPSDETreeDataSetNode} nodeModel
+     * @param {boolean} [_hasQuery=false]
+     * @memberof TreeService
+     */
+    protected getDENodeDatas(nodeModel: IPSDETreeDataSetNode, _hasQuery?: boolean): Promise<void>;
+    protected getCodeListNodeDatas(_nodeModel: IPSDETreeCodeListNode, _hasQuery?: boolean): Promise<void>;
+}
+//# sourceMappingURL=tree-service.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tree-service.d.ts","sourceRoot":"","sources":["../../../../src/service/service/widget/tree-service.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,qBAAqB,EACrB,oBAAoB,EACpB,mBAAmB,EACnB,SAAS,EACV,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;;;;;;;GAQG;AACH,qBAAa,WAAY,SAAQ,gBAAgB,CAAC,SAAS,CAAC;IAC1D;;;;;OAKG;IACH,aAAa;IAKb;;;;;;;OAOG;IACG,eAAe,CAAC,UAAU,CAAC,EAAE,YAAY,EAAE,QAAQ,GAAE,OAAe;IA8C1E;;;;;;;;OAQG;cACa,iBAAiB,CAC/B,SAAS,EAAE,mBAAmB,EAC9B,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,YAAY,CAAC;IAmBxB;;;;;;;OAOG;cACa,cAAc,CAC5B,SAAS,EAAE,oBAAoB,EAC/B,SAAS,GAAE,OAAe;cAWZ,oBAAoB,CAClC,UAAU,EAAE,qBAAqB,EACjC,SAAS,GAAE,OAAe;CAI7B"}

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

@@ -0,0 +1,100 @@
+import { MDControlService } from './md-control-service';
+/**
+ * 树部件服务
+ *
+ * @author lxm
+ * @date 2022-10-21 14:10:58
+ * @export
+ * @class TreeService
+ * @extends {MDControlService<TreeModel>}
+ */
+export class TreeService extends MDControlService {
+    /**
+     * 初始化属性映射
+     *
+     * @author lxm
+     * @date 2022-08-31 18:08:37
+     */
+    initUIDataMap() {
+        super.initUIDataMap();
+        // todo
+    }
+    /**
+     * 获取子节点数据
+     *
+     * @param {TreeNodeData} [parentNode] 父节点数据
+     * @param {boolean} [hasQuery=false] 是否搜索
+     * @returns {*}
+     * @memberof TreeService
+     */
+    async fetchChildNodes(parentNode, hasQuery = false) {
+        const childNodeModels = this.model.getChildNodes((parentNode === null || parentNode === void 0 ? void 0 : parentNode.nodeId) || this.model.rootNode.id, hasQuery);
+        if (childNodeModels.length === 0) {
+            return;
+        }
+        const results = await Promise.allSettled(childNodeModels.map(async (childNode) => {
+            if (childNode.treeNodeType === 'STATIC') {
+                const nodeData = await this.getStaticNodeData(childNode);
+                return [nodeData];
+            }
+            if (childNode.treeNodeType === 'DE') {
+                return this.getDENodeDatas(childNode, hasQuery);
+            }
+            if (childNode.treeNodeType === 'CODELIST') {
+                return this.getCodeListNodeDatas(childNode, hasQuery);
+            }
+            return null;
+        }));
+        const childrenNodes = [];
+        results.forEach(result => {
+            if (result.status === 'fulfilled' && result.value) {
+                childrenNodes.push(...result.value);
+            }
+        });
+        return childrenNodes;
+        // todo 查询回来之后，看是否默认打开，默认展开继续递归加载子节点。
+    }
+    /**
+     * 获取静态节点数据
+     *
+     * @protected
+     * @param {IPSDETreeStaticNode} nodeModel
+     * @param {boolean} [hasQuery=false]
+     * @returns {*}
+     * @memberof TreeService
+     */
+    async getStaticNodeData(nodeModel, hasQuery = false) {
+        const treeData = {
+            nodeId: nodeModel.nodeType,
+            id: nodeModel.nodeType,
+            text: nodeModel.text,
+            leaf: true,
+        };
+        treeData.leaf =
+            this.model.getChildNodes(treeData.nodeId, hasQuery).length === 0;
+        // todo 仅展开首节点
+        if (nodeModel.expanded) {
+            treeData.children = await this.fetchChildNodes(treeData, hasQuery);
+        }
+        return treeData;
+    }
+    /**
+     * 获取实体数据集数据
+     *
+     * @protected
+     * @param {IPSDETreeDataSetNode} nodeModel
+     * @param {boolean} [_hasQuery=false]
+     * @memberof TreeService
+     */
+    async getDENodeDatas(nodeModel, _hasQuery = false) {
+        const appde = nodeModel.getPSAppDataEntity();
+        await appde.fill();
+        const methodName = nodeModel.getPSAppDEDataSet().codeName;
+        const service = await this.app.es.getService(appde.codeName);
+        const response = await service.exec(methodName, {});
+        console.log(response);
+    }
+    async getCodeListNodeDatas(_nodeModel, _hasQuery = false) {
+        // todo 代码表查询
+    }
+}

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

@@ -10,14 +10,6 @@ import { AppEntityModel } from '@ibiz-template/model';
  */
 export declare class WorkFlowService {
     protected model: AppEntityModel;
-    /**
-     * 应用的模型
-     *
-     * @author lxm
-     * @date 2022-09-29 14:09:39
-     * @private
-     * @type {IPSApplication}
-     */
     private app;
     /**
      * 常规基础路径

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,EAAkB,MAAM,sBAAsB,CAAC;AAEtE;;;;;;;GAOG;AACH,qBAAa,eAAe;IA2Bd,SAAS,CAAC,KAAK,EAAE,cAAc;IA1B3C;;;;;;;OAOG;IACH,OAAO,CAAC,GAAG,CAAiB;IAE5B;;;;;;;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,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAOjE;;;;;;;;OAQG;IACG,SAAS,CACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;IASlC;;;;;;;OAOG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAOpE;;;;;;;OAOG;IACG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAY3E;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAInD;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;;OAUG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;CAWjC"}
+{"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,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAOjE;;;;;;;;OAQG;IACG,SAAS,CACb,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;IASlC;;;;;;;OAOG;IACG,YAAY,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAOpE;;;;;;;OAOG;IACG,mBAAmB,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAY3E;;;;;;OAMG;IACG,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAInD;;;;;;;;;OASG;IACG,OAAO,CACX,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAUhC;;;;;;;;;OASG;IACG,QAAQ,CACZ,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;OASG;IACG,UAAU,CACd,OAAO,EAAE,QAAQ,EACjB,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,KAAK,GACV,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAYhC;;;;;;;;;;OAUG;IACG,IAAI,CACR,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,QAAQ,EACjB,MAAM,GAAE,OAAY,EACpB,IAAI,GAAE,KAAU,GACf,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;CAWjC"}

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

@@ -16,9 +16,9 @@ export class WorkFlowService {
      */
     constructor(model) {
         this.model = model;
-        this.app = model.source.getPSModelService().app;
+        this.app = ibiz.hub.getApp(model.modelService.app);
         const appContext = ibiz.appData.context;
-        this.commonBaseUrl = `/wfcore/${appContext.srfsystemid}-app-${this.app.codeName.toLowerCase()}/${this.model.source.name.toLowerCase()}`;
+        this.commonBaseUrl = `/wfcore/${appContext.srfsystemid}-app-${model.modelService.app.codeName.toLowerCase()}/${this.model.source.name.toLowerCase()}`;
     }
     /**
      * 获取基础路径
@@ -41,7 +41,7 @@ export class WorkFlowService {
      */
     async getWFStep(context) {
         const { processDefinitionKey, taskDefinitionKey } = context;
-        return ibiz.net.get(`${this.getBaseUrl()}/process-definitions/${processDefinitionKey}/usertasks/${taskDefinitionKey}`);
+        return this.app.net.get(`${this.getBaseUrl()}/process-definitions/${processDefinitionKey}/usertasks/${taskDefinitionKey}`);
     }
     /**
      * 根据业务主键和当前步骤获取操作路径
@@ -55,7 +55,7 @@ export class WorkFlowService {
     async getWFLink(context, data) {
         const deKeyValue = context[this.model.deName];
         const { taskDefinitionKey } = context;
-        return ibiz.net.post(`${this.getBaseUrl()}/${deKeyValue}/usertasks/${taskDefinitionKey}/ways`, { activedata: data });
+        return this.app.net.post(`${this.getBaseUrl()}/${deKeyValue}/usertasks/${taskDefinitionKey}/ways`, { activedata: data });
     }
     /**
      * 根据业务主键获取工作流程进度
@@ -67,7 +67,7 @@ export class WorkFlowService {
      */
     async getWFHistory(context) {
         const deKeyValue = context[this.model.deName];
-        return ibiz.net.get(`${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/history`);
+        return this.app.net.get(`${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/history`);
     }
     /**
      * 根据业务主键获取工作流流程图片
@@ -79,7 +79,7 @@ export class WorkFlowService {
      */
     async getWFProcessDiagram(context) {
         const deKeyValue = context[this.model.deName];
-        return ibiz.net.request(`${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/processdiagram`, {
+        return this.app.net.request(`${this.getBaseUrl()}/${deKeyValue}/process-instances/alls/processdiagram`, {
             method: 'post',
             data: {},
             responseType: 'blob',
@@ -93,7 +93,7 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IData>>}
      */
     async getWFVersion() {
-        return ibiz.net.get(`${this.getBaseUrl()}/process-definitions2`);
+        return this.app.net.get(`${this.getBaseUrl()}/process-definitions2`);
     }
     /**
      * 启动工作流
@@ -106,7 +106,7 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IData>>}
      */
     async wfStart(context, params, data) {
-        return ibiz.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.deName]}/process-instances`, Object.assign(Object.assign({}, params), { activedata: data }));
     }
     /**
      * 提交工作流
@@ -119,7 +119,7 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IData>>}
      */
     async wfSubmit(context, params, data) {
-        return ibiz.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.deName]}/tasks/${params.taskId}`, Object.assign(Object.assign({}, params), { activedata: data }));
     }
     /**
      * 提交工作流
@@ -132,7 +132,7 @@ export class WorkFlowService {
      * @returns {*}  {Promise<IHttpResponse<IData>>}
      */
     async wfWithdraw(context, params, data) {
-        return ibiz.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.deName]}/tasks/${params.taskId}/withdraw`, Object.assign(Object.assign({}, params), { activedata: data }));
     }
     /**
      * 调用工作流接口

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

@@ -1,4 +1,4 @@
-import { IPSAppDataEntity } from '@ibiz-template/model';
+import { IPSAppDataEntity, ModelService } from '@ibiz-template/model';
 import { EntityService } from './service';
 /**
  * 应用服务工具类
@@ -9,6 +9,7 @@ import { EntityService } from './service';
  * @class ServiceUtil
  */
 export declare class ServiceUtil {
+    protected modelService: ModelService;
     /**
      * 实体服务缓存
      *
@@ -27,21 +28,28 @@ export declare class ServiceUtil {
      * @type {Map<string, IPSAppDataEntity>}
      */
     protected allEntities: Map<string, IPSAppDataEntity>;
+    /**
+     * Creates an instance of ServiceUtil.
+     *
+     * @author chitanda
+     * @date 2022-12-23 10:12:24
+     * @param {ModelService} modelService 应用模型服务
+     */
+    constructor(modelService: ModelService);
     /**
      * 初始化实体缓存
      *
      * @author chitanda
-     * @date 2022-08-18 22:08:56
+     * @date 2022-12-23 10:12:57
      * @protected
-     * @param {IContext} [context]
      * @return {*}  {Promise<void>}
      */
-    protected initAllEntities(context?: IContext): Promise<void>;
+    protected initAllEntities(): Promise<void>;
     /**
      * 根据实体标识获取实体服务
      *
      * @author chitanda
-     * @date 2022-08-17 23:08:20
+     * @date 2022-12-23 10:12:24
      * @param {string} entityCodeName 实体标识
      * @param {IContext} [context] 上下文,用于计算模型所属沙箱环境
      * @return {*}  {Promise<EntityService>}

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,EAGL,gBAAgB,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAG1C;;;;;;;GAOG;AACH,qBAAa,WAAW;IACtB;;;;;;;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;;;;;;;;OAQG;cACa,eAAe,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAYlE;;;;;;;;OAQG;IACG,UAAU,CACd,cAAc,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,aAAa,CAAC;IAoBzB;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;CAKxC"}
+{"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;AAG1C;;;;;;;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,CACd,cAAc,EAAE,MAAM,EACtB,OAAO,CAAC,EAAE,QAAQ,GACjB,OAAO,CAAC,aAAa,CAAC;IAoBzB;;;;;;;OAOG;IACH,cAAc,CAAC,OAAO,EAAE,QAAQ,GAAG,IAAI;CAKxC"}

package/out/service/service-util.js

@@ -1,4 +1,4 @@
-import { AppEntityModel, getModelService, } from '@ibiz-template/model';
+import { AppEntityModel, } from '@ibiz-template/model';
 import { EntityService } from './service';
 import { ServicePathUtil } from './utils';
 /**
@@ -10,7 +10,15 @@ import { ServicePathUtil } from './utils';
  * @class ServiceUtil
  */
 export class ServiceUtil {
-    constructor() {
+    /**
+     * Creates an instance of ServiceUtil.
+     *
+     * @author chitanda
+     * @date 2022-12-23 10:12:24
+     * @param {ModelService} modelService 应用模型服务
+     */
+    constructor(modelService) {
+        this.modelService = modelService;
         /**
          * 实体服务缓存
          *
@@ -34,17 +42,15 @@ export class ServiceUtil {
      * 初始化实体缓存
      *
      * @author chitanda
-     * @date 2022-08-18 22:08:56
+     * @date 2022-12-23 10:12:57
      * @protected
-     * @param {IContext} [context]
      * @return {*}  {Promise<void>}
      */
-    async initAllEntities(context) {
+    async initAllEntities() {
         if (this.allEntities.size !== 0) {
             return;
         }
-        const modelService = await getModelService(context);
-        const items = modelService.app.getAllPSAppDataEntities() || [];
+        const items = this.modelService.app.getAllPSAppDataEntities() || [];
         items.forEach(item => {
             const codeName = item.isFill ? item.codeName : item.refM.codeName;
             this.allEntities.set(codeName, item);
@@ -54,14 +60,14 @@ export class ServiceUtil {
      * 根据实体标识获取实体服务
      *
      * @author chitanda
-     * @date 2022-08-17 23:08:20
+     * @date 2022-12-23 10:12:24
      * @param {string} entityCodeName 实体标识
      * @param {IContext} [context] 上下文,用于计算模型所属沙箱环境
      * @return {*}  {Promise<EntityService>}
      */
     async getService(entityCodeName, context) {
         if (!this.cache.has(entityCodeName)) {
-            await this.initAllEntities(context);
+            await this.initAllEntities();
             const entity = this.allEntities.get(entityCodeName);
             if (!entity) {
                 throw new Error(`找不到实体[${entityCodeName}]模型`);

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

@@ -1,5 +1,6 @@
 import { IPSAppCounter, IPSAppDataEntity } from '@ibiz-template/model';
 import { QXEvent } from 'qx-util';
+import { Application } from '../../../application';
 import { EntityService } from '../../service';
 /**
  * 应用实体计数器
@@ -11,6 +12,7 @@ import { EntityService } from '../../service';
  */
 export declare class AppCounter {
     model: IPSAppCounter;
+    protected app: Application;
     protected entity: IPSAppDataEntity;
     protected service: EntityService;
     protected action: string;

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":"AAAA,OAAO,EAEL,aAAa,EACb,gBAAgB,EACjB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAe,OAAO,EAAE,MAAM,SAAS,CAAC;AAE/C,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;;GAOG;AACH,qBAAa,UAAU;IA8CF,KAAK,EAAE,aAAa;IA7CvC,SAAS,CAAC,MAAM,EAAG,gBAAgB,CAAC;IAEpC,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,QAAQ,CAAM;IAEjC,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,aAAa;IAEvC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO;IAc/C;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;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,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK7D;;;;;;;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;CAKhB"}
+{"version":3,"file":"app-counter.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/app-counter/app-counter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EACb,gBAAgB,EACjB,MAAM,sBAAsB,CAAC;AAC9B,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,aAAa;IA/CvC,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;IAE3B,SAAS,CAAC,MAAM,EAAG,gBAAgB,CAAC;IAEpC,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,QAAQ,CAAM;IAEjC,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,aAAa;IAIvC;;;;;;;OAOG;IACG,IAAI,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO;IAc/C;;;;;;;;OAQG;IACH,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,IAAI;IAS/D;;;;;;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,QAAQ,EAAE,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC;IAK7D;;;;;;;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;CAKhB"}

package/out/service/utils/app-counter/app-counter.js

@@ -43,6 +43,7 @@ export class AppCounter {
          * @type {IData}
          */
         this.data = {};
+        this.app = ibiz.hub.getApp(model.getPSModelService().app);
     }
     /**
      * 计数器初始化
@@ -56,7 +57,7 @@ export class AppCounter {
         this.setParams(context, params);
         this.entity = this.model.getPSAppDataEntity();
         await this.entity.fill(true);
-        this.service = await ibiz.entityService.getService(this.entity.codeName);
+        this.service = await this.app.es.getService(this.entity.codeName);
         const action = this.model.getGetPSAppDEAction();
         if (!action) {
             throw new DefectModelError(this.model, `未找到获取计数器行为!`);

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts

@@ -1,4 +1,5 @@
 import { AppEntityModel, IPSAppCodeList } from '@ibiz-template/model';
+import { Application } from '../../../application';
 import { CodeListItem } from '../../interface';
 /**
  * 实际缓存对象
@@ -42,6 +43,7 @@ type CacheData = {
  * @class DynamicCodeListCache
  */
 export declare class DynamicCodeListCache {
+    protected app: Application;
     /**
      * 代码表对象
      *

package/out/service/utils/dynamic-code-list/dynamic-code-list.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC;IAEnC;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,cAAc;IAIpC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK;IAwBjC;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,QAAa,EACtB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IA6B1B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,QAAa,EACtB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAoC3B"}
+{"version":3,"file":"dynamic-code-list.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/dynamic-code-list/dynamic-code-list.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAEd,cAAc,EAEf,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C;;;;;;GAMG;AACH,KAAK,SAAS,GAAG;IACf;;;;;;OAMG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,YAAY,EAAE,CAAC;IAEvB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;CACnC,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,oBAAoB;IAC/B,SAAS,CAAC,GAAG,EAAE,WAAW,CAAC;IAE3B;;;;;;;OAOG;IACH,SAAS,CAAC,QAAQ,EAAE,cAAc,CAAC;IAEnC;;;;;;OAMG;IACH,SAAS,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC;IAElC;;;;;;OAMG;IACH,SAAS,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAE9B;;;;;;OAMG;IACH,SAAS,CAAC,KAAK,yBAAgC;IAE/C;;;;;;;OAOG;IACH,SAAS,CAAC,YAAY,EAAE,OAAO,CAAS;IAExC;;;;;;OAMG;IACH,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;gBAE1B,QAAQ,EAAE,cAAc;IAKpC;;;;;;OAMG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAmC3B;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,CAAC,IAAI,EAAE,KAAK;IAwBjC;;;;;;;;;OASG;cACa,IAAI,CAClB,OAAO,GAAE,QAAa,EACtB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;IA6B1B;;;;;;;;OAQG;IACG,GAAG,CACP,OAAO,GAAE,QAAa,EACtB,MAAM,GAAE,OAAY,GACnB,OAAO,CAAC,YAAY,EAAE,CAAC;CAoC3B"}

package/out/service/utils/dynamic-code-list/dynamic-code-list.js

@@ -27,6 +27,7 @@ export class DynamicCodeListCache {
          */
         this.isPredefined = false;
         this.codeList = codeList;
+        this.app = ibiz.hub.getApp(codeList.getPSModelService().app);
     }
     /**
      * 初始化
@@ -112,14 +113,14 @@ export class DynamicCodeListCache {
     async load(context = {}, params = {}) {
         // *预定义加载
         if (this.isPredefined) {
-            const res = await ibiz.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, params);
+            const res = await this.app.net.get(`/dictionaries/codelist/${this.codeList.codeName}`, params);
             return Object.freeze(res.data.items);
         }
         // *加载实体服务数据
         if (!this.entity || !this.methodName) {
             new Error('动态代码表找不到实体或数据集');
         }
-        const deService = await ibiz.entityService.getService(this.entity.source.codeName);
+        const deService = await this.app.es.getService(this.entity.source.codeName);
         const res = await deService.exec(this.methodName, context, params);
         let resultItems = [];
         if (res.data.length) {

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

@@ -1 +1 @@
-{"version":3,"file":"service-path-util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/service-path-util/service-path-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAmB,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEnE;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,eAAe,EAAE,CAAC,CAAC;AAE9D;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAM;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAa;IAEpE;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,CAAC,CACtD;IAEZ;;;;;;;;OAQG;qBACoB,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7D;;;;;;;;OAQG;WACU,SAAS,CACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;IAqB/B;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,YAAY,CAC3B,KAAK,EAAE,UAAU,EAAE,EACnB,GAAG,GAAE,MAAU,GACd,eAAe,EAAE;IAapB;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,YAAY,CAC3B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,eAAe,EAAE,GACvB,IAAI;IA+BP;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,GAAG,eAAe,EAAE,EAAE;CAK3E"}
+{"version":3,"file":"service-path-util.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/service-path-util/service-path-util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAElD;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,CAAC,UAAU,EAAE,eAAe,EAAE,CAAC,CAAC;AAE9D;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;IACf;;;;;;OAMG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;;;;OAMG;IACH,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,qBAAa,eAAe;IAC1B,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAM;IAE7C;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAa;IAEpE;;;;;;;OAOG;IACH,SAAS,CAAC,MAAM,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,CAAC,CACtD;IAEZ;;;;;;;;OAQG;qBACoB,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAsB7D;;;;;;;;OAQG;WACU,SAAS,CACpB,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC;IAqB/B;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,YAAY,CAC3B,KAAK,EAAE,UAAU,EAAE,EACnB,GAAG,GAAE,MAAU,GACd,eAAe,EAAE;IAapB;;;;;;;;;OASG;IACH,SAAS,CAAC,MAAM,CAAC,YAAY,CAC3B,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,eAAe,EAAE,GACvB,IAAI;IA+BP;;;;;;;;OAQG;IACH,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,GAAG,eAAe,EAAE,EAAE;CAK3E"}

package/out/service/utils/service-path-util/service-path-util.js

@@ -1,5 +1,4 @@
 import { pluralLower } from '@ibiz-template/core';
-import { getModelService } from '@ibiz-template/model';
 /**
  * 服务路径拼接工具
  *
@@ -22,7 +21,7 @@ export class ServicePathUtil {
         if (this.allDERss.length > 0) {
             return;
         }
-        const service = await getModelService(context);
+        const service = await ibiz.model.getModelService(context);
         const { app } = service;
         const allPSAppEntities = app.getAllPSAppDataEntities() || [];
         this.allDERss = app.getAllPSAppDERSs() || [];

package/out/service/vo/tree-node-data.d.ts

@@ -0,0 +1,44 @@
+/**
+ * 树节点数据格式
+ *
+ * @export
+ * @class TreeNodeData
+ */
+export interface TreeNodeData {
+    /**
+     * 节点标识(节点模型的标识)
+     *
+     * @type {string}
+     * @memberof TreeNodeData
+     */
+    nodeId: string;
+    /**
+     * 节点数据主键
+     *
+     * @type {string}
+     * @memberof TreeNodeData
+     */
+    id: string;
+    /**
+     * 节点显示名称
+     *
+     * @type {string}
+     * @memberof TreeNodeData
+     */
+    text: string;
+    /**
+     * 是否没有子节点
+     *
+     * @type {boolean}
+     * @memberof TreeNodeData
+     */
+    leaf: boolean;
+    /**
+     * 子节点集合（没有子节点则不存在）
+     *
+     * @type {TreeNodeData[]}
+     * @memberof TreeNodeData
+     */
+    children?: TreeNodeData[];
+}
+//# sourceMappingURL=tree-node-data.d.ts.map

package/out/service/vo/tree-node-data.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"tree-node-data.d.ts","sourceRoot":"","sources":["../../../src/service/vo/tree-node-data.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,WAAW,YAAY;IAC3B;;;;;OAKG;IACH,MAAM,EAAE,MAAM,CAAC;IAEf;;;;;OAKG;IACH,EAAE,EAAE,MAAM,CAAC;IAEX;;;;;OAKG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;;;;OAKG;IACH,IAAI,EAAE,OAAO,CAAC;IAEd;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,YAAY,EAAE,CAAC;CAC3B"}

package/out/service/vo/tree-node-data.js

@@ -0,0 +1 @@
+export {};