update：更新树节点导航参数支持

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/widgets/tree-exp-bar-control/tree-exp-bar-control.ts

@@ -60,7 +60,7 @@ export class TreeExpBarControl extends ExpBarControl {
   protected computeNavParams(arg: any): { tempContext: any, tempViewParams: any } {
     const tempContext: any = {};
     const tempViewParams: any = {};
-    const { counter, context } = this.controlState;
+    let { counter, context } = this.controlState;
     if (arg && arg.navfilter) {
       Object.defineProperty(tempViewParams, arg.navfilter, {
         value: arg.srfkey,
@@ -96,8 +96,8 @@ export class TreeExpBarControl extends ExpBarControl {
       Object.assign(tempData, arg);
       let _params = UIUtil.computedNavData(tempData, tempContext, tempViewParams, arg.navigateParams);
       Object.assign(tempViewParams, _params);
-      counter.value += 1;
-      Object.assign(tempContext, { srfcounter: counter.value });
+      counter += 1;
+      Object.assign(tempContext, { srfcounter: counter });
     }
     return { tempContext, tempViewParams };
   }

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/runtime/control-vo/tree-control-vo/tree-node-rs-vo.ts

@@ -8,6 +8,20 @@ export interface TreeNodeRSVO {
    */
   childDeTreeNode?: IParam;
 
+  /**
+   * @description 导航上下文
+   * @type {IParam}
+   * @memberof TreeNodeRSVO
+   */
+  navigateContext?: IParam;
+
+  /**
+   * @description 导航参数
+   * @type {IParam}
+   * @memberof TreeNodeRSVO
+   */
+  navigateParams?: IParam;
+
   /**
    * @description 父值过滤项
    * @type {string}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/runtime/control-vo/tree-control-vo/tree-node-vo.ts

@@ -176,6 +176,20 @@ export interface TreeNodeVO {
    */
   navFilter: string,
 
+  /**
+   * @description 导航上下文
+   * @type {IParam}
+   * @memberof TreeNodeVO
+   */
+  navigateContext?: IParam;
+
+  /**
+   * @description 导航参数
+   * @type {IParam}
+   * @memberof TreeNodeVO
+   */
+  navigateParams?: IParam;
+  
   /**
    * @description 导航视图
    * @type {IParam}
@@ -183,6 +197,7 @@ export interface TreeNodeVO {
    */
   navView?: IParam,
 
+
   /**
    * @description 节点标识
    * @type {string}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/service/control-service/tree-service.ts

@@ -134,9 +134,9 @@ export class TreeService<T extends ControlVOBase> extends ControlServiceBase<T>
       // 填充对应节点关系的子节点
       if (nodeRSs && nodeRSs.length > 0) {
         for (let i = 0, len = nodeRSs.length; i < len; i++) {
-          let rsNavContext: any = this.getNavContext(nodeRSs[i]);
-          let rsNavParams: any = this.getNavParams(nodeRSs[i]);
-          let rsParams: any = this.getParams(nodeRSs[i]);
+          let rsNavContext: any = nodeRSs[i].navigateContext;
+          let rsNavParams: any = nodeRSs[i].navigateParams;
+          let rsParams: any = nodeRSs[i].params;
           // 根据节点标识填充节点
           let treeNode: any = treeNodes.find((_node: TreeNodeVO) => {
             return nodeRSs[i].childDeTreeNode?.id == _node.id;
@@ -191,9 +191,8 @@ export class TreeService<T extends ControlVOBase> extends ControlServiceBase<T>
           leaf: !node.hasPSDETreeNodeRSs,
           selected: node.selected,
           navfilter: node.navFilter,
-          // TODO 导航参数
-          // navgateContext: node.navgateContext,
-          // navgateParams: node.navgateParams
+          navigateContext: node.navigateContext,
+          navigateParams: node.navigateParams
         };
         //  删除无用属性
         let strNodeId: string = node.nodeType;
@@ -557,62 +556,4 @@ export class TreeService<T extends ControlVOBase> extends ControlServiceBase<T>
     }
   }
 
-  /**
- * 获取树节点关系导航上下文
- * 
- * @param noders 节点
- * @memberof AppTreeService
- */
-  public getNavContext(noders: TreeNodeRSVO) {
-    let context: any = {};
-    // let navcontext: any = noders.getPSNavigateContexts();
-    // if (navcontext?.length > 0) {
-    //   navcontext.forEach((item: IPSNavigateContext) => {
-    //     context[item?.key] = {
-    //       isRawValue: item?.rawValue,
-    //       value: item.value
-    //     }
-    //   })
-    // }
-    return context;
-  }
-
-  /**
-   * 获取树节点关系导航参数
-   * 
-   * @param noders 节点
-   * @memberof AppTreeService
-   */
-  public getNavParams(noders: TreeNodeRSVO) {
-    let params: any = {};
-    // let navparams: any = noders.getPSNavigateParams();
-    // if (navparams?.length > 0) {
-    //   navparams.forEach((item: IPSNavigateParam) => {
-    //     params[item?.key] = {
-    //       isRawValue: item?.rawValue,
-    //       value: item.value
-    //     }
-    //   })
-    // }
-    return params;
-  }
-
-  /**
-   * 获取树节点关系参数
-   * 
-   * @param noders 节点
-   * @memberof AppTreeService
-   */
-  public getParams(noders: TreeNodeRSVO) {
-    let params: any = {};
-    // let reparams: any = noders?.getPSDETreeNodeRSParams();
-    // if (reparams?.length > 0) {
-    //   reparams.forEach((item: IPSDETreeNodeRSParam) => {
-    //     params[item?.key] = {
-    //       value: item.value
-    //     };
-    //   })
-    // }
-    return params;
-  }
 }
\ No newline at end of file

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/widgets/{{appEntities}}/{{ctrls@TREEVIEW}}-tree/{{ctrls@TREEVIEW}}-tree-config.ts.hbs

-import { ControlVOBase, TreeControlVO, TreeNodeVO, TreeService } from "@core";
+import { ControlVOBase, TreeControlVO, TreeNodeVO, TreeNodeRSVO, TreeService } from "@core";
 import { {{pascalCase ctrl.psAppDataEntity.codeName}}Service } from '@api/{{spinalCase ctrl.psAppDataEntity.codeName}}/{{spinalCase ctrl.psAppDataEntity.codeName}}-service';
 
 export class ControlVO extends ControlVOBase implements TreeControlVO {
@@ -79,11 +79,28 @@ export class ControlVO extends ControlVOBase implements TreeControlVO {
         {{/if}}
         id: '{{treeNode.id}}',
         navFilter: '{{treeNode.navFilter}}',
+        {{#if treeNode.psNavigateContexts}}
+        navigateContext: {
+          {{#each treeNode.psNavigateContexts as | navContext |}}
+          {{navContext.key}}: '{{#if navContext.rawValue}}{{navContext.value}}{{else}}%{{navContext.value}}%{{/if}}',
+          {{/each}}
+        },
+        {{/if}}
+        {{#if treeNode.psNavigateParams}}
+        navigateParams: {
+          {{#each treeNode.psNavigateParams as | navParam |}}
+          {{navParam.key}}: '{{#if navParam.rawValue}}{{navParam.value}}{{else}}%{{navParam.value}}%{{/if}}',
+          {{/each}}
+        },
+        {{/if}}
         {{#if treeNode.navPSAppView}}
         navView: {
           viewName: '{{treeNode.navPSAppView.codeName}}'
         },
         {{/if}}
+        {{#if treeNode.nodeValue}}
+        nodeValue: '{{treeNode.nodeValue}}',
+        {{/if}}
         nodeType: '{{treeNode.nodeType}}',
         rootNode: {{treeNode.rootNode}},
         selectFirstOnly: {{treeNode.selectFirstOnly}},
@@ -112,7 +129,7 @@ export class ControlVO extends ControlVOBase implements TreeControlVO {
     ];
   }
 
-  get treeNodeRSs() {
+  get treeNodeRSs(): TreeNodeRSVO[] {
     return [
       {{#each ctrl.psDETreeNodeRSs as | treeNodeRS |}}
       {
@@ -121,6 +138,27 @@ export class ControlVO extends ControlVOBase implements TreeControlVO {
           id: '{{treeNodeRS.childPSDETreeNode.id}}'
         },
         {{/if}}
+        {{#if treeNodeRS.psNavigateContexts}}
+        navigateContext: {
+          {{#each treeNodeRS.psNavigateContexts as | navContext |}}
+          {{navContext.key}}: '{{#if navContext.rawValue}}{{navContext.value}}{{else}}%{{navContext.value}}%{{/if}}',
+          {{/each}}
+        },
+        {{/if}}
+        {{#if treeNodeRS.psNavigateParams}}
+        navigateParams: {
+          {{#each treeNodeRS.psNavigateParams as | navParam |}}
+          {{navParam.key}}: '{{#if navParam.rawValue}}{{navParam.value}}{{else}}%{{navParam.value}}%{{/if}}',
+          {{/each}}
+        },
+        {{/if}}
+        {{#if treeNodeRS.psDETreeNodeRSParams}}
+        params: {
+          {{#each treeNodeRS.psDETreeNodeRSParams as | param |}}
+          {{param.key}}: { value: '{{param.value}}' }
+          {{/each}}
+        },
+        {{/if}}
         {{#if treeNodeRS.parentFilter}}
         parentFilter: '{{treeNodeRS.parentFilter}}',
         {{/if}}