@3kles/kles-material-dynamicforms 17.11.0 → 17.11.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -19,12 +19,12 @@ export class KlesFormArray extends KlesFormControl {
|
|
|
19
19
|
const data = line[subfield.name] || null;
|
|
20
20
|
let control;
|
|
21
21
|
if (subfield.type) {
|
|
22
|
-
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield, ...(data && { value: data }) })
|
|
23
|
-
|| klesFieldControlFactory({ ...subfield, ...(data && { value: data }) });
|
|
22
|
+
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield, ...(data && { value: data }) }, this.ref)
|
|
23
|
+
|| klesFieldControlFactory({ ...subfield, ...(data && { value: data }) }, this.ref);
|
|
24
24
|
}
|
|
25
25
|
else {
|
|
26
|
-
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield, ...(data && { value: data }) })
|
|
27
|
-
|| klesFieldControlFactory({ ...subfield, ...(data && { value: data }) });
|
|
26
|
+
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield, ...(data && { value: data }) }, this.ref)
|
|
27
|
+
|| klesFieldControlFactory({ ...subfield, ...(data && { value: data }) }, this.ref);
|
|
28
28
|
}
|
|
29
29
|
group.addControl(subfield.name, control);
|
|
30
30
|
});
|
|
@@ -37,12 +37,12 @@ export class KlesFormArray extends KlesFormControl {
|
|
|
37
37
|
this.field.collections?.forEach(subfield => {
|
|
38
38
|
let control;
|
|
39
39
|
if (subfield.type) {
|
|
40
|
-
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield })
|
|
41
|
-
|| klesFieldControlFactory({ ...subfield });
|
|
40
|
+
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield }, this.ref)
|
|
41
|
+
|| klesFieldControlFactory({ ...subfield }, this.ref);
|
|
42
42
|
}
|
|
43
43
|
else {
|
|
44
|
-
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield })
|
|
45
|
-
|| klesFieldControlFactory({ ...subfield });
|
|
44
|
+
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield }, this.ref)
|
|
45
|
+
|| klesFieldControlFactory({ ...subfield }, this.ref);
|
|
46
46
|
}
|
|
47
47
|
group.addControl(subfield.name, control);
|
|
48
48
|
});
|
|
@@ -54,4 +54,4 @@ export class KlesFormArray extends KlesFormControl {
|
|
|
54
54
|
return array;
|
|
55
55
|
}
|
|
56
56
|
}
|
|
57
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
57
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"array.control.js","sourceRoot":"","sources":["../../../../../projects/kles-material-dynamicforms/src/lib/controls/array.control.ts"],"names":[],"mappings":"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","sourcesContent":["import { AbstractControl, FormArray, FormControl, FormGroup } from \"@angular/forms\";\nimport { KlesFormControl } from \"./default.control\";\nimport { v4 as uuidv4 } from 'uuid';\nimport { componentMapper } from \"../decorators/component.decorator\";\nimport { klesFieldControlFactory } from \"../factories/field.factory\";\n\nexport class KlesFormArray extends KlesFormControl {\n\n    public create(): AbstractControl<any, any> {\n        const array = new FormArray([], {\n            validators: this.bindValidations(this.field.validations || []),\n            asyncValidators: this.bindAsyncValidations(this.field.asyncValidations || []),\n            updateOn: this.field.updateOn || 'change'\n        });\n\n        if (this.field.value && Array.isArray(this.field.value)) {\n            if (this.field.collections && Array.isArray(this.field.collections)) {\n                this.field.value.forEach(val => {\n                    const group = new FormGroup({});\n                    const line = { ...val, _id: val?._id || uuidv4() };\n                    this.field.collections?.forEach(subfield => {\n                        const data = line[subfield.name] || null;\n                        let control;\n                        if (subfield.type) {\n                            control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield, ...(data && { value: data }) }, this.ref)\n                                || klesFieldControlFactory({ ...subfield, ...(data && { value: data }) }, this.ref);\n                        } else {\n                            control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield, ...(data && { value: data }) }, this.ref)\n                                || klesFieldControlFactory({ ...subfield, ...(data && { value: data }) }, this.ref);\n                        }\n                        group.addControl(subfield.name, control);\n                    });\n                    array.push(group);\n                });\n            }\n        } else {\n            const group = new FormGroup({ _id: new FormControl(uuidv4()) });\n            this.field.collections?.forEach(subfield => {\n                let control;\n                if (subfield.type) {\n                    control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield }, this.ref)\n                        || klesFieldControlFactory({ ...subfield }, this.ref);\n                } else {\n                    control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield }, this.ref)\n                        || klesFieldControlFactory({ ...subfield }, this.ref);\n\n                }\n                group.addControl(subfield.name, control);\n            });\n            array.push(group);\n        }\n\n\n        if (this.field.disabled) {\n            array.disable();\n        }\n\n\n        return array;\n    }\n}\n"]}
|
|
@@ -2,6 +2,8 @@ import { UntypedFormGroup } from "@angular/forms";
|
|
|
2
2
|
import { KlesFormControl } from "./default.control";
|
|
3
3
|
import { componentMapper } from "../decorators/component.decorator";
|
|
4
4
|
import { klesFieldControlFactory } from "../factories/field.factory";
|
|
5
|
+
import { concat, of } from "rxjs";
|
|
6
|
+
import { catchError, map, take } from "rxjs/operators";
|
|
5
7
|
export class KlesFormGroup extends KlesFormControl {
|
|
6
8
|
create() {
|
|
7
9
|
const subGroup = new UntypedFormGroup({});
|
|
@@ -9,12 +11,12 @@ export class KlesFormGroup extends KlesFormControl {
|
|
|
9
11
|
this.field.collections.forEach(subfield => {
|
|
10
12
|
let control;
|
|
11
13
|
if (subfield.type) {
|
|
12
|
-
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] })
|
|
13
|
-
|| klesFieldControlFactory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] });
|
|
14
|
+
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] }, this.ref)
|
|
15
|
+
|| klesFieldControlFactory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] }, this.ref);
|
|
14
16
|
}
|
|
15
17
|
else {
|
|
16
18
|
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] })
|
|
17
|
-
|| klesFieldControlFactory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] });
|
|
19
|
+
|| klesFieldControlFactory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] }, this.ref);
|
|
18
20
|
}
|
|
19
21
|
subGroup.addControl(subfield.name, control);
|
|
20
22
|
});
|
|
@@ -22,7 +24,26 @@ export class KlesFormGroup extends KlesFormControl {
|
|
|
22
24
|
if (this.field.disabled) {
|
|
23
25
|
subGroup.disable();
|
|
24
26
|
}
|
|
27
|
+
if (this.field.asyncValue) {
|
|
28
|
+
concat(of({ value: null, pending: true }), this.field.asyncValue.pipe(take(1), catchError((err) => {
|
|
29
|
+
console.error(err);
|
|
30
|
+
return of(null);
|
|
31
|
+
}), map((value) => ({ value, pending: false })))).subscribe((response) => {
|
|
32
|
+
this.field.pending = response.pending;
|
|
33
|
+
this.field.collections.forEach((col) => col.pending = response.pending);
|
|
34
|
+
if (response.pending) {
|
|
35
|
+
subGroup.disable({ emitEvent: false });
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
if (!this.field.disabled) {
|
|
39
|
+
subGroup.enable({ emitEvent: false });
|
|
40
|
+
}
|
|
41
|
+
subGroup.patchValue(response.value);
|
|
42
|
+
this.field.value = response.value;
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
}
|
|
25
46
|
return subGroup;
|
|
26
47
|
}
|
|
27
48
|
}
|
|
28
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
49
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZ3JvdXAuY29udHJvbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL2tsZXMtbWF0ZXJpYWwtZHluYW1pY2Zvcm1zL3NyYy9saWIvY29udHJvbHMvZ3JvdXAuY29udHJvbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQThCLGdCQUFnQixFQUFFLE1BQU0sZ0JBQWdCLENBQUM7QUFDOUUsT0FBTyxFQUFFLGVBQWUsRUFBRSxNQUFNLG1CQUFtQixDQUFDO0FBQ3BELE9BQU8sRUFBRSxlQUFlLEVBQUUsTUFBTSxtQ0FBbUMsQ0FBQztBQUNwRSxPQUFPLEVBQUUsdUJBQXVCLEVBQUUsTUFBTSw0QkFBNEIsQ0FBQztBQUNyRSxPQUFPLEVBQUUsTUFBTSxFQUFFLEVBQUUsRUFBRSxNQUFNLE1BQU0sQ0FBQztBQUNsQyxPQUFPLEVBQUUsVUFBVSxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsTUFBTSxnQkFBZ0IsQ0FBQztBQUV2RCxNQUFNLE9BQU8sYUFBYyxTQUFRLGVBQWU7SUFFdkMsTUFBTTtRQUNULE1BQU0sUUFBUSxHQUFHLElBQUksZ0JBQWdCLENBQUMsRUFBRSxDQUFDLENBQUM7UUFFMUMsSUFBSSxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsSUFBSSxLQUFLLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsV0FBVyxDQUFDLEVBQUU7WUFDakUsSUFBSSxDQUFDLEtBQUssQ0FBQyxXQUFXLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxFQUFFO2dCQUN0QyxJQUFJLE9BQU8sQ0FBQztnQkFDWixJQUFJLFFBQVEsQ0FBQyxJQUFJLEVBQUU7b0JBQ2YsT0FBTyxHQUFHLGVBQWUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxLQUFLLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxPQUFPLENBQUMsRUFBRSxHQUFHLFFBQVEsRUFB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Q3JDO1lBQ0wsQ0FBQyxDQUFDLENBQUM7U0FDTjtRQUVELE9BQU8sUUFBUSxDQUFDO0lBQ3BCLENBQUM7Q0FDSiIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IEFic3RyYWN0Q29udHJvbCwgRm9ybUdyb3VwLCBVbnR5cGVkRm9ybUdyb3VwIH0gZnJvbSBcIkBhbmd1bGFyL2Zvcm1zXCI7XG5pbXBvcnQgeyBLbGVzRm9ybUNvbnRyb2wgfSBmcm9tIFwiLi9kZWZhdWx0LmNvbnRyb2xcIjtcbmltcG9ydCB7IGNvbXBvbmVudE1hcHBlciB9IGZyb20gXCIuLi9kZWNvcmF0b3JzL2NvbXBvbmVudC5kZWNvcmF0b3JcIjtcbmltcG9ydCB7IGtsZXNGaWVsZENvbnRyb2xGYWN0b3J5IH0gZnJvbSBcIi4uL2ZhY3Rvcmllcy9maWVsZC5mYWN0b3J5XCI7XG5pbXBvcnQgeyBjb25jYXQsIG9mIH0gZnJvbSBcInJ4anNcIjtcbmltcG9ydCB7IGNhdGNoRXJyb3IsIG1hcCwgdGFrZSB9IGZyb20gXCJyeGpzL29wZXJhdG9yc1wiO1xuXG5leHBvcnQgY2xhc3MgS2xlc0Zvcm1Hcm91cCBleHRlbmRzIEtsZXNGb3JtQ29udHJvbCB7XG5cbiAgICBwdWJsaWMgY3JlYXRlKCk6IEFic3RyYWN0Q29udHJvbDxhbnksIGFueT4ge1xuICAgICAgICBjb25zdCBzdWJHcm91cCA9IG5ldyBVbnR5cGVkRm9ybUdyb3VwKHt9KTtcblxuICAgICAgICBpZiAodGhpcy5maWVsZC5jb2xsZWN0aW9ucyAmJiBBcnJheS5pc0FycmF5KHRoaXMuZmllbGQuY29sbGVjdGlvbnMpKSB7XG4gICAgICAgICAgICB0aGlzLmZpZWxkLmNvbGxlY3Rpb25zLmZvckVhY2goc3ViZmllbGQgPT4ge1xuICAgICAgICAgICAgICAgIGxldCBjb250cm9sO1xuICAgICAgICAgICAgICAgIGlmIChzdWJmaWVsZC50eXBlKSB7XG4gICAgICAgICAgICAgICAgICAgIGNvbnRyb2wgPSBjb21wb25lbnRNYXBwZXIuZmluZChjID0+IGMudHlwZSA9PT0gc3ViZmllbGQudHlwZSk/LmZhY3RvcnkoeyAuLi5zdWJmaWVsZCwgdmFsdWU6IHN1YmZpZWxkLnZhbHVlIHx8IHRoaXMuZmllbGQudmFsdWU/LltzdWJmaWVsZC5uYW1lXSB9LCB0aGlzLnJlZilcbiAgICAgICAgICAgICAgICAgICAgICAgIHx8IGtsZXNGaWVsZENvbnRyb2xGYWN0b3J5KHsgLi4uc3ViZmllbGQsIHZhbHVlOiBzdWJmaWVsZC52YWx1ZSB8fCB0aGlzLmZpZWxkLnZhbHVlPy5bc3ViZmllbGQubmFtZV0gfSwgdGhpcy5yZWYpO1xuICAgICAgICAgICAgICAgIH0gZWxzZSB7XG4gICAgICAgICAgICAgICAgICAgIGNvbnRyb2wgPSBjb21wb25lbnRNYXBwZXIuZmluZChjID0+IGMuY29tcG9uZW50ID09PSBzdWJmaWVsZC5jb21wb25lbnQpPy5mYWN0b3J5KHsgLi4uc3ViZmllbGQsIHZhbHVlOiBzdWJmaWVsZC52YWx1ZSB8fCB0aGlzLmZpZWxkLnZhbHVlPy5bc3ViZmllbGQubmFtZV0gfSlcbiAgICAgICAgICAgICAgICAgICAgICAgIHx8IGtsZXNGaWVsZENvbnRyb2xGYWN0b3J5KHsgLi4uc3ViZmllbGQsIHZhbHVlOiBzdWJmaWVsZC52YWx1ZSB8fCB0aGlzLmZpZWxkLnZhbHVlPy5bc3ViZmllbGQubmFtZV0gfSwgdGhpcy5yZWYpO1xuICAgICAgICAgICAgICAgIH1cblxuICAgICAgICAgICAgICAgIHN1Ykdyb3VwLmFkZENvbnRyb2woc3ViZmllbGQubmFtZSwgY29udHJvbCk7XG4gICAgICAgICAgICB9KTtcbiAgICAgICAgfVxuXG4gICAgICAgIGlmICh0aGlzLmZpZWxkLmRpc2FibGVkKSB7XG4gICAgICAgICAgICBzdWJHcm91cC5kaXNhYmxlKCk7XG4gICAgICAgIH1cblxuICAgICAgICBpZiAodGhpcy5maWVsZC5hc3luY1ZhbHVlKSB7XG4gICAgICAgICAgICBjb25jYXQoXG4gICAgICAgICAgICAgICAgb2YoeyB2YWx1ZTogbnVsbCwgcGVuZGluZzogdHJ1ZSB9KSxcbiAgICAgICAgICAgICAgICB0aGlzLmZpZWxkLmFzeW5jVmFsdWUucGlwZShcbiAgICAgICAgICAgICAgICAgICAgdGFrZSgxKSxcbiAgICAgICAgICAgICAgICAgICAgY2F0Y2hFcnJvcigoZXJyKSA9PiB7XG4gICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKGVycik7XG4gICAgICAgICAgICAgICAgICAgICAgICByZXR1cm4gb2YobnVsbCk7XG4gICAgICAgICAgICAgICAgICAgIH0pLFxuICAgICAgICAgICAgICAgICAgICBtYXAoKHZhbHVlKSA9PiAoeyB2YWx1ZSwgcGVuZGluZzogZmFsc2UgfSkpXG4gICAgICAgICAgICAgICAgKVxuICAgICAgICAgICAgKS5zdWJzY3JpYmUoKHJlc3BvbnNlKSA9PiB7XG4gICAgICAgICAgICAgICAgdGhpcy5maWVsZC5wZW5kaW5nID0gcmVzcG9uc2UucGVuZGluZztcbiAgICAgICAgICAgICAgICB0aGlzLmZpZWxkLmNvbGxlY3Rpb25zLmZvckVhY2goKGNvbCkgPT4gY29sLnBlbmRpbmcgPSByZXNwb25zZS5wZW5kaW5nKTtcbiAgICAgICAgICAgICAgICBpZiAocmVzcG9uc2UucGVuZGluZykge1xuICAgICAgICAgICAgICAgICAgICBzdWJHcm91cC5kaXNhYmxlKHsgZW1pdEV2ZW50OiBmYWxzZSB9KTtcbiAgICAgICAgICAgICAgICB9IGVsc2Uge1xuICAgICAgICAgICAgICAgICAgICBpZiAoIXRoaXMuZmllbGQuZGlzYWJsZWQpIHtcbiAgICAgICAgICAgICAgICAgICAgICAgIHN1Ykdyb3VwLmVuYWJsZSh7IGVtaXRFdmVudDogZmFsc2UgfSk7XG4gICAgICAgICAgICAgICAgICAgIH1cbiAgICAgICAgICAgICAgICAgICAgc3ViR3JvdXAucGF0Y2hWYWx1ZShyZXNwb25zZS52YWx1ZSk7XG4gICAgICAgICAgICAgICAgICAgIHRoaXMuZmllbGQudmFsdWUgPSByZXNwb25zZS52YWx1ZTtcbiAgICAgICAgICAgICAgICB9XG4gICAgICAgICAgICB9KTtcbiAgICAgICAgfVxuXG4gICAgICAgIHJldHVybiBzdWJHcm91cDtcbiAgICB9XG59XG4iXX0=
|
|
@@ -1730,12 +1730,12 @@ class KlesFormArray extends KlesFormControl {
|
|
|
1730
1730
|
const data = line[subfield.name] || null;
|
|
1731
1731
|
let control;
|
|
1732
1732
|
if (subfield.type) {
|
|
1733
|
-
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield, ...(data && { value: data }) })
|
|
1734
|
-
|| klesFieldControlFactory({ ...subfield, ...(data && { value: data }) });
|
|
1733
|
+
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield, ...(data && { value: data }) }, this.ref)
|
|
1734
|
+
|| klesFieldControlFactory({ ...subfield, ...(data && { value: data }) }, this.ref);
|
|
1735
1735
|
}
|
|
1736
1736
|
else {
|
|
1737
|
-
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield, ...(data && { value: data }) })
|
|
1738
|
-
|| klesFieldControlFactory({ ...subfield, ...(data && { value: data }) });
|
|
1737
|
+
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield, ...(data && { value: data }) }, this.ref)
|
|
1738
|
+
|| klesFieldControlFactory({ ...subfield, ...(data && { value: data }) }, this.ref);
|
|
1739
1739
|
}
|
|
1740
1740
|
group.addControl(subfield.name, control);
|
|
1741
1741
|
});
|
|
@@ -1748,12 +1748,12 @@ class KlesFormArray extends KlesFormControl {
|
|
|
1748
1748
|
this.field.collections?.forEach(subfield => {
|
|
1749
1749
|
let control;
|
|
1750
1750
|
if (subfield.type) {
|
|
1751
|
-
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield })
|
|
1752
|
-
|| klesFieldControlFactory({ ...subfield });
|
|
1751
|
+
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield }, this.ref)
|
|
1752
|
+
|| klesFieldControlFactory({ ...subfield }, this.ref);
|
|
1753
1753
|
}
|
|
1754
1754
|
else {
|
|
1755
|
-
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield })
|
|
1756
|
-
|| klesFieldControlFactory({ ...subfield });
|
|
1755
|
+
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield }, this.ref)
|
|
1756
|
+
|| klesFieldControlFactory({ ...subfield }, this.ref);
|
|
1757
1757
|
}
|
|
1758
1758
|
group.addControl(subfield.name, control);
|
|
1759
1759
|
});
|
|
@@ -2667,12 +2667,12 @@ class KlesFormGroup extends KlesFormControl {
|
|
|
2667
2667
|
this.field.collections.forEach(subfield => {
|
|
2668
2668
|
let control;
|
|
2669
2669
|
if (subfield.type) {
|
|
2670
|
-
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] })
|
|
2671
|
-
|| klesFieldControlFactory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] });
|
|
2670
|
+
control = componentMapper.find(c => c.type === subfield.type)?.factory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] }, this.ref)
|
|
2671
|
+
|| klesFieldControlFactory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] }, this.ref);
|
|
2672
2672
|
}
|
|
2673
2673
|
else {
|
|
2674
2674
|
control = componentMapper.find(c => c.component === subfield.component)?.factory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] })
|
|
2675
|
-
|| klesFieldControlFactory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] });
|
|
2675
|
+
|| klesFieldControlFactory({ ...subfield, value: subfield.value || this.field.value?.[subfield.name] }, this.ref);
|
|
2676
2676
|
}
|
|
2677
2677
|
subGroup.addControl(subfield.name, control);
|
|
2678
2678
|
});
|
|
@@ -2680,6 +2680,25 @@ class KlesFormGroup extends KlesFormControl {
|
|
|
2680
2680
|
if (this.field.disabled) {
|
|
2681
2681
|
subGroup.disable();
|
|
2682
2682
|
}
|
|
2683
|
+
if (this.field.asyncValue) {
|
|
2684
|
+
concat(of({ value: null, pending: true }), this.field.asyncValue.pipe(take(1), catchError((err) => {
|
|
2685
|
+
console.error(err);
|
|
2686
|
+
return of(null);
|
|
2687
|
+
}), map((value) => ({ value, pending: false })))).subscribe((response) => {
|
|
2688
|
+
this.field.pending = response.pending;
|
|
2689
|
+
this.field.collections.forEach((col) => col.pending = response.pending);
|
|
2690
|
+
if (response.pending) {
|
|
2691
|
+
subGroup.disable({ emitEvent: false });
|
|
2692
|
+
}
|
|
2693
|
+
else {
|
|
2694
|
+
if (!this.field.disabled) {
|
|
2695
|
+
subGroup.enable({ emitEvent: false });
|
|
2696
|
+
}
|
|
2697
|
+
subGroup.patchValue(response.value);
|
|
2698
|
+
this.field.value = response.value;
|
|
2699
|
+
}
|
|
2700
|
+
});
|
|
2701
|
+
}
|
|
2683
2702
|
return subGroup;
|
|
2684
2703
|
}
|
|
2685
2704
|
}
|