Skip to content

Commit a52cf6d

Browse files
committed
compliance with vuetify 2.x
1 parent 7f07bfc commit a52cf6d

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>io.github.jeemv.springboot.vuejs</groupId>
88
<artifactId>springboot-vuejs</artifactId>
9-
<version>1.0.10</version>
9+
<version>1.0.11</version>
1010

1111
<name>springboot-vuejs</name>
1212
<url>https://github.com/jeeMv/SpringBoot-VueJS</url>

src/main/java/io/github/jeemv/springboot/vuejs/VueJS.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public class VueJS extends AbstractVueJS{
3434
protected String el;
3535
protected String[] delimiters;
3636
protected boolean useAxios;
37+
protected boolean vuetify;
3738
protected Map<String,VueComponent> globalComponents;
3839
protected Map<String,AbstractVueComposition> globalElements;
3940

@@ -51,6 +52,9 @@ public void init() {
5152
if(vueJSProperties.isUseAxios()) {
5253
useAxios=true;
5354
}
55+
if(vueJSProperties.isVuetify()) {
56+
vuetify=true;
57+
}
5458
el=vueJSProperties.getEl();
5559
}
5660
}
@@ -163,4 +167,8 @@ public void setUseAxios(boolean useAxios) {
163167
this.useAxios = useAxios;
164168
}
165169

170+
public boolean isVuetify() {
171+
return vuetify;
172+
}
173+
166174
}

src/main/java/io/github/jeemv/springboot/vuejs/configuration/VueJSProperties.java

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ public class VueJSProperties {
1515
private String[] delimiters;
1616
private boolean axios;
1717
private String el;
18+
19+
private boolean vuetify;
1820

1921
public String[] getDelimiters() {
2022
return delimiters;
@@ -60,12 +62,12 @@ public boolean getAxios() {
6062
public void setAxios(boolean axios) {
6163
this.axios = axios;
6264
}
63-
64-
/* private boolean isBooleanTrue(String value,boolean dValue) {
65-
if(value==null) {
66-
return dValue;
67-
}
68-
return "1".equals(value) || "true".equals(value);
65+
66+
public boolean isVuetify() {
67+
return vuetify;
68+
}
69+
70+
public void setVuetify(boolean vuetify) {
71+
this.vuetify = vuetify;
6972
}
70-
*/
7173
}

src/main/java/io/github/jeemv/springboot/vuejs/serializers/VueJSSerializer.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,10 @@ protected VueJSSerializer(Class<VueJS> t) {
2727
public void serialize(VueJS value, JsonGenerator gen, SerializerProvider provider) throws IOException {
2828
gen.writeStartObject();
2929
gen.writeStringField("el", value.getEl());
30+
if(value.isVuetify()) {
31+
gen.writeFieldName("vuetify");
32+
gen.writeRawValue("new Vuetify()");
33+
}
3034
gen.writeArrayFieldStart("delimiters");
3135
for (String arg: value.getDelimiters()) {
3236
gen.writeString(arg);

0 commit comments

Comments
 (0)