Merge branch 'lowcoder-org:dev' into dev

lowcoder-org · Mar 8, 2024 · 348c98e · 348c98e
2 parents 800c16c + eb0e0d5
commit 348c98e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/...er/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java b/...er/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java
@@ -17,4 +17,9 @@ public class Folder extends HasIdAndAuditing {
     @Nullable
     private String parentFolderId; // null represents folder in the root folder
     private String name;
+    private String title;
+    private String description;
+    private String category;
+    private String type;
+    private String image;
 }
diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiService.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiService.java
@@ -182,6 +182,11 @@ private Mono<Void> removePermissions(String folderId) {
     public Mono<FolderInfoView> update(Folder folder) {
         Folder newFolder = new Folder();
         newFolder.setName(folder.getName());
+        newFolder.setTitle(folder.getTitle());
+        newFolder.setType(folder.getType());
+        newFolder.setCategory(folder.getCategory());
+        newFolder.setDescription(folder.getDescription());
+        newFolder.setImage(folder.getImage());
         return checkManagePermission(folder.getId())
                 .then(folderService.updateById(folder.getId(), newFolder))
                 .then(folderService.findById(folder.getId()))
@@ -421,6 +426,10 @@ public Mono<FolderInfoView> buildFolderInfoView(Folder folder, boolean visible,
                         .folderId(folder.getId())
                         .parentFolderId(folder.getParentFolderId())
                         .name(folder.getName())
+                        .description(folder.getDescription())
+                        .category(folder.getCategory())
+                        .type(folder.getType())
+                        .image(folder.getImage())
                         .createAt(folder.getCreatedAt() == null ? 0 : folder.getCreatedAt().toEpochMilli())
                         .createBy(user.getName())
                         .createTime(folder.getCreatedAt())

diff --git a/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderInfoView.java b/server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderInfoView.java
@@ -20,6 +20,11 @@ public class FolderInfoView {
     private final String folderId;
     private final String parentFolderId;
     private final String name;
+    private final String title;
+    private final String description;
+    private final String category;
+    private final String type;
+    private final String image;
     private final Long createAt;
     private final String createBy;
     private boolean isVisible;