@stemy/ngx-dynamic-form 13.1.18 → 13.1.20

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

@@ -626,7 +626,7 @@ class DynamicFormService extends DynamicFormService$1 {
     async getFormModelForSchema(name, customizeModel) {
         this.api.cache = {};
         this.schemas = await this.openApi.getSchemas();
-        const customizeModels = (property, schema, modelType, config) => {
+        const customizeModels = async (property, schema, modelType, config) => {
             const model = new modelType(config);
             if (model instanceof DynamicFormValueControlModel) {
                 model.value = (model instanceof DynamicDatePickerModel)
@@ -634,19 +634,25 @@ class DynamicFormService extends DynamicFormService$1 {
             }
             if (!ObjectUtils.isFunction(customizeModel))
                 return [model];
-            const res = customizeModel(property, schema, model, config, this.injector);
+            let res = customizeModel(property, schema, model, config, this.injector);
+            if (!res)
+                return [model];
+            if (res instanceof Promise) {
+                res = await res;
+            }
             return Array.isArray(res) ? res : [res];
         };
         return this.getFormModelForSchemaDef(this.schemas[name], customizeModels);
     }
-    getFormModelForSchemaDef(schema, customizeModels) {
+    async getFormModelForSchemaDef(schema, customizeModels) {
         if (!schema)
             return [];
         const keys = Object.keys(schema.properties || {});
         const controls = [];
         for (const p of keys) {
             const property = schema.properties[p];
-            controls.push(...this.getFormControlModels(property, schema, customizeModels));
+            const models = await this.getFormControlModels(property, schema, customizeModels);
+            controls.push(...models);
         }
         return controls.filter(t => null !== t);
     }
@@ -655,7 +661,7 @@ class DynamicFormService extends DynamicFormService$1 {
             return false;
         return EDITOR_FORMATS.indexOf(property.format) >= 0 || property.format.endsWith("script");
     }
-    getFormControlModels(property, schema, customizeModels) {
+    async getFormControlModels(property, schema, customizeModels) {
         const $enum = property.items?.enum || property.enum;
         if (Array.isArray($enum) || isStringWithVal(property.optionsPath) || isStringWithVal(property.endpoint)) {
             return customizeModels(property, schema, DynamicSelectModel, this.getFormSelectConfig(property, schema));
@@ -681,7 +687,7 @@ class DynamicFormService extends DynamicFormService$1 {
                 return customizeModels(property, schema, DynamicCheckboxModel, this.getFormCheckboxConfig(property, schema));
             case "array":
                 if (findRefs(property).length > 0) {
-                    return customizeModels(property, schema, DynamicFormArrayModel, this.getFormArrayConfig(property, schema, customizeModels));
+                    return customizeModels(property, schema, DynamicFormArrayModel, await this.getFormArrayConfig(property, schema, customizeModels));
                 }
                 else {
                     return customizeModels(property, schema, DynamicInputModel, this.getFormInputConfig(property, schema));
@@ -690,7 +696,7 @@ class DynamicFormService extends DynamicFormService$1 {
                 return customizeModels(property, schema, DynamicFileUploadModel, this.getFormUploadConfig(property, schema));
         }
         if (findRefs(property).length > 0) {
-            return customizeModels(property, schema, DynamicFormGroupModel, this.getFormGroupConfig(property, schema, customizeModels));
+            return customizeModels(property, schema, DynamicFormGroupModel, await this.getFormGroupConfig(property, schema, customizeModels));
         }
         return [];
     }
@@ -725,10 +731,12 @@ class DynamicFormService extends DynamicFormService$1 {
             additional: Object.assign({}, property)
         };
     }
-    getFormArrayConfig(property, schema, customizeModels) {
+    async getFormArrayConfig(property, schema, customizeModels) {
         const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
+        const subModels = await Promise.all(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)));
         return Object.assign(this.getFormControlConfig(property, schema), {
-            groupFactory: () => mergeFormModels(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels))),
+            groupFactory: () => mergeFormModels(ObjectUtils.copy(subModels)),
+            initialCount: property.initialCount || 0,
             sortable: property.sortable || false,
             useTabs: property.useTabs || false,
             addItem: property.addItem !== false,
@@ -739,10 +747,11 @@ class DynamicFormService extends DynamicFormService$1 {
             clearItems: property.clearItems !== false
         });
     }
-    getFormGroupConfig(property, schema, customizeModels) {
+    async getFormGroupConfig(property, schema, customizeModels) {
         const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
+        const subModels = await Promise.all(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)));
         return Object.assign(this.getFormControlConfig(property, schema), {
-            group: mergeFormModels(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)))
+            group: mergeFormModels(subModels)
         });
     }
     getFormInputConfig(property, schema) {
@@ -853,10 +862,14 @@ class DynamicFormService extends DynamicFormService$1 {
         }
         return new FormSelectSubject(async (selectModel, control) => {
             this.api.cache[property.endpoint] = this.api.cache[property.endpoint] || this.api.list(property.endpoint, this.api.makeListParams(1, -1)).then(result => {
-                return result.items.map(i => {
+                const items = ObjectUtils.isArray(result)
+                    ? result
+                    : (ObjectUtils.isArray(result.items) ? result.items : []);
+                return items.map(i => {
+                    const item = ObjectUtils.isObject(i) ? i : { id: i };
                     return {
-                        ...i,
-                        value: i.id || i._id, label: i[property.labelField] || i.label || i.id || i._id
+                        ...item,
+                        value: item.id || item._id, label: item[property.labelField] || item.label || item.id || item._id
                     };
                 });
             });