hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3770 from DSpace/backport-3679-to-dspace-7_x

Browse Source 
[Port dspace-7_x] #3678, #3217 - Fix ordering and changing values of repeatable inputs in submission form
This commit is contained in:
Tim Donohue
2024-12-19 16:58:03 -06:00
committed by GitHub
parent a8e658a399 abc3c41c63
commit d578222f8f
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.html
View File

@@ -7,9 +7,9 @@
<!-- Draggable Container --> <!-- Draggable Container -->
<div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)"> <div cdkDropList cdkDropListLockAxis="y" (cdkDropListDropped)="moveSelection($event)">
<!-- Draggable Items --> <!-- Draggable Items -->
<div *ngFor="let groupModel of model.groups; let idx = index" <div *ngFor="let groupModel of model.groups"
role="group" role="group"
[formGroupName]="idx" [formGroupName]="groupModel.index"
[ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]" [ngClass]="[getClass('element', 'group'), getClass('grid', 'group')]"
cdkDrag cdkDrag
[cdkDragDisabled]="dragDisabled" [cdkDragDisabled]="dragDisabled"
@@ -25,7 +25,7 @@
[formGroup]="group" [formGroup]="group"
[formModel]="formModel" [formModel]="formModel"
[context]="groupModel" [context]="groupModel"
[group]="control.get([idx])" [group]="getControlOfGroup(groupModel)"
[hidden]="_model.hidden" [hidden]="_model.hidden"
[class.d-none]="_model.hidden" [class.d-none]="_model.hidden"
[layout]="formLayout" [layout]="formLayout"

13
src/app/shared/form/builder/ds-dynamic-form-ui/models/array-group/dynamic-form-array.component.ts
View File

@@ -81,4 +81,17 @@ export class DsDynamicFormArrayComponent extends DynamicFormArrayComponent {
get dragDisabled(): boolean { get dragDisabled(): boolean {
return this.model.groups.length === 1 || !this.model.isDraggable; return this.model.groups.length === 1 || !this.model.isDraggable;
} }
/**
* Gets the control of the specified group model. It adds the startingIndex property to the group model if it does not
* already have it. This ensures that the controls are always linked to the correct group model.
* @param groupModel The group model to get the control for.
* @returns The form control of the specified group model.
*/
getControlOfGroup(groupModel: any) {
if (!groupModel.hasOwnProperty('startingIndex')) {
groupModel.startingIndex = groupModel.index;
}
return this.control.get([groupModel.startingIndex]);
}
} }