@stemy/ngx-dynamic-form 13.1.19 → 13.1.20

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

@@ -634,7 +634,7 @@ class DynamicFormService extends DynamicFormService$1 {
         return __awaiter(this, void 0, void 0, function* () {
             this.api.cache = {};
             this.schemas = yield this.openApi.getSchemas();
-            const customizeModels = (property, schema, modelType, config) => {
+            const customizeModels = (property, schema, modelType, config) => __awaiter(this, void 0, void 0, function* () {
                 const model = new modelType(config);
                 if (model instanceof DynamicFormValueControlModel) {
                     model.value = (model instanceof DynamicDatePickerModel)
@@ -642,22 +642,30 @@ 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 = yield res;
+                }
                 return Array.isArray(res) ? res : [res];
-            };
+            });
             return this.getFormModelForSchemaDef(this.schemas[name], customizeModels);
         });
     }
     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));
-        }
-        return controls.filter(t => null !== t);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!schema)
+                return [];
+            const keys = Object.keys(schema.properties || {});
+            const controls = [];
+            for (const p of keys) {
+                const property = schema.properties[p];
+                const models = yield this.getFormControlModels(property, schema, customizeModels);
+                controls.push(...models);
+            }
+            return controls.filter(t => null !== t);
+        });
     }
     checkIsEditorProperty(property) {
         if (!property.format)
@@ -666,43 +674,45 @@ class DynamicFormService extends DynamicFormService$1 {
     }
     getFormControlModels(property, schema, customizeModels) {
         var _a;
-        const $enum = ((_a = property.items) === null || _a === void 0 ? void 0 : _a.enum) || property.enum;
-        if (Array.isArray($enum) || isStringWithVal(property.optionsPath) || isStringWithVal(property.endpoint)) {
-            return customizeModels(property, schema, DynamicSelectModel, this.getFormSelectConfig(property, schema));
-        }
-        switch (property.type) {
-            case "string":
-            case "number":
-            case "integer":
-            case "textarea":
-                if (this.checkIsEditorProperty(property)) {
-                    return customizeModels(property, schema, DynamicEditorModel, this.getFormEditorConfig(property, schema));
-                }
-                if (property.format == "textarea") {
-                    return customizeModels(property, schema, DynamicTextAreaModel, this.getFormTextareaConfig(property, schema));
-                }
-                if (property.format == "date") {
-                    return customizeModels(property, schema, DynamicDatePickerModel, this.getFormDatepickerConfig(property, schema));
-                }
-                return customizeModels(property, schema, DynamicInputModel, this.getFormInputConfig(property, schema));
-            case "object":
-                return customizeModels(property, schema, DynamicEditorModel, this.getFormEditorConfig(property, schema));
-            case "boolean":
-                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));
-                }
-                else {
+        return __awaiter(this, void 0, void 0, function* () {
+            const $enum = ((_a = property.items) === null || _a === void 0 ? void 0 : _a.enum) || property.enum;
+            if (Array.isArray($enum) || isStringWithVal(property.optionsPath) || isStringWithVal(property.endpoint)) {
+                return customizeModels(property, schema, DynamicSelectModel, this.getFormSelectConfig(property, schema));
+            }
+            switch (property.type) {
+                case "string":
+                case "number":
+                case "integer":
+                case "textarea":
+                    if (this.checkIsEditorProperty(property)) {
+                        return customizeModels(property, schema, DynamicEditorModel, this.getFormEditorConfig(property, schema));
+                    }
+                    if (property.format == "textarea") {
+                        return customizeModels(property, schema, DynamicTextAreaModel, this.getFormTextareaConfig(property, schema));
+                    }
+                    if (property.format == "date") {
+                        return customizeModels(property, schema, DynamicDatePickerModel, this.getFormDatepickerConfig(property, schema));
+                    }
                     return customizeModels(property, schema, DynamicInputModel, this.getFormInputConfig(property, schema));
-                }
-            case "file":
-                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 [];
+                case "object":
+                    return customizeModels(property, schema, DynamicEditorModel, this.getFormEditorConfig(property, schema));
+                case "boolean":
+                    return customizeModels(property, schema, DynamicCheckboxModel, this.getFormCheckboxConfig(property, schema));
+                case "array":
+                    if (findRefs(property).length > 0) {
+                        return customizeModels(property, schema, DynamicFormArrayModel, yield this.getFormArrayConfig(property, schema, customizeModels));
+                    }
+                    else {
+                        return customizeModels(property, schema, DynamicInputModel, this.getFormInputConfig(property, schema));
+                    }
+                case "file":
+                    return customizeModels(property, schema, DynamicFileUploadModel, this.getFormUploadConfig(property, schema));
+            }
+            if (findRefs(property).length > 0) {
+                return customizeModels(property, schema, DynamicFormGroupModel, yield this.getFormGroupConfig(property, schema, customizeModels));
+            }
+            return [];
+        });
     }
     findModelByPath(parent, path) {
         if (path.length == 0)
@@ -736,24 +746,30 @@ class DynamicFormService extends DynamicFormService$1 {
         };
     }
     getFormArrayConfig(property, schema, customizeModels) {
-        const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
-        return Object.assign(this.getFormControlConfig(property, schema), {
-            groupFactory: () => mergeFormModels(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels))),
-            initialCount: property.initialCount || 0,
-            sortable: property.sortable || false,
-            useTabs: property.useTabs || false,
-            addItem: property.addItem !== false,
-            insertItem: property.insertItem !== false,
-            cloneItem: property.cloneItem !== false,
-            moveItem: property.moveItem !== false,
-            removeItem: property.removeItem !== false,
-            clearItems: property.clearItems !== false
+        return __awaiter(this, void 0, void 0, function* () {
+            const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
+            const subModels = yield Promise.all(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)));
+            return Object.assign(this.getFormControlConfig(property, schema), {
+                groupFactory: () => mergeFormModels(ObjectUtils.copy(subModels)),
+                initialCount: property.initialCount || 0,
+                sortable: property.sortable || false,
+                useTabs: property.useTabs || false,
+                addItem: property.addItem !== false,
+                insertItem: property.insertItem !== false,
+                cloneItem: property.cloneItem !== false,
+                moveItem: property.moveItem !== false,
+                removeItem: property.removeItem !== false,
+                clearItems: property.clearItems !== false
+            });
         });
     }
     getFormGroupConfig(property, schema, customizeModels) {
-        const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
-        return Object.assign(this.getFormControlConfig(property, schema), {
-            group: mergeFormModels(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)))
+        return __awaiter(this, void 0, void 0, function* () {
+            const subSchemas = findRefs(property).map(ref => this.schemas[ref]);
+            const subModels = yield Promise.all(subSchemas.map(s => this.getFormModelForSchemaDef(s, customizeModels)));
+            return Object.assign(this.getFormControlConfig(property, schema), {
+                group: mergeFormModels(subModels)
+            });
         });
     }
     getFormInputConfig(property, schema) {