@stemy/ngx-dynamic-form 19.9.36 → 19.9.38

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

@@ -1,7 +1,7 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, inject, Inject, Injectable, untracked, input, Renderer2, ElementRef, computed, signal, effect, HostBinding, Directive, Input, Optional, Pipe, Type, Component, Injector, output, ChangeDetectionStrategy, ViewEncapsulation, viewChild, makeEnvironmentProviders, NgModule } from '@angular/core';
 import * as i2 from '@stemy/ngx-utils';
-import { cachedFactory, ReflectUtils, ObjectUtils, convertToDateFormat, LANGUAGE_SERVICE, convertToDate, ForbiddenZone, SetUtils, ArrayUtils, API_SERVICE, StringUtils, AsyncMethodBase, EventsService, NgxUtilsModule } from '@stemy/ngx-utils';
+import { cachedFactory, ReflectUtils, ObjectUtils, convertToDateFormat, LANGUAGE_SERVICE, convertToDate, ForbiddenZone, SetUtils, ArrayUtils, API_SERVICE, StringUtils, Enum, AsyncMethodBase, EventsService, NgxUtilsModule } from '@stemy/ngx-utils';
 import { of, merge, Observable, firstValueFrom, BehaviorSubject, combineLatestWith, switchMap, distinctUntilChanged, first, Subject, map, filter } from 'rxjs';
 import { debounceTime } from 'rxjs/operators';
 import * as i1 from '@angular/forms';
@@ -68,19 +68,37 @@ function FormInput(data) {
                 break;
         }
         data.type = data.type || inputType;
-        defineFormControl(target, key, (fb, path, options) => fb.createFormInput(key, data, path, options));
+        defineFormControl(target, key, (fb, path, options) => {
+            const instance = getInstance(target);
+            return fb.createFormInput(key, {
+                ...data,
+                defaultValue: instance[key] ?? null
+            }, path, options);
+        });
     };
 }
 function FormSelect(data) {
     data = data || {};
     return (target, key) => {
-        defineFormControl(target, key, (fb, path, options) => fb.createFormSelect(key, data, path, options));
+        defineFormControl(target, key, (fb, path, options) => {
+            const instance = getInstance(target);
+            return fb.createFormSelect(key, {
+                ...data,
+                defaultValue: instance[key] ?? null
+            }, path, options);
+        });
     };
 }
 function FormDate(data) {
     data = data || {};
     return (target, key) => {
-        defineFormControl(target, key, (fb, path, options) => fb.createFormDate(key, data, path, options));
+        defineFormControl(target, key, (fb, path, options) => {
+            const instance = getInstance(target);
+            return fb.createFormDate(key, {
+                ...data,
+                defaultValue: instance[key] ?? null
+            }, path, options);
+        });
     };
 }
 function FormUpload(data) {
@@ -92,7 +110,13 @@ function FormUpload(data) {
 function FormStatic(data) {
     data = data || {};
     return (target, key) => {
-        defineFormControl(target, key, (fb, path, options) => fb.createFormStatic(key, data, path, options));
+        defineFormControl(target, key, (fb, path, options) => {
+            const instance = getInstance(target);
+            return fb.createFormStatic(key, {
+                ...data,
+                defaultValue: instance[key] ?? null
+            }, path, options);
+        });
     };
 }
 function FormGroup(data) {
@@ -100,7 +124,11 @@ function FormGroup(data) {
     return (target, key) => {
         defineFormControl(target, key, (fb, parent, options) => {
             const targetType = ReflectUtils.getOwnMetadata("design:type", target, key);
-            return fb.resolveFormGroup(key, targetType, data, parent, options);
+            const instance = getInstance(target);
+            return fb.resolveFormGroup(key, targetType, {
+                ...data,
+                defaultValue: instance[key] ?? {}
+            }, parent, options);
         });
     };
 }
@@ -108,7 +136,11 @@ function FormArray(itemType, data) {
     data = data || {};
     return (target, key) => {
         defineFormControl(target, key, (fb, parent, options) => {
-            return fb.resolveFormArray(key, itemType, data, parent, options);
+            const instance = getInstance(target);
+            return fb.resolveFormArray(key, itemType, {
+                ...data,
+                defaultValue: instance[key] ?? []
+            }, parent, options);
         });
     };
 }
@@ -122,6 +154,19 @@ function FormFieldSet(data) {
         defineFormFieldSet(target, data);
     };
 }
+function getInstance(target) {
+    let instance = ReflectUtils.getMetadata("dynamicFormInstance", target);
+    if (!instance) {
+        try {
+            instance = new target.constructor();
+        }
+        catch (e) {
+            instance = {};
+        }
+        ReflectUtils.defineMetadata("dynamicFormInstance", target, instance);
+    }
+    return instance;
+}
 
 function replaceSpecialChars(str, to = "-") {
     return `${str}`.replace(/[&\/\\#, +()$~%.@'":*?<>{}]/g, to);
@@ -1091,7 +1136,7 @@ class DynamicFormBuilderService {
             path: target => {
                 const tp = target.parent;
                 const prefix = tp?.path || "";
-                return [prefix, String(target.key ?? "")].filter(ObjectUtils.isStringWithValue).join("-");
+                return [prefix, String(target.key ?? "")].filter(ObjectUtils.isStringWithValue).join(".");
             },
             testId: target => {
                 const tp = target.parent;
@@ -1688,7 +1733,8 @@ class DynamicFormService {
                 Object.assign(result, group);
                 continue;
             }
-            result[key] = control.value;
+            const value = control.value;
+            result[key] = value instanceof Enum ? value.value : value;
         }
         return result;
     }