@stemy/ngx-dynamic-form 19.9.18 → 19.9.21

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

@@ -378,9 +378,7 @@ function jsonValidation() {
     }, "json");
 }
 function requiredValidation() {
-    return withName((control, field) => {
-        if (field.props?.type === "checkbox")
-            return control.value === true;
+    return withName(control => {
         return ObjectUtils.isString(control.value) ? control.value.length > 0 : ObjectUtils.isDefined(control.value);
     }, "required");
 }
@@ -446,6 +444,11 @@ function maxValueValidation() {
         return v == null || v <= max;
     }, "maxValue");
 }
+function enumValidation($enum) {
+    return validateEach(v => {
+        return $enum.includes(v);
+    }, "enum");
+}
 function setFieldMinDate(field, min) {
     setFieldDefault(field, min);
     setFieldProp(field, "min", min);
@@ -769,11 +772,13 @@ class DynamicFormBuilderService {
     }
     createFormSelect(key, data, parent, options) {
         data = data || {};
+        const multiple = data.multiple === true;
+        data.defaultValue = data.defaultValue ?? (multiple ? [] : null);
         const type = `${data.type || "select"}`;
         const fieldType = type === "radio" ? type : (data.strict === false ? "chips" : "select");
         const field = this.createFormField(key, fieldType, data, {
             type,
-            multiple: data.multiple === true,
+            multiple,
             strict: data.strict !== false,
             allowEmpty: data.allowEmpty === true,
             groupBy: data.groupBy,
@@ -933,8 +938,15 @@ class DynamicFormBuilderService {
         }));
         const control = field.formControl;
         const multiple = field.props.multiple;
-        field.defaultValue = multiple ? [] : options[0]?.value ?? null;
-        if (multiple || options.length === 0 || options.findIndex(o => o.value === control.value) >= 0)
+        if (multiple) {
+            // Handle if current control value is not an array
+            const value = Array.isArray(control.value)
+                ? control.value
+                : String(control.value || "").split(",");
+            control.setValue(value);
+            return options;
+        }
+        if (options.length === 0 || options.findIndex(o => o.value === control.value) >= 0)
             return options;
         control.setValue(field.defaultValue);
         return options;
@@ -1141,10 +1153,6 @@ class DynamicFormSchemaService {
         return !field ? [] : options.customize(field, property, schema);
     }
     async getFormFieldForProp(property, options, parent) {
-        const $enum = property.items?.enum || property.enum;
-        if (Array.isArray($enum) || ObjectUtils.isStringWithValue(property.optionsPath) || ObjectUtils.isStringWithValue(property.endpoint)) {
-            return this.getFormSelectConfig($enum, property, options, parent);
-        }
         switch (property.type) {
             // case "object":
             //     return this.getFormEditorConfig(property, options, parent);
@@ -1156,6 +1164,10 @@ class DynamicFormSchemaService {
             case "array":
                 return this.getFormArrayConfig(property, options, parent);
         }
+        const $enum = property.items?.enum || property.enum;
+        if (Array.isArray($enum) || ObjectUtils.isStringWithValue(property.optionsPath) || ObjectUtils.isStringWithValue(property.endpoint)) {
+            return this.getFormSelectConfig($enum, property, options, parent);
+        }
         // if (this.checkIsEditorProperty(property)) {
         //     return this.getFormEditorConfig(property, options, parent);
         // }
@@ -1378,8 +1390,9 @@ class DynamicFormSchemaService {
             const endpoint = entries.reduce((res, [key, control]) => {
                 return this.replaceOptionsEndpoint(res, key, control.value);
             }, `${property.endpoint}`);
+            const cache = property.cache ?? new Date(Date.now() + 20_000);
             const data = await this.api.list(endpoint, this.api.makeListParams(1, -1), {
-                cache: this.api.cached(property.cache),
+                cache: this.api.cached(cache),
                 read: String(property.responseProperty || "")
             });
             const items = ObjectUtils.isArray(data)
@@ -1389,7 +1402,7 @@ class DynamicFormSchemaService {
                 item = ObjectUtils.isObject(item) ? item : { id: item };
                 return {
                     ...item,
-                    value: item.id || item._id,
+                    value: item[property.idField] || item.id || item._id,
                     label: item[property.labelField] || item.label || item.id || item._id
                 };
             }));
@@ -1462,6 +1475,12 @@ class DynamicFormSchemaService {
         if (!isNaN(property.maximum)) {
             validators.max = maxValueValidation();
         }
+        if (!isNaN(property.maximum)) {
+            validators.max = maxValueValidation();
+        }
+        if (Array.isArray(property.enum)) {
+            validators.enum = enumValidation(property.enum);
+        }
         // if (isString(property.pattern) && property.pattern.length) {
         //     validators.pattern = property.pattern;
         // }
@@ -1486,6 +1505,9 @@ class DynamicFormSchemaService {
         if (!isNaN(items.maximum)) {
             validators.itemsMaxValue = maxValueValidation();
         }
+        if (Array.isArray(items.enum)) {
+            validators.enum = enumValidation(items.enum);
+        }
     }
     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 });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "19.2.19", ngImport: i0, type: DynamicFormSchemaService });
@@ -2428,5 +2450,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.19", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { AsyncSubmitDirective, DEFAULT_NUMERIC_STEP, DynamicFieldType, DynamicFormAlertComponent, DynamicFormArrayComponent, DynamicFormBuilderService, DynamicFormChipsComponent, DynamicFormComponent, DynamicFormFieldComponent, DynamicFormFieldsetComponent, DynamicFormGroupComponent, DynamicFormPasswordComponent, 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 };
+export { AsyncSubmitDirective, DEFAULT_NUMERIC_STEP, DynamicFieldType, DynamicFormAlertComponent, DynamicFormArrayComponent, DynamicFormBuilderService, DynamicFormChipsComponent, DynamicFormComponent, DynamicFormFieldComponent, DynamicFormFieldsetComponent, DynamicFormGroupComponent, DynamicFormPasswordComponent, 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, enumValidation, 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