update：更新路由计算逻辑

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/AppEntityModel.java

@@ -51,8 +51,8 @@ public class AppEntityModel extends BaseModel{
                 appEntityResource.put("deResPaths", deResPaths);
                 appEntityResources.add(appEntityResource);
             });
-        }else{
-            // 没有主从关系,路径就只有自己本身一个
+        }
+        // 本身路径
         JSONObject appEntityResource = new JSONObject();
         appEntityResource.put("curCodeName",appDataEntity.getCodeName().toLowerCase());
         appEntityResource.put("path",String.format("%1$s/:%2$s?",Inflector.getInstance().pluralize(appDataEntity.getCodeName()),appDataEntity.getCodeName()).toLowerCase());
@@ -66,7 +66,6 @@ public class AppEntityModel extends BaseModel{
         appEntityResource.put("deResPaths", deResPaths);
         appEntityResource.put("deResPathsString", deResPaths.toString());
         appEntityResources.add(appEntityResource);
-        }
 
         // 初始化界面行为
         try {

modules/ibizlab-generator-core/src/main/java/cn/ibizlab/codegen/model/AppModel.java

@@ -54,13 +54,12 @@ public class AppModel extends BaseModel{
                         tempObj.put("appDataEntity",appDataEntity);
                         appEntityResourceMap.put(String.format("%1$s:%2$s",majorCodeName,minorCodeName),tempObj);
                     });
-                }else{
+                }
                 JSONObject tempObj = new JSONObject();
                 tempObj.put("curCodeName",appDataEntity.getCodeName().toLowerCase());
                 tempObj.put("path",String.format("%1$s/:%2$s?",Inflector.getInstance().pluralize(appDataEntity.getCodeName()),appDataEntity.getCodeName()).toLowerCase());
                 tempObj.put("appDataEntity",appDataEntity);
                 appEntityResourceMap.put(appDataEntity.getCodeName(),tempObj);
-                }
             });
         }
 

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/tab-exp-view/tab-exp-view-prop.ts

 import { ExpViewProps } from "@core";
 
 /**
- * @description 树导航视图props
+ * @description 分页导航视图props
  * @export
  * @interface TabExpViewProps
  * @extends {ExpViewProps}

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/modules/views/tab-exp-view/tab-exp-view-state.ts

 import { ExpViewState } from '@core';
 
 /**
- * @description 树导航视图状态
+ * @description 分页导航视图状态
  * @export
  * @interface TabExpViewState
  * @extends {ExpViewState}

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

 import { IParam, MainControlProps } from "@core";
 
 /**
- * @description 搜索栏部件的props
+ * @description 分页导航部件props
  * @export
  * @interface TabExpPanelControlProps
  * @extends {MainControlProps}
@@ -16,5 +16,5 @@ export interface TabExpPanelControlProps extends MainControlProps {
   /**
    * 默认打开的分页name
    */
-  defaultActivePanel?: string;
+  defaultActivePanel: string;
 }
\ No newline at end of file

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

-import { IParam, MainControlState } from '@core';
+import { MainControlState } from '@core';
 
 /**
- * @description 搜索栏部件状态
+ * @description 分页导航面板状态
  * @export
  * @interface TabExpPanelControlState
  * @extends {MainControlState}

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

-import { UIUtil, deepCopy, IActionParam, IParam, MainControl, TabExpPanelControlState, TabExpPanelControlProps } from '@core';
+import { MainControl, TabExpPanelControlState, TabExpPanelControlProps } from '@core';
 
 /**
  * @description 分页导航部件
@@ -15,6 +15,14 @@ export class TabExpPanelControl extends MainControl {
    */
   public declare state: TabExpPanelControlState;
 
+  /**
+   * 分页导航部件输出参数
+   *
+   * @type {TabExpPanelControlProps}
+   * @memberof TabExpPanelControl
+   */
+  public declare props: TabExpPanelControlProps;
+
   /**
    * @memberof TabExpPanelControl
    */

modules/ibizlab-generator-core/src/main/resources/templ/r7/app_{{apps}}/src/core/utils/ui/route-util.ts

@@ -59,7 +59,7 @@ export class RouteUtil {
   public static getDeResRoutePath(context: any = {}, deResPaths: any[]): string {
     let routePath: string = '';
     // 首先给deResPaths排序，关系多的排前面。
-    deResPaths.sort((a: any[], b: any[]) => a.length - b.length);
+    deResPaths.sort((a: any[], b: any[]) => b.length - a.length);
 
     // 最多匹配路径节点数
     let maxMatch: number = 0;
@@ -118,7 +118,7 @@ export class RouteUtil {
   public static buildDeResRequestPath(context: any = {}, deResPaths: any[]): string {
     let routePath: string = '';
     // 首先给deResPaths排序，关系多的排前面。
-    deResPaths.sort((a: any[], b: any[]) => a.length - b.length);
+    deResPaths.sort((a: any[], b: any[]) => b.length - a.length);
 
     // 最多匹配路径节点数
     let maxMatch: number = 0;
@@ -135,21 +135,23 @@ export class RouteUtil {
 
       deResPath.some((deResNode: any, index: number) => {
         let value: any = context[deResNode.parameterName];
-        //  如果不是最后一条，则正常拼接，否则会一直拼接
+        //  存在关系
+        if (deResPath.length > 1) {
           if (index !== deResPath.length - 1) {
             if (notEmpty(value)) {
               curMatch++;
               curRoutPath += `/${deResNode.pathName}/${value}`;
             } else {
-            // 只要有一个节点没值,则整个路径作废。
+              // 只要有一个主关系节点没值,则整个路径作废。
               curMatch = 0;
               curRoutPath = '';
-            return true
+              return true;
             }
-        } else {
+          } else {    //  该实体本身主键正常拼接
             curMatch++;
             curRoutPath += `/${deResNode.pathName}/${notEmpty(value) ? value : 'undefined'}`;
           }
+        }
       });
 
       // 当前匹配个数大于最大匹配时，修改最大匹配和最终结果
@@ -160,9 +162,9 @@ export class RouteUtil {
     });
 
     // 如果一个匹配的没有，即没有任何主键匹配上，关系路径为实体自身的/pathName/undefined
-    // if(routePath == ''){
-    //   routePath = "/"+deResPaths[deResPaths.length -1][0].pathName+"/undefined";
-    // }
+    if(routePath == ''){
+      routePath = "/"+deResPaths[deResPaths.length -1][0].pathName+"/undefined";
+    }
 
     return routePath;
   }