Skip to content

Commit 95a6c57

Browse files
committed
select upgraded to v2.0
1 parent 21d516c commit 95a6c57

File tree

2 files changed

+48
-51
lines changed

2 files changed

+48
-51
lines changed

src/fields/fieldSelect.vue

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<template>
2-
<div class="form-group">
3-
<label v-if="form[key].label" :for="form[key].id ? form[key].id : null">{{form[key].label}}</label>
4-
<select class="form-control" :class="form[key].classes" :id="form[key].id ? form[key].id : null" v-model="form[key].value" @blur="onBlur" @focus="onFocus" @click="onClick" @change="onChange" @keyup="onKeyup" @keydown="onKeydown" v-formly-atts="form[key].atts">
5-
<option v-for="option in form[key].options" :value="option.value || option">{{option.label || option}}</option>
2+
<div class="form-group formly-select">
3+
<label v-if="to.label" :for="to.id ? to.id : null">{{to.label}}</label>
4+
<select class="form-control" :class="to.classes" :id="to.id ? to.id : null" v-model="model[field.key]" @blur="onBlur" @focus="onFocus" @click="onClick" @change="onChange" @keyup="onKeyup" @keydown="onKeydown" v-formly-atts="to.atts">
5+
<option v-for="option in field.options" :value="option.value || option">{{option.label || option}}</option>
66
</select>
77
</div>
88
</template>

test/unit/specs/index.spec.js

Lines changed: 44 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -252,58 +252,55 @@ describe('Bootstrap Field Inputs', () => {
252252
});
253253

254254
});
255+
256+
describe('Select', () => {
257+
describe('functions', ()=>{
258+
describeFunctions('select', 'select');
259+
});
260+
describe('classes & attributes', () => {
261+
describeAttributes('select', false);
262+
});
263+
describe('conditional elements', ()=>{
264+
describeConditional('select');
265+
});
255266

267+
it('layout', () => {
268+
data.fields[0].type = 'select';
269+
createForm(data);
256270

271+
let inputs = vm.$el.querySelectorAll('select');
272+
let input = inputs[0];
257273

258-
/*
259-
describe('Select', () => {
260-
describe('functions', ()=>{
261-
describeFunctions('select', 'select');
262-
});
263-
describe('classes & attributes', () => {
264-
describeAttributes('select', false);
265-
});
266-
describe('conditional elements', ()=>{
267-
describeConditional('select');
268-
});
269-
270-
it('layout', () => {
271-
data.form.test.type = 'select';
272-
createForm(data);
273-
274-
let inputs = vm.$el.querySelectorAll('select');
275-
let input = inputs[0];
276-
277-
expect(inputs).to.be.length(1);
278-
});
279-
280-
it('array options', () => {
281-
data.form.test.type = 'select';
282-
data.form.test.options = ['one', 'two', 'three'];
283-
createForm();
284-
let options = vm.$el.querySelectorAll('option');
285-
let option = options[0];
286-
expect(options).to.be.length(3);
287-
expect(option.value).to.equal('one');
288-
expect(option.innerHTML).to.equal('one');
289-
});
274+
expect(inputs).to.be.length(1);
275+
});
290276

291-
it('object options', () => {
292-
data.form.test.type = 'select';
293-
data.form.test.options = [
294-
{ label: 'Foo', value: 'bar' },
295-
{ label: 'Bar', value: 'foo' }
296-
];
297-
createForm();
298-
let options = vm.$el.querySelectorAll('option');
299-
let option = options[0];
300-
expect(options).to.be.length(2);
301-
expect(option.value).to.equal('bar');
302-
expect(option.innerHTML).to.equal('Foo');
303-
});
304-
305-
});
277+
it('array options', () => {
278+
data.fields[0].type = 'select';
279+
data.fields[0].options = ['one', 'two', 'three'];
280+
createForm();
281+
let options = vm.$el.querySelectorAll('option');
282+
let option = options[0];
283+
expect(options).to.be.length(3);
284+
expect(option.value).to.equal('one');
285+
expect(option.innerHTML).to.equal('one');
286+
});
306287

288+
it('object options', () => {
289+
data.fields[0].type = 'select';
290+
data.fields[0].options = [
291+
{ label: 'Foo', value: 'bar' },
292+
{ label: 'Bar', value: 'foo' }
293+
];
294+
createForm();
295+
let options = vm.$el.querySelectorAll('option');
296+
let option = options[0];
297+
expect(options).to.be.length(2);
298+
expect(option.value).to.equal('bar');
299+
expect(option.innerHTML).to.equal('Foo');
300+
});
301+
302+
});
303+
/*
307304
describe('Textarea', () => {
308305
describe('functions', ()=>{
309306
describeFunctions('textarea', 'textarea');

0 commit comments

Comments
 (0)