Skip to content

Commit 90031eb

Browse files
committed
pulled changes from master
2 parents 076f0e8 + a8eaf38 commit 90031eb

19 files changed

+439
-127
lines changed

.eslintrc.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ module.exports = {
2121
"rules": {
2222
"indent": [
2323
"warn",
24-
"tab"
24+
"tab",
25+
{ SwitchCase: 1 }
2526
],
2627
"quotes": [
2728
"warn",

README.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,16 @@ If you don't know what to choose, don't worry, the full is the default version.
7373
If you want the slim down version, here is the changes:
7474

7575
```js
76+
// the "full" way
77+
<script>
78+
import VueFormGenerator from "vue-form-generator";
79+
import "vue-form-generator/dist/vfg.css"; // optional full css additions
80+
</script>
81+
7682
// the "core" way
7783
<script>
7884
import VueFormGenerator from "vue-form-generator/dist/vfg-core.js";
79-
import "vue-form-generator/dist/vfg-core.css";
85+
import "vue-form-generator/dist/vfg-core.css"; // optional core css additions
8086
</script>
8187
```
8288

dev/checklist/app.vue

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ export default {
2323
label: "Skills",
2424
model: "skills",
2525
required: true,
26+
inputName:"skill",
2627
min: 2,
2728
listBox: true,
2829
values: ["HTML5", "Javascript", "CSS3", "CoffeeScript", "AngularJS", "ReactJS", "VueJS"],

dev/full/schema.js

+60-56
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ module.exports = {
8686
required: true,
8787
hint: "Minimum 6 characters",
8888
styleClasses: "half-width",
89-
validator: validators.string.locale({
89+
validator: validators.string.locale({
9090
fieldIsRequired: "The password is required!",
9191
textTooSmall: "Password must be at least {1} characters!"
9292
})
@@ -210,60 +210,60 @@ module.exports = {
210210
model: "",
211211
styleClasses: "alert alert-info"
212212
}, {
213-
type: "checklist",
214-
label: "CHECKLIST combobox",
215-
model: "checklistcombobox",
216-
listBox: false,
217-
values: [{
218-
name: "HTML5",
219-
value: "HTML5-123"
220-
}, {
221-
name: "Javascript",
222-
value: "Javascript-123"
223-
}, {
224-
name: "CSS3",
225-
value: "CSS3-123"
226-
}, {
227-
name: "CoffeeScript",
228-
value: "CoffeeScript-123"
229-
}, {
230-
name: "AngularJS",
231-
value: "AngularJS-123"
232-
}, {
233-
name: "ReactJS",
234-
value: "ReactJS-123"
235-
}, {
236-
name: "VueJS",
237-
value: "VueJS-123"
238-
}],
239-
}, {
240-
type: "checklist",
241-
label: "CHECKLIST listBox",
242-
model: "checklistlistbox",
243-
listBox: true,
244-
values: [{
245-
name: "HTML5",
246-
value: "HTML5-123"
247-
}, {
248-
name: "Javascript",
249-
value: "Javascript-123"
250-
}, {
251-
name: "CSS3",
252-
value: "CSS3-123"
253-
}, {
254-
name: "CoffeeScript",
255-
value: "CoffeeScript-123"
256-
}, {
257-
name: "AngularJS",
258-
value: "AngularJS-123"
259-
}, {
260-
name: "ReactJS",
261-
value: "ReactJS-123"
262-
}, {
263-
name: "VueJS",
264-
value: "VueJS-123"
265-
}],
266-
}, {
213+
type: "checklist",
214+
label: "CHECKLIST combobox",
215+
model: "checklistcombobox",
216+
listBox: false,
217+
values: [{
218+
name: "HTML5",
219+
value: "HTML5-123"
220+
}, {
221+
name: "Javascript",
222+
value: "Javascript-123"
223+
}, {
224+
name: "CSS3",
225+
value: "CSS3-123"
226+
}, {
227+
name: "CoffeeScript",
228+
value: "CoffeeScript-123"
229+
}, {
230+
name: "AngularJS",
231+
value: "AngularJS-123"
232+
}, {
233+
name: "ReactJS",
234+
value: "ReactJS-123"
235+
}, {
236+
name: "VueJS",
237+
value: "VueJS-123"
238+
}],
239+
}, {
240+
type: "checklist",
241+
label: "CHECKLIST listBox",
242+
model: "checklistlistbox",
243+
listBox: true,
244+
values: [{
245+
name: "HTML5",
246+
value: "HTML5-123"
247+
}, {
248+
name: "Javascript",
249+
value: "Javascript-123"
250+
}, {
251+
name: "CSS3",
252+
value: "CSS3-123"
253+
}, {
254+
name: "CoffeeScript",
255+
value: "CoffeeScript-123"
256+
}, {
257+
name: "AngularJS",
258+
value: "AngularJS-123"
259+
}, {
260+
name: "ReactJS",
261+
value: "ReactJS-123"
262+
}, {
263+
name: "VueJS",
264+
value: "VueJS-123"
265+
}],
266+
}, {
267267
type: "radios",
268268
label: "RADIOS",
269269
model: "radios",
@@ -319,7 +319,11 @@ module.exports = {
319319
type: "textArea",
320320
label: "Biography (textArea field)",
321321
model: "bio",
322-
hint: "Max 500 characters",
322+
hint(model) {
323+
if (model && model.bio) {
324+
return model.bio.length + " of max 500 characters used!";
325+
}
326+
},
323327
max: 500,
324328
placeholder: "User's biography",
325329
rows: 4,

dist/vfg-core.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/vfg-core.js

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)