@stemy/ngx-dynamic-form 19.9.31 → 19.9.32

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

@@ -40,10 +40,8 @@ function defineFormControl(target, propertyKey, cb) {
     const fields = ReflectUtils.getMetadata("dynamicFormFields", target) || new Set();
     const existing = ReflectUtils.getMetadata("dynamicFormField", target, propertyKey);
     const builder = (fb, opts, path) => {
-        const data = ObjectUtils.isFunction(existing) ? existing(fb, opts, path) : {
-            priority: Number.MAX_SAFE_INTEGER
-        };
-        return ObjectUtils.assign(data, cb(fb, opts, path) || {});
+        const data = ObjectUtils.isFunction(existing) ? existing(fb, opts, path) : {};
+        return ObjectUtils.assign(cb(fb, opts, path) || {}, data);
     };
     fields.add(propertyKey);
     ReflectUtils.defineMetadata("dynamicFormField", builder, target, propertyKey);
@@ -805,7 +803,6 @@ class DynamicFormBuilderService {
                 setFieldProp(target, "options", options instanceof Observable
                     ? options
                     : controlValues(root).pipe(combineLatestWith(this.language), switchMap(async (a, b) => {
-                        console.log(a, b, "????", target.key, target.formControl?.value);
                         const results = await factory(target, this.injector) || [];
                         return this.fixSelectOptions(target, results);
                     })));
@@ -1206,6 +1203,12 @@ class DynamicFormSchemaService {
         return !field ? [] : options.customize(field, property, schema);
     }
     async getFormFieldForProp(property, options, parent) {
+        // First check property references, because a dynamic schema can be a type of object which we use for editor
+        const refs = await this.openApi.getReferences(property, options.schema);
+        if (refs.length > 0) {
+            return this.getFormGroupConfig(property, options, parent);
+        }
+        // Then check the property type
         switch (property.type) {
             case "object":
                 return this.getFormEditorConfig(property, options, parent);
@@ -1233,10 +1236,6 @@ class DynamicFormSchemaService {
         if (property.format == "date" || property.format == "date-time") {
             return this.getFormDatepickerConfig(property, options, parent);
         }
-        const refs = await this.openApi.getReferences(property, options.schema);
-        if (refs.length > 0) {
-            return this.getFormGroupConfig(property, options, parent);
-        }
         if (this.checkIsEditorProperty(property)) {
             return this.getFormEditorConfig(property, options, parent);
         }
@@ -1329,7 +1328,7 @@ class DynamicFormSchemaService {
                 break;
         }
         const sub = property.type == "array" ? property.items || property : property;
-        const input = this.builder.createFormInput(property.id, {
+        return this.builder.createFormInput(property.id, {
             ...this.getFormFieldData(property, options),
             type,
             autocomplete: property.autocomplete,
@@ -1343,7 +1342,6 @@ class DynamicFormSchemaService {
             indeterminate: property.indeterminate,
             suffix: property.suffix
         }, parent, options);
-        return input;
     }
     getFormTextareaConfig(property, options, parent) {
         return this.builder.createFormInput(property.id, {