From 0b8ad07f3796a7f960445740ffb5231856b984b9 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Tue, 14 Dec 2021 16:51:42 +0800 Subject: [PATCH] update --- README.md | 6 +++--- .../jeesite/modules/sys/db/InitCoreData.xlsx | Bin 179183 -> 179148 bytes .../templates/modules/gen/crud/vueForm.xml | 6 ++++-- .../templates/modules/gen/crud/vueIndex.xml | 2 +- .../jeesite/modules/test/entity/TestData.java | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) 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 2fc2a4d8322d050e16cf5224038928feb9fc2683..3037f7481603797ba4f1ee377b88975247bd477e 100644 GIT binary patch delta 23488 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 F{{X;(h9Up} delta 23473 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�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
-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 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; }