@esfaenza/forms-and-validations 15.2.51 → 15.2.52

package/fesm2020/esfaenza-forms-and-validations.mjs

@@ -2623,13 +2623,38 @@ class FormAdaptiveComponent extends BaseFormControl {
                     break;
             }
             // A quanto pare la creazione del validatore rompe il caso d'uso classico...
-            //(<any>pv)._validator = (<any>pv).createValidator(pv.pattern);
+            pv._validator = this.customPatternValidator(pv.pattern);
             this.ngControl._setValidators(validators);
             this.ngControl.control.setValidators(validators);
             this.ngControl.control.updateValueAndValidity();
         }
         super.ngOnInit();
     }
+    /**
+     * Validator that requires the control's value to match a regex pattern.
+     * See `Validators.pattern` for additional information.
+     */
+    customPatternValidator(pattern) {
+        if (!pattern)
+            return (_) => null;
+        let regex;
+        let regexStr;
+        if (typeof pattern === 'string') {
+            regexStr = '';
+            if (pattern.charAt(0) !== '^')
+                regexStr += '^';
+            regexStr += pattern;
+            if (pattern.charAt(pattern.length - 1) !== '$')
+                regexStr += '$';
+            regex = new RegExp(regexStr);
+        }
+        return (control) => {
+            if (!control.value) {
+                return null;
+            }
+            return regex.test(this.floatValuePreAdjustmente) ? null : { 'pattern': { 'requiredPattern': regexStr, 'actualValue': this.floatValuePreAdjustmente } };
+        };
+    }
     /** @ignore */
     async ngOnChanges(changes) {
         const newSource = changes["Source"];
@@ -2786,8 +2811,10 @@ class FormAdaptiveComponent extends BaseFormControl {
                 : JSON.parse(JSON.stringify(this.Model)))
             : null;
         if ((this.Type == "float" || this.Type == "number") && toEmit) {
-            if (this.AdjustNumber)
+            if (this.AdjustNumber) {
+                this.floatValuePreAdjustmente = toEmit;
                 toEmit = toEmit.replace(".", "").replace(",", ".");
+            }
             this.EvaluatedModel = toEmit;
         }
         else if (this.Type == "boolean") {