@stemy/ngx-dynamic-form 19.9.30 → 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);
@@ -679,7 +677,7 @@ class DynamicFormBuilderService {
             id,
             parent,
             schemas: new Set(),
-            discriminator: parent.discriminator,
+            discriminator: parent?.discriminator,
             fieldGroup: fields,
             wrappers: ["form-fieldset"],
             props: {
@@ -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);
                     })));
@@ -830,11 +827,15 @@ class DynamicFormBuilderService {
             data.multiple = true;
             console.warn(`File upload property "multi" is deprecated. Use "multiple" instead.`);
         }
+        const baseUrl = data.url?.startsWith("http") ? data.url : this.api.url(data.url || "assets");
         return this.createFormField(key, "upload", data, {
             inline: data.inline === true,
             multiple: data.multiple === true,
             accept: data.accept || [".png", ".jpg"],
-            url: data.url?.startsWith("http") ? data.url : this.api.url(data.url || "assets"),
+            url: baseUrl,
+            uploadUrl: data.url?.startsWith("http")
+                ? data.uploadUrl
+                : (data.uploadUrl ? this.api.url(data.uploadUrl || "assets") : baseUrl),
             maxSize: isNaN(data.maxSize) ? MAX_INPUT_NUM : data.maxSize,
             uploadOptions: data.uploadOptions || {},
             createUploadData: data.createUploadData
@@ -1202,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);
@@ -1229,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);
         }
@@ -1325,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,
@@ -1339,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, {
@@ -2301,11 +2303,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.22", ngImpo
 
 class DynamicFormUploadComponent extends DynamicFieldType {
     static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "19.2.22", ngImport: i0, type: DynamicFormUploadComponent, deps: null, target: i0.ɵɵFactoryTarget.Component }); }
-    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.22", type: DynamicFormUploadComponent, isStandalone: false, selector: "dynamic-form-upload", usesInheritance: true, ngImport: i0, template: "<upload [formControl]=\"formControl\"\n        [multiple]=\"props.multiple\"\n        [inline]=\"props.inline\"\n        [accept]=\"props.accept\"\n        [baseUrl]=\"props.url\"\n        [makeUpload]=\"props.createUploadData\"\n        [formlyAttributes]=\"field\">\n</upload>\n", dependencies: [{ kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.FormControlDirective, selector: "[formControl]", inputs: ["formControl", "disabled", "ngModel"], outputs: ["ngModelChange"], exportAs: ["ngForm"] }, { kind: "component", type: i2.UploadComponent, selector: "upload", inputs: ["value", "disabled", "inline", "accept", "baseUrl", "message", "multiple", "buttonText", "makeUpload", "preProcess"], outputs: ["onUploaded", "onRemove"] }, { kind: "directive", type: i3.LegacyFormlyAttributes, selector: "[formlyAttributes]" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
+    static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "19.2.22", type: DynamicFormUploadComponent, isStandalone: false, selector: "dynamic-form-upload", usesInheritance: true, ngImport: i0, template: "<upload [formControl]=\"formControl\"\n        [multiple]=\"props.multiple\"\n        [inline]=\"props.inline\"\n        [accept]=\"props.accept\"\n        [baseUrl]=\"props.url\"\n        [uploadUrl]=\"props.uploadUrl\"\n        [makeUpload]=\"props.createUploadData\"\n        [formlyAttributes]=\"field\">\n</upload>\n", dependencies: [{ kind: "directive", type: i1.NgControlStatus, selector: "[formControlName],[ngModel],[formControl]" }, { kind: "directive", type: i1.FormControlDirective, selector: "[formControl]", inputs: ["formControl", "disabled", "ngModel"], outputs: ["ngModelChange"], exportAs: ["ngForm"] }, { kind: "component", type: i2.UploadComponent, selector: "upload", inputs: ["value", "disabled", "inline", "accept", "baseUrl", "uploadUrl", "message", "multiple", "buttonText", "makeUpload", "preProcess"], outputs: ["onUploaded", "onRemove"] }, { kind: "directive", type: i3.LegacyFormlyAttributes, selector: "[formlyAttributes]" }], changeDetection: i0.ChangeDetectionStrategy.OnPush, encapsulation: i0.ViewEncapsulation.None }); }
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "19.2.22", ngImport: i0, type: DynamicFormUploadComponent, decorators: [{
             type: Component,
-            args: [{ standalone: false, selector: "dynamic-form-upload", encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, template: "<upload [formControl]=\"formControl\"\n        [multiple]=\"props.multiple\"\n        [inline]=\"props.inline\"\n        [accept]=\"props.accept\"\n        [baseUrl]=\"props.url\"\n        [makeUpload]=\"props.createUploadData\"\n        [formlyAttributes]=\"field\">\n</upload>\n" }]
+            args: [{ standalone: false, selector: "dynamic-form-upload", encapsulation: ViewEncapsulation.None, changeDetection: ChangeDetectionStrategy.OnPush, template: "<upload [formControl]=\"formControl\"\n        [multiple]=\"props.multiple\"\n        [inline]=\"props.inline\"\n        [accept]=\"props.accept\"\n        [baseUrl]=\"props.url\"\n        [uploadUrl]=\"props.uploadUrl\"\n        [makeUpload]=\"props.createUploadData\"\n        [formlyAttributes]=\"field\">\n</upload>\n" }]
         }] });
 
 class DynamicFormWysiwygComponent extends DynamicFieldType {