@stemy/ngx-dynamic-form 19.9.1 → 19.9.3

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;
@@ -431,6 +436,12 @@ function maxValueValidation(max, each) {
         return v == null || v <= max;
     }, "maxValue");
 }
+function setFieldMinDate(field, min) {
+    setFieldDefault(field, min);
+    setFieldProp(field, "min", min);
+    setFieldValue(field, min);
+    addFieldValidators(field, [minValueValidation(field.type === "array")]);
+}
 
 class ModelUtils {
     static getLanguages() {
@@ -638,6 +649,23 @@ class DynamicFormBuilderService {
             return typeof itemType === "function" ? this.resolveFormFields(itemType, sp, options) : this.createFormInput("", typeof itemType === "string" ? { type: `${itemType}` } : itemType, sp, options);
         }, data, parent, options);
     }
+    createFieldSet(set, fields, parent, options) {
+        const id = !parent?.path ? set.id : `${parent.path}.${set.id}`;
+        return this.setExpressions({
+            id,
+            parent,
+            fieldGroup: fields,
+            wrappers: ["form-fieldset"],
+            props: {
+                label: this.getLabel(set.id, set.label, set.labelPrefix, parent, options, "title"),
+                hidden: false,
+                classes: toStringArray(set.classes),
+                layout: toStringArray(set.layout),
+            },
+            hooks: {},
+            expressions: {}
+        }, options);
+    }
     createFieldSets(fields, parent, options, sets = []) {
         const result = [];
         const groups = {};
@@ -654,27 +682,12 @@ class DynamicFormBuilderService {
             // If we have a fieldset name defined, then push the property fields into a group
             if (fsName) {
                 const id = !parent?.path ? fsName : `${parent.path}.${fsName}`;
-                const set = sets.find(s => s.id === fsName);
+                const set = sets.find(s => s.id === fsName) || { id: fsName, layout: "" };
                 let fieldGroup = groups[id];
                 if (!fieldGroup) {
                     fieldGroup = [];
-                    const fieldSet = {
-                        id,
-                        parent,
-                        fieldGroup,
-                        wrappers: ["form-fieldset"],
-                        props: {
-                            label: this.getLabel(fsName, set?.label, set?.labelPrefix, parent, options, "title"),
-                            hidden: false,
-                            classes: toStringArray(set?.classes),
-                            layout: toStringArray(set?.layout),
-                        },
-                        hooks: {},
-                        expressions: {}
-                    };
-                    this.setExpressions(fieldSet, options);
                     groups[id] = fieldGroup;
-                    result.push(fieldSet);
+                    result.push(this.createFieldSet(set, fieldGroup, parent, options));
                 }
                 fieldGroup.push(field);
                 continue;
@@ -993,7 +1006,10 @@ class DynamicFormBuilderService {
             configurable: true
         });
         // Set expressions
-        addFieldValidators(field, data.validators);
+        const validators = ObjectUtils.isArray(data.validators)
+            ? data.validators.map(v => ReflectUtils.resolve(v, this.injector))
+            : data.validators;
+        addFieldValidators(field, validators);
         this.setExpressions(field, options);
         return field;
     }
@@ -1052,6 +1068,7 @@ class DynamicFormBuilderService {
                 field[key] = expression(field);
             }
         });
+        return field;
     }
     static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.19", ngImport: i0, type: DynamicFormBuilderService, deps: [{ token: i0.Injector }, { token: i2.EventsService }, { token: API_SERVICE }, { token: LANGUAGE_SERVICE }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.19", ngImport: i0, type: DynamicFormBuilderService });
@@ -1425,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 });
@@ -2322,5 +2339,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.19", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AsyncSubmitDirective, DynamicFieldType, DynamicFormAlertComponent, DynamicFormArrayComponent, DynamicFormBuilderService, DynamicFormChipsComponent, DynamicFormComponent, DynamicFormFieldComponent, DynamicFormFieldsetComponent, DynamicFormGroupComponent, DynamicFormSchemaService, DynamicFormService, DynamicFormStaticComponent, DynamicFormTemplateDirective, DynamicFormTemplatePipe, DynamicFormTemplateService, DynamicFormTranslationComponent, DynamicFormUploadComponent, DynamicFormWysiwygComponent, EDITOR_FORMATS, FORM_ROOT_ID, FormArray, FormFieldSet, FormGroup, FormInput, FormSelect, FormSerializable, FormStatic, FormUpload, MAX_INPUT_NUM, MIN_INPUT_NUM, NgxDynamicFormModule, RichTranslationModel, TranslationModel, addFieldValidators, arrayLengthValidation, clearFieldArray, controlStatus, controlValues, convertToDate, convertToDateFormat, convertToNumber, customizeFormField, emailValidation, getFieldByPath, getFieldsByKey, getFieldsByPredicate, getSelectOptions, insertToFieldArray, isFieldHidden, isFieldVisible, jsonValidation, maxLengthValidation, maxValueValidation, minLengthValidation, minValueValidation, phoneValidation, removeFieldValidators, removeFromFieldArray, replaceFieldArray, replaceSpecialChars, requiredValidation, setFieldDefault, setFieldDisabled, setFieldHidden, setFieldHooks, setFieldProp, setFieldProps, setFieldSerialize, setFieldValue, translationValidation };
+export { AsyncSubmitDirective, DynamicFieldType, DynamicFormAlertComponent, DynamicFormArrayComponent, DynamicFormBuilderService, DynamicFormChipsComponent, DynamicFormComponent, DynamicFormFieldComponent, DynamicFormFieldsetComponent, DynamicFormGroupComponent, DynamicFormSchemaService, DynamicFormService, DynamicFormStaticComponent, DynamicFormTemplateDirective, DynamicFormTemplatePipe, DynamicFormTemplateService, DynamicFormTranslationComponent, DynamicFormUploadComponent, DynamicFormWysiwygComponent, EDITOR_FORMATS, FORM_ROOT_ID, FormArray, FormFieldSet, FormGroup, FormInput, FormSelect, FormSerializable, FormStatic, FormUpload, MAX_INPUT_NUM, MIN_INPUT_NUM, NgxDynamicFormModule, RichTranslationModel, TranslationModel, addFieldValidators, arrayLengthValidation, clearFieldArray, controlStatus, controlValues, convertToDate, convertToDateFormat, convertToNumber, customizeFormField, emailValidation, getFieldByPath, getFieldsByKey, getFieldsByPredicate, getSelectOptions, insertToFieldArray, isFieldHidden, isFieldVisible, jsonValidation, maxLengthValidation, maxValueValidation, minLengthValidation, minValueValidation, phoneValidation, removeFieldValidators, removeFromFieldArray, replaceFieldArray, replaceSpecialChars, requiredValidation, setFieldDefault, setFieldDisabled, setFieldHidden, setFieldHooks, setFieldMinDate, setFieldProp, setFieldProps, setFieldSerialize, setFieldValue, translationValidation };
 //# sourceMappingURL=stemy-ngx-dynamic-form.mjs.map