Merging completed
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import {Component, forwardRef, Inject, Input, OnChanges, Pipe, PipeTransform, SimpleChanges} from '@angular/core';
|
||||
import { NG_VALUE_ACCESSOR, NG_VALIDATORS, FormControl, ValidationErrors } from '@angular/forms';
|
||||
import {CustomInputComponent} from "./custom-input.component";
|
||||
import {HelloService} from '../../../services/hello.service';
|
||||
import {HttpCachedService} from '../../../services/http-cached.service';
|
||||
|
||||
@Pipe({name: 'keys'})
|
||||
export class KeysPipe implements PipeTransform {
|
||||
@@ -42,9 +42,8 @@ export class DropdownInputComponent extends CustomInputComponent implements OnCh
|
||||
private listedItems: Array<{key: string, value: string}> = [];
|
||||
private constVal: string;
|
||||
|
||||
constructor(private helloService: HelloService) {
|
||||
constructor(private httpCachedService: HttpCachedService) {
|
||||
super();
|
||||
helloService.sayHello();
|
||||
}
|
||||
|
||||
// set initial value
|
||||
|
||||
@@ -10,18 +10,40 @@ export class QuestionService {
|
||||
public getQuestions(cb: (res: QuestionInterface[], err: any) => void) {
|
||||
setTimeout(() => cb([
|
||||
{
|
||||
type: "flag",
|
||||
description: "This is a help tooltip",
|
||||
type: 'flag',
|
||||
description: 'This is a help tooltip',
|
||||
properties: {
|
||||
key: "flags",
|
||||
label: "Form Type Flags",
|
||||
key: 'flags',
|
||||
label: 'Form Type Flags',
|
||||
order: 1,
|
||||
|
||||
// dropdown && flags
|
||||
options: [{key: "alpha", value: "A"}, {key: "beta", value: "B"}]
|
||||
},
|
||||
constraints: {
|
||||
optional: true
|
||||
options: [{key: 'alpha', value: 'A'}, {key: 'beta', value: 'B'}, {key: 'gamma', value: 'C'}, {key: 'delta', value: 'D'}]
|
||||
}, constraints: {
|
||||
optional: true
|
||||
}
|
||||
}, {
|
||||
type: 'dropdown',
|
||||
description: 'Cool dropdown',
|
||||
properties: {
|
||||
key: 'cooldrop',
|
||||
label: 'Dropdown',
|
||||
order: 2,
|
||||
methods: ['insert'],
|
||||
|
||||
// dropdown
|
||||
options: [{key: 'hello', value: 'Hallo'}, {key: 'world', value: 'World'}, {key: 'and', value: 'And'}, {key: 'u', value: 'You'}]
|
||||
}, constraints: {
|
||||
optional: false
|
||||
}
|
||||
}, {
|
||||
type: 'hidden',
|
||||
description: 'ID',
|
||||
properties: {
|
||||
key: 'ID',
|
||||
order: 3
|
||||
}, constraints: {
|
||||
optional: false
|
||||
}
|
||||
}
|
||||
], null), 4000);
|
||||
|
||||
Reference in New Issue
Block a user