Skip to content

Commit 3bd6587

Browse files
author
Lionel Bijaoui
committed
Streamlining of schema. Refactoring. Update of dependency.
1 parent fff0078 commit 3bd6587

20 files changed

+592
-443
lines changed

dev/projects/basic/app.vue

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,11 @@ export default {
3636
fields: [
3737
{
3838
type: "input",
39-
inputType: "text",
40-
label: "First Name",
4139
model: "first_name",
40+
label: "First Name",
41+
fieldOptions: {
42+
inputType: "text"
43+
},
4244
attributes: {
4345
input: {
4446
"data-toggle": "tooltip"
@@ -60,9 +62,11 @@ export default {
6062
},
6163
{
6264
type: "input",
63-
inputType: "color",
6465
label: "Color",
6566
model: "color",
67+
fieldOptions: {
68+
inputType: "color"
69+
},
6670
attributes: {
6771
input: {
6872
"data-target": "tooltip"
@@ -71,19 +75,19 @@ export default {
7175
},
7276
{
7377
type: "submit",
74-
buttonText: "Change Previous Type",
7578
attributes: {
7679
input: {
7780
"data-target": "toggle"
7881
}
7982
},
8083
fieldOptions: {
84+
buttonText: "Change Previous Type",
8185
onSubmit: () => {
8286
// this.schema.fields[2].type = "input";
83-
if (this.schema.fields[2].inputType === "color") {
84-
this.schema.fields[2].inputType = "text";
87+
if (this.schema.fields[2].fieldOptions.inputType === "color") {
88+
this.schema.fields[2].fieldOptions.inputType = "text";
8589
} else {
86-
this.schema.fields[2].inputType = "color";
90+
this.schema.fields[2].fieldOptions.inputType = "color";
8791
}
8892
}
8993
}

dev/projects/full/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/ion-rangeslider/2.1.4/css/ion.rangeSlider.skinHTML5.css">
1414
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/pikaday/1.4.0/css/pikaday.min.css">
1515
<link rel="stylesheet" type="text/css" href="https://unpkg.com/vue-multiselect@2.0.8/dist/vue-multiselect.min.css">
16-
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.min.css">
16+
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/11.1.0/nouislider.min.css">
1717

1818

1919
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.js"></script>
@@ -30,7 +30,7 @@
3030
<script type="text/javascript" src="https://unpkg.com/vue-multiselect@2.0.8/dist/vue-multiselect.min.js"></script>
3131
<script type="text/javascript" src="https://rawgit.com/nosir/cleave.js/master/dist/cleave.min.js"></script>
3232
<script type="text/javascript" src="https://nosir.github.io/cleave.js/lib/cleave-phone.i18n.js"></script>
33-
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.js"></script>
33+
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/11.1.0/nouislider.js"></script>
3434
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/pikaday/1.5.1/pikaday.min.js"></script>
3535
<script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyCEz-sX9bRJorDS-D_JL0JkZVZe2gzoUMw&amp;libraries=places"></script>
3636

dev/projects/full/schema.js

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ export default {
272272
{
273273
type: "checklist",
274274
model: "checklistcombobox",
275-
label: "CHECKLIST combobox",
275+
label: "CHECKLIST (combobox)",
276276
fieldOptions: {
277277
listBox: false
278278
},
@@ -310,9 +310,9 @@ export default {
310310
{
311311
type: "checklist",
312312
model: "checklistlistbox",
313-
label: "CHECKLIST listBox",
313+
label: "CHECKLIST (listBox)",
314314
fieldOptions: {
315-
listBox: false
315+
listBox: true
316316
},
317317
values: [
318318
{
@@ -348,7 +348,7 @@ export default {
348348
{
349349
type: "radios",
350350
model: "radios",
351-
label: "RADIOS",
351+
label: "RADIOS (object)",
352352
fieldOptions: {
353353
value: "value",
354354
name: "name"
@@ -387,7 +387,7 @@ export default {
387387
{
388388
type: "radios",
389389
model: "radios2",
390-
label: "RADIOS2",
390+
label: "RADIOS2 (array)",
391391
values: ["HTML5", "Javascript", "CSS3", "CoffeeScript", "AngularJS", "ReactJS", "VueJS"]
392392
},
393393
{
@@ -775,7 +775,7 @@ export default {
775775
},
776776
{
777777
type: "noUiSlider",
778-
model: "rank",
778+
model: "rank2",
779779
label: "Rank (noUiSlider field)",
780780
required: true,
781781
disabled: false,
@@ -804,7 +804,7 @@ export default {
804804
},
805805
{
806806
type: "noUiSlider",
807-
model: "income",
807+
model: "income2",
808808
label: "Rank (noUiSlider field)",
809809
required: true,
810810
disabled: false,

dev/projects/multiselect/app.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export default {
3737
label: "Skills",
3838
model: "skills",
3939
fieldOptions: {
40-
multiSelect: true
40+
multiple: true
4141
},
4242
values: ["Javascript", "VueJS", "CSS3", "HTML5"]
4343
}

dev/projects/picker/app.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ export default {
2828
fields: [
2929
{
3030
type: "dateTimePicker",
31-
/* type: "input",
32-
inputType: "date",*/
3331
label: "DT",
3432
model: "dt",
3533
dateTimePickerOptions: {

0 commit comments

Comments
 (0)