@stemy/ngx-dynamic-form 19.9.2 → 19.9.4

package/fesm2022/stemy-ngx-dynamic-form.mjs

@@ -151,11 +151,10 @@ function convertToDateFormat(value, format) {
         return value;
     value = ObjectUtils.isDate(value) ? value : new Date(value);
     const date = isNaN(value) ? new Date() : value;
+    const target = new Date(date.getTime() - date.getTimezoneOffset() * 60000).toISOString();
     return format === "datetime-local" || format === "date-time"
-        ? new Date(date.getTime() - date.getTimezoneOffset() * 60000)
-            .toISOString()
-            .slice(0, 16)
-        : date.toISOString().slice(0, 10);
+        ? target.slice(0, 16)
+        : target.slice(0, 10);
 }
 /**
  * Convert value to date object with format (date, date-time)
@@ -317,9 +316,9 @@ function withName(fn, name) {
     return mainFn;
 }
 function validateEach(each, cb, name) {
-    return withName((control) => {
+    return withName((control, field) => {
         const value = control.value;
-        return each ? Array.isArray(value) && value.every(cb) : cb(value);
+        return each ? Array.isArray(value) && value.every(v => cb(v, field)) : cb(value, field);
     }, name);
 }
 function addFieldValidators(field, validators) {
@@ -346,7 +345,7 @@ function addFieldValidators(field, validators) {
 }
 function removeFieldValidators(field, ...names) {
     const validators = Object.assign({}, field.validators || {});
-    const validation = field.validation || {};
+    const validation = Object.assign({}, field.validation || {});
     const messages = Object.assign({}, validation.messages || {});
     names.forEach(name => {
         delete validators[name];
@@ -413,8 +412,11 @@ function minLengthValidation(minLength, each) {
 function maxLengthValidation(maxLength, each) {
     return validateEach(each, v => typeof v == "string" && v.length <= maxLength, "maxLength");
 }
-function minValueValidation(min, each) {
-    return validateEach(each, v => {
+function minValueValidation(each) {
+    return validateEach(each, (v, f) => {
+        const type = f.props.type || "number";
+        const min = type.includes("date")
+            ? convertToDate(f.props.min, type) : Number(f.props.min ?? 0);
         if (min instanceof Date) {
             const date = new Date(v);
             return isNaN(date) || date >= min;
@@ -422,8 +424,11 @@ function minValueValidation(min, each) {
         return v == null || v >= min;
     }, "minValue");
 }
-function maxValueValidation(max, each) {
-    return validateEach(each, v => {
+function maxValueValidation(each) {
+    return validateEach(each, (v, f) => {
+        const type = f.props.type || "number";
+        const max = type.includes("date")
+            ? convertToDate(f.props.max, type) : Number(f.props.max ?? 0);
         if (max instanceof Date) {
             const date = new Date(v);
             return isNaN(date) || date <= max;
@@ -435,8 +440,7 @@ function setFieldMinDate(field, min) {
     setFieldDefault(field, min);
     setFieldProp(field, "min", min);
     setFieldValue(field, min);
-    removeFieldValidators(field, "minValue");
-    addFieldValidators(field, [minValueValidation(min)]);
+    addFieldValidators(field, [minValueValidation(field.type === "array")]);
 }
 
 class ModelUtils {
@@ -1438,10 +1442,10 @@ class DynamicFormSchemaService {
             validators.itemsMaxLength = maxLengthValidation(items.maxLength, true);
         }
         if (!isNaN(items.minimum)) {
-            validators.itemsMinValue = minValueValidation(items.minimum, true);
+            validators.itemsMinValue = minValueValidation(true);
         }
         if (!isNaN(items.maximum)) {
-            validators.itemsMaxValue = maxValueValidation(items.maximum, true);
+            validators.itemsMaxValue = maxValueValidation(true);
         }
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.19", ngImport: i0, type: DynamicFormSchemaService, deps: [{ token: i2.OpenApiService }, { token: i0.Injector }, { token: DynamicFormBuilderService }], target: i0.ɵɵFactoryTarget.Injectable });