Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit 082a5e2

Browse files
author
Lionel Bijaoui
committed
Fix and correction to pass Eslint and other checks
1 parent 9875587 commit 082a5e2

File tree

7 files changed

+93
-83
lines changed

7 files changed

+93
-83
lines changed

‎projects/basic/app.vue

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<template>
2-
<div class="container">
3-
<h1>Basic</h1>
4-
<div class="row">
5-
<div class="col-sm-12">
6-
<vue-form-generator :schema="schema" :model="model" :options="formOptions" ref="form" :is-new-model="isNewModel" @model-updated="modelUpdated" @validated="onValidated"></vue-form-generator>
7-
</div>
8-
</div>
9-
<div class="row">
10-
<div class="col-sm-12">
11-
<pre v-if="model" v-html="prettyModel"></pre>
12-
</div>
13-
</div>
14-
</div>
2+
<div class="container">
3+
<h1>Basic</h1>
4+
<div class="row">
5+
<div class="col-sm-12">
6+
<vue-form-generator :schema="schema" :model="model" :options="formOptions" ref="form" :is-new-model="isNewModel" @model-updated="modelUpdated" @validated="onValidated"></vue-form-generator>
7+
</div>
8+
</div>
9+
<div class="row">
10+
<div class="col-sm-12">
11+
<pre v-if="model" v-html="prettyModel"></pre>
12+
</div>
13+
</div>
14+
</div>
1515
</template>
1616

1717
<script>
@@ -56,7 +56,7 @@ export default {
5656
buttonText: "Change Previous Type",
5757
onSubmit: () => {
5858
// this.schema.fields[2].type = "input";
59-
if (this.schema.fields[2].inputType == "color") {
59+
if (this.schema.fields[2].inputType === "color") {
6060
this.schema.fields[2].inputType = "text";
6161
} else {
6262
this.schema.fields[2].inputType = "color";

‎projects/full/app.vue

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,19 @@
88
<div v-show="model" class="row">
99
<div class="col-md-5 col-md-offset-1">
1010
<div class="control-buttons text-center">
11-
<button @click="newModel" class="btn btn-default new"> <i class="fa fa-plus"></i>New</button>
12-
<button @click="saveModel" class="btn btn-primary save"> <i class="fa fa-floppy-o"></i>Save<i v-if="showWarning()" class="fa fa-warning"></i></button>
13-
<button @click="deleteModel" class="btn btn-danger delete"> <i class="fa fa-trash"></i>Delete</button>
11+
<button @click="newModel" class="btn btn-default new">
12+
<i class="fa fa-plus"></i>New</button>
13+
<button @click="saveModel" class="btn btn-primary save">
14+
<i class="fa fa-floppy-o"></i>Save
15+
<i v-if="showWarning()" class="fa fa-warning"></i>
16+
</button>
17+
<button @click="deleteModel" class="btn btn-danger delete">
18+
<i class="fa fa-trash"></i>Delete</button>
1419
</div>
1520
<div class="errors text-center">
16-
<div v-for="(item, index) in validationErrors" :key="index" class="alert alert-danger">{{ item.field.label}}: <strong>{{ item.error }}</strong></div>
21+
<div v-for="(item, index) in validationErrors" :key="index" class="alert alert-danger">{{ item.field.label}}:
22+
<strong>{{ item.error }}</strong>
23+
</div>
1724
</div>
1825
<vue-form-generator :schema="schema" :model="model" :options="formOptions" :multiple="selected.length > 1" ref="form" :is-new-model="isNewModel" @model-updated="modelUpdated" @validated="onValidated"></vue-form-generator>
1926
</div>
@@ -92,7 +99,7 @@ export default {
9299
selectRow(event, row, add) {
93100
this.isNewModel = false;
94101
if (add || (event && event.ctrlKey)) {
95-
if (this.selected.indexOf(row) != -1) {
102+
if (this.selected.indexOf(row) !== -1) {
96103
let index = this.selected.indexOf(row);
97104
this.selected.splice(index, 1);
98105
} else {
@@ -115,7 +122,7 @@ export default {
115122
},
116123
117124
generateModel() {
118-
if (this.selected.length == 1) {
125+
if (this.selected.length === 1) {
119126
this.model = cloneDeep(this.selected[0]);
120127
} else if (this.selected.length > 1) {
121128
this.model = VueFormGenerator.schema.mergeMultiObjectFields(Schema, this.selected);
@@ -127,6 +134,8 @@ export default {
127134
newModel() {
128135
console.log("Create new model...");
129136
this.selected.splice(0);
137+
console.log("VueFormGenerator.schema", VueFormGenerator);
138+
130139
let newRow = VueFormGenerator.schema.createDefaultObject(Schema, { id: this.getNextID() });
131140
this.isNewModel = true;
132141
this.model = newRow;
@@ -180,7 +189,7 @@ export default {
180189
},
181190
182191
validate() {
183-
//console.log("validate", this.$refs.form, this.$refs.form.validate());
192+
//console.log("validate", this.$refs.form, this.$refs.form.validate());
184193
return this.$refs.form.validate();
185194
},
186195
@@ -217,7 +226,7 @@ export default {
217226
}
218227
};
219228
220-
window.Vue = require("vue");
229+
window.Vue = require("vue").default;
221230
</script>
222231

223232
<style lang="scss">

‎projects/full/data.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@ let users = (function() {
1616
user.type = fakerator.random.arrayElement(["personal", "business"]);
1717
user.bio = fakerator.lorem.paragraph();
1818
let dob = fakerator.date.past(40, "1998年01月01日");
19-
user.dob = /*fecha.format(dob, "YYYY.MM.DD");*/ dob.valueOf();
19+
user.dob = /*fecha.format(dob, "YYYY.MM.DD");*/ dob.valueOf();
2020
user.time = fecha.format(new Date(), "hh:mm:ss");
2121
user.age = fecha.format(new Date().getFullYear() - dob, "YY");
2222
user.rank = fakerator.random.number(1, 10);
2323
user.role = fakerator.random.arrayElement(roles).id;
24-
//user.mobile = fakerator.phone.phoneNumber();
24+
//user.mobile = fakerator.phone.phoneNumber();
2525
user.avatar = fakerator.internet.avatar();
2626
user.sex = fakerator.random.arrayElement(["male", "female"]);
2727

@@ -34,7 +34,7 @@ let users = (function() {
3434
user.favoriteColor = "#" + fakerator.internet.color();
3535
user.color = "#" + fakerator.internet.color();
3636

37-
if (user.type == "business") user.company = fakerator.entity.company();
37+
if (user.type === "business") user.company = fakerator.entity.company();
3838

3939
user.income = [fakerator.random.number(50000), fakerator.random.number(50000, 100000)];
4040

‎projects/full/dataTable.vue

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
tbody
1313
tr(v-for="row in rows", @click="select($event, row)", :class="{ active: isSelected(row) }")
1414
td {{ row.id }}
15-
td
16-
img(:src="row.avatar")
15+
td
16+
img(:src="row.avatar")
1717
| {{ row.firstName + " " + row.lastName }} ({{row.userName}})
1818
.label.label-warning(v-if="!row.status") Inactive
1919
td {{ row.email }}
20-
td {{ row.address.country }}
20+
td(v-if="row.address") {{ row.address.country }}
2121
td {{ getRoleName(row) }}
22-
td
22+
td
2323
i.fa(:class=" row.status? 'fa-check' : 'fa-ban' ")
2424
</template>
2525

@@ -32,11 +32,11 @@ export default {
3232
3333
methods: {
3434
isSelected(row) {
35-
return this.selected.indexOf(row) != -1;
35+
return this.selected.indexOf(row) !== -1;
3636
},
3737
3838
getRoleName(row) {
39-
let role = find(roles, role => role.id == row.role);
39+
let role = find(roles, role => role.id === row.role);
4040
return role ? role.name : "";
4141
}
4242
}

‎projects/full/index.html

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/spectrum/1.8.0/spectrum.css">
1212
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/ion-rangeslider/2.1.4/css/ion.rangeSlider.css">
1313
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/ion-rangeslider/2.1.4/css/ion.rangeSlider.skinHTML5.css">
14-
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.min.css">
1514
<link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/pikaday/1.4.0/css/pikaday.min.css">
15+
<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">
1617

1718

1819
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.js"></script>
@@ -26,7 +27,7 @@
2627
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery.maskedinput/1.4.1/jquery.maskedinput.js"></script>
2728
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/ion-rangeslider/2.1.4/js/ion.rangeSlider.js"></script>
2829
<!-- Vanilla libs -->
29-
<script type="text/javascript" src="https://unpkg.com/vue-multiselect@2.0.0-beta.15"></script>
30+
<script type="text/javascript" src="https://unpkg.com/vue-multiselect@2.0.8/dist/vue-multiselect.min.js"></script>
3031
<script type="text/javascript" src="https://rawgit.com/nosir/cleave.js/master/dist/cleave.min.js"></script>
3132
<script type="text/javascript" src="https://nosir.github.io/cleave.js/lib/cleave-phone.i18n.js"></script>
3233
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/noUiSlider/9.0.0/nouislider.js"></script>
@@ -41,4 +42,4 @@
4142
<script src="/full.js"></script>
4243
</body>
4344

44-
</html>
45+
</html>

‎projects/full/schema.js

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ let customAsyncValidator = function(value) {
1313

1414
export default {
1515
fields: [
16-
/***********/
17-
/* INPUT */
18-
/***********/
16+
/***********/
17+
/* INPUT */
18+
/***********/
1919
{
2020
type: "input",
2121
inputType: "hidden",
@@ -41,10 +41,10 @@ export default {
4141
placeholder: "User's first name",
4242
styleClasses: "half-width",
4343
validator: validators.string,
44-
onChanged(model, newVal, oldVal,field) {
44+
onChanged(model, newVal, oldVal) {
4545
console.log(`Model's name changed from ${oldVal} to ${newVal}. Model:`, model);
4646
},
47-
onValidated(model, errors,field) {
47+
onValidated(model, errors) {
4848
if (errors.length > 0) console.warn("Validation error in Name field! Errors:", errors);
4949
}
5050
},
@@ -216,9 +216,9 @@ export default {
216216
styleClasses: "half-width"
217217
},
218218

219-
/**************/
220-
/* BUILD IN */
221-
/**************/
219+
/**************/
220+
/* BUILD IN */
221+
/**************/
222222

223223
{
224224
type: "input",
@@ -381,9 +381,9 @@ export default {
381381
let values = val.split(",");
382382
if (!model.address) model.address = {};
383383
if (!model.address.geo) model.address.geo = {};
384-
if (values.length > 0 && values[0].trim() != "") model.address.geo.latitude = parseFloat(values[0].trim());
384+
if (values.length > 0 && values[0].trim() !== "") model.address.geo.latitude = parseFloat(values[0].trim());
385385
else model.address.geo.latitude = 0;
386-
if (values.length > 1 && values[1].trim() != "") model.address.geo.longitude = parseFloat(values[1].trim());
386+
if (values.length > 1 && values[1].trim() !== "") model.address.geo.longitude = parseFloat(values[1].trim());
387387
else model.address.geo.longitude = 0;
388388
},
389389
buttons: [
@@ -456,17 +456,17 @@ export default {
456456
type: "label",
457457
label: "Created (label field)",
458458
model: "created",
459-
get(model) {
460-
// return model && model.created ? fecha.format(model.created,"MMMM D YYYY H") : "-";
461-
},
459+
// get(model) {
460+
// // return model && model.created ? fecha.format(model.created,"MMMM D YYYY H") : "-";
461+
// },
462462
styleClasses: "half-width"
463463
},
464464
{
465465
type: "submit",
466466
label: "",
467467
buttonText: "Submit form",
468468
validateBeforeSubmit: true,
469-
onSubmit(model,schema) {
469+
onSubmit(model) {
470470
console.log("Form submitted!", model);
471471
alert("Form submitted!");
472472
},
@@ -559,9 +559,9 @@ export default {
559559
validator: validators.required
560560
},
561561

562-
/************/
563-
/* JQUERY */
564-
/************/
562+
/************/
563+
/* JQUERY */
564+
/************/
565565

566566
{
567567
type: "input",
@@ -672,10 +672,10 @@ export default {
672672
validator: [validators.date],
673673
dateTimePickerOptions: {
674674
format: "YYYY-MM-DD"
675-
},
676-
onChanged(model, newVal, oldVal, field) {
677-
// model.age = moment().year() - moment(newVal).year();
678675
}
676+
// onChanged(model, newVal, oldVal, field) {
677+
// // model.age = moment().year() - moment(newVal).year();
678+
// }
679679
},
680680
{
681681
type: "dateTimePicker",
@@ -701,9 +701,9 @@ export default {
701701
}
702702
},
703703

704-
/*************/
705-
/* VANILLA */
706-
/*************/
704+
/*************/
705+
/* VANILLA */
706+
/*************/
707707

708708
{
709709
type: "input",
@@ -717,10 +717,10 @@ export default {
717717
label: "Location (googleAddress)",
718718
model: "location",
719719
placeholder: "Location",
720-
onPlaceChanged(value, place, rawPlace,model,schema) {
720+
onPlaceChanged(value, place, rawPlace) {
721721
console.log("Location changed! " + value);
722-
// console.log(place);
723-
// console.log(rawPlace);
722+
console.log(place);
723+
console.log(rawPlace);
724724
}
725725
},
726726
{
@@ -858,10 +858,10 @@ export default {
858858
// onOpen: ,
859859
// onClose: ,
860860
// onDraw: ,
861-
},
862-
onChanged(model, newVal, oldVal, field) {
863-
// model.age = moment().year() - moment(newVal).year();
864861
}
862+
// onChanged(model, newVal, oldVal, field) {
863+
// // model.age = moment().year() - moment(newVal).year();
864+
// }
865865
},
866866
{
867867
type: "vueMultiSelect",
@@ -900,17 +900,17 @@ export default {
900900
// loading: false
901901
},
902902
values: ["HTML5", "Javascript", "CSS3", "CoffeeScript", "AngularJS", "ReactJS", "VueJS"],
903-
onChanged(model, newVal, oldVal,field) {
903+
onChanged(model, newVal, oldVal) {
904904
console.log(`Model's skills changed from ${oldVal} to ${newVal}. Model:`, model);
905905
},
906906
max: 4,
907907
placeholder: "placeholder",
908908
validator: validators.array
909909
},
910910

911-
/*******************/
912-
/* CUSTOM FIELDS */
913-
/*******************/
911+
/*******************/
912+
/* CUSTOM FIELDS */
913+
/*******************/
914914

915915
{
916916
type: "input",
@@ -925,9 +925,9 @@ export default {
925925
model: "userName"
926926
}
927927

928-
/****************/
929-
/* DEPRECATED */
930-
/****************/
928+
/****************/
929+
/* DEPRECATED */
930+
/****************/
931931

932932
// {
933933
// type: "text",

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /