myrta-ui 1.1.24 → 1.1.26

package/fesm2020/myrta-ui.mjs

@@ -4315,7 +4315,7 @@ const minLengthValidation = (value, validations, key, invalidMessages) => {
 
 const minValueValidation = (value, validations, key, invalidMessages) => {
     const result = { isValid: true, message: null };
-    if (parseInt(value) > Number(validations[key])) {
+    if (parseInt(value) < Number(validations[key])) {
         result.message = getErrorMessageHelper(key, invalidMessages, validations.messages, Number(validations[key]));
         result.isValid = false;
     }
@@ -4324,7 +4324,7 @@ const minValueValidation = (value, validations, key, invalidMessages) => {
 
 const maxValueValidation = (value, validations, key, invalidMessages) => {
     const result = { isValid: true, message: null };
-    if (parseInt(value) < Number(validations[key])) {
+    if (parseInt(value) > Number(validations[key])) {
         result.message = getErrorMessageHelper(key, invalidMessages, validations.messages, Number(validations[key]));
         result.isValid = false;
     }
@@ -4426,9 +4426,6 @@ class MrxFormValidator {
         if (!validateEmptyValue && (value.length === 0)) {
             return;
         }
-        if (!this._isValid) {
-            return;
-        }
         for (let key in validations) {
             switch (key) {
                 case ValidationTypesEnum.Required:
@@ -4437,9 +4434,6 @@ class MrxFormValidator {
                     if (!silent && !this._errors[name]) {
                         this._errors[name] = requiredRes.message;
                     }
-                    if (!this._isValid) {
-                        return;
-                    }
                     break;
                 case ValidationTypesEnum.Email:
                     const emailRes = emailValidation(value, validations, key, this._invalidMessages);
@@ -4447,9 +4441,6 @@ class MrxFormValidator {
                     if (!silent && !this._errors[name]) {
                         this._errors[name] = emailRes.message;
                     }
-                    if (!this._isValid) {
-                        return;
-                    }
                     break;
                 case ValidationTypesEnum.Pattern:
                     const patternRes = patternValidation(value, validations, key, this._invalidMessages);
@@ -4457,9 +4448,6 @@ class MrxFormValidator {
                     if (!silent && !this._errors[name]) {
                         this._errors[name] = patternRes.message;
                     }
-                    if (!this._isValid) {
-                        return;
-                    }
                     break;
                 case ValidationTypesEnum.MinLength:
                     const minLengthRes = minLengthValidation(value, validations, key, this._invalidMessages);
@@ -4467,9 +4455,6 @@ class MrxFormValidator {
                     if (!silent && !this._errors[name]) {
                         this._errors[name] = minLengthRes.message;
                     }
-                    if (!this._isValid) {
-                        return;
-                    }
                     break;
                 case ValidationTypesEnum.MaxLength:
                     const maxLengthRes = maxLengthValidation(value, validations, key, this._invalidMessages);
@@ -4477,9 +4462,6 @@ class MrxFormValidator {
                     if (!silent && !this._errors[name]) {
                         this._errors[name] = maxLengthRes.message;
                     }
-                    if (!this._isValid) {
-                        return;
-                    }
                     break;
                 case ValidationTypesEnum.MinValue:
                     const minValueRes = minValueValidation(value, validations, key, this._invalidMessages);
@@ -4487,9 +4469,6 @@ class MrxFormValidator {
                     if (!silent && !this._errors[name]) {
                         this._errors[name] = minValueRes.message;
                     }
-                    if (!this._isValid) {
-                        return;
-                    }
                     break;
                 case ValidationTypesEnum.MaxValue:
                     const maxValueRes = maxValueValidation(value, validations, key, this._invalidMessages);
@@ -4497,9 +4476,6 @@ class MrxFormValidator {
                     if (!silent && !this._errors[name]) {
                         this._errors[name] = maxValueRes.message;
                     }
-                    if (!this._isValid) {
-                        return;
-                    }
                     break;
                 case ValidationTypesEnum.Callback:
                     const callbackRes = callbackValidation(value, validations, key, this._invalidMessages);
@@ -4507,13 +4483,20 @@ class MrxFormValidator {
                     if (!silent && !this._errors[name]) {
                         this._errors[name] = callbackRes.message;
                     }
-                    if (!this._isValid) {
-                        return;
-                    }
                     break;
             }
         }
     }
+    _checkErrors(errors) {
+        let isValid = true;
+        for (let error in errors) {
+            if (!!errors[error]) {
+                isValid = !errors[error];
+                break;
+            }
+        }
+        return isValid;
+    }
     initFields(fields, validations) {
         this.fields = cloneDeep(fields);
         this._validations = validations;
@@ -4549,13 +4532,10 @@ class MrxFormValidator {
     }
     isValid() {
         for (let key in this._validations) {
-            if (!this._isValid) {
-                return this._isValid;
-            }
             this.errors[key] = null;
             this.validateField(this._fields[key], key, this._validations[key], true);
         }
-        return this._isValid;
+        return this._checkErrors(this.errors);
     }
     // TODO Вырезать в будущем
     initModelChangedFromField(field, fieldName) {
@@ -17495,6 +17475,7 @@ class FormulaEditorComponent {
         if (outsideValue !== null) {
             this.value = outsideValue;
             this.visibleValue = this._transformValue(this._modifiedValue(outsideValue)).visibleValue;
+            this._detector.detectChanges();
         }
     }
     onInput(event) {
@@ -17525,6 +17506,7 @@ class FormulaEditorComponent {
     updateVisibleValue(insideValue) {
         this.visibleValue = insideValue;
         this._storeCursorPosition();
+        this._detector.detectChanges();
     }
     updateValue(insideValue) {
         this.value = insideValue;