Browse Source

解决两个问题

1 online表单开发代码生成选择Vue3风格,生成的代码却是vue2的 issues/4151
2 GUI代码生成器 issues/4150
pull/4164/head
zhangdaiscott 2 years ago
parent
commit
fb8afcda7d
  1. 33
      jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
  2. 4
      pom.xml

33
jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java

@ -14,32 +14,33 @@ public enum CgformEnum {
/** /**
* 单表 * 单表
*/ */
ONE(1, "one", "/jeecg/code-template-online", "default.one", "经典风格"), ONE(1, "one", "/jeecg/code-template-online", "default.one", "经典风格", new String[]{"vue3","vue","vue3Native"}),
/** /**
* 多表 * 多表
*/ */
MANY(2, "many", "/jeecg/code-template-online", "default.onetomany", "经典风格"), MANY(2, "many", "/jeecg/code-template-online", "default.onetomany", "经典风格" ,new String[]{"vue"}),
/** /**
* 多表jvxe风格 * 多表jvxe风格
* */ * */
JVXE_TABLE(2, "jvxe", "/jeecg/code-template-online", "jvxe.onetomany", "JVXE风格"), JVXE_TABLE(2, "jvxe", "/jeecg/code-template-online", "jvxe.onetomany", "JVXE风格" ,new String[]{"vue3","vue","vue3Native"}),
/** /**
* 多表 * 多表 (erp风格)
*/ */
ERP(2, "erp", "/jeecg/code-template-online", "erp.onetomany", "ERP风格"), ERP(2, "erp", "/jeecg/code-template-online", "erp.onetomany", "ERP风格" ,new String[]{"vue3","vue"}),
/** /**
* 多表内嵌子表风格 * 多表内嵌子表风格
*/ */
INNER_TABLE(2, "innerTable", "/jeecg/code-template-online", "inner-table.onetomany", "内嵌子表风格"), INNER_TABLE(2, "innerTable", "/jeecg/code-template-online", "inner-table.onetomany", "内嵌子表风格" ,new String[]{"vue3","vue"}),
/** /**
* 多表tab风格 * 多表tab风格
* */ * */
TAB(2, "tab", "/jeecg/code-template-online", "tab.onetomany", "Tab风格"), TAB(2, "tab", "/jeecg/code-template-online", "tab.onetomany", "Tab风格" ,new String[]{"vue3","vue"}),
/** /**
* 树形列表 * 树形列表
*/ */
TREE(3, "tree", "/jeecg/code-template-online", "default.tree", "树形列表"); TREE(3, "tree", "/jeecg/code-template-online", "default.tree", "树形列表" ,new String[]{"vue3","vue","vue3Native"});
/** /**
* 类型 1/单表 2/一对多 3/ * 类型 1/单表 2/一对多 3/
@ -61,6 +62,10 @@ public enum CgformEnum {
* 模板风格名称 * 模板风格名称
*/ */
String note; String note;
/**
* 支持代码风格 vue3:vue3包装代码 vue3Native:vue3原生代码 vue:vue2代码
*/
String[] vueStyle;
/** /**
* 构造器 * 构造器
@ -70,13 +75,15 @@ public enum CgformEnum {
* @param templatePath 模板路径 * @param templatePath 模板路径
* @param stylePath 模板子路径 * @param stylePath 模板子路径
* @param note * @param note
* @param vueStyle 支持代码风格
*/ */
CgformEnum(int type, String code, String templatePath, String stylePath, String note) { CgformEnum(int type, String code, String templatePath, String stylePath, String note, String[] vueStyle) {
this.type = type; this.type = type;
this.code = code; this.code = code;
this.templatePath = templatePath; this.templatePath = templatePath;
this.stylePath = stylePath; this.stylePath = stylePath;
this.note = note; this.note = note;
this.vueStyle = vueStyle;
} }
/** /**
@ -114,6 +121,14 @@ public enum CgformEnum {
this.stylePath = stylePath; this.stylePath = stylePath;
} }
public String[] getVueStyle() {
return vueStyle;
}
public void setVueStyle(String[] vueStyle) {
this.vueStyle = vueStyle;
}
/** /**
* 根据code找枚举 * 根据code找枚举
* *

4
pom.xml

@ -50,7 +50,7 @@
<shiro.version>1.9.1</shiro.version> <shiro.version>1.9.1</shiro.version>
<java-jwt.version>3.11.0</java-jwt.version> <java-jwt.version>3.11.0</java-jwt.version>
<shiro-redis.version>3.1.0</shiro-redis.version> <shiro-redis.version>3.1.0</shiro-redis.version>
<codegenerate.version>1.4.1</codegenerate.version> <codegenerate.version>1.4.2</codegenerate.version>
<autopoi-web.version>1.4.2</autopoi-web.version> <autopoi-web.version>1.4.2</autopoi-web.version>
<minio.version>8.0.3</minio.version> <minio.version>8.0.3</minio.version>
<justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version> <justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version>
@ -222,7 +222,7 @@
<dependency> <dependency>
<groupId>org.jeecgframework.boot</groupId> <groupId>org.jeecgframework.boot</groupId>
<artifactId>hibernate-re</artifactId> <artifactId>hibernate-re</artifactId>
<version>3.4.3-beta</version> <version>3.4.3-GA</version>
</dependency> </dependency>
<!-- 七牛云SDK --> <!-- 七牛云SDK -->

Loading…
Cancel
Save