jackwang 部署微服务应用

app_PIM/src/widgets/hromhierarchy/tree-001-treeview/tree-001-treeview-service.ts

@@ -202,6 +202,11 @@ export default class TREE_001Service extends ControlService {
                 Object.assign(searchFilter, { n_n_hromhierarchycatid_eq_eq: filter.nodeid });
             }
 
+
+            if (Object.is(filter.strNodeType, this.TREENODE_SECOND)) {
+                Object.assign(searchFilter, { n_n_hromhierarchycatid_eq_eq: filter.nodeid });
+            }
+
             Object.assign(searchFilter, { total: false });
             let bFirst: boolean = true;
             let records: any[] = [];
@@ -226,7 +231,8 @@ export default class TREE_001Service extends ControlService {
                         Object.assign(treeNode, { id: strNodeId });
                         Object.assign(treeNode, { iconcls: 'fa fa-building-o' });
                         Object.assign(treeNode, { expanded: filter.isautoexpand });
-                        Object.assign(treeNode, { leaf: true });
+                        Object.assign(treeNode, { leaf: false });
+                        Object.assign(treeNode, { navfilter: "n_pomhierarchyid_eq" });
                         Object.assign(treeNode, { curData: entity });
                         Object.assign(treeNode, { nodeid: treeNode.srfkey });
                         Object.assign(treeNode, { nodeid2: filter.strRealNodeId });
@@ -313,7 +319,17 @@ export default class TREE_001Service extends ControlService {
     @Errorlog
     public async fillSecondNodeChilds(context:any={}, filter: any, list: any[]): Promise<any> {
 		if (filter.srfnodefilter && !Object.is(filter.srfnodefilter,"")) {
+			// 填充子组织
+            let SecondRsNavContext:any = {};
+            let SecondRsNavParams:any = {};
+            let SecondRsParams:any = {};
+			await this.fillSecondNodes(context, filter, list ,SecondRsNavContext,SecondRsNavParams,SecondRsParams);
 		} else {
+			// 填充子组织
+            let SecondRsNavContext:any = {};
+            let SecondRsNavParams:any = {};
+            let SecondRsParams:any = {};
+			await this.fillSecondNodes(context, filter, list ,SecondRsNavContext,SecondRsNavParams,SecondRsParams);
 		}
 	}
 
@@ -433,6 +449,7 @@ export default class TREE_001Service extends ControlService {
                         Object.assign(treeNode, { iconcls: 'fa fa-sitemap' });
                         Object.assign(treeNode, { expanded: true });
                         Object.assign(treeNode, { leaf: false });
+                        Object.assign(treeNode, { navfilter: "n_pomhierarchyid_eq" });
                         Object.assign(treeNode, { curData: entity });
                         Object.assign(treeNode, { nodeid: treeNode.srfkey });
                         Object.assign(treeNode, { nodeid2: filter.strRealNodeId });

app_PIM/src/widgets/hromhierarchy/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar-base.tsx

@@ -190,14 +190,14 @@ export class TreeExpViewtreeexpbarTreeExpBarBase extends MainControlBase {
         if (Object.is(expmode, 'SECOND')) {
             return {  
                 viewname: 'hromhierarchy-grid-view', 
-                parentdata: {"srfparentdefname":"HROMHIERARCHYCATID","srfparentdename":"HROMHIERARCHYCAT","srfparentmode":"DER1N_HROMHIERARCHY_HROMHIERARCHYCAT_HROMHIERARCHYCATID_ABD0C1"},
+                parentdata: {"srfparentdefname":"n_pomhierarchyid_eq"},
                 deKeyField:'hromhierarchy'
 			};
         }
         if (Object.is(expmode, 'FIRST')) {
             return {  
                 viewname: 'hromhierarchy-grid-view', 
-                parentdata: {"srfparentdefname":"HROMHIERARCHYCATID","srfparentdename":"HROMHIERARCHYCAT","srfparentmode":"DER1N_HROMHIERARCHY_HROMHIERARCHYCAT_HROMHIERARCHYCATID_ABD0C1"},
+                parentdata: {"srfparentdefname":"n_pomhierarchyid_eq"},
                 deKeyField:'hromhierarchy'
 			};
         }