Merge pull request #1023 from Alfresco/dev-denys-748

fix attach widget rendering (complete form)
This commit is contained in:
Eugenio Romano 2016-11-08 14:18:40 +00:00 committed by GitHub
commit 31f696b631
3 changed files with 35 additions and 2 deletions

View File

@ -9,3 +9,23 @@
.display-value-widget__dynamic-table table { .display-value-widget__dynamic-table table {
width: 100%; width: 100%;
} }
.upload-widget {
width:100%;
word-break: break-all;
}
.upload-widget__icon {
float: left;
color: rgba(0,0,0,.26);
}
.upload-widget__file {
float: left;
margin-top: 4px;
color: rgba(0,0,0,.26);
}
.upload-widget__label {
color: rgba(0,0,0,.26);
}

View File

@ -29,8 +29,7 @@
</textarea> </textarea>
<label class="mdl-textfield__label" [attr.for]="field.id">{{field.name}}</label> <label class="mdl-textfield__label" [attr.for]="field.id">{{field.name}}</label>
</div> </div>
<div *ngSwitchCase="'hyperlink'" <div *ngSwitchCase="'hyperlink'" class="hyperlink-widget">
class="hyperlink-widget">
<div> <div>
<span>{{field.name}}</span> <span>{{field.name}}</span>
</div> </div>
@ -61,6 +60,15 @@
</table> </table>
</div> </div>
</div> </div>
<div *ngSwitchCase="'upload'">
<div class="upload-widget">
<label class="upload-widget__label" [attr.for]="field.id">{{field.name}}</label>
<div>
<i *ngIf="hasFile" class="material-icons upload-widget__icon">attachment</i>
<span *ngIf="hasFile" class="upload-widget__file">{{value}}</span>
</div>
</div>
</div>
<div *ngSwitchDefault <div *ngSwitchDefault
class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label text-widget"> class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label text-widget">
<input class="mdl-textfield__input" <input class="mdl-textfield__input"

View File

@ -43,6 +43,9 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit {
columns: DynamicTableColumn[] = []; columns: DynamicTableColumn[] = [];
visibleColumns: DynamicTableColumn[] = []; visibleColumns: DynamicTableColumn[] = [];
// upload/attach
hasFile: boolean = false;
constructor(private formService: FormService) { constructor(private formService: FormService) {
super(); super();
} }
@ -77,8 +80,10 @@ export class DisplayValueWidget extends WidgetComponent implements OnInit {
let files = this.field.value || []; let files = this.field.value || [];
if (files.length > 0) { if (files.length > 0) {
this.value = decodeURI(files[0].name); this.value = decodeURI(files[0].name);
this.hasFile = true;
} else { } else {
this.value = null; this.value = null;
this.hasFile = false;
} }
break; break;
case FormFieldTypes.TYPEAHEAD: case FormFieldTypes.TYPEAHEAD: