@ibiz-template/runtime 0.0.3-beta.0 → 0.0.3-beta.2

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

@@ -1,3 +1,4 @@
+import { TreeDataSetNodeData, TreeStaticNodeData } from '../../vo';
 import { MDControlService } from './md-control-service';
 /**
  * 树部件服务
@@ -22,28 +23,29 @@ export class TreeService extends MDControlService {
     /**
      * 获取子节点数据
      *
-     * @param {TreeNodeData} [parentNode] 父节点数据
+     * @param {ITreeNodeData} [parentNodeData] 父节点数据
      * @param {boolean} [hasQuery=false] 是否搜索
      * @returns {*}
      * @memberof TreeService
      */
-    async fetchChildNodes(parentNode, opts) {
-        const childNodeModels = this.model.getChildNodes((parentNode === null || parentNode === void 0 ? void 0 : parentNode.nodeId) || this.model.rootNode.id, opts.hasQuery);
-        if (childNodeModels.length === 0) {
+    async fetchChildNodes(parentNodeData, opts) {
+        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;
         }
-        const results = await Promise.allSettled(childNodeModels.map(async (childNode) => {
+        const results = await Promise.allSettled(childNodeRSs.map(async (childNodeRS) => {
+            const { childNode } = childNodeRS;
             if (childNode.treeNodeType === 'STATIC') {
-                const nodeData = await this.getStaticNodeData(childNode.source, opts);
+                const nodeData = await this.getStaticNodeData(childNodeRS, parentNodeData, opts);
                 return [nodeData];
             }
             if (childNode.treeNodeType === 'DE') {
-                return this.getDENodeDatas(childNode.source, opts);
+                return this.getDENodeDatas(childNodeRS, parentNodeData, opts);
             }
             if (childNode.treeNodeType === 'CODELIST') {
-                return this.getCodeListNodeDatas(childNode.source, opts);
+                return this.getCodeListNodeDatas(childNodeRS, parentNodeData, opts);
             }
-            return null;
+            return undefined;
         }));
         const childrenNodes = [];
         results.forEach(result => {
@@ -54,56 +56,66 @@ export class TreeService extends MDControlService {
         return childrenNodes;
         // todo 查询回来之后，看是否默认打开，默认展开继续递归加载子节点。
     }
-    getBaseNodeData(nodeModel, opts) {
-        const nodeData = {
-            nodeId: nodeModel.nodeType,
-            id: nodeModel.nodeType,
-            text: '',
-            leaf: this.model.getChildNodes(nodeModel.nodeType, opts.hasQuery).length ===
-                0,
-        };
-        if (nodeData.leaf === false) {
-            nodeData.children = [];
-            // nodeData.loading = false;
-        }
-        return nodeData;
-    }
     /**
      * 获取静态节点数据
      *
      * @protected
-     * @param {IPSDETreeStaticNode} nodeModel
+     * @param {TreeStaticNodeModel} nodeModel
      * @param {boolean} [hasQuery=false]
      * @returns {*}
      * @memberof TreeService
      */
-    async getStaticNodeData(nodeModel, opts) {
-        const nodeData = this.getBaseNodeData(nodeModel, opts);
-        nodeData.text = nodeModel.text;
+    async getStaticNodeData(nodeRS, parentNodeData, opts) {
+        const nodeModel = nodeRS.childNode;
+        const nodeData = new TreeStaticNodeData(nodeModel, parentNodeData, opts);
         // todo 仅展开首节点
         if (nodeModel.expanded) {
             nodeData.children = await this.fetchChildNodes(nodeData, opts);
         }
         return nodeData;
     }
+    /**
+     * 获取父值过滤的视图参数
+     *
+     * @param {TreeNodeRSModel} nodeRS 节点关系模型
+     * @param {(ITreeNodeData | undefined)} parentNodeData 父节点数据
+     * @returns {*}  {(IParams | undefined)}
+     * @memberof TreeService
+     */
+    getParentFilterParams(nodeRS, parentNodeData) {
+        // 处理父值过滤项
+        const { parentFilter, parentValueLevel } = nodeRS;
+        if (parentNodeData && parentFilter) {
+            // 根据父值级别查找父数据的value
+            let parent = parentNodeData;
+            for (let index = 1; index < parentValueLevel; index++) {
+                parent = parent === null || parent === void 0 ? void 0 : parent.parent;
+            }
+            if (parent === null || parent === void 0 ? void 0 : parent.value) {
+                return { [`n_${parentFilter}_eq`]: parent.value };
+            }
+        }
+    }
     /**
      * 获取实体数据集数据
      *
      * @protected
-     * @param {IPSDETreeDataSetNode} nodeModel
-     * @param {boolean} [_hasQuery=false]
+     * @param {TreeNodeRSModel} nodeRS
+     * @param {TreeFetchOpts} opts
+     * @returns {*}
      * @memberof TreeService
      */
-    async getDENodeDatas(nodeModel, opts) {
-        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, opts.context, opts.params);
-        const baseNodeData = this.getBaseNodeData(nodeModel, opts);
+    async getDENodeDatas(nodeRS, parentNodeData, opts) {
+        const nodeModel = nodeRS.childNode;
+        const { methodName, appEntity } = nodeModel;
+        const service = await this.app.es.getService(appEntity.codeName);
+        // 处理查询视图参数
+        const tempParams = Object.assign(Object.assign({}, opts.params), (this.getParentFilterParams(nodeRS, parentNodeData) || {}));
+        // 请求实体数据
+        const response = await service.exec(methodName, opts.context, tempParams);
         if (response.data.length) {
             const nodeDatas = response.data.map((item) => {
-                return Object.assign(Object.assign({}, baseNodeData), { id: item.srfkey, text: item.srfmajortext });
+                return new TreeDataSetNodeData(nodeModel, parentNodeData, Object.assign(Object.assign({}, opts), { data: item }));
             });
             return nodeDatas;
         }
@@ -113,11 +125,11 @@ export class TreeService extends MDControlService {
      * 获取代码表节点数据
      *
      * @protected
-     * @param {IPSDETreeCodeListNode} _nodeModel
+     * @param {TreeCodeListNodeModel} _nodeModel
      * @param {TreeFetchOpts} _opts
      * @memberof TreeService
      */
-    async getCodeListNodeDatas(_nodeModel, _opts) {
+    async getCodeListNodeDatas(_nodeRS, _parentNodeData, _opts) {
         // todo 代码表查询
     }
 }

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

@@ -54,7 +54,7 @@ export declare class ServiceUtil {
      * @param {IContext} [context] 上下文,用于计算模型所属沙箱环境
      * @return {*}  {Promise<EntityService>}
      */
-    getService(entityCodeName: string, context?: IContext): Promise<EntityService>;
+    getService(entityCodeName: string): 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,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"}
+{"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,QAAQ,GAAG,IAAI;CAKxC"}

package/out/service/service-util.js

@@ -1,6 +1,5 @@
 import { AppEntityModel, } from '@ibiz-template/model';
 import { EntityService } from './service';
-import { ServicePathUtil } from './utils';
 /**
  * 应用服务工具类
  *
@@ -65,7 +64,7 @@ export class ServiceUtil {
      * @param {IContext} [context] 上下文,用于计算模型所属沙箱环境
      * @return {*}  {Promise<EntityService>}
      */
-    async getService(entityCodeName, context) {
+    async getService(entityCodeName) {
         if (!this.cache.has(entityCodeName)) {
             await this.initAllEntities();
             const entity = this.allEntities.get(entityCodeName);
@@ -75,7 +74,8 @@ export class ServiceUtil {
             await entity.fill(true);
             const entityModel = new AppEntityModel(entity);
             await entityModel.init();
-            const paths = await ServicePathUtil.calcPaths(context || {}, entityCodeName);
+            const app = ibiz.hub.getApp(this.modelService.app);
+            const paths = app.resourcePathUtil.calcPaths(entityCodeName);
             const service = await new EntityService(entityModel, paths);
             this.cache.set(entityCodeName, service);
         }

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

@@ -3,8 +3,9 @@ export * from './de-dq-cond';
 export { DEDQCondUtil } from './de-dq-cond-util/de-dq-cond-util';
 export { DynamicCodeListCache } from './dynamic-code-list/dynamic-code-list';
 export { EntityCache } from './entity-cache/entity-cache';
+export { IBizVerify } from './ibiz-verify/ibiz-verify';
+export { calcResPath } from './res-path/res-path';
+export { calcRouteContext } from './route-context/route-context';
 export { SearchFilter } from './search-filter/search-filter';
 export { ServicePathDeep, ServicePathItem, ServicePathUtil, } from './service-path-util/service-path-util';
-export { IBizVerify } from './ibiz-verify/ibiz-verify';
-export * from './res-path/res-path';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC;AAC/C,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,cAAc,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/service/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,cAAc,cAAc,CAAC;AAC7B,OAAO,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACjE,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,uCAAuC,CAAC"}

package/out/service/utils/index.js

@@ -3,7 +3,8 @@ export * from './de-dq-cond';
 export { DEDQCondUtil } from './de-dq-cond-util/de-dq-cond-util';
 export { DynamicCodeListCache } from './dynamic-code-list/dynamic-code-list';
 export { EntityCache } from './entity-cache/entity-cache';
+export { IBizVerify } from './ibiz-verify/ibiz-verify';
+export { calcResPath } from './res-path/res-path';
+export { calcRouteContext } from './route-context/route-context';
 export { SearchFilter } from './search-filter/search-filter';
 export { ServicePathUtil, } from './service-path-util/service-path-util';
-export { IBizVerify } from './ibiz-verify/ibiz-verify';
-export * from './res-path/res-path';

package/out/service/utils/route-context/route-context.d.ts

@@ -0,0 +1,13 @@
+import { ServicePathItem } from '../service-path-util/service-path-util';
+/**
+ * 计算放置到路径中的资源上下文参数
+ *
+ * @author chitanda
+ * @date 2023-01-10 14:01:51
+ * @export
+ * @param {IContext} context
+ * @param {ServicePathItem[][]} pathItems
+ * @return {*}  {Record<string, unknown>}
+ */
+export declare function calcRouteContext(context: IContext, pathItems: ServicePathItem[][]): Record<string, unknown>;
+//# sourceMappingURL=route-context.d.ts.map

package/out/service/utils/route-context/route-context.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"route-context.d.ts","sourceRoot":"","sources":["../../../../src/service/utils/route-context/route-context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AAEzE;;;;;;;;;GASG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,EACjB,SAAS,EAAE,eAAe,EAAE,EAAE,GAC7B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB"}

package/out/service/utils/route-context/route-context.js

@@ -0,0 +1,37 @@
+/**
+ * 计算放置到路径中的资源上下文参数
+ *
+ * @author chitanda
+ * @date 2023-01-10 14:01:51
+ * @export
+ * @param {IContext} context
+ * @param {ServicePathItem[][]} pathItems
+ * @return {*}  {Record<string, unknown>}
+ */
+export function calcRouteContext(context, pathItems) {
+    let paths = [];
+    pathItems.forEach(items => {
+        const values = [];
+        for (let i = 0; i < items.length; i++) {
+            const arr = [];
+            const item = items[i];
+            const val = context[item.name];
+            if (val) {
+                arr.push(item.name);
+                arr.push(val);
+                values.push(arr);
+            }
+        }
+        paths.push(values);
+    });
+    paths = paths.sort((a, b) => b.length - a.length);
+    const [pathArr] = paths;
+    if (pathArr) {
+        const obj = {};
+        pathArr.forEach(([key, val]) => {
+            obj[key] = val;
+        });
+        return obj;
+    }
+    return {};
+}

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

@@ -1,4 +1,4 @@
-import { IPSAppDERS } from '@ibiz-template/model';
+import { IPSAppDERS, ModelService } from '@ibiz-template/model';
 /**
  * 获取服务拼接递归对象
  */
@@ -41,7 +41,8 @@ export type ServicePathItem = {
  * @class ServicePathUtil
  */
 export declare class ServicePathUtil {
-    protected static allDERss: IPSAppDERS[];
+    protected modelService: ModelService;
+    protected allDERss: IPSAppDERS[];
     /**
      * 应用实体关系
      *
@@ -50,7 +51,7 @@ export declare class ServicePathUtil {
      * @protected
      * @type {Map<string, IPSAppDERS[]>} <应用实体, 应用实体父关系>
      */
-    protected static entityRsMap: Map<string, IPSAppDERS[]>;
+    protected entityRsMap: Map<string, IPSAppDERS[]>;
     /**
      * 实体资源路径
      *
@@ -59,27 +60,34 @@ export declare class ServicePathUtil {
      * @protected
      * @type {Map<string, ServicePathItem[][]>}
      */
-    protected static entityRsPathMap: Map<string, ServicePathItem[][]>;
+    protected entityRsPathMap: Map<string, ServicePathItem[][]>;
+    /**
+     * Creates an instance of ServicePathUtil.
+     *
+     * @author chitanda
+     * @date 2023-01-10 16:01:18
+     * @param {ModelService} modelService 当前应用所归属的模型服务
+     */
+    constructor(modelService: ModelService);
     /**
      * 初始化工具参数
      *
      * @author chitanda
      * @date 2022-08-22 21:08:47
-     * @protected
      * @param {IContext} context
      * @return {*}  {Promise<void>}
      */
-    protected static init(context: IContext): Promise<void>;
+    init(): Promise<void>;
     /**
      * 计算指定实体所有资源路径
      *
      * @author chitanda
      * @date 2022-08-22 22:08:54
      * @param {IParams} context
-     * @param {string} deName
-     * @return {*}  {Promise<string[][]>} 返回顺序为 [祖父实体，爷爷实体，父实体，当前实体]
+     * @param {string} codeName
+     * @return {*}  {Promise<ServicePathItem[][]>} 返回顺序为 [祖父实体，爷爷实体，父实体，当前实体]
      */
-    static calcPaths(context: IParams, deName: string): Promise<ServicePathItem[][]>;
+    calcPaths(codeName: string): ServicePathItem[][];
     /**
      * 计算递归资源路径
      *
@@ -89,7 +97,7 @@ export declare class ServicePathUtil {
      * @param {IPSAppDERS[]} deRss
      * @return {*}  {ServicePathDeep[]}
      */
-    protected static calcDeepPath(deRss: IPSAppDERS[], num?: number): ServicePathDeep[];
+    protected calcDeepPath(deRss: IPSAppDERS[], num?: number): ServicePathDeep[];
     /**
      * 递归填充计算所有资源路径
      *
@@ -100,7 +108,7 @@ export declare class ServicePathUtil {
      * @param {string[]} pathNames
      * @param {ServicePathDeep[]} items
      */
-    protected static deepFillPath(deName: string, pathNames: string[], items: ServicePathDeep[]): void;
+    protected deepFillPath(deName: string, pathNames: string[], items: ServicePathDeep[]): void;
     /**
      * 排序资源路径顺序
      *
@@ -110,6 +118,6 @@ export declare class ServicePathUtil {
      * @param {ServicePathItem[][]} paths
      * @return {*}  {ServicePathItem[][]}
      */
-    protected static sortPath(paths: ServicePathItem[][]): ServicePathItem[][];
+    protected sortPath(paths: ServicePathItem[][]): ServicePathItem[][];
 }
 //# sourceMappingURL=service-path-util.d.ts.map

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,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"}
+{"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,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEhE;;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;IA8Bd,SAAS,CAAC,YAAY,EAAE,YAAY;IA7BhD,SAAS,CAAC,QAAQ,EAAE,UAAU,EAAE,CAAM;IAEtC;;;;;;;OAOG;IACH,SAAS,CAAC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAa;IAE7D;;;;;;;OAOG;IACH,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,eAAe,EAAE,EAAE,CAAC,CAAa;IAExE;;;;;;OAMG;gBACmB,YAAY,EAAE,YAAY;IAEhD;;;;;;;OAOG;IACG,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAqB3B;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,EAAE,MAAM,GAAG,eAAe,EAAE,EAAE;IA0BhD;;;;;;;;OAQG;IACH,SAAS,CAAC,YAAY,CACpB,KAAK,EAAE,UAAU,EAAE,EACnB,GAAG,GAAE,MAAU,GACd,eAAe,EAAE;IAapB;;;;;;;;;OASG;IACH,SAAS,CAAC,YAAY,CACpB,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,MAAM,EAAE,EACnB,KAAK,EAAE,eAAe,EAAE,GACvB,IAAI;IA+BP;;;;;;;;OAQG;IACH,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,EAAE,GAAG,eAAe,EAAE,EAAE;CAKpE"}

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

@@ -8,21 +8,48 @@ import { pluralLower } from '@ibiz-template/core';
  * @class ServicePathUtil
  */
 export class ServicePathUtil {
+    /**
+     * Creates an instance of ServicePathUtil.
+     *
+     * @author chitanda
+     * @date 2023-01-10 16:01:18
+     * @param {ModelService} modelService 当前应用所归属的模型服务
+     */
+    constructor(modelService) {
+        this.modelService = modelService;
+        this.allDERss = [];
+        /**
+         * 应用实体关系
+         *
+         * @author chitanda
+         * @date 2022-08-22 22:08:18
+         * @protected
+         * @type {Map<string, IPSAppDERS[]>} <应用实体, 应用实体父关系>
+         */
+        this.entityRsMap = new Map();
+        /**
+         * 实体资源路径
+         *
+         * @author chitanda
+         * @date 2022-08-22 22:08:58
+         * @protected
+         * @type {Map<string, ServicePathItem[][]>}
+         */
+        this.entityRsPathMap = new Map();
+    }
     /**
      * 初始化工具参数
      *
      * @author chitanda
      * @date 2022-08-22 21:08:47
-     * @protected
      * @param {IContext} context
      * @return {*}  {Promise<void>}
      */
-    static async init(context) {
+    async init() {
         if (this.allDERss.length > 0) {
             return;
         }
-        const service = await ibiz.model.getModelService(context);
-        const { app } = service;
+        const { app } = this.modelService;
         const allPSAppEntities = app.getAllPSAppDataEntities() || [];
         this.allDERss = app.getAllPSAppDERSs() || [];
         allPSAppEntities.forEach(entity => {
@@ -44,27 +71,32 @@ export class ServicePathUtil {
      * @author chitanda
      * @date 2022-08-22 22:08:54
      * @param {IParams} context
-     * @param {string} deName
-     * @return {*}  {Promise<string[][]>} 返回顺序为 [祖父实体，爷爷实体，父实体，当前实体]
+     * @param {string} codeName
+     * @return {*}  {Promise<ServicePathItem[][]>} 返回顺序为 [祖父实体，爷爷实体，父实体，当前实体]
      */
-    static async calcPaths(context, deName) {
-        if (this.entityRsPathMap.has(deName)) {
-            return this.entityRsPathMap.get(deName);
+    calcPaths(codeName) {
+        if (this.entityRsPathMap.has(codeName)) {
+            return this.entityRsPathMap.get(codeName);
         }
-        await this.init(context);
-        const deRss = this.entityRsMap.get(deName);
+        const deRss = this.entityRsMap.get(codeName);
         if (deRss) {
             const arr = this.calcDeepPath(deRss);
-            this.deepFillPath(deName, [deName], arr);
-            const paths = this.entityRsPathMap.get(deName);
+            this.deepFillPath(codeName, [codeName], arr);
+            const paths = this.entityRsPathMap.get(codeName);
             if (paths) {
                 const sortedPaths = this.sortPath(paths);
-                this.entityRsPathMap.set(deName, sortedPaths);
+                this.entityRsPathMap.set(codeName, sortedPaths);
                 return sortedPaths;
             }
         }
         return [
-            [{ deName, name: deName.toLowerCase(), plural: pluralLower(deName) }],
+            [
+                {
+                    deName: codeName,
+                    name: codeName.toLowerCase(),
+                    plural: pluralLower(codeName),
+                },
+            ],
         ];
     }
     /**
@@ -76,7 +108,7 @@ export class ServicePathUtil {
      * @param {IPSAppDERS[]} deRss
      * @return {*}  {ServicePathDeep[]}
      */
-    static calcDeepPath(deRss, num = 0) {
+    calcDeepPath(deRss, num = 0) {
         if (num > 10) {
             throw new Error('服务路径计算超过最大层级 10');
         }
@@ -98,7 +130,7 @@ export class ServicePathUtil {
      * @param {string[]} pathNames
      * @param {ServicePathDeep[]} items
      */
-    static deepFillPath(deName, pathNames, items) {
+    deepFillPath(deName, pathNames, items) {
         items.forEach(item => {
             const [rs, children] = item;
             if (children.length > 0) {
@@ -135,28 +167,9 @@ export class ServicePathUtil {
      * @param {ServicePathItem[][]} paths
      * @return {*}  {ServicePathItem[][]}
      */
-    static sortPath(paths) {
+    sortPath(paths) {
         return paths.sort((a, b) => {
             return b.length - a.length;
         });
     }
 }
-ServicePathUtil.allDERss = [];
-/**
- * 应用实体关系
- *
- * @author chitanda
- * @date 2022-08-22 22:08:18
- * @protected
- * @type {Map<string, IPSAppDERS[]>} <应用实体, 应用实体父关系>
- */
-ServicePathUtil.entityRsMap = new Map();
-/**
- * 实体资源路径
- *
- * @author chitanda
- * @date 2022-08-22 22:08:58
- * @protected
- * @type {Map<string, ServicePathItem[][]>}
- */
-ServicePathUtil.entityRsPathMap = new Map();

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

@@ -1 +1 @@
-{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACK,MAAM,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACK,YAAY,EAAE,MAAM,CAAC;IAE7B;;;;;;OAMG;gBACS,OAAO,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;IA+BjE;;;;;;;;;;OAUG;IACH,OAAO,CAAC,YAAY;IAgCpB;;;;;;OAMG;IACH,SAAS;IAIT;;;;;;OAMG;IACH,cAAc;IAUd;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAIjC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAOnC;;;;;OAKG;IACH,YAAY;CAQb"}
+{"version":3,"file":"control.vo.d.ts","sourceRoot":"","sources":["../../../src/service/vo/control.vo.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAE5C;;;;;;;GAOG;AACH,qBAAa,SAAS;IAEpB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,GAAG,CAAC;IAE5B;;;;;;;OAOG;IACK,OAAO,EAAE,KAAK,CAAC;IAEvB;;;;;;;OAOG;IACK,UAAU,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAE5C;;;;;;OAMG;IACH,IAAI,KAAK,IAAI,KAAK,CAKjB;IAED;;;;;;OAMG;IACK,MAAM,EAAE,MAAM,CAAC;IAEvB;;;;;;OAMG;IACK,YAAY,EAAE,MAAM,CAAC;IAE7B;;;;;;OAMG;gBACS,OAAO,CAAC,EAAE,KAAK,EAAE,UAAU,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC;IAiCjE;;;;;;;;;;OAUG;IACH,OAAO,CAAC,YAAY;IAgCpB;;;;;;OAMG;IACH,SAAS;IAIT;;;;;;OAMG;IACH,cAAc;IAUd;;;;;;OAMG;IACH,SAAS,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAIjC;;;;;;OAMG;IACH,WAAW,CAAC,IAAI,EAAE,KAAK,GAAG,SAAS;IAOnC;;;;;OAKG;IACH,YAAY;CAQb"}

package/out/service/vo/control.vo.js

@@ -35,10 +35,12 @@ export class ControlVO {
         }
         Object.defineProperty(this, '$origin', {
             enumerable: false,
+            configurable: true,
             value: $origin || {},
         });
         Object.defineProperty(this, '$dataUIMap', {
             enumerable: false,
+            configurable: true,
             value: $dataUIMap || new Map(),
         });
         // 先转换映射的属性

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

@@ -0,0 +1,3 @@
+export * from './control.vo';
+export * from './tree-node-data';
+//# sourceMappingURL=index.d.ts.map

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

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

package/out/service/vo/index.js

@@ -0,0 +1,2 @@
+export * from './control.vo';
+export * from './tree-node-data';

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

@@ -0,0 +1,3 @@
+export { TreeDataSetNodeData } from './tree-data-set-node-data';
+export { TreeStaticNodeData } from './tree-static-node-data';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC"}

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

@@ -0,0 +1,2 @@
+export { TreeDataSetNodeData } from './tree-data-set-node-data';
+export { TreeStaticNodeData } from './tree-static-node-data';

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

@@ -0,0 +1,22 @@
+import { TreeDataSetNodeModel } from '@ibiz-template/model';
+import { ITreeNodeData } from '../../interface';
+import { TreeNodeData } from './tree-node-data';
+/**
+ * 实体数据集树节点数据
+ *
+ * @export
+ * @class TreeDataSetNodeData
+ * @extends {TreeNodeData}
+ * @implements {ITreeNodeData}
+ */
+export declare class TreeDataSetNodeData extends TreeNodeData implements ITreeNodeData {
+    text: string;
+    id: string;
+    value: string;
+    deData: IData;
+    constructor(model: TreeDataSetNodeModel, parentNodeData: ITreeNodeData | undefined, opts: {
+        hasQuery: boolean;
+        data: IData;
+    });
+}
+//# sourceMappingURL=tree-data-set-node-data.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"tree-data-set-node-data.d.ts","sourceRoot":"","sources":["../../../../src/service/vo/tree-node-data/tree-data-set-node-data.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAEhD;;;;;;;GAOG;AACH,qBAAa,mBAAoB,SAAQ,YAAa,YAAW,aAAa;IAC5E,IAAI,EAAE,MAAM,CAAC;IAEb,EAAE,EAAE,MAAM,CAAC;IAEX,KAAK,EAAE,MAAM,CAAC;IAEd,MAAM,EAAE,KAAK,CAAC;gBAGZ,KAAK,EAAE,oBAAoB,EAC3B,cAAc,EAAE,aAAa,GAAG,SAAS,EACzC,IAAI,EAAE;QAAE,QAAQ,EAAE,OAAO,CAAC;QAAC,IAAI,EAAE,KAAK,CAAA;KAAE;CAa3C"}

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

@@ -0,0 +1,23 @@
+import { TreeNodeData } from './tree-node-data';
+/**
+ * 实体数据集树节点数据
+ *
+ * @export
+ * @class TreeDataSetNodeData
+ * @extends {TreeNodeData}
+ * @implements {ITreeNodeData}
+ */
+export class TreeDataSetNodeData extends TreeNodeData {
+    constructor(model, parentNodeData, opts) {
+        super(model, parentNodeData, opts);
+        const { data } = opts;
+        this.deData = data;
+        this.text = data.srfmajortext;
+        this.value = data.srfkey;
+        this.id = parentNodeData
+            ? `${parentNodeData.id}:${data.srfkey}`
+            : data.srfkey;
+        // id小写
+        this.id = this.id.toLowerCase();
+    }
+}