Skip to content

Commit 2c6c810

Browse files
ludomikulaludomikula
authored
Merge branch 'dev' into deployment_updates
2 parents 2037ca2 + 085c802 commit 2c6c810

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+11167
-264
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ const DatePickerTmpCmp = new UICompBuilder(childrenMap, (props) => {
326326
{disabledPropertyView(children)}
327327
{hiddenPropertyView(children)}
328328
{showDataLoadingIndicatorsPropertyView(children)}
329+
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
329330
</Section>
330331
</>
331332
)}
@@ -344,7 +345,6 @@ const DatePickerTmpCmp = new UICompBuilder(childrenMap, (props) => {
344345
<><Section name={sectionNames.advanced}>
345346
{timeFields(children, isMobile)}
346347
{children.suffixIcon.propertyView({ label: trans("button.suffixIcon") })}
347-
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
348348
</Section></>
349349
)}
350350
{(useContext(EditorContext).editorModeStatus === "logic" || useContext(EditorContext).editorModeStatus === "both") && !isMobile && commonAdvanceSection(children)}
@@ -543,6 +543,7 @@ let DateRangeTmpCmp = (function () {
543543
{disabledPropertyView(children)}
544544
{hiddenPropertyView(children)}
545545
{showDataLoadingIndicatorsPropertyView(children)}
546+
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
546547
</Section>
547548
</>
548549
)}
@@ -560,7 +561,6 @@ let DateRangeTmpCmp = (function () {
560561
<><Section name={sectionNames.advanced}>
561562
{timeFields(children, isMobile)}
562563
{children.suffixIcon.propertyView({ label: trans("button.suffixIcon") })}
563-
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
564564
</Section></>
565565
)}
566566
{(useContext(EditorContext).editorModeStatus === "logic" || useContext(EditorContext).editorModeStatus === "both") && commonAdvanceSection(children)}

‎client/packages/lowcoder/src/comps/comps/dateComp/timeComp.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,7 @@ const TimePickerTmpCmp = new UICompBuilder(childrenMap, (props) => {
250250
{disabledPropertyView(children)}
251251
{hiddenPropertyView(children)}
252252
{showDataLoadingIndicatorsPropertyView(children)}
253+
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
253254
</Section></>
254255
)}
255256

@@ -266,7 +267,6 @@ const TimePickerTmpCmp = new UICompBuilder(childrenMap, (props) => {
266267
{commonAdvanceSection(children)}
267268
{children.use12Hours.propertyView({ label: trans("prop.use12Hours") })}
268269
{children.suffixIcon.propertyView({ label: trans("button.suffixIcon") })}
269-
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
270270
</Section>
271271
)}
272272

@@ -428,6 +428,7 @@ const TimeRangeTmpCmp = (function () {
428428
{disabledPropertyView(children)}
429429
{hiddenPropertyView(children)}
430430
{showDataLoadingIndicatorsPropertyView(children)}
431+
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
431432
</Section></>
432433
)}
433434

@@ -444,7 +445,6 @@ const TimeRangeTmpCmp = (function () {
444445
{commonAdvanceSection(children)}
445446
{children.use12Hours.propertyView({ label: trans("prop.use12Hours") })}
446447
{children.suffixIcon.propertyView({ label: trans("button.suffixIcon") })}
447-
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
448448
</Section>
449449
)}
450450

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,7 @@ let NumberInputTmpComp = (function () {
438438
{children.onEvent.getPropertyView()}
439439
{disabledPropertyView(children)}
440440
{hiddenPropertyView(children)}
441+
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
441442
</Section>
442443
</>
443444
)}
@@ -458,7 +459,6 @@ let NumberInputTmpComp = (function () {
458459
})}
459460
{children.controls.propertyView({ label: trans("numberInput.controls") })}
460461
{readOnlyPropertyView(children)}
461-
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
462462
</Section>
463463
)}
464464

‎client/packages/lowcoder/src/comps/comps/numberInputComp/rangeSliderComp.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ const RangeSliderBasicComp = (function () {
8888
tooltip: trans("rangeSlider.stepTooltip"),
8989
})}
9090
{children.vertical.propertyView({ label: trans("slider.vertical") })}
91-
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
9291
</Section>
9392

9493
<SliderPropertyView {...children} />

‎client/packages/lowcoder/src/comps/comps/numberInputComp/sliderComp.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ const SliderBasicComp = (function () {
6868
tooltip: trans("slider.stepTooltip"),
6969
})}
7070
{children.vertical.propertyView({ label: trans("slider.vertical") })}
71-
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
7271
</Section>
7372
<FormDataPropertyView {...children} />
7473
<SliderPropertyView {...children} />

‎client/packages/lowcoder/src/comps/comps/numberInputComp/sliderCompConstants.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ const InteractionSection = memo(({ children }: { children: RecordConstructorToCo
104104
{disabledPropertyView(children)}
105105
{hiddenPropertyView(children)}
106106
{showDataLoadingIndicatorsPropertyView(children as any)}
107+
{(children as any).tabIndex?.propertyView({ label: trans("prop.tabIndex") })}
107108
</Section>
108109
);
109110
});

‎client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export const getStyle = (style: CheckboxStyleType) => {
6565
}
6666
}
6767
68-
.ant-checkbox-inner) {
68+
.ant-checkbox-inner {
6969
background-color: ${style.uncheckedBackground};
7070
border-radius: ${style.radius};
7171
border-color: ${style.checkedBorder};

‎client/packages/lowcoder/src/comps/comps/selectInputComp/radioCompConstants.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,9 @@ export const RadioPropertyView = (
7474
{disabledPropertyView(children)}
7575
{hiddenPropertyView(children)}
7676
{showDataLoadingIndicatorsPropertyView(children as any)}
77-
</Section>
78-
<Section name={sectionNames.advanced}>
7977
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
80-
</Section></>
78+
</Section>
79+
</>
8180
)}
8281

8382
{["layout", "both"].includes(useContext(EditorContext).editorModeStatus) && (

‎client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ let InputBasicComp = new UICompBuilder(childrenMap, (props) => {
103103
{children.prefixIcon.propertyView({ label: trans("button.prefixIcon") })}
104104
{children.suffixIcon.propertyView({ label: trans("button.suffixIcon") })}
105105
{children.showCount.propertyView({ label: trans("prop.showCount") })}
106-
{children.tabIndex.propertyView({ label: trans("prop.tabIndex") })}
107106
{allowClearPropertyView(children)}
108107
{readOnlyPropertyView(children)}
109108
</Section>

‎client/packages/lowcoder/src/comps/comps/textInputComp/textInputConstants.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,7 @@ export const TextInputInteractionSection = (children: TextInputComp) => (
275275
{children.onEvent.getPropertyView()}
276276
{disabledPropertyView(children)}
277277
{showDataLoadingIndicatorsPropertyView(children as any)}
278+
{(children as any).tabIndex?.propertyView({ label: trans("prop.tabIndex") })}
278279
</Section>
279280
);
280281

@@ -308,7 +309,6 @@ export function getStyle(style: InputLikeStyleType, labelStyle?: LabelStyleType)
308309
text-decoration:${style.textDecoration};
309310
background-color: ${style.background};
310311
border-color: ${style.border};
311-
// line-height: ${style.lineHeight};
312312
313313
&:focus,
314314
&.ant-input-affix-wrapper-focused {

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/ApplicationCommonEvent.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ public class ApplicationCommonEvent extends AbstractEvent {
1616
private final String applicationName;
1717
private final String applicationCategory;
1818
private final String applicationDescription;
19+
private final String applicationTitle;
20+
private final String oldApplicationName;
21+
private final String oldApplicationCategory;
22+
private final String oldApplicationDescription;
23+
private final String oldApplicationTitle;
1924
private final EventType type;
2025
@Nullable
2126
private final String folderId;

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/DatasourceResourcePermissionEvent.java

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package org.lowcoder.infra.event;
2+
3+
import lombok.Getter;
4+
import lombok.experimental.SuperBuilder;
5+
6+
@Getter
7+
@SuperBuilder
8+
public class DatasourceResourcePermissionEvent extends AbstractEvent {
9+
10+
private final String datasourceId;
11+
private final String name;
12+
private final String type;
13+
14+
private final Object oldPermission;
15+
private final Object newPermission;
16+
17+
private final EventType eventType;
18+
}

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/FolderCommonEvent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public class FolderCommonEvent extends AbstractEvent {
99

1010
private final String id;
1111
private final String name;
12+
private final String fromName;
1213
private final EventType type;
1314

1415
@Override

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/LibraryQueryEvent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public class LibraryQueryEvent extends AbstractEvent {
1010
private String id;
1111
private String name;
1212
private EventType eventType;
13+
private String oldName;
1314

1415
@Override
1516
public EventType getEventType() {

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/LibraryQueryPublishEvent.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package org.lowcoder.infra.event;
2+
3+
import lombok.Getter;
4+
import lombok.experimental.SuperBuilder;
5+
6+
@Getter
7+
@SuperBuilder
8+
public class LibraryQueryPublishEvent extends AbstractEvent {
9+
10+
private String id;
11+
private String oldVersion;
12+
private String newVersion;
13+
private EventType eventType;
14+
15+
@Override
16+
public EventType getEventType() {
17+
return eventType;
18+
}
19+
}

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourceEvent.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class DatasourceEvent extends AbstractEvent {
1111
private final String datasourceId;
1212
private final String name;
1313
private final String type;
14+
private final String oldName;
1415

1516
private final EventType eventType;
1617
}

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/datasource/DatasourcePermissionEvent.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import org.lowcoder.infra.event.AbstractEvent;
66

77
import java.util.Collection;
8+
import java.util.List;
89

910
@Getter
1011
@SuperBuilder
@@ -18,5 +19,8 @@ public class DatasourcePermissionEvent extends AbstractEvent {
1819
private final Collection<String> groupIds;
1920
private final String role;
2021

22+
private final List<?> oldPermissions;
23+
private final List<?> newPermissions;
24+
2125
private final EventType eventType;
2226
}

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/BaseGroupEvent.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@
99
public abstract class BaseGroupEvent extends AbstractEvent {
1010

1111
private final String groupId;
12-
private final String groupName;
1312
}

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupCreateEvent.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
@SuperBuilder
66
public class GroupCreateEvent extends BaseGroupEvent {
77

8+
private final String groupName;
9+
private final String oldGroupName;
10+
811
@Override
912
public EventType getEventType() {
1013
return EventType.GROUP_CREATE;

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupDeleteEvent.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
@SuperBuilder
66
public class GroupDeleteEvent extends BaseGroupEvent {
77

8+
private final String groupName;
9+
private final String oldGroupName;
10+
811
@Override
912
public EventType getEventType() {
1013
return EventType.GROUP_DELETE;

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/group/GroupUpdateEvent.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
@SuperBuilder
66
public class GroupUpdateEvent extends BaseGroupEvent {
77

8+
private final String groupName;
9+
private final String oldGroupName;
10+
811
@Override
912
public EventType getEventType() {
1013
return EventType.GROUP_UPDATE;

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/BaseGroupMemberEvent.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,4 @@
88
@SuperBuilder
99
public abstract class BaseGroupMemberEvent extends AbstractEvent {
1010

11-
private final String groupId;
12-
private final String groupName;
13-
private final String memberId;
14-
private final String memberName;
15-
private final String memberRole;
1611
}

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberAddEvent.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
@SuperBuilder
66
public class GroupMemberAddEvent extends BaseGroupMemberEvent {
77

8+
private final String groupId;
9+
private final String groupName;
10+
private final String memberId;
11+
private final String memberName;
12+
private final String memberRole;
13+
814
@Override
915
public EventType getEventType() {
1016
return EventType.GROUP_MEMBER_ADD;

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberLeaveEvent.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
@SuperBuilder
66
public class GroupMemberLeaveEvent extends BaseGroupMemberEvent {
77

8+
private final String groupId;
9+
private final String groupName;
10+
private final String memberId;
11+
private final String memberName;
12+
private final String memberRole;
13+
814
@Override
915
public EventType getEventType() {
1016
return EventType.GROUP_MEMBER_LEAVE;

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRemoveEvent.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
@SuperBuilder
66
public class GroupMemberRemoveEvent extends BaseGroupMemberEvent {
77

8+
private final String groupId;
9+
private final String groupName;
10+
private final String memberId;
11+
private final String memberName;
12+
private final String memberRole;
13+
814
@Override
915
public EventType getEventType() {
1016
return EventType.GROUP_MEMBER_REMOVE;

‎server/api-service/lowcoder-infra/src/main/java/org/lowcoder/infra/event/groupmember/GroupMemberRoleUpdateEvent.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,13 @@
55
@SuperBuilder
66
public class GroupMemberRoleUpdateEvent extends BaseGroupMemberEvent {
77

8+
private final String groupId;
9+
private final String groupName;
10+
private final String memberId;
11+
private final String memberName;
12+
private final String memberRole;
13+
private final String oldMemberRole;
14+
815
@Override
916
public EventType getEventType() {
1017
return EventType.GROUP_MEMBER_ROLE_UPDATE;

‎server/api-service/lowcoder-server/pom.xml

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@
5656
<artifactId>lowcoder-plugin-api</artifactId>
5757
</dependency>
5858

59-
<dependency>
60-
<groupId>ch.qos.logback</groupId>
61-
<artifactId>logback-classic</artifactId>
62-
</dependency>
59+
<dependency>
60+
<groupId>ch.qos.logback</groupId>
61+
<artifactId>logback-classic</artifactId>
62+
</dependency>
6363
<dependency>
6464
<groupId>org.springframework.boot</groupId>
6565
<artifactId>spring-boot-starter-security</artifactId>
@@ -77,6 +77,11 @@
7777
<groupId>org.springdoc</groupId>
7878
<artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
7979
</dependency>
80+
<dependency>
81+
<groupId>org.springdoc</groupId>
82+
<artifactId>springdoc-openapi-webflux-ui</artifactId>
83+
<version>1.8.0</version>
84+
</dependency>
8085
<dependency>
8186
<groupId>io.projectreactor.tools</groupId>
8287
<artifactId>blockhound</artifactId>

0 commit comments

Comments
 (0)