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

[TLC-254] Hidden fields can collapse in row, revert drag-handle problem

Browse Source 
apply d-none class to form-control container when model is hidden
css rule for ds-form-control-container.d-none forces collapse
drag-handle fix from 9019b809 was recent and is applied manually here too
This commit is contained in:
Kim Shepherd
2022-02-25 12:21:22 +13:00
parent 61d64d5e5e
commit f97a87702c
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form.component.html
View File

@@ -3,6 +3,7 @@
[group]="formGroup"
[hasErrorMessaging]="model.hasErrorMessages"
[hidden]="model.hidden"
[class.d-none]="model.hidden"
[layout]="formLayout"
[model]="model"
[templates]="templates"

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

@@ -17,8 +17,8 @@
[cdkDragPreviewClass]="'ds-submission-reorder-dragging'"
[class.grey-background]="model.isInlineGroupArray">
<!-- Item content -->
<div class="drag-handle" [class.invisible]="dragDisabled" tabindex="0">
<i class="drag-icon fas fa-grip-vertical fa-fw" ></i>
<div class="drag-handle" [class.drag-disable]="dragDisabled" tabindex="0">
<i class="drag-icon fas fa-grip-vertical fa-fw" [class.drag-disable]="dragDisabled" ></i>
</div>
<ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: groupModel"></ng-container>
<ds-dynamic-form-control-container *ngFor="let _model of groupModel.group"
@@ -28,6 +28,7 @@
[context]="groupModel"
[group]="control.get([idx])"
[hidden]="_model.hidden"
[class.d-none]="_model.hidden"
[layout]="formLayout"
[model]="_model"
[templates]="templates"

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

@@ -11,6 +11,7 @@
[group]="control"
[hasErrorMessaging]="model.hasErrorMessages"
[hidden]="_model.hidden"
[class.d-none]="_model.hidden"
[layout]="formLayout"
[model]="_model"
[templates]="templates"

7
src/styles/_global-styles.scss
View File

@@ -108,3 +108,10 @@ ngb-modal-backdrop {
.ml-gap {
margin-left: var(--ds-gap);
}
ds-dynamic-form-control-container.d-none {
/* Ensures that form-control containers hidden and disabled by type binding collapse and let other fields in
the same row expand accordingly
*/
visibility: collapse;
}