Commit fed088d

authored

Merge pull request #2075 from iamfaran/feat/markdown-tooltip

[Feat]: #1827 #1937 markdown + tooltip on events

2 parents 56fefba + 507efa6 commit fed088dCopy full SHA for fed088d

File tree

+15

-6

lines changed

client/packages/lowcoder/src/comps
- controls
  - eventHandlerControl.tsx
- queries/queryComp
  - queryConfirmationModal.tsx

+15

-6

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import {`
`14`	`14`	`EventContent,`
`15`	`15`	`EventDiv,`
`16`	`16`	`EventTitle,`
	`17`	`+ Tooltip,`
`17`	`18`	`InlineEventFormWrapper,`
`18`	`19`	`LinkButton,`
`19`	`20`	`OptionType,`
`@@ -123,7 +124,11 @@ class SingleEventHandlerControl<`
`123`	`124`	`defaultVisible={props.popup}`
`124`	`125`	`>`
`125`	`126`	`<EventContent>`
`126`		`- {!_.isEmpty(eventName) && <EventTitle>{eventName}</EventTitle>}`
	`127`	`+ {!_.isEmpty(eventName) && (`
	`128`	`+ <Tooltip title={eventName} placement="top">`
	`129`	`+ <EventTitle>{eventName}</EventTitle>`
	`130`	`+ </Tooltip>`
	`131`	`+ )}`
`127`	`132`	`<EventAction>{eventAction}</EventAction>`
`128`	`133`	`</EventContent>`
`129`	`134`	`</CustomPopover>`

Lines changed: 9 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`import { MultiCompBuilder } from "../../generators";`
`2`	`2`	`import { BoolPureControl } from "../../controls/boolControl";`
`3`	`3`	`import { StringControl } from "../../controls/codeControl";`
`4`		`-import { CustomModal } from "lowcoder-design";`
	`4`	`+import { CustomModal,TacoMarkDown } from "lowcoder-design";`
`5`	`5`	`import { isEmpty } from "lodash";`
`6`	`6`	`import { QueryResult } from "../queryComp";`
`7`	`7`	`import { trans } from "i18n";`
`@@ -16,15 +16,19 @@ export const QueryConfirmationModal = new MultiCompBuilder(`
`16`	`16`	`new Promise<QueryResult>((resolve) => {`
`17`	`17`	`props.showConfirmationModal && isManual`
`18`	`18`	`? 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`	`+ ),`
`22`	`26`	`onConfirm: () => {`
`23`	`27`	`resolve(onConfirm());`
`24`	`28`	`},`
`25`	`29`	`confirmBtnType: "primary",`
`26`	`30`	`style: { top: "-100px" },`
`27`		`- bodyStyle: { marginTop: 0,height: "42px" },`
	`31`	`+ bodyStyle: { marginTop: 0 },`
`28`	`32`	`})`
`29`	`33`	`: resolve(onConfirm());`
`30`	`34`	`})`

Comments

(0)