diff --git a/README.md b/README.md index 006e0270..24a42976 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@

快速开发平台 - Spring Boot

JeeSite-V4.3 - SpringBoot-2.5 + SpringBoot-2.5 star fork

@@ -49,9 +49,9 @@ JeeSite 是一个低代码开发平台,具有较高的封装度、扩展性, ## 技术选型 -* 主框架:Spring Boot 2.5、Spring Framework 5.3、Apache Shiro 1.7、J2Cache +* 主框架:Spring Boot 2.6、Spring Framework 5.3、Apache Shiro 1.8、J2Cache * 持久层:Apache MyBatis 3.5、Hibernate Validator 6.1、Alibaba Druid 1.2 -* 视图层:Spring MVC 5.3、Beetl 3.3(替换JSP)、Bootstrap 3.3、AdminLTE 2.4 +* 视图层:Spring MVC 5.3、Beetl 3.8(替换JSP)、Bootstrap 3.3、AdminLTE 2.4 * 前端组件:jQuery 3.5、jqGrid 4.7、layer 3.1、zTree 3.5、jQuery Validation * 支持 IE9 及以上版本及其他所有现代浏览器,如:谷歌浏览器、火狐浏览器、国产浏览器 等 * 工作流引擎:Flowable 6.6、符合 BPMN 规范、在线流程设计器、中国式流程、退回、撤回、自由流 diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx index 2fc2a4d8..3037f748 100644 Binary files a/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx and b/modules/core/src/main/java/com/jeesite/modules/sys/db/InitCoreData.xlsx differ diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml index 4db073c6..6b30e741 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueForm.xml @@ -340,13 +340,15 @@ for (c in table.columnList){ } %> }; - console.log('submit', params, data, record); + // console.log('submit', params, data, record); const res = await ${className}Save(params, data); showMessage(res.message); setTimeout(closeDrawer); emit('success', data); } catch (error: any) { - showMessage(t('您填写的信息有误,请根据提示修正。')); + if (error && error.errorFields) { + showMessage(t('您填写的信息有误,请根据提示修正。')); + } console.log('error', error); } finally { setDrawerProps({ confirmLoading: false }); diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/vueIndex.xml b/modules/core/src/main/resources/templates/modules/gen/crud/vueIndex.xml index 9139613d..d8a4a129 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/vueIndex.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/vueIndex.xml @@ -20,7 +20,7 @@ :search="true" :toolbar="true" :api="${className}TreeData" - :defaultExpandLevel="1" + :defaultExpandLevel="2" @select="handleSelect" /> diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java index 52e0d41c..b991c378 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java @@ -131,7 +131,7 @@ public class TestData extends DataEntity { this.testCheckbox = testCheckbox; } - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd") public Date getTestDate() { return testDate; } @@ -140,7 +140,7 @@ public class TestData extends DataEntity { this.testDate = testDate; } - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm") public Date getTestDatetime() { return testDatetime; }