Commit 54c82ad

authored

Merge pull request #1672 from iamfaran/feat/1537-custom-error-message

[Feat]: #1537 Add Custom Invalid Form Message

2 parents 71fa1f2 + 583e996 commit 54c82adCopy full SHA for 54c82ad

File tree

2 files changed

-2

lines changed

client/packages/lowcoder/src
- comps/comps/formComp
  - formComp.tsx
- i18n/locales
  - en.ts

2 files changed

-2

lines changed

`‎client/packages/lowcoder/src/comps/comps/formComp/formComp.tsx`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,7 @@ import { messageInstance } from "lowcoder-design/src/components/GlobalInstances"`
`60`	`60`	`import { styled } from "styled-components";`
`61`	`61`	`import { styleControl } from "@lowcoder-ee/comps/controls/styleControl";`
`62`	`62`	`import { AnimationStyle } from "@lowcoder-ee/comps/controls/styleControlConstants";`
	`63`	`+import { StringControl } from "comps/controls/codeControl";`
`63`	`64`
`64`	`65`	const FormWrapper = styled.div`
`65`	`66`	`height: 100%;`
`@@ -80,7 +81,8 @@ const childrenMap = {`
`80`	`81`	`disableSubmit: BoolCodeControl,`
`81`	`82`	`loading: BoolCodeControl,`
`82`	`83`	`onEvent: eventHandlerControl(eventOptions),`
`83`		`- animationStyle: styleControl(AnimationStyle)`
	`84`	`+ animationStyle: styleControl(AnimationStyle),`
	`85`	`+ invalidFormMessage: StringControl`
`84`	`86`	`};`
`85`	`87`
`86`	`88`	`type FormProps = TriContainerViewProps &`
`@@ -230,6 +232,7 @@ const FormBaseComp = (function () {`
`230`	`232`	`{(useContext(EditorContext).editorModeStatus === "logic" \|\| useContext(EditorContext).editorModeStatus === "both") && (`
`231`	`233`	`<Section name={sectionNames.advanced}>`
`232`	`234`	`{children.initialData.propertyView({ label: trans("formComp.initialData") })}`
	`235`	`+ {children.invalidFormMessage.propertyView({ label: trans("formComp.invalidFormMessage") })}`
`233`	`236`	`</Section>`
`234`	`237`	`)}`
`235`	`238`
`@@ -363,7 +366,8 @@ let FormTmpComp = class extends FormBaseComp implements IForm {`
`363`	`366`	`return Promise.resolve();`
`364`	`367`	`});`
`365`	`368`	`} else {`
`366`		`- messageInstance.error(trans("formComp.notValidForm"));`
	`369`	`+ const customMessage = this.children.invalidFormMessage.getView();`
	`370`	`+ messageInstance.error(customMessage \|\| trans("formComp.notValidForm"));`
`367`	`371`	`return Promise.reject("formComp.notValidForm");`
`368`	`372`	`}`
`369`	`373`	`}`

`‎client/packages/lowcoder/src/i18n/locales/en.ts`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2547,6 +2547,7 @@ export const en = {`
`2547`	`2547`	`"success": "Form Generated Successfully",`
`2548`	`2548`	`"selectCompType": "Select Component Type",`
`2549`	`2549`	`"dataSource": "Data Source: ",`
	`2550`	`+ "invalidFormMessage": "Custom Invalid Form Message",`
`2550`	`2551`	`"selectSource": "Select Source",`
`2551`	`2552`	`"table": "Table: ",`
`2552`	`2553`	`"selectTable": "Select Table",`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 54c82ad

File tree

2 files changed

2 files changed

`‎client/packages/lowcoder/src/comps/comps/formComp/formComp.tsx`

`‎client/packages/lowcoder/src/i18n/locales/en.ts`

0 commit comments