Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix: input widget number validation #768 (#917)

Browse Source
This commit is contained in:
MartinT 2020-10-05 09:06:24 +02:00 committed by GitHub
parent 2158434ba4
commit 58b759bd6a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/client/src/widgets/InputWidget.tsx
View File

@ -61,12 +61,15 @@ class InputWidget extends BaseWidget<InputWidgetProps, InputWidgetState> {
return {
isValid: `{{
function(){
const isEmailType = this.inputType === "EMAIL";
if(isEmailType) {
if (this.inputType === "EMAIL") {
const emailRegex = new RegExp(/^\\w+([\\.-]?\\w+)*@\\w+([\\.-]?\\w+)*(\\.\\w{2,3})+$/);
return emailRegex.test(this.text);
} else if(this.isRequired) {
if(this.text && this.text.length > 0) {
}
else if (this.inputType === "NUMBER") {
return !isNaN(this.text)
}
else if (this.isRequired) {
if(this.text && this.text.length) {
if(this.regex) {
return new RegExp(this.regex).test(this.text)
} else {
@ -75,7 +78,7 @@ class InputWidget extends BaseWidget<InputWidgetProps, InputWidgetState> {
} else {
return false;
}
} if(this.regex) {
} if (this.regex) {
return new RegExp(this.regex).test(this.text)
} else {
return true;