diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.scss b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.scss index c4c555472c..d5d907aca9 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dropdown/dropdown.widget.scss @@ -12,7 +12,7 @@ } &-dropdown-required-message .adf-error-text-container{ - margin-top: -2px !important; + margin-top: 1px !important; } } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html index 57a7bf02f6..dc2d3b8904 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/dynamic-table/dynamic-table.widget.html @@ -62,5 +62,5 @@ (cancel)="onCancelChanges()"> - + diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.scss b/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.scss index 3874a65ef4..160fdbe03c 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/error/error.component.scss @@ -1,5 +1,4 @@ .adf-error-text-container { - margin-top: -16px !important; - position: inherit; - width: 100%; + margin-top: -14px !important; + width: 50%; } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.html index 08974468a0..aa2d3c5104 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/functional-group/functional-group.widget.html @@ -15,7 +15,7 @@ placeholder="{{field.placeholder}}"> - +
{{field?.value?.length || 0}}/{{field.maxLength}}
- + diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.scss b/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.scss index a52df46c6e..43d68ac1e5 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/multiline-text/multiline-text.widget.scss @@ -24,4 +24,8 @@ padding-left: 0; } + &-multiline-required-message { + display: flex; + } + } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html index 5903ee83a9..1eb4fd0fac 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/number/number.widget.html @@ -15,5 +15,5 @@ placeholder="{{field.placeholder}}"> - + diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html index 7aeb79f552..85f68860dd 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.html @@ -1,23 +1,26 @@
+ [class.adf-invalid]="!field.isValid" + [class.adf-readonly]="field.readOnly" + id="people-widget-content" + *ngIf="field.isVisible"> - - +
-
+
@@ -30,7 +33,7 @@ [src]="user.userImage" (error)="onErrorImageLoad(user)"/>
- {{getDisplayName(user)}} + {{getDisplayName(user)}}
diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.scss b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.scss index 5a2d148a9a..ae49549c19 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.scss +++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.scss @@ -14,8 +14,8 @@ width: 100%; overflow-y: auto; z-index: 5; + border-radius: 3%; color: #555; - margin: -15px 0 0 0; box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 3px 1px -2px rgba(0, 0, 0, 0.2), 0 1px 5px 0 rgba(0, 0, 0, 0.12); > md-option { list-style-type: none; @@ -48,7 +48,7 @@ } &-people-widget-row { - padding: 5px 5px; + padding-bottom: 10px; } &-people-widget-image { @@ -63,4 +63,8 @@ &-people-widget-image-row { display: inline-block; } + + &-people-label-name { + padding-left: 10px; + } } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts index 6033a81e8e..f623bca37f 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.spec.ts @@ -58,16 +58,6 @@ describe('PeopleWidgetComponent', () => { expect(widget.getDisplayName(model)).toBe('John'); }); - it('should flush value on blur', (done) => { - spyOn(widget, 'flushValue').and.stub(); - widget.onBlur(); - - setTimeout(() => { - expect(widget.flushValue).toHaveBeenCalled(); - done(); - }, 200); - }); - it('should init value from the field', () => { widget.field.value = new GroupUserModel({ firstName: 'John', diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.ts b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.ts index 69995a824f..1bf41b4abf 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/people/people.widget.ts @@ -17,7 +17,8 @@ /* tslint:disable:component-selector */ -import { Component, ElementRef, OnInit, ViewEncapsulation } from '@angular/core'; +import { AfterViewInit, Component, ElementRef, OnInit, ViewChild, ViewEncapsulation } from '@angular/core'; +import { Observable } from 'rxjs/Observable'; import { FormService } from '../../../services/form.service'; import { GroupUserModel } from '../core/group-user.model'; import { GroupModel } from '../core/group.model'; @@ -30,7 +31,10 @@ import { baseHost , WidgetComponent } from './../widget.component'; host: baseHost, encapsulation: ViewEncapsulation.None }) -export class PeopleWidgetComponent extends WidgetComponent implements OnInit { +export class PeopleWidgetComponent extends WidgetComponent implements OnInit, AfterViewInit { + + @ViewChild('inputValue') + input: ElementRef; popupVisible: boolean = false; minTermLength: number = 1; @@ -67,6 +71,13 @@ export class PeopleWidgetComponent extends WidgetComponent implements OnInit { } } + ngAfterViewInit() { + let onBlurInputEvent = Observable.fromEvent(this.input.nativeElement, 'blur'); + onBlurInputEvent.debounceTime(200).subscribe((event) => { + this.flushValue(); + }); + } + onKeyUp(event: KeyboardEvent) { if (this.value && this.value.length >= this.minTermLength) { this.formService.getWorkflowUsers(this.value, this.groupId) @@ -79,12 +90,6 @@ export class PeopleWidgetComponent extends WidgetComponent implements OnInit { } } - onBlur() { - setTimeout(() => { - this.flushValue(); - }, 200); - } - onErrorImageLoad(user) { if (user.userImage) { user.userImage = null; @@ -119,7 +124,6 @@ export class PeopleWidgetComponent extends WidgetComponent implements OnInit { return ''; } - // TODO: still causes onBlur execution onItemClick(item: GroupUserModel, event: Event) { if (item) { this.field.value = item; diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.html index 28cfad62aa..bcb5e912ef 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/radio-buttons/radio-buttons.widget.html @@ -17,7 +17,7 @@ - + diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html index 428f035477..8d26fba026 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/text/text.widget.html @@ -15,5 +15,5 @@ placeholder="{{field.placeholder}}"> - + diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.html index 74f852ef29..447ccc6326 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/typeahead/typeahead.widget.html @@ -16,9 +16,9 @@ placeholder="{{field.placeholder}}"> - + -
+
{{item.name}} diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html index ac3be76ab1..aa18fa58a6 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html @@ -28,5 +28,5 @@ (change)="onFileChanged($event)">
- +