diff --git a/core/core-frontend/src/models/tree/TreeNode.ts b/core/core-frontend/src/models/tree/TreeNode.ts index 5acb88cdb2..8348b9bb42 100644 --- a/core/core-frontend/src/models/tree/TreeNode.ts +++ b/core/core-frontend/src/models/tree/TreeNode.ts @@ -4,6 +4,7 @@ export interface BusiTreeNode { name: string leaf?: boolean weight: number + ext?: number extraFlag: number children?: BusiTreeNode[] } diff --git a/de-xpack b/de-xpack index d02a09a678..bba26306bc 160000 --- a/de-xpack +++ b/de-xpack @@ -1 +1 @@ -Subproject commit d02a09a6780123598f4e1068cb6762ff9150b07d +Subproject commit bba26306bc91332d6c62e0638a28ed4bc653c13c diff --git a/sdk/common/src/main/java/io/dataease/constant/AuthEnum.java b/sdk/common/src/main/java/io/dataease/constant/AuthEnum.java index 536898955c..696b3617f1 100644 --- a/sdk/common/src/main/java/io/dataease/constant/AuthEnum.java +++ b/sdk/common/src/main/java/io/dataease/constant/AuthEnum.java @@ -1,7 +1,7 @@ package io.dataease.constant; public enum AuthEnum { - READ(1), EXPORT(4), MANAGE(7), AUTH(9); + READ(1), EXPORT(4), EXPORT_VIEW(5), EXPORT_DETAIL(6), MANAGE(7), AUTH(9); private Integer weight; public Integer getWeight() { diff --git a/sdk/common/src/main/java/io/dataease/model/BusiNodeVO.java b/sdk/common/src/main/java/io/dataease/model/BusiNodeVO.java index 014280525a..d70dfaffd1 100644 --- a/sdk/common/src/main/java/io/dataease/model/BusiNodeVO.java +++ b/sdk/common/src/main/java/io/dataease/model/BusiNodeVO.java @@ -32,4 +32,6 @@ public class BusiNodeVO implements TreeResultModel, Serializable { private String type; @Schema(description = "子节点") private List children; + @Schema(description = "独立权重") + private Integer ext; }