Movatterモバイル変換

[0]ホーム
URL:

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

Commite192087

Browse files
committed
Merge branch 'dev' of github.com:lowcoder-org/lowcoder into dev
2 parents6e9aa66 +c8b9c18 commite192087

File tree

7 files changed

+16
-6
lines changed

7 files changed

+16
-6
lines changed

‎client/packages/lowcoder/src/comps/controls/actionSelector/executeQueryAction.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ const ExecuteQueryPropertyView = ({
5656
},[placement]);
5757

5858
constgetVariableOptions=useCallback((editorState?:EditorState)=>{
59+
constqueryVariables=comp.children.queryVariables.getView();
60+
if(!queryVariables.length)returnnull;
61+
5962
returncomp.children.queryVariables.propertyView({
6063
label:trans("eventHandler.queryVariables"),
6164
layout:"vertical",

‎client/packages/lowcoder/src/comps/queries/queryComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,11 @@ QueryCompTmp = class extends QueryCompTmp {
259259
||isInputChangeTrigger
260260
||(isPageLoadTrigger&&notExecuted)
261261
)
262-
// && (!isJsQuery || (isJsQuery && notExecuted)) // query which has deps can be executed on page load(first time)
262+
&&(
263+
!isJsQuery
264+
||(isJsQuery&&!isAutomatic)
265+
||(isJsQuery&&isAutomatic&&notExecuted)
266+
)// query which has deps can be executed on page load(first time)
263267
){
264268
constnext=super.reduce(action);
265269
constdepends=this.children.comp.node()?.dependValues();

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
importlombok.extern.slf4j.Slf4j;
1010
importorg.apache.commons.collections4.CollectionUtils;
1111
importorg.apache.commons.collections4.SetUtils;
12+
importorg.apache.commons.lang3.ObjectUtils;
1213
importorg.apache.commons.lang3.StringUtils;
1314
importorg.lowcoder.api.application.ApplicationEndpoints.CreateApplicationRequest;
1415
importorg.lowcoder.api.application.view.ApplicationInfoView;
@@ -101,7 +102,7 @@ public class ApplicationApiServiceImpl implements ApplicationApiService {
101102
publicMono<ApplicationView>create(CreateApplicationRequestcreateApplicationRequest) {
102103

103104
Applicationapplication =newApplication(createApplicationRequest.organizationId(),
104-
UuidCreator.getTimeOrderedEpoch().toString(),
105+
ObjectUtils.defaultIfNull(createApplicationRequest.gid(),UuidCreator.getTimeOrderedEpoch().toString()),
105106
createApplicationRequest.name(),
106107
createApplicationRequest.applicationType(),
107108
NORMAL,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@ public record UpdatePermissionRequest(String role) {
298298
}
299299

300300
publicrecordCreateApplicationRequest(@JsonProperty("orgId")StringorganizationId,
301+
@NullableStringgid,
301302
Stringname,
302303
IntegerapplicationType,
303304
Map<String,Object>editingApplicationDSL,

‎server/api-service/lowcoder-server/src/main/java/org/lowcoder/api/datasource/UpsertDatasourceRequestMapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public Datasource resolve(UpsertDatasourceRequest dto) {
3434

3535
Datasourcedatasource =newDatasource();
3636
datasource.setId(dto.getId());
37+
datasource.setGid(dto.getGid());
3738
datasource.setName(dto.getName());
3839
datasource.setType(dto.getType());
3940
datasource.setOrganizationId(dto.getOrganizationId());

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceIntegrationTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ public void testCreateApplicationSuccess() {
7070
});
7171
//
7272
Mono<ApplicationView>applicationViewMono =datasourceMono.map(datasource ->newCreateApplicationRequest(
73-
"org01",
73+
"org01",null,
7474
"app05",
7575
ApplicationType.APPLICATION.getValue(),
7676
Map.of("comp","list","queries",Set.of(Map.of("datasourceId",datasource.getId()))),
@@ -104,7 +104,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
104104
});
105105
//
106106
Mono<ApplicationView>applicationViewMono =datasourceMono.map(datasource ->newCreateApplicationRequest(
107-
"org01",
107+
"org01",null,
108108
"app03",
109109
ApplicationType.APPLICATION.getValue(),
110110
Map.of("comp","list","queries",Set.of(Map.of("datasourceId",datasource.getId()))),
@@ -129,7 +129,7 @@ public void testUpdateApplicationFailedDueToLackOfDatasourcePermissions() {
129129
@Test
130130
@WithMockUser
131131
publicvoidtestUpdateEditingStateSuccess() {
132-
Mono<ApplicationView>applicationViewMono =applicationApiService.create(newCreateApplicationRequest("org01","app1",ApplicationType.APPLICATION.getValue(),Map.of("comp","list"),null));
132+
Mono<ApplicationView>applicationViewMono =applicationApiService.create(newCreateApplicationRequest("org01",null,"app1",ApplicationType.APPLICATION.getValue(),Map.of("comp","list"),null));
133133
Mono<ApplicationView>updateEditStateMono =applicationViewMono.delayUntil(app ->applicationApiService.updateEditState(app.getApplicationInfoView().getApplicationId(),newApplicationEndpoints.UpdateEditStateRequest(true)));
134134
Mono<ApplicationView>app =updateEditStateMono.flatMap(applicationView ->applicationApiService.getEditingApplication(applicationView.getApplicationInfoView().getApplicationId()));
135135
StepVerifier.create(app)

‎server/api-service/lowcoder-server/src/test/java/org/lowcoder/api/application/ApplicationApiServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public void testDeleteNormalApplicationWithError() {
130130

131131
privateMono<ApplicationView>createApplication(Stringname,StringfolderId) {
132132
CreateApplicationRequestcreateApplicationRequest =
133-
newCreateApplicationRequest("org01",name,ApplicationType.APPLICATION.getValue(),
133+
newCreateApplicationRequest("org01",null,name,ApplicationType.APPLICATION.getValue(),
134134
Map.of("comp","list"),folderId);
135135
returnapplicationApiService.create(createApplicationRequest);
136136
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp