Skip to content

Commit 27d250c

Browse files
ludomikulaludomikula
authored
Merge branch 'dev' into audit_log_before_after_detail
2 parents 02c41aa + 2727c64 commit 27d250c

File tree

19 files changed

+10858
-126
lines changed

19 files changed

+10858
-126
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-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)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy