@magic-xpa/angular 4.1000.0-dev4100.286 → 4.1000.0-dev4100.288

package/fesm2020/magic-xpa-angular.mjs

@@ -2484,13 +2484,25 @@ class AccessorMagicService {
         if (c.hasError('pattern')) {
             if (c.errors.pattern.actualValue < 0 && !c.errors.pattern.requiredPattern.includes('-'))
                 return 'Value must be non-negative';
-            if (Math.floor(Math.abs(c.errors.pattern.actualValue)).toString().length > parseInt(c.errors.pattern.requiredPattern.match(/,(\d+)/)[1])) {
-                const picLimit = c.errors.pattern.requiredPattern.match(/,(\d+)/)[1];
-                return 'Numeric format is limited to ' + picLimit + (picLimit == '1' ? ' digit' : ' digits');
+            if (c.errors.pattern.requiredPattern.includes('.')) {
+                const numericFormat = Math.abs(c.errors.pattern.actualValue).toString().split('.')[0];
+                const decimalFormat = Math.abs(c.errors.pattern.actualValue).toString().split('.')[1];
+                const actualNumericLimit = c.errors.pattern.requiredPattern.match(/,(\d+)/)[1];
+                const actualDecimalLimit = c.errors.pattern.requiredPattern.match(/(?:[^,]+,){2}(\d+)/)[1];
+                if (numericFormat.length > actualNumericLimit || decimalFormat.length > actualDecimalLimit) {
+                    return "Numeric format is limited to " + actualNumericLimit + "." + actualDecimalLimit + " digits";
+                }
+            }
+            else if (!c.errors.pattern.requiredPattern.includes('.') && !Number.isInteger(c.errors.pattern.actualValue)) {
+                const actualNumericLimit = c.errors.pattern.requiredPattern.match(/,(\d+)/)[1];
+                return "Numeric format is limited to " + actualNumericLimit + "." + 0 + " digits";
             }
-            if (c.errors.pattern.requiredPattern.split(",").length - 1 === 2) {
-                const decimalPicLimit = c.errors.pattern.requiredPattern.match(/(?:[^,]+,){2}(\d+)/)[1];
-                return 'Decimal format is limited to ' + decimalPicLimit + (decimalPicLimit == '1' ? ' digit' : ' digits');
+            else {
+                const numericFormat = Math.abs(c.errors.pattern.actualValue).toString();
+                const actualNumericLimit = c.errors.pattern.requiredPattern.match(/,(\d+)/)[1];
+                if (numericFormat.length > actualNumericLimit) {
+                    return "Numeric format is limited to " + actualNumericLimit + "." + 0 + " digits";
+                }
             }
         }
         if (c.hasError('rangevalidator'))