Skip to content

Commit 5f94c41

Browse files
FalkWolskyFalkWolsky
authored
Merge branch 'dev' into ee-setup
2 parents 6d2f42c + 6ef41f5 commit 5f94c41

File tree

68 files changed

+11616
-736
lines changed

Some content is hidden

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

68 files changed

+11616
-736
lines changed

‎client/packages/lowcoder-comps/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "lowcoder-comps",
3-
"version": "2.6.6",
3+
"version": "2.7.0",
44
"type": "module",
55
"license": "MIT",
66
"dependencies": {

‎client/packages/lowcoder-design/src/icons/index.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ export { ReactComponent as ImportAppIcon } from "./v1/icon-app-import.svg";
8787
export { ReactComponent as ImportIcon } from "./v1/icon-import.svg";
8888
export { ReactComponent as ImportIconV2 } from "./v1/icon-import-v2.svg";
8989
export { ReactComponent as DatasourceIcon } from "./v1/icon-datasource.svg";
90-
export { ReactComponent as QueryLibraryIcon } from "./v1/icon-query-library.svg";
90+
export { ReactComponent as QueryLibraryIcon } from "./remix/braces-line.svg";
9191
export { ReactComponent as TransformerIcon } from "./v1/icon-transformer.svg";
9292
export { ReactComponent as TempStateIcon } from "./v1/icon-temp-state.svg";
9393
export { ReactComponent as IconDep } from "./v1/icon-style-dep.svg";
@@ -149,6 +149,8 @@ export { ReactComponent as OracleIcon } from "./v1/icon-query-OracleDB.svg";
149149
export { ReactComponent as ClickHouseIcon } from "./v1/icon-query-ClickHouse.svg";
150150
export { ReactComponent as GoogleSheetsIcon } from "./v1/icon-query-GoogleSheets.svg";
151151
export { ReactComponent as GraphqlIcon } from "./v1/icon-query-Graphql.svg";
152+
export { ReactComponent as AlasqlIcon } from "./remix/database-2-line.svg";
153+
export { ReactComponent as StreamApiIcon } from "./remix/rfid-line.svg";
152154
export { ReactComponent as SnowflakeIcon } from "./v1/icon-query-snowflake.svg";
153155
export { ReactComponent as MariaDBIcon } from "./v1/icon-query-MariaDB.svg";
154156

‎client/packages/lowcoder/src/components/ResCreatePanel.tsx‎

Lines changed: 34 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { Datasource } from "constants/datasourceConstants";
1717
import {
1818
QUICK_GRAPHQL_ID,
1919
QUICK_REST_API_ID,
20+
JS_CODE_ID,
2021
} from "../constants/datasourceConstants";
2122
import { ResourceType } from "constants/queryConstants";
2223
import { default as Upload } from "antd/es/upload";
@@ -25,7 +26,6 @@ import { getUser } from "../redux/selectors/usersSelectors";
2526
import DataSourceIcon from "./DataSourceIcon";
2627
import { genRandomKey } from "comps/utils/idGenerator";
2728
import { isPublicApplication } from "@lowcoder-ee/redux/selectors/applicationSelector";
28-
import { JS_CODE_ID } from "constants/datasourceConstants";
2929

3030
const Wrapper = styled.div<{ $placement: PageType }>`
3131
width: 100%;
@@ -265,6 +265,11 @@ export function ResCreatePanel(props: ResCreateModalProps) {
265265
.map((id, idx) => (
266266
<ResButton key={idx} size={buttonSize} identifier={id} onSelect={onSelect} />
267267
))}
268+
<ResButton
269+
size={buttonSize}
270+
identifier={BottomResTypeEnum.Folder}
271+
onSelect={onSelect}
272+
/>
268273
</DataSourceListWrapper>
269274
</div>
270275

@@ -273,28 +278,8 @@ export function ResCreatePanel(props: ResCreateModalProps) {
273278
<div className="section-title">{trans("code")}</div>
274279
<div className="section">
275280
<DataSourceListWrapper $placement={placement}>
276-
<ResButton
277-
size={buttonSize}
278-
identifier={BottomResTypeEnum.TempState}
279-
onSelect={onSelect}
280-
/>
281-
<ResButton
282-
size={buttonSize}
283-
identifier={BottomResTypeEnum.Transformer}
284-
onSelect={onSelect}
285-
/>
286-
<ResButton
287-
size={buttonSize}
288-
identifier={BottomResTypeEnum.DateResponder}
289-
onSelect={onSelect}
290-
/>
291281
<ResButton size={buttonSize} identifier={"js"} onSelect={onSelect} />
292-
{!isPublicApp && <ResButton size={buttonSize} identifier={"libraryQuery"} onSelect={onSelect} /> }
293-
<ResButton
294-
size={buttonSize}
295-
identifier={BottomResTypeEnum.Folder}
296-
onSelect={onSelect}
297-
/>
282+
<ResButton size={buttonSize} identifier={BottomResTypeEnum.TempState} onSelect={onSelect} />
298283
</DataSourceListWrapper>
299284
</div>
300285
</>
@@ -334,13 +319,39 @@ export function ResCreatePanel(props: ResCreateModalProps) {
334319
</>
335320
)}
336321

337-
<div className="section-title">{trans("query.datasource")}</div>
322+
<div className="section-title">{trans("query.preparedDataQueries")}</div>
323+
<div className="section">
324+
{!isPublicApp && <ResButton size={buttonSize} identifier={"libraryQuery"} onSelect={onSelect} /> }
325+
</div>
326+
327+
<div className="section-title">{trans("query.adHocDataQueries")}</div>
338328
<div className="section">
339329
<DataSourceListWrapper $placement={placement}>
340330
<ResButton size={buttonSize} identifier={"restApi"} onSelect={onSelect} />
341331
<ResButton size={buttonSize} identifier={"streamApi"} onSelect={onSelect} />
342332
<ResButton size={buttonSize} identifier={"alasql"} onSelect={onSelect} />
343333
<ResButton size={buttonSize} identifier={"graphql"} onSelect={onSelect} />
334+
</DataSourceListWrapper>
335+
</div>
336+
337+
<div className="section-title">{trans("query.queryResultTransformer")}</div>
338+
<div className="section">
339+
<DataSourceListWrapper $placement={placement}>
340+
<ResButton size={buttonSize} identifier={BottomResTypeEnum.Transformer} onSelect={onSelect} />
341+
</DataSourceListWrapper>
342+
</div>
343+
344+
<div className="section-title">{trans("query.queryResultReactor")}</div>
345+
<div className="section">
346+
<DataSourceListWrapper $placement={placement}>
347+
<ResButton size={buttonSize} identifier={BottomResTypeEnum.DateResponder} onSelect={onSelect} />
348+
</DataSourceListWrapper>
349+
</div>
350+
351+
<div className="section-title">{trans("query.datasource")}</div>
352+
<div className="section">
353+
<DataSourceListWrapper $placement={placement}>
354+
344355
{datasource.map((i) => (
345356
<ResButton size={buttonSize} key={i.id} identifier={i} onSelect={onSelect} />
346357
))}

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,7 @@ const childrenMap = {
134134
style: ButtonStyleControl,
135135
animationStyle: styleControl(AnimationStyle, 'animationStyle'),
136136
viewRef: RefControl<HTMLElement>,
137+
tooltip: StringControl
137138
};
138139

139140
type ChildrenType = NewChildren<RecordConstructorToComp<typeof childrenMap>>;
@@ -146,6 +147,7 @@ const ButtonPropertyView = React.memo((props: {
146147
<>
147148
<Section name={sectionNames.basic}>
148149
{props.children.text.propertyView({ label: trans("text") })}
150+
{props.children.tooltip.propertyView({ label: trans("labelProp.tooltip")})}
149151
</Section>
150152

151153
{(editorModeStatus === "logic" || editorModeStatus === "both") && (
@@ -204,7 +206,7 @@ const ButtonView = React.memo((props: ToViewReturn<ChildrenType>) => {
204206
<ButtonCompWrapper $disabled={props.disabled}>
205207
<EditorContext.Consumer>
206208
{(editorState) => (
207-
<Tooltip title={props.text}>
209+
<Tooltip title={props.tooltip}>
208210
<Button100
209211
ref={props.viewRef}
210212
$buttonStyle={props.style}

‎client/packages/lowcoder/src/comps/comps/buttonComp/toggleButtonComp.tsx‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ const ToggleTmpComp = (function () {
6666
animationStyle: styleControl(AnimationStyle , 'animationStyle'),
6767
showBorder: withDefault(BoolControl, true),
6868
viewRef: RefControl<HTMLElement>,
69+
tooltip: StringControl,
6970
};
7071
return new UICompBuilder(childrenMap, (props) => {
7172
const text = props.showText
@@ -79,7 +80,7 @@ const ToggleTmpComp = (function () {
7980
$showBorder={props.showBorder}
8081
$animationStyle={props.animationStyle}
8182
>
82-
<Tooltip title={props.value.value ? props.trueText : props.falseText}>
83+
<Tooltip title={props.tooltip}>
8384
<Button100
8485
ref={props.viewRef}
8586
$buttonStyle={props.style}
@@ -117,6 +118,7 @@ const ToggleTmpComp = (function () {
117118
</Section>
118119
<Section name={sectionNames.advanced}>
119120
{children.showText.propertyView({ label: trans("toggleButton.showText") })}
121+
{children.tooltip.propertyView({label: trans("labelProp.tooltip")})}
120122
{children.showText.getView() &&
121123
children.trueText.propertyView({ label: trans("toggleButton.trueLabel") })}
122124
{children.showText.getView() &&

‎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/meetingComp/controlButton.tsx‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ const childrenMap = {
201201
iconScoutAsset: IconscoutControl(AssetType.ICON),
202202
style: ButtonStyleControl,
203203
viewRef: RefControl<HTMLElement>,
204-
restrictPaddingOnRotation:withDefault(StringControl, 'controlButton')
204+
restrictPaddingOnRotation:withDefault(StringControl, 'controlButton'),
205+
tooltip: StringControl
205206
};
206207

207208
let ButtonTmpComp = (function () {
@@ -259,7 +260,7 @@ let ButtonTmpComp = (function () {
259260
: undefined
260261
}
261262
>
262-
<Tooltip title={trans("meeting.meetingControlCompName")}>
263+
<Tooltip title={props.tooltip}>
263264
<Button100
264265
ref={props.viewRef}
265266
$buttonStyle={props.style}
@@ -323,6 +324,9 @@ let ButtonTmpComp = (function () {
323324
{children.sourceMode.getView() === 'asset-library' &&children.iconScoutAsset.propertyView({
324325
label: trans("button.icon"),
325326
})}
327+
{children.tooltip.propertyView({
328+
label: trans("labelProp.tooltip"),
329+
})}
326330
</Section>
327331

328332
{(useContext(EditorContext).editorModeStatus === "logic" ||

‎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} />

0 commit comments

Comments
 (0)