@stemy/ngx-dynamic-form 19.9.6 → 19.9.8

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

@@ -175,33 +175,37 @@ function convertToNumber(value, defaultVal) {
     const num = Number(value);
     return isNaN(num) ? defaultVal ?? value : num;
 }
-function getFieldByPath(field, path) {
-    if (field.path === path) {
+function getFieldByPath(lookup, path) {
+    const field = ObjectUtils.isArray(lookup) ? null : lookup;
+    if (field?.path === path) {
         return field;
     }
-    if (!field.fieldGroup)
+    const fields = ObjectUtils.isArray(lookup) ? lookup : field.fieldGroup;
+    if (!fields)
         return null;
-    for (const sf of field.fieldGroup) {
+    for (const sf of fields) {
         const found = getFieldByPath(sf, path);
         if (found)
             return found;
     }
     return null;
 }
-function getFieldsByPredicate(field, cb) {
-    if (cb(field)) {
+function getFieldsByPredicate(lookup, cb) {
+    const field = ObjectUtils.isArray(lookup) ? null : lookup;
+    if (field && cb(field)) {
         return [field];
     }
-    if (!field.fieldGroup)
-        return [];
     const results = [];
-    for (const sf of field.fieldGroup) {
+    const fields = ObjectUtils.isArray(lookup) ? lookup : field.fieldGroup;
+    if (!fields)
+        return results;
+    for (const sf of fields) {
         results.push(...getFieldsByPredicate(sf, cb));
     }
     return results;
 }
-function getFieldsByKey(field, key) {
-    return getFieldsByPredicate(field, f => f.key === key);
+function getFieldsByKey(lookup, key) {
+    return getFieldsByPredicate(lookup, f => f.key === key);
 }
 async function getSelectOptions(fieldOrOpts) {
     const options = fieldOrOpts.props?.options || fieldOrOpts;
@@ -315,10 +319,10 @@ function withName(fn, name) {
     mainFn.validatorName = name;
     return mainFn;
 }
-function validateEach(each, cb, name) {
+function validateEach(cb, name) {
     return withName((control, field) => {
         const value = control.value;
-        return each ? Array.isArray(value) && value.every(v => cb(v, field)) : cb(value, field);
+        return field.type === "array" ? Array.isArray(value) && value.every(v => cb(v, field)) : cb(value, field);
     }, name);
 }
 function addFieldValidators(field, validators) {
@@ -410,14 +414,14 @@ function arrayLengthValidation(min = 1, max = Number.MAX_SAFE_INTEGER) {
         return !Array.isArray(value) || (min <= value.length && value.length <= max);
     }, "arrayLength");
 }
-function minLengthValidation(minLength, each) {
-    return validateEach(each, v => typeof v == "string" && v.length >= minLength, "minLength");
+function minLengthValidation(minLength) {
+    return validateEach(v => typeof v == "string" && v.length >= minLength, "minLength");
 }
-function maxLengthValidation(maxLength, each) {
-    return validateEach(each, v => typeof v == "string" && v.length <= maxLength, "maxLength");
+function maxLengthValidation(maxLength) {
+    return validateEach(v => typeof v == "string" && v.length <= maxLength, "maxLength");
 }
-function minValueValidation(each) {
-    return validateEach(each, (v, f) => {
+function minValueValidation() {
+    return validateEach((v, f) => {
         const type = f.props.type || "number";
         const min = type.includes("date")
             ? convertToDate(f.props.min, type) : Number(f.props.min ?? 0);
@@ -428,8 +432,8 @@ function minValueValidation(each) {
         return v == null || v >= min;
     }, "minValue");
 }
-function maxValueValidation(each) {
-    return validateEach(each, (v, f) => {
+function maxValueValidation() {
+    return validateEach((v, f) => {
         const type = f.props.type || "number";
         const max = type.includes("date")
             ? convertToDate(f.props.max, type) : Number(f.props.max ?? 0);
@@ -444,7 +448,7 @@ function setFieldMinDate(field, min) {
     setFieldDefault(field, min);
     setFieldProp(field, "min", min);
     setFieldValue(field, min);
-    addFieldValidators(field, [minValueValidation(field.type === "array")]);
+    addFieldValidators(field, [minValueValidation()]);
 }
 
 class ModelUtils {
@@ -1244,8 +1248,8 @@ class DynamicFormSchemaService {
             autocomplete: property.autocomplete,
             pattern: property.pattern,
             step: isNaN(sub.step) ? property.step : sub.step,
-            min: sub.minimum,
-            max: sub.maximum,
+            min: sub.minimum ?? sub.min,
+            max: sub.maximum ?? sub.max,
             minLength: sub.minLength,
             maxLength: sub.maxLength,
             placeholder: property.placeholder,
@@ -1289,8 +1293,8 @@ class DynamicFormSchemaService {
         return this.builder.createFormInput(property.id, {
             ...this.getFormFieldData(property, options),
             type,
-            min: convertToDateFormat(property.min, property.format),
-            max: convertToDateFormat(property.max, property.format),
+            min: convertToDateFormat(property.minimum ?? property.min, property.format),
+            max: convertToDateFormat(property.maximum ?? property.max, property.format),
         }, parent, options);
     }
     getFormSelectConfig($enum, property, options, parent) {
@@ -1428,10 +1432,10 @@ class DynamicFormSchemaService {
             validators.maxLength = maxLengthValidation(property.maxLength);
         }
         if (!isNaN(property.minimum)) {
-            validators.min = minValueValidation(convertToDate(property.minimum, property.format));
+            validators.min = minValueValidation();
         }
         if (!isNaN(property.maximum)) {
-            validators.max = maxValueValidation(convertToDate(property.maximum, property.format));
+            validators.max = maxValueValidation();
         }
         // if (isString(property.pattern) && property.pattern.length) {
         //     validators.pattern = property.pattern;
@@ -1446,16 +1450,16 @@ class DynamicFormSchemaService {
         if (!items)
             return;
         if (!isNaN(items.minLength)) {
-            validators.itemsMinLength = minLengthValidation(items.minLength, true);
+            validators.itemsMinLength = minLengthValidation(items.minLength);
         }
         if (!isNaN(items.maxLength)) {
-            validators.itemsMaxLength = maxLengthValidation(items.maxLength, true);
+            validators.itemsMaxLength = maxLengthValidation(items.maxLength);
         }
         if (!isNaN(items.minimum)) {
-            validators.itemsMinValue = minValueValidation(true);
+            validators.itemsMinValue = minValueValidation();
         }
         if (!isNaN(items.maximum)) {
-            validators.itemsMaxValue = maxValueValidation(true);
+            validators.itemsMaxValue = maxValueValidation();
         }
     }
     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 });