Skip to content

Commit 348c98e

Browse files
authored
Merge branch 'lowcoder-org:dev' into dev
2 parents 800c16c + eb0e0d5 commit 348c98e

File tree

3 files changed

+19
-0
lines changed

3 files changed

+19
-0
lines changed

server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/folder/model/Folder.java

+5
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,9 @@ public class Folder extends HasIdAndAuditing {
1717
@Nullable
1818
private String parentFolderId; // null represents folder in the root folder
1919
private String name;
20+
private String title;
21+
private String description;
22+
private String category;
23+
private String type;
24+
private String image;
2025
}

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderApiService.java

+9
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,11 @@ private Mono<Void> removePermissions(String folderId) {
182182
public Mono<FolderInfoView> update(Folder folder) {
183183
Folder newFolder = new Folder();
184184
newFolder.setName(folder.getName());
185+
newFolder.setTitle(folder.getTitle());
186+
newFolder.setType(folder.getType());
187+
newFolder.setCategory(folder.getCategory());
188+
newFolder.setDescription(folder.getDescription());
189+
newFolder.setImage(folder.getImage());
185190
return checkManagePermission(folder.getId())
186191
.then(folderService.updateById(folder.getId(), newFolder))
187192
.then(folderService.findById(folder.getId()))
@@ -421,6 +426,10 @@ public Mono<FolderInfoView> buildFolderInfoView(Folder folder, boolean visible,
421426
.folderId(folder.getId())
422427
.parentFolderId(folder.getParentFolderId())
423428
.name(folder.getName())
429+
.description(folder.getDescription())
430+
.category(folder.getCategory())
431+
.type(folder.getType())
432+
.image(folder.getImage())
424433
.createAt(folder.getCreatedAt() == null ? 0 : folder.getCreatedAt().toEpochMilli())
425434
.createBy(user.getName())
426435
.createTime(folder.getCreatedAt())

server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/home/FolderInfoView.java

+5
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ public class FolderInfoView {
2020
private final String folderId;
2121
private final String parentFolderId;
2222
private final String name;
23+
private final String title;
24+
private final String description;
25+
private final String category;
26+
private final String type;
27+
private final String image;
2328
private final Long createAt;
2429
private final String createBy;
2530
private boolean isVisible;

0 commit comments

Comments
 (0)