Skip to content

Commit 507efa6

Browse files
committed
[Feat]: #1827 #1937 markdown + tooltip on events
1 parent 013cd90 commit 507efa6

File tree

2 files changed

+15
-6
lines changed

2 files changed

+15
-6
lines changed

client/packages/lowcoder/src/comps/controls/eventHandlerControl.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
EventContent,
1515
EventDiv,
1616
EventTitle,
17+
Tooltip,
1718
InlineEventFormWrapper,
1819
LinkButton,
1920
OptionType,
@@ -123,7 +124,11 @@ class SingleEventHandlerControl<
123124
defaultVisible={props.popup}
124125
>
125126
<EventContent>
126-
{!_.isEmpty(eventName) && <EventTitle>{eventName}</EventTitle>}
127+
{!_.isEmpty(eventName) && (
128+
<Tooltip title={eventName} placement="top">
129+
<EventTitle>{eventName}</EventTitle>
130+
</Tooltip>
131+
)}
127132
<EventAction>{eventAction}</EventAction>
128133
</EventContent>
129134
</CustomPopover>

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { MultiCompBuilder } from "../../generators";
22
import { BoolPureControl } from "../../controls/boolControl";
33
import { StringControl } from "../../controls/codeControl";
4-
import { CustomModal } from "lowcoder-design";
4+
import { CustomModal, TacoMarkDown } from "lowcoder-design";
55
import { isEmpty } from "lodash";
66
import { QueryResult } from "../queryComp";
77
import { trans } from "i18n";
@@ -16,15 +16,19 @@ export const QueryConfirmationModal = new MultiCompBuilder(
1616
new Promise<QueryResult>((resolve) => {
1717
props.showConfirmationModal && isManual
1818
? CustomModal.confirm({
19-
content: isEmpty(props.confirmationMessage)
20-
? trans("query.confirmationMessage")
21-
: props.confirmationMessage,
19+
content: (
20+
<TacoMarkDown>
21+
{isEmpty(props.confirmationMessage)
22+
? trans("query.confirmationMessage")
23+
: props.confirmationMessage}
24+
</TacoMarkDown>
25+
),
2226
onConfirm: () => {
2327
resolve(onConfirm());
2428
},
2529
confirmBtnType: "primary",
2630
style: { top: "-100px" },
27-
bodyStyle: { marginTop: 0, height: "42px" },
31+
bodyStyle: { marginTop: 0 },
2832
})
2933
: resolve(onConfirm());
3034
})

0 commit comments

Comments
 (0)