From cb6cb3cab7610af0ca3f97a156a1470074ced0e2 Mon Sep 17 00:00:00 2001 From: yanglin Date: Wed, 19 Mar 2025 20:23:58 +0800 Subject: [PATCH] =?UTF-8?q?REQ-3540:=20=E6=B7=BB=E5=8A=A0=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../axzo/nanopart/doc/api/domain/IndexNodeScope.java | 5 +---- .../cn/axzo/nanopart/doc/api/enums/DatabaseScope.java | 11 ++++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeScope.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeScope.java index d686fb64..a373294d 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeScope.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/domain/IndexNodeScope.java @@ -2,7 +2,6 @@ package cn.axzo.nanopart.doc.api.domain; import cn.axzo.nanopart.doc.api.enums.DatabaseScope; -import cn.axzo.nanopart.doc.api.enums.DatabaseType; import cn.axzo.nanopart.doc.api.enums.IndexNodeContext; /** @@ -24,8 +23,6 @@ public interface IndexNodeScope { switch (context()) { case FILE_TEMPLATE: case TEMPLATE_DATABASE: - case FILE_DATABASE: - return false; default: return scope().getChildNameDuplicatable(); } @@ -37,7 +34,7 @@ public interface IndexNodeScope { case TEMPLATE_DATABASE: return true; default: - return scope().getDatabaseType() != DatabaseType.NONE; + return scope().getLimitChildrenCount(); } } diff --git a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/enums/DatabaseScope.java b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/enums/DatabaseScope.java index 25197742..3ba70587 100644 --- a/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/enums/DatabaseScope.java +++ b/doc/doc-api/src/main/java/cn/axzo/nanopart/doc/api/enums/DatabaseScope.java @@ -12,17 +12,18 @@ import lombok.RequiredArgsConstructor; public enum DatabaseScope { // 无含义, 只有系统预定义用途的才能使用这个值 - NONE(DatabaseType.NONE, null), + NONE(DatabaseType.NONE, null, null), // 匿名数据库 - ANONYMOUS(DatabaseType.NONE, true), + ANONYMOUS(DatabaseType.NONE, true, false), // 企业数据库 - ENT_DATABASE(DatabaseType.CREATED_BY_SYSTEM, false), + ENT_DATABASE(DatabaseType.CREATED_BY_SYSTEM, false, true), // 项目数据库 - PROJECT_DATABASE(DatabaseType.CREATED_BY_SYSTEM, false), + PROJECT_DATABASE(DatabaseType.CREATED_BY_SYSTEM, false, true), // 个人数据库: 为单位建的 - PERSONAL_FOR_ENT(DatabaseType.CREATED_BY_USER_FOR_ENT, false); + PERSONAL_FOR_ENT(DatabaseType.CREATED_BY_USER_FOR_ENT, false, true); private final DatabaseType databaseType; private final Boolean childNameDuplicatable; + private final Boolean limitChildrenCount; }