fixed relationship specific labels in modal and cleaned up existing code

This commit is contained in:
lotte
2020-01-02 13:46:31 +01:00
parent 3dfba2ad12
commit 3e9eb9eedc
10 changed files with 31 additions and 36 deletions

View File

@@ -124,6 +124,7 @@ export class FormBuilderService extends DynamicFormService {
const iterateControlModels = (findGroupModel: DynamicFormControlModel[], controlModelIndex: number = 0): void => {
let iterateResult = Object.create({});
// Iterate over all group's controls
for (const controlModel of findGroupModel) {
@@ -139,7 +140,6 @@ export class FormBuilderService extends DynamicFormService {
if (this.isRowArrayGroup(controlModel)) {
for (const arrayItemModel of (controlModel as DynamicRowArrayModel).groups) {
iterateResult = mergeWith(iterateResult, iterateControlModels(arrayItemModel.group, arrayItemModel.index), customizer);
}
continue;
@@ -147,8 +147,6 @@ export class FormBuilderService extends DynamicFormService {
if (this.isArrayGroup(controlModel)) {
iterateResult[controlModel.name] = [];
console.log((controlModel as DynamicFormArrayModel).groups);
for (const arrayItemModel of (controlModel as DynamicFormArrayModel).groups) {
iterateResult[controlModel.name].push(iterateControlModels(arrayItemModel.group, arrayItemModel.index));
}
@@ -199,6 +197,7 @@ export class FormBuilderService extends DynamicFormService {
return iterateResult;
};
result = iterateControlModels(groupModel);
return result;