diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeParentScope.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeParentScope.java index df99ae2b..adf82da5 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeParentScope.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeParentScope.java @@ -8,26 +8,6 @@ public interface IndexNodeParentScope { IndexNodeScope nodeScope(); - default boolean isChildrenNameDuplicatable() { - switch (nodeScope().context()) { - case FILE_TEMPLATE: - case TEMPLATE_DATABASE: - return false; - default: - return nodeScope().scope().getChildNameDuplicatable(); - } - } - - default boolean isLimitChildrenCount() { - switch (nodeScope().context()) { - case FILE_TEMPLATE: - case TEMPLATE_DATABASE: - return true; - default: - return nodeScope().scope().getLimitChildrenCount(); - } - } - default String parentCode() { return IndexNodeScope.TREE_ROOT_NODE_CODE; } diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/IndexNode.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/IndexNode.java index 3684e37a..44a76028 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/IndexNode.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/entity/IndexNode.java @@ -239,4 +239,4 @@ public class IndexNode extends BaseEntity implements NodeValue, Index // my parent scope return parentCode; } -} +} \ No newline at end of file diff --git a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java index 2a870d96..da507207 100644 --- a/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java +++ b/doc/doc-server/src/main/java/cn/axzo/nanopart/doc/file/index/IndexSupport.java @@ -102,15 +102,23 @@ public class IndexSupport { } boolean isChildrenNameDuplicatable(IndexNodeParentScope parentScope) { - if (StringUtils.isNotBlank(parentScope.parentCode())) - return indexNodeDao.getOrThrow(parentScope.parentCode()).isChildrenNameDuplicatable(); - return parentScope.isChildrenNameDuplicatable(); + switch (parentScope.nodeScope().context()) { + case FILE_TEMPLATE: + case TEMPLATE_DATABASE: + return false; + default: + return parentScope.nodeScope().scope().getChildNameDuplicatable(); + } } boolean isLimitChildrenCount(IndexNodeParentScope parentScope) { - if (StringUtils.isNotBlank(parentScope.parentCode())) - return indexNodeDao.getOrThrow(parentScope.parentCode()).isLimitChildrenCount(); - return parentScope.isLimitChildrenCount(); + switch (parentScope.nodeScope().context()) { + case FILE_TEMPLATE: + case TEMPLATE_DATABASE: + return true; + default: + return parentScope.nodeScope().scope().getLimitChildrenCount(); + } } List collectValidSubtreeAsValueRoot(IndexNode srcNode) {