Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 0ec2a69

Browse files
Merge branch 'dev' into calendar-updates
2 parents 3a00b21 + b06d729 commit 0ec2a69

File tree

16 files changed

+77
-64
lines changed

16 files changed

+77
-64
lines changed

‎client/packages/lowcoder/src/comps/comps/containerComp/containerView.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,9 +225,10 @@ const onDrop = async (
225225
const nameGenerator = editorState.getNameGenerator();
226226
const compInfo = parseCompType(compType);
227227
const compName = nameGenerator.genItemName(compInfo.compName);
228+
const isLazyLoadComp = uiCompRegistry[compType as UICompType]?.lazyLoad;
228229
let defaultDataFn = undefined;
229230

230-
if (!compInfo.isRemote) {
231+
if (isLazyLoadComp) {
231232
const {
232233
defaultDataFnName,
233234
defaultDataFnPath,
@@ -237,6 +238,8 @@ const onDrop = async (
237238
const module = await import(`../../${defaultDataFnPath}.tsx`);
238239
defaultDataFn = module[defaultDataFnName];
239240
}
241+
} else if(!compInfo.isRemote) {
242+
defaultDataFn = uiCompRegistry[compType as UICompType]?.defaultDataFn;
240243
}
241244

242245
const widgetValue: GridItemDataType = {

‎client/packages/lowcoder/src/comps/comps/rootComp.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import "comps/comps/layout/navLayout";
2-
import "comps/comps/layout/mobileTabLayout";
1+
// import "comps/comps/layout/navLayout";
2+
// import "comps/comps/layout/mobileTabLayout";
33

44
import { CompAction, CompActionTypes } from "lowcoder-core";
55
import { EditorContext, EditorState } from "comps/editorState";

‎client/packages/lowcoder/src/comps/index.tsx‎

Lines changed: 27 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
import "comps/comps/layout/navLayout";
2+
import "comps/comps/layout/mobileTabLayout";
3+
14
import cnchar from "cnchar";
25
import { trans } from "i18n";
36
import { remoteComp } from "./comps/remoteComp/remoteComp";
@@ -113,6 +116,17 @@ import {
113116
KanbanCompIcon,
114117

115118
} from "lowcoder-design";
119+
import { ModuleComp } from "./comps/moduleComp/moduleComp";
120+
import { TableComp } from "./comps/tableComp/tableComp";
121+
import { defaultTableData } from "./comps/tableComp/mockTableComp";
122+
import { ContainerComp, defaultContainerData } from "./comps/containerComp/containerComp";
123+
import { ColumnLayoutComp } from "./comps/columnLayout/columnLayout";
124+
import { TabbedContainerComp } from "./comps/tabs/tabbedContainerComp";
125+
import { ButtonComp } from "./comps/buttonComp/buttonComp";
126+
import { TextComp } from "./comps/textComp";
127+
import { SelectComp } from "./comps/selectInputComp/selectComp";
128+
import { InputComp } from "./comps/textInputComp/inputComp";
129+
import { TextAreaComp } from "./comps/textInputComp/textAreaComp";
116130

117131
type Registry = {
118132
[key in UICompType]?: UICompManifest;
@@ -340,19 +354,16 @@ export var uiCompMap: Registry = {
340354
name: trans("uiComp.tableCompName"),
341355
enName: "Table",
342356
description: trans("uiComp.tableCompDesc"),
343-
categories: ["dashboards"],
357+
categories: ["dashboards","projectmanagement"],
344358
icon: TableCompIcon,
345359
keywords: trans("uiComp.tableCompKeywords"),
346-
lazyLoad: true,
347-
compName: "TableComp",
348-
compPath: "comps/tableComp/index",
360+
comp: TableComp,
349361
layoutInfo: {
350362
w: 12,
351363
h: 40,
352364
},
353365
withoutLoading: true,
354-
defaultDataFnName: "defaultTableData",
355-
defaultDataFnPath: "comps/tableComp/mockTableComp",
366+
defaultDataFn: defaultTableData,
356367
},
357368

358369
pivotTable: {
@@ -450,9 +461,7 @@ export var uiCompMap: Registry = {
450461
categories: ["layout"],
451462
icon: ColumnLayoutCompIcon,
452463
keywords: trans("uiComp.responsiveLayoutCompKeywords"),
453-
lazyLoad: true,
454-
compName: "ColumnLayoutComp",
455-
compPath: "comps/columnLayout/index",
464+
comp: ColumnLayoutComp,
456465
withoutLoading: true,
457466
layoutInfo: {
458467
w: 24,
@@ -502,9 +511,7 @@ export var uiCompMap: Registry = {
502511
categories: ["layout"],
503512
icon: TabbedContainerCompIcon,
504513
keywords: trans("uiComp.tabbedContainerCompKeywords"),
505-
lazyLoad: true,
506-
compName: "TabbedContainerComp",
507-
compPath: "comps/tabs/index",
514+
comp: TabbedContainerComp,
508515
withoutLoading: true,
509516
layoutInfo: {
510517
w: 12,
@@ -540,18 +547,15 @@ export var uiCompMap: Registry = {
540547
categories: ["layout"],
541548
icon: ContainerCompIcon,
542549
keywords: trans("uiComp.containerCompKeywords"),
543-
lazyLoad: true,
544-
compName: "ContainerComp",
545-
compPath: "comps/containerComp/containerComp",
550+
comp: ContainerComp,
546551
withoutLoading: true,
547552
layoutInfo: {
548553
w: 12,
549554
h: 25,
550555
// static: true,
551556
delayCollision: true,
552557
},
553-
defaultDataFnName: "defaultContainerData",
554-
defaultDataFnPath: "comps/containerComp/containerComp",
558+
defaultDataFn: defaultContainerData,
555559
},
556560
listView: {
557561
name: trans("uiComp.listViewCompName"),
@@ -927,9 +931,7 @@ export var uiCompMap: Registry = {
927931
categories: ["forms"],
928932
icon: InputCompIcon,
929933
keywords: trans("uiComp.inputCompKeywords"),
930-
lazyLoad: true,
931-
compName: "InputComp",
932-
compPath: "comps/textInputComp/inputComp",
934+
comp: InputComp,
933935
layoutInfo: {
934936
w: 6,
935937
h: 6,
@@ -972,9 +974,7 @@ export var uiCompMap: Registry = {
972974
categories: ["forms"],
973975
icon: TextAreaCompIcon,
974976
keywords: trans("uiComp.textAreaCompKeywords"),
975-
lazyLoad: true,
976-
compName: "TextAreaComp",
977-
compPath: "comps/textInputComp/textAreaComp",
977+
comp: TextAreaComp,
978978
layoutInfo: {
979979
w: 6,
980980
h: 12,
@@ -1141,9 +1141,7 @@ export var uiCompMap: Registry = {
11411141
categories: ["forms"],
11421142
icon: ButtonCompIcon,
11431143
keywords: trans("uiComp.buttonCompKeywords"),
1144-
lazyLoad: true,
1145-
compName: "ButtonComp",
1146-
compPath: "comps/buttonComp/buttonComp",
1144+
comp: ButtonComp,
11471145
layoutInfo: {
11481146
w: 6,
11491147
h: 6,
@@ -1563,9 +1561,7 @@ export var uiCompMap: Registry = {
15631561
categories: ["forms", "itemHandling"],
15641562
icon: SelectCompIcon,
15651563
keywords: trans("uiComp.selectCompKeywords"),
1566-
lazyLoad: true,
1567-
compName: "SelectComp",
1568-
compPath: "comps/selectInputComp/selectComp",
1564+
comp: SelectComp,
15691565
layoutInfo: {
15701566
w: 6,
15711567
h: 5,
@@ -1705,9 +1701,7 @@ export var uiCompMap: Registry = {
17051701
description: trans("uiComp.moduleCompDesc"),
17061702
categories: [],
17071703
keywords: trans("uiComp.moduleCompKeywords"),
1708-
lazyLoad: true,
1709-
compName: "ModuleComp",
1710-
compPath: "comps/moduleComp/moduleComp",
1704+
comp: ModuleComp,
17111705
layoutInfo: {
17121706
w: 12,
17131707
h: 40,
@@ -1723,9 +1717,7 @@ export var uiCompMap: Registry = {
17231717
categories: ["dashboards", "layout", "multimedia"],
17241718
icon: TextCompIcon,
17251719
keywords: trans("uiComp.textCompKeywords"),
1726-
compName: "TextComp",
1727-
lazyLoad: true,
1728-
compPath: "comps/textComp",
1720+
comp: TextComp,
17291721
layoutInfo: {
17301722
w: 6,
17311723
h: 24,

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/model/Application.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,18 @@ public Map<String, Object> getEditingApplicationDSL() {
179179
return dsl;
180180
}
181181

182+
public String getCategory() {
183+
if(editingApplicationDSL == null || editingApplicationDSL.get("settings") == null) return "";
184+
Object settingsObject = editingApplicationDSL.get("settings");
185+
if (settingsObject instanceof Map) {
186+
@SuppressWarnings("unchecked")
187+
Map<String, Object> settings = (Map<String, Object>) editingApplicationDSL.get("settings");
188+
return (String) settings.get("category");
189+
} else {
190+
return "";
191+
}
192+
}
193+
182194
public Map<String, Object> getEditingApplicationDSLOrNull() {return editingApplicationDSL; }
183195

184196
public Object getLiveContainerSize() {

‎server/api-service/lowcoder-domain/src/main/java/org/lowcoder/domain/application/repository/ApplicationRepository.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import jakarta.annotation.Nonnull;
55
import org.lowcoder.domain.application.model.Application;
66
import org.lowcoder.domain.application.model.ApplicationStatus;
7+
import org.springframework.data.mongodb.repository.Aggregation;
78
import org.springframework.data.mongodb.repository.Query;
89
import org.springframework.data.mongodb.repository.ReactiveMongoRepository;
910
import org.springframework.stereotype.Repository;
@@ -16,16 +17,16 @@
1617
public interface ApplicationRepository extends ReactiveMongoRepository<Application, String>, CustomApplicationRepository {
1718

1819
// publishedApplicationDSL : 0 -> excludes publishedApplicationDSL from the return
19-
@Query(fields = "{ publishedApplicationDSL : 0 , editingApplicationDSL : 0 }")
20+
@Aggregation(pipeline = {"{ $project: { 'editingApplicationDSL.settings.category': 1, _id: 1, gid: 1, organizationId: 1, name: 1, applicationType: 1, applicationStatus: 1, publicToAll: 1, publicToMarketplace: 1, agencyProfile: 1, editingUserId: 1, lastEditedAt: 1, createdAt: 1, updatedAt: 1, createdBy: 1, modifiedBy: 1, _class: 1}}"})
2021
Flux<Application> findByOrganizationId(String organizationId);
2122

2223

2324
@Override
2425
@Nonnull
25-
@Query(fields = "{ publishedApplicationDSL : 0 , editingApplicationDSL : 0 }")
26+
@Aggregation(pipeline = {"{ $project: { 'editingApplicationDSL.settings.category': 1, _id: 1, gid: 1, organizationId: 1, name: 1, applicationType: 1, applicationStatus: 1, publicToAll: 1, publicToMarketplace: 1, agencyProfile: 1, editingUserId: 1, lastEditedAt: 1, createdAt: 1, updatedAt: 1, createdBy: 1, modifiedBy: 1, _class: 1}}"})
2627
Mono<Application> findById(@Nonnull String id);
2728

28-
@Query(fields = "{ publishedApplicationDSL : 0 , editingApplicationDSL : 0 }")
29+
@Aggregation(pipeline = {"{ $project: { 'editingApplicationDSL.settings.category': 1, _id: 1, gid: 1, organizationId: 1, name: 1, applicationType: 1, applicationStatus: 1, publicToAll: 1, publicToMarketplace: 1, agencyProfile: 1, editingUserId: 1, lastEditedAt: 1, createdAt: 1, updatedAt: 1, createdBy: 1, modifiedBy: 1, _class: 1}}"})
2930
Flux<Application> findByGid(@Nonnull String gid);
3031

3132
Mono<Long> countByOrganizationIdAndApplicationStatus(String organizationId, ApplicationStatus applicationStatus);

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
public interface ApplicationApiService {
1818
Mono<ApplicationView> create(ApplicationEndpoints.CreateApplicationRequest createApplicationRequest);
1919

20-
Flux<ApplicationInfoView> getRecycledApplications(String name);
20+
Flux<ApplicationInfoView> getRecycledApplications(String name, Stringcategory);
2121

2222
Mono<ApplicationView> delete(String applicationId);
2323

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationApiServiceImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,8 +169,8 @@ private Mono<Void> autoGrantPermissionsByFolderDefault(String applicationId, @Nu
169169
}
170170

171171
@Override
172-
public Flux<ApplicationInfoView> getRecycledApplications(String name) {
173-
return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null, ApplicationStatus.RECYCLED, false, name);
172+
public Flux<ApplicationInfoView> getRecycledApplications(String name, Stringcategory) {
173+
return userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(null, ApplicationStatus.RECYCLED, false, name, category);
174174
}
175175

176176
private Mono<Void> checkCurrentUserApplicationPermission(String applicationId, ResourceAction action) {

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationController.java‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ public Mono<ResponseView<Boolean>> restore(@PathVariable String applicationId) {
7878
}
7979

8080
@Override
81-
public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications(@RequestParam(required = false) String name) {
82-
return applicationApiService.getRecycledApplications(name)
81+
public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications(@RequestParam(required = false) String name, @RequestParam(required = false) Stringcategory) {
82+
return applicationApiService.getRecycledApplications(name, category)
8383
.collectList()
8484
.map(ResponseView::success);
8585
}
@@ -159,13 +159,14 @@ public Mono<ResponseView<UserHomepageView>> getUserHomePage(@RequestParam(requir
159159

160160
@Override
161161
public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestParam(required = false) Integer applicationType,
162-
@RequestParam(required = false) ApplicationStatus applicationStatus,
163-
@RequestParam(defaultValue = "true") boolean withContainerSize,
164-
@RequestParam(required = false) String name,
165-
@RequestParam(required = false, defaultValue = "1") Integer pageNum,
166-
@RequestParam(required = false, defaultValue = "0") Integer pageSize) {
162+
@RequestParam(required = false) ApplicationStatus applicationStatus,
163+
@RequestParam(defaultValue = "true") boolean withContainerSize,
164+
@RequestParam(required = false) String name,
165+
@RequestParam(required = false) String category,
166+
@RequestParam(required = false, defaultValue = "1") Integer pageNum,
167+
@RequestParam(required = false, defaultValue = "0") Integer pageSize) {
167168
ApplicationType applicationTypeEnum = applicationType == null ? null : ApplicationType.fromValue(applicationType);
168-
var flux = userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum, applicationStatus, withContainerSize, name).cache();
169+
var flux = userHomeApiService.getAllAuthorisedApplications4CurrentOrgMember(applicationTypeEnum, applicationStatus, withContainerSize, name, category).cache();
169170
Mono<Long> countMono = flux.count();
170171
var flux1 = flux.skip((long) (pageNum - 1) * pageSize);
171172
if(pageSize > 0) flux1 = flux1.take(pageSize);

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/application/ApplicationEndpoints.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public interface ApplicationEndpoints
7171
description = "List all the recycled Lowcoder Applications in the recycle bin where the authenticated or impersonated user has access."
7272
)
7373
@GetMapping("/recycle/list")
74-
public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications(@RequestParam(required = false) String name);
74+
public Mono<ResponseView<List<ApplicationInfoView>>> getRecycledApplications(@RequestParam(required = false) String name, @RequestParam(required = false) Stringcategory);
7575

7676
@Operation(
7777
tags = TAG_APPLICATION_MANAGEMENT,
@@ -167,6 +167,7 @@ public Mono<ResponseView<List<ApplicationInfoView>>> getApplications(@RequestPar
167167
@RequestParam(required = false) ApplicationStatus applicationStatus,
168168
@RequestParam(defaultValue = "true") boolean withContainerSize,
169169
@RequestParam(required = false) String name,
170+
@RequestParam(required = false) String category,
170171
@RequestParam(required = false, defaultValue = "1") Integer pageNum,
171172
@RequestParam(required = false, defaultValue = "0") Integer pageSize);
172173

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public interface FolderApiService {
2727

2828
Mono<Void> upsertLastViewTime(@Nullable String folderId);
2929

30-
Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType applicationType, @Nullable String name);
30+
Flux<?> getElements(@Nullable String folderId, @Nullable ApplicationType applicationType, @Nullable String name, @NullableStringcategory);
3131

3232
Mono<Void> grantPermission(String folderId, Set<String> userIds, Set<String> groupIds, ResourceRole role);
3333

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /