From fb8afcda7d4fdd9cf5a2b023b46cf953e609c96b Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Thu, 27 Oct 2022 12:40:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=A4=E4=B8=AA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=201=20online=E8=A1=A8=E5=8D=95=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E9=80=89=E6=8B=A9Vue3?=
 =?UTF-8?q?=E9=A3=8E=E6=A0=BC,=E7=94=9F=E6=88=90=E7=9A=84=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E5=8D=B4=E6=98=AFvue2=E7=9A=84=20issues/4151=202=20GU?=
 =?UTF-8?q?I=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E5=99=A8=20issues/4150?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/constant/enums/CgformEnum.java     | 43 +++++++++++++------
 pom.xml                                       |  4 +-
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java b/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
index e97c553a..37191ec9 100644
--- a/jeecg-boot-base-core/src/main/java/org/jeecg/common/constant/enums/CgformEnum.java
+++ b/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", "经典风格"),
-    /**
-     * 多表
-     */
-    MANY(2, "many", "/jeecg/code-template-online", "default.onetomany", "经典风格"),
-    /**
-     * 多表（jvxe风格）
-     *  */
-    JVXE_TABLE(2, "jvxe", "/jeecg/code-template-online", "jvxe.onetomany", "JVXE风格"),
+    ONE(1, "one", "/jeecg/code-template-online", "default.one", "经典风格", new String[]{"vue3","vue","vue3Native"}),
 
     /**
      * 多表
      */
-    ERP(2, "erp", "/jeecg/code-template-online", "erp.onetomany", "ERP风格"),
+    MANY(2, "many", "/jeecg/code-template-online", "default.onetomany", "经典风格" ,new String[]{"vue"}),
+    /**
+     * 多表（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风格" ,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(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/树
@@ -61,6 +62,10 @@ public enum CgformEnum {
      * 模板风格名称
      */
     String note;
+    /**
+     * 支持代码风格 vue3:vue3包装代码 vue3Native:vue3原生代码 vue:vue2代码
+     */
+    String[] vueStyle;
 
     /**
      * 构造器
@@ -70,13 +75,15 @@ public enum CgformEnum {
      * @param templatePath  模板路径
      * @param stylePath  模板子路径
      * @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.code = code;
         this.templatePath = templatePath;
         this.stylePath = stylePath;
         this.note = note;
+        this.vueStyle = vueStyle;
     }
 
     /**
@@ -114,6 +121,14 @@ public enum CgformEnum {
         this.stylePath = stylePath;
     }
 
+    public String[] getVueStyle() {
+        return vueStyle;
+    }
+
+    public void setVueStyle(String[] vueStyle) {
+        this.vueStyle = vueStyle;
+    }
+
     /**
      * 根据code找枚举
      *
diff --git a/pom.xml b/pom.xml
index a4ff542e..16189e5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 		<shiro.version>1.9.1</shiro.version>
 		<java-jwt.version>3.11.0</java-jwt.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>
 		<minio.version>8.0.3</minio.version>
 		<justauth-spring-boot-starter.version>1.3.4</justauth-spring-boot-starter.version>
@@ -222,7 +222,7 @@
 			<dependency>
 				<groupId>org.jeecgframework.boot</groupId>
 				<artifactId>hibernate-re</artifactId>
-				<version>3.4.3-beta</version>
+				<version>3.4.3-GA</version>
 			</dependency>
 
 			<!-- 七牛云SDK -->