后端升级到2.4.3版本

jero-boot/README.md

@@ -1,7 +1,7 @@
 jero-boot 低代码开发平台
 ===============
 
-当前最新版本： 2.4.2（发布日期：20210126）
+当前最新版本： 2.4.3（发布日期：20210126）
 
 
 ## 后端技术架构

jero-boot/db/Dockerfile

@@ -8,6 +8,6 @@ RUN ln -sf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 COPY ./tables_nacos.sql /docker-entrypoint-initdb.d
 
-COPY jeroboot-mysql-5.7.sql /docker-entrypoint-initdb.d
+COPY jeroboot-mysql-5.7-20220224.sql /docker-entrypoint-initdb.d
 
 COPY ./tables_xxl_job.sql /docker-entrypoint-initdb.d

jero-boot/db/jeroboot-oracle11g.sql

@@ -1735,6 +1735,7 @@ INSERT INTO "SYS_DICT" VALUES ('1209733563293962241', '数据库类型', 'databa
 INSERT INTO "SYS_DICT" VALUES ('1232913193820581889', 'Online表单业务分类', 'ol_form_biz_type', null, '0', 'admin', TO_DATE('2020-02-27 14:19:46', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2020-02-27 14:20:23', 'YYYY-MM-DD HH24:MI:SS'), '0');
 INSERT INTO "SYS_DICT" VALUES ('1250687930947620866', '定时任务状态', 'quartz_status', null, '0', 'admin', TO_DATE('2020-04-16 15:30:14', 'YYYY-MM-DD HH24:MI:SS'), null, null, null);
 INSERT INTO "SYS_DICT" VALUES ('1280401766745718786', '租户状态', 'tenant_status', '租户状态', '0', 'admin', TO_DATE('2020-07-07 15:22:25', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
+INSERT INTO "SYS_DICT" VALUES ('1356445645198135298', '开关', 'is_open', '', '0', 'admin', TO_DATE('2021-02-02 11:33:38', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2021-02-02 15:28:12', 'YYYY-MM-DD HH24:MI:SS'), '0');
 INSERT INTO "SYS_DICT" VALUES ('236e8a4baff0db8c62c00dd95632834f', '同步工作流引擎', 'activiti_sync', '同步工作流引擎', '0', 'admin', TO_DATE('2019-05-15 15:27:33', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
 INSERT INTO "SYS_DICT" VALUES ('2e02df51611a4b9632828ab7e5338f00', '权限策略', 'perms_type', '权限策略', '0', 'admin', TO_DATE('2019-04-26 18:26:55', 'YYYY-MM-DD HH24:MI:SS'), null, null, '0');
 INSERT INTO "SYS_DICT" VALUES ('2f0320997ade5dd147c90130f7218c3e', '推送类别', 'msg_type', null, '0', 'admin', TO_DATE('2019-03-17 21:21:32', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-03-26 19:57:45', 'YYYY-MM-DD HH24:MI:SS'), '0');
@@ -1873,7 +1874,8 @@ INSERT INTO "SYS_DICT_ITEM" VALUES ('f2a7920421f3335afdf6ad2b342f6b5d', '845da50
 INSERT INTO "SYS_DICT_ITEM" VALUES ('f37f90c496ec9841c4c326b065e00bb2', '83bfb33147013cc81640d5fd9eda030c', '登录日志', '1', null, null, '1', 'admin', TO_DATE('2019-03-18 23:22:37', 'YYYY-MM-DD HH24:MI:SS'), null, null);
 INSERT INTO "SYS_DICT_ITEM" VALUES ('f80a8f6838215753b05e1a5ba3346d22', '880a895c98afeca9d9ac39f29e67c13e', '删除', '4', null, '4', '1', 'admin', TO_DATE('2019-07-22 10:55:14', 'YYYY-MM-DD HH24:MI:SS'), 'admin', TO_DATE('2019-07-22 10:55:30', 'YYYY-MM-DD HH24:MI:SS'));
 INSERT INTO "SYS_DICT_ITEM" VALUES ('fe50b23ae5e68434def76f67cef35d2d', '78bda155fe380b1b3f175f1e88c284c6', '已作废', '4', '已作废', '4', '1', 'admin', TO_DATE('2021-09-09 16:33:43', 'YYYY-MM-DD HH24:MI:SS'), null, TO_DATE('2019-05-09 16:34:40', 'YYYY-MM-DD HH24:MI:SS'));
-
+INSERT INTO "SYS_DICT_ITEM" VALUES ('1356445705549975553', '1356445645198135298', '是', 'Y', '', '1', '1', 'admin', TO_DATE('2021-02-02 11:33:52', 'YYYY-MM-DD HH24:MI:SS'),, NULL, NULL);
+INSERT INTO "SYS_DICT_ITEM" VALUES ('1356445754212290561', '1356445645198135298', '否', 'N', '', '1', '1', 'admin', TO_DATE('2021-02-02 11:34:04', 'YYYY-MM-DD HH24:MI:SS'),, NULL, NULL);
 -- ----------------------------
 -- Table structure for SYS_FILL_RULE
 -- ----------------------------

jero-boot/db/jeroboot-sqlserver2017.sql

@@ -4584,6 +4584,9 @@ GO
 INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'fc6cd58fde2e8481db10d3a1e68ce70c', N'用户状态', N'user_status', NULL, N'0', N'admin', N'2019-03-18 21:57:25.0000000', N'admin', N'2019-03-18 23:11:58.0000000', N'1')
 GO
 
+INSERT INTO [dbo].[sys_dict] ([id], [dict_name], [dict_code], [description], [del_flag], [create_by], [create_time], [update_by], [update_time], [type]) VALUES (N'1356445645198135298', N'开关', N'is_open', N'', N'0', N'admin', N'2021-02-02 11:33:38.0000000', N'admin', N'2021-02-02 15:28:12.0000000', N'0')
+GO
+
 
 -- ----------------------------
 -- Table structure for sys_dict_item
@@ -4905,6 +4908,11 @@ GO
 INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'fe50b23ae5e68434def76f67cef35d2d', N'78bda155fe380b1b3f175f1e88c284c6', N'已作废', N'4', N'已作废', N'4', N'1', N'admin', N'2021-09-09 16:33:43.0000000', N'admin', N'2019-05-09 16:34:40.0000000')
 GO
 
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1356445705549975553', N'1356445645198135298', N'是', N'Y', N'', N'1', N'1', N'admin', N'2021-02-02 11:33:52.0000000', NULL, NULL)
+GO
+
+INSERT INTO [dbo].[sys_dict_item] ([id], [dict_id], [item_text], [item_value], [description], [sort_order], [status], [create_by], [create_time], [update_by], [update_time]) VALUES (N'1356445754212290561', N'1356445645198135298', N'否', N'N', N'', N'1', N'1', N'admin', N'2021-02-02 11:33:52.0000000', NULL, NULL)
+GO
 
 -- ----------------------------
 -- Table structure for sys_fill_rule

jero-boot/db/增量SQL/2.4升级到2.4.2增量mysql.sql

@@ -1,28 +0,0 @@
-INSERT INTO SYS_DICT_ITEM(ID, DICT_ID, ITEM_TEXT, ITEM_VALUE, DESCRIPTION, SORT_ORDER, STATUS, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME) VALUES ('1334440962954936321', '1209733563293962241', 'MYSQL5.7', '4', NULL, '1', '1', 'admin', '2020-12-03 18:16:02', 'admin', '2020-12-03 18:16:02');
-UPDATE SYS_DICT_ITEM SET ITEM_TEXT = 'MySQL5.5' WHERE ID = '1209733775114702850';
-UPDATE SYS_DICT_ITEM SET SORT_ORDER = '3' WHERE ID = '1209733839933476865';
-UPDATE SYS_DICT_ITEM SET SORT_ORDER = '4' WHERE ID = '1209733903020003330';
-
-ALTER TABLE `sys_gateway_route`
-CHANGE COLUMN `persist` `persistable` int(3) NULL DEFAULT NULL COMMENT '是否为保留数据:0-否 1-是' AFTER `strip_prefix`;
-
-DROP TABLE IF EXISTS `test_online_link`;
-CREATE TABLE `test_online_link`  (
-  `id` varchar(32) NOT NULL,
-  `pid` varchar(32) DEFAULT NULL COMMENT 'pid',
-  `name` varchar(255) DEFAULT NULL COMMENT 'name',
-  PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-INSERT INTO `test_online_link` VALUES ('1', NULL, '中国');
-INSERT INTO `test_online_link` VALUES ('10', '8', '庐阳区');
-INSERT INTO `test_online_link` VALUES ('11', '7', '黄山市');
-INSERT INTO `test_online_link` VALUES ('2', '1', '山东省');
-INSERT INTO `test_online_link` VALUES ('3', '2', '济南市');
-INSERT INTO `test_online_link` VALUES ('4', '3', '历城区');
-INSERT INTO `test_online_link` VALUES ('5', '3', '长青区');
-INSERT INTO `test_online_link` VALUES ('6', '2', '青岛市');
-INSERT INTO `test_online_link` VALUES ('7', '1', '安徽省');
-INSERT INTO `test_online_link` VALUES ('8', '7', '合肥市');
-INSERT INTO `test_online_link` VALUES ('9', '8', '包河区');
-
-update ONL_CGFORM_FIELD set DB_TYPE = 'Date' WHERE DB_TYPE = 'date';

jero-boot/db/增量SQL/版本升级说明.txt

@@ -1,10 +0,0 @@
-版本升级方法？
-
-  JeroBoot属于平台级产品，每次升级改动内容较多，目前做不到平滑升级。
-
-  这里给用户的升级建议是这样的：
-  1.代码升级  => 本地版本通过svn或者git做好主干，在分支上做业务开发，jeecg每次版本发布，可以手工覆盖主干的代码，对比代码进行提交；
-  2.数据库升级 => 针对数据库我们每次发布会提供增量升级SQL，可以通过增量SQL实现数据库的升级。
-  3.兼容问题 => 每次版本发布会针对不兼容地方标注说明，需要手工修改不兼容的代码。
-
-  注意： 升级sql目前只提供mysql版本，执行完脚步后，新菜单需要手工进行角色授权，刷新首页才会出现。

jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jero-boot-base-api</artifactId>
         <groupId>com.jero.boot</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java

@@ -15,6 +15,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -438,7 +439,10 @@ public interface ISysBaseAPI extends CommonAPI {
     @GetMapping("/sys/api/listSonDepartsByDepId")
     List<SysDepartTreeModel> listSonDepartsByDepId(@RequestParam("departId") String departId);
 
-
+    /**
-
+     * 41 获取公司下级部门和公司下所有用户id
-
+     * @param orgCode
+     */
+    @GetMapping("/sys/api/getDeptUserByOrgCode")
+    List<Map> getDeptUserByOrgCode(@RequestParam("orgCode")String orgCode);
 }

jero-boot/jero-boot-base/jero-boot-base-api/jero-system-cloud-api/src/main/java/com/jero/common/system/api/fallback/SysBaseAPIFallback.java

@@ -9,6 +9,7 @@ import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.vo.*;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -269,6 +270,11 @@ public class SysBaseAPIFallback implements ISysBaseAPI {
         return null;
     }
 
+    @Override
+    public List<Map> getDeptUserByOrgCode(String orgCode) {
+        return null;
+    }
+
     @Override
     public List<JSONObject> queryDepartsByOrgIds(String ids) {
         return null;

jero-boot/jero-boot-base/jero-boot-base-api/jero-system-local-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jero-boot-base-api</artifactId>
         <groupId>com.jero.boot</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jero-boot/jero-boot-base/jero-boot-base-api/jero-system-local-api/src/main/java/com/jero/common/system/api/ISysBaseAPI.java

@@ -7,6 +7,7 @@ import com.jero.common.api.dto.message.*;
 import com.jero.common.system.vo.*;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 /**
@@ -299,4 +300,9 @@ public interface ISysBaseAPI extends CommonAPI {
      */
     List<SysDepartTreeModel> listSonDepartsByDepId(String departId);
 
+    /**
+     * 43 获取公司下级部门和公司下所有用户信息
+     * @param orgCode
+     */
+    List<Map> getDeptUserByOrgCode(String orgCode);
 }

jero-boot/jero-boot-base/jero-boot-base-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jero-boot-base</artifactId>
         <groupId>com.jero.boot</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jero-boot/jero-boot-base/jero-boot-base-core/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jero.boot</groupId>
 		<artifactId>jero-boot-base</artifactId>
-		<version>2.4.2</version>
+		<version>2.4.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -156,16 +156,6 @@
 			<artifactId>shiro-spring-boot-starter</artifactId>
 			<version>${shiro.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.hibernate</groupId>
-			<artifactId>hibernate-core</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>commons-collections</groupId>
-					<artifactId>commons-collections</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
 		<!-- shiro-redis -->
 		<dependency>
 			<groupId>org.crazycake</groupId>
@@ -186,16 +176,6 @@
 			<version>${knife4j-spring-boot-starter.version}</version>
 		</dependency>
 
-		<!-- Redis -->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-redis</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.apache.commons</groupId>
-			<artifactId>commons-pool2</artifactId>
-		</dependency>
-
 		<!-- AutoPoi Excel工具类-->
 		<dependency>
 			<groupId>org.jeecgframework</groupId>

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/aspect/PermissionDataAspect.java

@@ -70,7 +70,7 @@ public class PermissionDataAspect {
         String url = "";
         if(oConvertUtils.isNotEmpty(requestPath)){
             url = requestPath.replace("\\", "/");
-            url = requestPath.replace("//", "/");
+            url = url.replace("//", "/");
             if(url.indexOf("//")>=0){
                 url = filterUrl(url);
             }

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonConstant.java

@@ -265,7 +265,7 @@ public interface CommonConstant {
     /**
      * 在线聊天 用户好友缓存前缀
      */
-    public static final String IM_PREFIX_USER_FRIEND_CACHE = "im_prefix_user_friend_";
+    public static final String IM_PREFIX_USER_FRIEND_CACHE = "sys:cache:im:im_prefix_user_friend_";
 
     /**
      * 考勤补卡业务状态 （1：同意  2：不同意）
@@ -294,7 +294,7 @@ public interface CommonConstant {
     /**
      * 多租户 请求头
      */
-    public final static String TENANT_ID = "tenant_id";
+    public final static String TENANT_ID = "tenant-id";
 
     /**
      * 微服务读取配置文件属性 服务地址

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/CommonSendStatus.java

@@ -13,7 +13,8 @@ public interface CommonSendStatus {
 	
 	public static final String REVOKE_STATUS_2 = "2";			//撤销
 
-
+	//app端推送会话标识后缀
+	public static final String  APP_SESSION_SUFFIX = "_app";	//app端推送会话标识后缀
 
 	/**流程催办——系统通知消息模板*/
 	public static final String TZMB_BPM_CUIBAN = "bpm_cuiban";

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/constant/DataBaseConstant.java

@@ -6,6 +6,7 @@ public interface DataBaseConstant {
 	//*********数据库类型****************************************
 	public static final String DB_TYPE_MYSQL = "MYSQL";
 	public static final String DB_TYPE_ORACLE = "ORACLE";
+	public static final String DB_TYPE_DM = "DM";//达梦数据库
 	public static final String DB_TYPE_POSTGRESQL = "POSTGRESQL";
 	public static final String DB_TYPE_SQLSERVER = "SQLSERVER";
 

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/common/system/base/controller/JeroController.java

@@ -1,6 +1,8 @@
 package com.jero.common.system.base.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.PropertyUtils;
@@ -13,6 +15,7 @@ import org.jeecgframework.poi.excel.ExcelImportUtil;
 import org.jeecgframework.poi.excel.def.NormalExcelConstants;
 import org.jeecgframework.poi.excel.entity.ExportParams;
 import org.jeecgframework.poi.excel.entity.ImportParams;
+import org.jeecgframework.poi.excel.entity.enmus.ExcelType;
 import org.jeecgframework.poi.excel.view.JeecgEntityExcelView;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -23,11 +26,8 @@ import org.springframework.web.servlet.ModelAndView;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
-
 /**
  * @Description: Controller基类
  * @Author: dangzhenghui@163.com
@@ -77,6 +77,55 @@ public class JeroController<T, S extends IService<T>> {
         return mv;
     }
 
+    /**
+     * 根据每页sheet数量导出多sheet
+     *
+     * @param request
+     * @param object 实体类
+     * @param clazz 实体类class
+     * @param title 标题
+     * @param exportFields 导出字段自定义
+     * @param pageNum 每个sheet的数据条数
+     * @param request
+     */
+    protected ModelAndView exportXlsSheet(HttpServletRequest request, T object, Class<T> clazz, String title,String exportFields,Integer pageNum) {
+        // Step.1 组装查询条件
+        QueryWrapper<T> queryWrapper = QueryGenerator.initQueryWrapper(object, request.getParameterMap());
+        LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        // Step.2 计算分页sheet数据
+        double total = service.count();
+        int count = (int)Math.ceil(total/pageNum);
+        // Step.3 多sheet处理
+        List<Map<String, Object>> listMap = new ArrayList<Map<String, Object>>();
+        for (int i = 1; i <=count ; i++) {
+            Page<T> page = new Page<T>(i, pageNum);
+            IPage<T> pageList = service.page(page, queryWrapper);
+            List<T> records = pageList.getRecords();
+            List<T> exportList = null;
+            // 过滤选中数据
+            String selections = request.getParameter("selections");
+            if (oConvertUtils.isNotEmpty(selections)) {
+                List<String> selectionList = Arrays.asList(selections.split(","));
+                exportList = records.stream().filter(item -> selectionList.contains(getId(item))).collect(Collectors.toList());
+            } else {
+                exportList = records;
+            }
+            Map<String, Object> map = new HashMap<String, Object>();
+            ExportParams  exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title+i,upLoadPath);
+            exportParams.setType(ExcelType.XSSF);
+            //map.put("title",exportParams);//表格Title
+            map.put(NormalExcelConstants.PARAMS,exportParams);//表格Title
+            map.put(NormalExcelConstants.CLASS,clazz);//表格对应实体
+            map.put(NormalExcelConstants.DATA_LIST, exportList);//数据集合
+            listMap.add(map);
+        }
+        // Step.4 AutoPoi 导出Excel
+        ModelAndView mv = new ModelAndView(new JeecgEntityExcelView());
+        mv.addObject(NormalExcelConstants.FILE_NAME, title); //此处设置的filename无效 ,前端会重更新设置一下
+        mv.addObject(NormalExcelConstants.MAP_LIST, listMap);
+        return mv;
+    }
+
     /**
      * 根据权限导出excel，传入导出字段参数
      *

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/WebMvcConfiguration.java

@@ -72,7 +72,7 @@ public class WebMvcConfiguration implements WebMvcConfigurer {
     }
 
     /**
-    * 添加Long转json精度丢失是配置
+    * 添加Long转json精度丢失的配置
     * @Return: void
     */
     @Override

jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroConfig.java

@@ -238,7 +238,7 @@ public class ShiroConfig {
             }
             manager = redisManager;
         }else{
-            // redis 集群支持，优先使用集群配置	add by jzyadmin@163.com
+            // redis 集群支持，优先使用集群配置
             RedisClusterManager redisManager = new RedisClusterManager();
             Set<HostAndPort> portSet = new HashSet<>();
             lettuceConnectionFactory.getClusterConfiguration().getClusterNodes().forEach(node -> portSet.add(new HostAndPort(node.getHost() , node.getPort())));

jero-boot/jero-boot-base/jero-boot-base-generater-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jero-boot-base</artifactId>
         <groupId>com.jero.boot</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>代码生成核心模块</description>

jero-boot/jero-boot-base/jero-boot-base-generater/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jero-boot-base</artifactId>
         <groupId>com.jero.boot</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -17,10 +17,23 @@
     </properties>
 
     <dependencies>
+
         <dependency>
             <groupId>com.jero.boot</groupId>
             <artifactId>jero-system-local-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.hibernate</groupId>
+            <artifactId>hibernate-core</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>commons-collections</groupId>
+                    <artifactId>commons-collections</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
     </dependencies>
 
 </project>

jero-boot/jero-boot-base/jero-boot-base-tools/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.jero.boot</groupId>
         <artifactId>jero-boot-base</artifactId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <description>公共模块</description>
@@ -17,6 +17,15 @@
             <artifactId>spring-boot-starter-web</artifactId>
             <optional>true</optional>
         </dependency>
+        <!-- Redis -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-pool2</artifactId>
+        </dependency>
         <!--加载hutool-->
         <dependency>
             <groupId>cn.hutool</groupId>

jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/client/JeroRedisClient.java

@@ -1,4 +1,4 @@
-package com.jero.boot.starter.redis.client;
+package com.jero.common.modules.redis.client;
 
 import com.jero.common.base.BaseMap;
 import com.jero.common.constant.GlobalConstants;

jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/config/RedisConfiguration.java

@@ -1,11 +1,11 @@
-package com.jero.boot.starter.redis.config;
+package com.jero.common.modules.redis.config;
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;
 import com.fasterxml.jackson.annotation.PropertyAccessor;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.jero.common.modules.redis.service.RedisReceiver;
 import lombok.extern.slf4j.Slf4j;
-import com.jero.boot.starter.redis.prop.JeroRedisProperties;
+import com.jero.common.modules.redis.prop.JeroRedisProperties;
-import com.jero.boot.starter.redis.service.RedisReceiver;
 import com.jero.common.constant.GlobalConstants;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/listener/JeroRedisListerer.java

@@ -1,4 +1,4 @@
-package com.jero.boot.starter.redis.listener;
+package com.jero.common.modules.redis.listener;
 
 import com.jero.common.base.BaseMap;
 

jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/prop/JeroRedisProperties.java

@@ -1,4 +1,4 @@
-package com.jero.boot.starter.redis.prop;
+package com.jero.common.modules.redis.prop;
 
 import lombok.Getter;
 import lombok.Setter;

jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/service/RedisReceiver.java

@@ -1,9 +1,9 @@
-package com.jero.boot.starter.redis.service;
+package com.jero.common.modules.redis.service;
 
 
 import cn.hutool.core.util.ObjectUtil;
+import com.jero.common.modules.redis.listener.JeroRedisListerer;
 import lombok.Data;
-import com.jero.boot.starter.redis.listener.JeroRedisListerer;
 import com.jero.common.base.BaseMap;
 import com.jero.common.constant.GlobalConstants;
 import com.jero.common.util.SpringContextHolder;

jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/modules/redis/write/JeroRedisCacheWriter.java

@@ -0,0 +1,221 @@
+package com.jero.common.modules.redis.write;
+
+import java.nio.charset.StandardCharsets;
+import java.time.Duration;
+import java.util.Collections;
+import java.util.Optional;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.PessimisticLockingFailureException;
+import org.springframework.data.redis.cache.RedisCacheWriter;
+import org.springframework.data.redis.connection.RedisConnection;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.connection.RedisStringCommands.SetOption;
+import org.springframework.data.redis.core.types.Expiration;
+import org.springframework.lang.Nullable;
+import org.springframework.util.Assert;
+
+/**
+ * 该类参照 DefaultRedisCacheWriter 重写了 remove 方法实现通配符*删除
+ */
+@Slf4j
+public class JeroRedisCacheWriter implements RedisCacheWriter {
+
+    private final RedisConnectionFactory connectionFactory;
+    private final Duration sleepTime;
+
+    public JeroRedisCacheWriter(RedisConnectionFactory connectionFactory) {
+        this(connectionFactory, Duration.ZERO);
+    }
+
+    public JeroRedisCacheWriter(RedisConnectionFactory connectionFactory, Duration sleepTime) {
+        Assert.notNull(connectionFactory, "ConnectionFactory must not be null!");
+        Assert.notNull(sleepTime, "SleepTime must not be null!");
+        this.connectionFactory = connectionFactory;
+        this.sleepTime = sleepTime;
+    }
+
+    public void put(String name, byte[] key, byte[] value, @Nullable Duration ttl) {
+        Assert.notNull(name, "Name must not be null!");
+        Assert.notNull(key, "Key must not be null!");
+        Assert.notNull(value, "Value must not be null!");
+        this.execute(name, (connection) -> {
+            if (shouldExpireWithin(ttl)) {
+                connection.set(key, value, Expiration.from(ttl.toMillis(), TimeUnit.MILLISECONDS), SetOption.upsert());
+            } else {
+                connection.set(key, value);
+            }
+
+            return "OK";
+        });
+    }
+
+    public byte[] get(String name, byte[] key) {
+        Assert.notNull(name, "Name must not be null!");
+        Assert.notNull(key, "Key must not be null!");
+        return (byte[])this.execute(name, (connection) -> {
+            return connection.get(key);
+        });
+    }
+
+    public byte[] putIfAbsent(String name, byte[] key, byte[] value, @Nullable Duration ttl) {
+        Assert.notNull(name, "Name must not be null!");
+        Assert.notNull(key, "Key must not be null!");
+        Assert.notNull(value, "Value must not be null!");
+        return (byte[])this.execute(name, (connection) -> {
+            if (this.isLockingCacheWriter()) {
+                this.doLock(name, connection);
+            }
+
+            Object var7;
+            try {
+                boolean put;
+                if (shouldExpireWithin(ttl)) {
+                    put = connection.set(key, value, Expiration.from(ttl), SetOption.ifAbsent());
+                } else {
+                    put = connection.setNX(key, value);
+                }
+
+                if (!put) {
+                    byte[] var11 = connection.get(key);
+                    return var11;
+                }
+
+                var7 = null;
+            } finally {
+                if (this.isLockingCacheWriter()) {
+                    this.doUnlock(name, connection);
+                }
+
+            }
+
+            return (byte[])var7;
+        });
+    }
+
+    public void remove(String name, byte[] key) {
+        Assert.notNull(name, "Name must not be null!");
+        Assert.notNull(key, "Key must not be null!");
+        String keyString = new String(key);
+        log.info("redis remove key:" + keyString);
+        if(keyString!=null && keyString.endsWith("*")){
+            execute(name, connection -> {
+                // 获取某个前缀所拥有的所有的键，某个前缀开头，后面肯定是*
+                Set<byte[]> keys = connection.keys(key);
+                int delNum = 0;
+                for (byte[] keyByte : keys) {
+                    delNum += connection.del(keyByte);
+                }
+                return delNum;
+            });
+        }else{
+            this.execute(name, (connection) -> {
+                return connection.del(new byte[][]{key});
+            });
+        }
+    }
+
+    public void clean(String name, byte[] pattern) {
+        Assert.notNull(name, "Name must not be null!");
+        Assert.notNull(pattern, "Pattern must not be null!");
+        this.execute(name, (connection) -> {
+            boolean wasLocked = false;
+
+            try {
+                if (this.isLockingCacheWriter()) {
+                    this.doLock(name, connection);
+                    wasLocked = true;
+                }
+
+                byte[][] keys = (byte[][])((Set)Optional.ofNullable(connection.keys(pattern)).orElse(Collections.emptySet())).toArray(new byte[0][]);
+                if (keys.length > 0) {
+                    connection.del(keys);
+                }
+            } finally {
+                if (wasLocked && this.isLockingCacheWriter()) {
+                    this.doUnlock(name, connection);
+                }
+
+            }
+
+            return "OK";
+        });
+    }
+
+    void lock(String name) {
+        this.execute(name, (connection) -> {
+            return this.doLock(name, connection);
+        });
+    }
+
+    void unlock(String name) {
+        this.executeLockFree((connection) -> {
+            this.doUnlock(name, connection);
+        });
+    }
+
+    private Boolean doLock(String name, RedisConnection connection) {
+        return connection.setNX(createCacheLockKey(name), new byte[0]);
+    }
+
+    private Long doUnlock(String name, RedisConnection connection) {
+        return connection.del(new byte[][]{createCacheLockKey(name)});
+    }
+
+    boolean doCheckLock(String name, RedisConnection connection) {
+        return connection.exists(createCacheLockKey(name));
+    }
+
+    private boolean isLockingCacheWriter() {
+        return !this.sleepTime.isZero() && !this.sleepTime.isNegative();
+    }
+
+    private <T> T execute(String name, Function<RedisConnection, T> callback) {
+        RedisConnection connection = this.connectionFactory.getConnection();
+
+        try {
+            this.checkAndPotentiallyWaitUntilUnlocked(name, connection);
+            return callback.apply(connection);
+        } finally {
+            connection.close();
+        }
+
+    }
+
+    private void executeLockFree(Consumer<RedisConnection> callback) {
+        RedisConnection connection = this.connectionFactory.getConnection();
+
+        try {
+            callback.accept(connection);
+        } finally {
+            connection.close();
+        }
+
+    }
+
+    private void checkAndPotentiallyWaitUntilUnlocked(String name, RedisConnection connection) {
+        if (this.isLockingCacheWriter()) {
+            try {
+                while(this.doCheckLock(name, connection)) {
+                    Thread.sleep(this.sleepTime.toMillis());
+                }
+
+            } catch (InterruptedException var4) {
+                Thread.currentThread().interrupt();
+                throw new PessimisticLockingFailureException(String.format("Interrupted while waiting to unlock cache %s", name), var4);
+            }
+        }
+    }
+
+    private static boolean shouldExpireWithin(@Nullable Duration ttl) {
+        return ttl != null && !ttl.isZero() && !ttl.isNegative();
+    }
+
+    private static byte[] createCacheLockKey(String name) {
+        return (name + "~lock").getBytes(StandardCharsets.UTF_8);
+    }
+}

jero-boot/jero-boot-base/jero-boot-base-tools/src/main/java/com/jero/common/util/RedisUtil.java

@@ -6,7 +6,6 @@ import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-import com.jero.common.exception.JeroBootException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.*;
 import org.springframework.stereotype.Component;

jero-boot/jero-boot-base/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jero.boot</groupId>
         <artifactId>jero-boot</artifactId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jero-boot/jero-boot-module-demo/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.jero.boot</groupId>
         <artifactId>jero-boot</artifactId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -16,17 +16,14 @@
             <groupId>com.jero.boot</groupId>
             <artifactId>jero-system-local-api</artifactId>
         </dependency>
-        <!-- 如果需要微服务版本，则以上API注释，释放该API
+        <!--引入微服务启动依赖 starter
       <dependency>
-            <groupId>com.jero.boot</groupId>
+          <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jero-system-cloud-api</artifactId>
+          <artifactId>jero-boot-starter-cloud</artifactId>
       </dependency>
-        -->
-        <!-- 如果需要微服务版本，则引入微服务启动依赖 starter
         <dependency>
-          <groupId>com.jero.boot</groupId>
+            <groupId>org.jeecgframework.boot</groupId>
-          <artifactId>jero-cloud-feign-config</artifactId>
+            <artifactId>jero-boot-starter-job</artifactId>
-        </dependency>
+        </dependency>-->
-        -->
     </dependencies>
 </project>

jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JeroDemoController.java

@@ -149,7 +149,8 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
     public ModelAndView exportXls(HttpServletRequest request, JeroDemo jeroDemo) {
         //获取导出表格字段
         String exportFields = JeroDemoService.getExportFields();
-        return super.exportXls(request, jeroDemo, JeroDemo.class, "单表模型",exportFields);
+        //分sheet导出表格字段
+        return super.exportXlsSheet(request, jeroDemo, JeroDemo.class, "单表模型",exportFields,500);
     }
 
     /**
@@ -280,20 +281,4 @@ public class JeroDemoController extends JeroController<JeroDemo, IJeroDemoServic
         IPage<JeroDemo> pageList = JeroDemoService.queryListWithPermission(pageSize, pageNo);
         return Result.OK(pageList);
     }
-    /*----------------------------------------外部获取权限示例------------------------------------*/
-
-
-//    /**
-//    * 测试MQ
-//    */
-//    @GetMapping(value = "/rabbitMqClientTest")
-//    public Result<?> rabbitMqClientTest(HttpServletRequest req) {
-//        BaseMap map = new BaseMap();
-//        map.put("orderId", RandomUtil.randomNumbers(10));
-//        rabbitMqClient.sendMessage("jero_place_order", map);
-//        rabbitMqClient.sendMessage("jero_place_order_time", map,10);
-//        return Result.OK();
-//    }
-//    @Autowired
-//    private RabbitMqClient rabbitMqClient;
 }

jero-boot/jero-boot-module-demo/src/main/java/com/jero/modules/demo/test/controller/JoaDemoController.java

@@ -175,7 +175,7 @@ public class JoaDemoController {
   /**
       * 导出excel
    *
-   * @param requestFieldPresenceUtil
+   * @param request
    * @param response
    */
   @RequestMapping(value = "/exportXls")

jero-boot/jero-boot-module-system/Dockerfile

@@ -10,6 +10,6 @@ WORKDIR /jero-boot
 
 EXPOSE 8080
 
-ADD ./target/jero-boot-module-system-2.4.2.jar ./
+ADD ./target/jero-boot-module-system-2.4.3.jar ./
 
-CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jero-boot-module-system-2.4.2.jar
+CMD sleep 60;java -Djava.security.egd=file:/dev/./urandom -jar jero-boot-module-system-2.4.3.jar

jero-boot/jero-boot-module-system/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.jero.boot</groupId>
 		<artifactId>jero-boot</artifactId>
-		<version>2.4.2</version>
+		<version>2.4.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 
@@ -34,10 +34,6 @@
 			<groupId>com.jero.boot</groupId>
 			<artifactId>jero-system-local-api</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>com.jero.boot</groupId>
-			<artifactId>jero-boot-starter-redis</artifactId>
-		</dependency>
 		<!-- 积木报表 -->
 		<dependency>
 			<groupId>com.jimureport</groupId>

jero-boot/jero-boot-module-system/src/main/java/com/jero/config/jimureport/JimuReportTokenService.java

@@ -2,6 +2,7 @@ package com.jero.config.jimureport;
 
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.util.JwtUtil;
+import com.jero.common.system.vo.SysUserCacheInfo;
 import com.jero.common.util.RedisUtil;
 import com.jero.common.util.TokenUtils;
 import org.jeecg.modules.jmreport.api.JmReportTokenServiceI;
@@ -10,13 +11,14 @@ import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
-* 自定义积木报表鉴权实现类(如果不进行自定义，则所有请求不做权限控制)
+ * 自定义积木报表鉴权(如果不进行自定义，则所有请求不做权限控制)
- * 1.自定义获取登录token
+ *  * 1.自定义获取登录token
- * 2.自定义获取登录用户
+ *  * 2.自定义获取登录用户
-*/
+ */
-@Component
 class JimuReportTokenService implements JmReportTokenServiceI {
     @Autowired
     private ISysBaseAPI sysBaseAPI;
@@ -38,4 +40,18 @@ class JimuReportTokenService implements JmReportTokenServiceI {
     public Boolean verifyToken(String token) {
         return TokenUtils.verifyToken(token, sysBaseAPI, redisUtil);
     }
+
+    @Override
+    public Map<String, Object> getUserInfo(String token) {
+        String username = JwtUtil.getUsername(token);
+        //此处通过token只能拿到一个信息 用户账号  后面的就是根据账号获取其他信息 查询数据或是走redis 用户根据自身业务可自定义
+        SysUserCacheInfo userInfo = sysBaseAPI.getCacheUser(username);
+        Map<String, Object> map = new HashMap<String, Object>();
+        //设置账号名
+        map.put(SYS_USER_CODE, userInfo.getSysUserCode());
+        //设置部门编码
+        map.put(SYS_ORG_CODE, userInfo.getSysOrgCode());
+        // 将所有信息存放至map 解析sql/api会根据map的键值解析
+        return map;
+    }
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/api/controller/SystemAPIController.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 
@@ -485,7 +486,7 @@ public class SystemAPIController {
 
     /**
      * 37根据多个用户id(逗号分隔)，查询返回多个用户信息
-     * @param usernames
+     * @param ids
      * @return
      */
     @GetMapping("/queryUsersByIds")
@@ -545,7 +546,13 @@ public class SystemAPIController {
         return sysDepartService.listSonDepartsByDepId(departId);
     }
 
-
+    /**
-
+     * 41 获取公司下级部门和公司下所有用户信息
+     * @param orgCode
+     */
+    @GetMapping("/getDeptUserByOrgCode")
+    List<Map> getDeptUserByOrgCode(@RequestParam("orgCode")String orgCode){
+        return this.sysBaseAPI.getDeptUserByOrgCode(orgCode);
+    }
 
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/job/SendMsgJob.java

@@ -59,6 +59,7 @@ public class SendMsgJob implements Job {
 				// 发送消息成功
 				sysMessage.setEsSendStatus(SendMsgStatusEnum.SUCCESS.getCode());
 			} catch (Exception e) {
+				e.printStackTrace();
 				// 发送消息出现异常
 				sysMessage.setEsSendStatus(SendMsgStatusEnum.FAIL.getCode());
 			}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/SocketHandler.java

@@ -1,14 +1,17 @@
 package com.jero.modules.message.websocket;
 
 import cn.hutool.core.util.ObjectUtil;
-import com.jero.boot.starter.redis.listener.JeroRedisListerer;
+import com.jero.common.constant.CommonSendStatus;
+import com.jero.common.modules.redis.listener.JeroRedisListerer;
 import com.jero.common.base.BaseMap;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 /**
  * 监听消息(采用redis发布订阅方式发送消息)
  */
+@Slf4j
 @Component
 public class SocketHandler implements JeroRedisListerer {
 
@@ -17,10 +20,14 @@ public class SocketHandler implements JeroRedisListerer {
 
     @Override
     public void onMessage(BaseMap map) {
+        log.info("【SocketHandler消息】Redis Listerer:" + map.toString());
+
         String userId = map.get("userId");
         String message = map.get("message");
         if (ObjectUtil.isNotEmpty(userId)) {
             webSocket.pushMessage(userId, message);
+            //app端消息推送
+            webSocket.pushMessage(userId + CommonSendStatus.APP_SESSION_SUFFIX, message);
         } else {
             webSocket.pushMessage(message);
         }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/message/websocket/WebSocket.java

@@ -12,7 +12,7 @@ import javax.websocket.Session;
 import javax.websocket.server.PathParam;
 import javax.websocket.server.ServerEndpoint;
 
-import com.jero.boot.starter.redis.client.JeroRedisClient;
+import com.jero.common.modules.redis.client.JeroRedisClient;
 import com.jero.common.base.BaseMap;
 import com.jero.common.constant.WebsocketConst;
 import org.springframework.stereotype.Component;
@@ -40,6 +40,9 @@ public class WebSocket {
     @Resource
     private JeroRedisClient jeroRedisClient;
 
+    /**
+     * 缓存 webSocket连接到单机服务class中（整体方案支持集群）
+     */
     private static CopyOnWriteArraySet<WebSocket> webSockets = new CopyOnWriteArraySet<>();
     private static Map<String, Session> sessionPool = new HashMap<String, Session>();
 
@@ -102,8 +105,10 @@ public class WebSocket {
         //todo 现在有个定时任务刷，应该去掉
         log.debug("【websocket消息】收到客户端消息:" + message);
         JSONObject obj = new JSONObject();
-        obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_CHECK);//业务类型
+        //业务类型
-        obj.put(WebsocketConst.MSG_TXT, "心跳响应");//消息内容
+        obj.put(WebsocketConst.MSG_CMD, WebsocketConst.CMD_CHECK);
+        //消息内容
+        obj.put(WebsocketConst.MSG_TXT, "心跳响应");
         for (WebSocket webSocket : webSockets) {
             webSocket.pushMessage(message);
         }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/DuplicateCheckController.java

@@ -1,8 +1,7 @@
 package com.jero.modules.system.controller;
 
-import io.swagger.annotations.Api;
+import javax.servlet.http.HttpServletRequest;
-import io.swagger.annotations.ApiOperation;
+
-import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import com.jero.common.api.vo.Result;
 import com.jero.common.util.SqlInjectionUtil;
@@ -13,7 +12,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * @Title: DuplicateCheckAction
@@ -56,7 +57,7 @@ public class DuplicateCheckController {
 
 		if (num == null || num == 0) {
 			// 该值可用
-			return Result.OK("该值可用！");
+			return Result.ok("该值可用！");
 		} else {
 			// 该值不可用
 			log.info("该值不可用，系统中已存在！");

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDepartController.java

@@ -112,6 +112,25 @@ public class SysDepartController {
 		return result;
 	}
 
+	/**
+	 * 异步查询部门list
+	 *
+	 * @return
+	 */
+	@RequestMapping(value = "/queryDepartTreeSync", method = RequestMethod.GET)
+	public Result<List<SysDepartTreeModel>> queryDepartTreeSync(@RequestParam(name = "pid", required = false) String parentId) {
+		Result<List<SysDepartTreeModel>> result = new Result<>();
+		try {
+			List<SysDepartTreeModel> list = sysDepartService.queryTreeListByPid(parentId);
+			result.setResult(list);
+			result.setSuccess(true);
+		} catch (Exception e) {
+			log.error(e.getMessage(),e);
+		}
+		return result;
+	}
+
+
 	/**
 	 * 添加新数据 添加用户新建的部门对象数据,并保存到数据库
 	 * 

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -325,7 +325,6 @@ public class SysDictController {
 	 * @return
 	 */
 	@ApiOperation(value = "字典控制器-新增字典", notes = "字典控制器-新增字典")
-	@RequiresRoles({"admin"})
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	public Result<SysDict> add(@RequestBody SysDict sysDict) {
 		Result<SysDict> result = new Result<SysDict>();
@@ -349,7 +348,6 @@ public class SysDictController {
 	 * @return
 	 */
 	@ApiOperation(value = "字典控制器-编辑字典", notes = "字典控制器-编辑字典")
-	@RequiresRoles({"admin"})
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
 	public Result<SysDict> edit(@RequestBody SysDict sysDict) {
 		Result<SysDict> result = new Result<SysDict>();
@@ -374,7 +372,6 @@ public class SysDictController {
 	 * @return
 	 */
 	@ApiOperation(value = "字典控制器-删除字典", notes = "字典控制器-删除字典")
-	@RequiresRoles({"admin"})
 	@DeleteMapping(value = "/delete")
 	@CacheEvict(value=CacheConstant.SYS_DICT_CACHE, allEntries=true)
 	public Result<SysDict> delete(@RequestParam(name="id",required=true) String id) {
@@ -454,14 +451,7 @@ public class SysDictController {
 		return mv;
 	}
 
-	/**
+
-	 * 通过excel导入数据
-	 *
-	 * @param request
-	 * @param
-	 * @return
-	 */
-	@RequiresRoles({"admin"})
 	@PostMapping(value = "/importExcel")
 	public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response) {
  		MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysUserController.java

@@ -15,7 +15,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
-import org.apache.shiro.authz.annotation.RequiresRoles;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.PermissionData;
 import com.jero.common.constant.CommonConstant;
@@ -133,7 +132,6 @@ public class SysUserController {
 		return result;
 	}
 
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("user:add")
 	@RequestMapping(value = "/add", method = RequestMethod.POST)
 	public Result<SysUser> add(@RequestBody JSONObject jsonObject) {
@@ -179,7 +177,6 @@ public class SysUserController {
 		return result;
 	}
 
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("user:edit")
 	@RequestMapping(value = "/edit", method = RequestMethod.PUT)
 	public Result<SysUser> edit(@RequestBody JSONObject jsonObject) {
@@ -224,10 +221,7 @@ public class SysUserController {
 		return result;
 	}
 
-	/**
+
-	 * 删除用户
-	 */
-	//@RequiresRoles({"admin"})
     @RequiresPermissions("sys:user:del")
 	@RequestMapping(value = "/delete", method = RequestMethod.DELETE)
 	public Result<?> delete(@RequestParam(name="id",required=true) String id) {
@@ -236,10 +230,7 @@ public class SysUserController {
 		return Result.OK("删除用户成功");
 	}
 
-	/**
+
-	 * 批量删除用户
-	 */
-	//@RequiresRoles({"admin"})
     @RequiresPermissions("sys:user:del")
 	@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
 	public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
@@ -248,12 +239,7 @@ public class SysUserController {
 		return Result.OK("批量删除用户成功");
 	}
 
-	/**
+
-	  * 冻结&解冻用户
-	 * @param jsonObject
-	 * @return
-	 */
-	//@RequiresRoles({"admin"})
     @RequiresPermissions("sys:user:list")
 	@RequestMapping(value = "/frozenBatch", method = RequestMethod.PUT)
 	public Result<SysUser> frozenBatch(@RequestBody JSONObject jsonObject) {
@@ -339,10 +325,7 @@ public class SysUserController {
         return result;
     }
 
-    /**
+
-     * 修改密码
-     */
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("user:edit")
     @RequestMapping(value = "/changePassword", method = RequestMethod.PUT)
     public Result<?> changePassword(@RequestBody SysUser sysUser) {
@@ -476,7 +459,6 @@ public class SysUserController {
      * @param response
      * @return
      */
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("sys:user:import")
     @RequestMapping(value = "/importExcel", method = RequestMethod.POST)
     public Result<?> importExcel(HttpServletRequest request, HttpServletResponse response)throws IOException {
@@ -572,7 +554,6 @@ public class SysUserController {
 	/**
 	 * 首页用户重置密码
 	 */
-	//@RequiresRoles({"admin"})
 	@RequestMapping(value = "/updatePassword", method = RequestMethod.PUT)
 	public Result<?> changPassword(@RequestBody JSONObject json) {
 		String username = json.getString("username");
@@ -614,7 +595,6 @@ public class SysUserController {
      * @param
      * @return
      */
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("user:add")
     @RequestMapping(value = "/addSysUserRole", method = RequestMethod.POST)
     public Result<String> addSysUserRole(@RequestBody SysUserRoleVO sysUserRoleVO) {
@@ -646,7 +626,6 @@ public class SysUserController {
      * @param
      * @return
      */
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("sys:user:del")
     @RequestMapping(value = "/deleteUserRole", method = RequestMethod.DELETE)
     public Result<SysUserRole> deleteUserRole(@RequestParam(name="roleId") String roleId,
@@ -671,7 +650,6 @@ public class SysUserController {
      * @param
      * @return
      */
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("sys:user:del")
     @RequestMapping(value = "/deleteUserRoleBatch", method = RequestMethod.DELETE)
     public Result<SysUserRole> deleteUserRoleBatch(
@@ -755,7 +733,6 @@ public class SysUserController {
     /**
      * 给指定部门添加对应的用户
      */
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("user:add")
     @RequestMapping(value = "/editSysDepartWithUser", method = RequestMethod.POST)
     public Result<String> editSysDepartWithUser(@RequestBody SysDepartUsersVO sysDepartUsersVO) {
@@ -785,7 +762,6 @@ public class SysUserController {
     /**
      *   删除指定机构的用户关系
      */
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("sys:user:del")
     @RequestMapping(value = "/deleteUserInDepart", method = RequestMethod.DELETE)
     public Result<SysUserDepart> deleteUserInDepart(@RequestParam(name="depId") String depId,
@@ -818,7 +794,6 @@ public class SysUserController {
     /**
      * 批量删除指定机构的用户关系
      */
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("sys:user:del")
     @RequestMapping(value = "/deleteUserInDepartBatch", method = RequestMethod.DELETE)
     public Result<SysUserDepart> deleteUserInDepartBatch(
@@ -1174,7 +1149,6 @@ public class SysUserController {
      * @param userIds 被删除的用户ID，多个id用半角逗号分割
      * @return
      */
-    //@RequiresRoles({"admin"})
     @RequiresPermissions("sys:user:del")
     @RequestMapping(value = "/deleteRecycleBin", method = RequestMethod.DELETE)
     public Result deleteRecycleBin(@RequestParam("userIds") String userIds) {

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/SysDepartMapper.java

@@ -50,4 +50,25 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 	 */
 	List<String> getSubDepIdsByOrgCodes(@org.apache.ibatis.annotations.Param("orgCodes") String[] orgCodes);
 
+	List<SysDepart> queryTreeListByPid(@Param("parentId") String parentId);
+	/**
+	 * 根据id下级部门数量
+	 * @param parentId
+	 * @return
+	 */
+	@Select("SELECT count(*) FROM sys_depart where del_flag ='0' AND parent_id = #{parentId,jdbcType=VARCHAR}")
+	Integer queryCountByPid(@Param("parentId")String parentId);
+	/**
+	 * 根据OrgCod查询所属公司信息
+	 * @param orgCode
+	 * @return
+	 */
+	SysDepart queryCompByOrgCode(@Param("orgCode")String orgCode);
+	/**
+	 * 根据id下级部门
+	 * @param parentId
+	 * @return
+	 */
+	@Select("SELECT * FROM sys_depart where del_flag ='0' AND parent_id = #{parentId,jdbcType=VARCHAR}")
+	List<SysDepart> queryDeptByPid(@Param("parentId")String parentId);
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysDepartMapper.xml

@@ -34,4 +34,22 @@
         </foreach>
 	</select>
 
+    <!--根据parent_id查询下级部门-->
+    <select id="queryTreeListByPid" parameterType="Object"  resultType="org.jeecg.modules.system.entity.SysDepart">
+        SELECT * FROM  sys_depart where del_flag = '0'
+        <choose>
+            <when test="parentId != null and parentId != ''">
+                AND parent_id =  #{parentId,jdbcType=VARCHAR}
+            </when>
+            <otherwise>
+                AND parent_id is null or parent_id=''
+            </otherwise>
+        </choose>
+        order by depart_order
+    </select>
+
+    <!-- 根据OrgCod查询公司信息 -->
+    <select id="queryCompByOrgCode" resultType="org.jeecg.modules.system.entity.SysDepart">
+        select * from sys_depart where del_flag = '0' and org_category='1' and org_code= #{orgCode,jdbcType=VARCHAR}
+    </select>
 </mapper>

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysDepartService.java

@@ -123,4 +123,20 @@ public interface ISysDepartService extends IService<SysDepart>{
      * @param departId 部门id
      */
     List<SysDepartTreeModel> listSonDepartsByDepId(String departId);
+
+    /**
+     * 获取我的部门下级所有部门
+     * @return
+     */
+    List<SysDepartTreeModel> queryTreeListByPid(String parentId);
+    /**
+     * 获取公司信息
+     * @return
+     */
+    SysDepart queryCompByOrgCode(String orgCode);
+    /**
+     * 获取下级部门
+     * @return
+     */
+    List<SysDepart> queryDeptByPid(String pid);
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/LoginServiceImpl.java

@@ -134,6 +134,9 @@ public class LoginServiceImpl implements ILoginService {
 
         //用户登录信息
         userInfo(sysUser, result);
+        //update-begin--Author:liusq  Date:20210126  for：登录成功，删除redis中的验证码
+        redisUtil.del(realKey);
+        //update-begin--Author:liusq  Date:20210126  for：登录成功，删除redis中的验证码
         //update-begin--Author:wangshuai  Date:20200714  for：登录日志没有记录人员
         LoginUser loginUser = new LoginUser();
         BeanUtils.copyProperties(sysUser, loginUser);

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java

@@ -1015,4 +1015,43 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 	public List<SysDepartTreeModel> listSonDepartsByDepId(String departId) {
 		return sysDepartService.listSonDepartsByDepId(departId);
 	}
+
+	/**
+	 * 获取公司下级部门和所有用户id信息
+	 * @param orgCode
+	 * @return
+	 */
+	@Override
+	public List<Map> getDeptUserByOrgCode(String orgCode) {
+		//1.获取公司信息
+		SysDepart comp=sysDepartService.queryCompByOrgCode(orgCode);
+		if(comp!=null){
+			//2.获取公司下级部门
+			List<SysDepart> departs=sysDepartService.queryDeptByPid(comp.getId());
+			//3.获取部门下的人员信息
+			List<Map> list=new ArrayList();
+			//4.处理部门和下级用户数据
+			for (SysDepart dept:departs) {
+				Map map=new HashMap();
+				//部门名称
+				String departName = dept.getDepartName();
+				//根据部门编码获取下级部门id
+				List<String> listIds = departMapper.getSubDepIdsByDepId(dept.getId());
+				//根据下级部门ids获取下级部门的所有用户
+				List<SysUserDepart> userList = sysUserDepartService.list(new QueryWrapper<SysUserDepart>().in("dep_id",listIds));
+				List<String> userIds = new ArrayList<>();
+				for(SysUserDepart userDepart : userList){
+					if(!userIds.contains(userDepart.getUserId())){
+						userIds.add(userDepart.getUserId());
+					}
+				}
+				map.put("name",departName);
+				map.put("ids",userIds);
+				list.add(map);
+			}
+			return list;
+		}
+		return null;
+	}
+
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysDepartServiceImpl.java

@@ -457,6 +457,49 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
         return treelist;
     }
 
+
+	/**
+	 * 根据parentId查询部门树
+	 * @param parentId
+	 * @return
+	 */
+	@Override
+	public List<SysDepartTreeModel> queryTreeListByPid(String parentId) {
+		List<SysDepart> list = this.baseMapper.queryTreeListByPid(parentId);
+		List<SysDepartTreeModel> records = new ArrayList<>();
+		for (int i = 0; i < list.size(); i++) {
+			SysDepart depart = list.get(i);
+			SysDepartTreeModel treeModel = new SysDepartTreeModel();
+			FindsDepartsChildrenUtil.convertSysDepartToSysDepartTreeModel(depart, treeModel);
+
+			//TODO 异步树加载key拼接__+时间戳,以便于每次展开节点会刷新数据
+			treeModel.setKey(treeModel.getKey()+"__"+System.currentTimeMillis());
+			Integer count=this.baseMapper.queryCountByPid(depart.getId());
+			if(count>0){
+				treeModel.setIsLeaf(false);
+			}else{
+				treeModel.setIsLeaf(true);
+			}
+			records.add(treeModel);
+		}
+		return records;
+	}
+	@Override
+	public SysDepart queryCompByOrgCode(String orgCode) {
+		int length = YouBianCodeUtil.zhanweiLength;
+		String compyOrgCode = orgCode.substring(0,length);
+		return this.baseMapper.queryCompByOrgCode(compyOrgCode);
+	}
+	/**
+	 * 根据id查询下级部门
+	 * @param pid
+	 * @return
+	 */
+	@Override
+	public List<SysDepart> queryDeptByPid(String pid) {
+		return this.baseMapper.queryDeptByPid(pid);
+	}
+
 	/**
      * 根据关键字筛选部门信息
      * @param keyWord

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/util/FindsDepartsChildrenUtil.java

@@ -1,12 +1,9 @@
 package com.jero.modules.system.util;
 
-import com.jero.common.constant.CommonConstant;
 import com.jero.common.system.vo.SysDepartTreeModel;
-import com.jero.common.util.RedisUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.system.entity.SysDepart;
 import com.jero.modules.system.model.DepartIdModel;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,13 +18,6 @@ import java.util.List;
  */
 public class FindsDepartsChildrenUtil {
 
-	//部门树信息-树结构
-	//private static List<SysDepartTreeModel> sysDepartTreeList = new ArrayList<SysDepartTreeModel>();
-	
-	//部门树id-树结构
-    //private static List<DepartIdModel> idList = new ArrayList<>();
-
-
     /**
      * queryTreeList的子方法 ====1=====
      * 该方法是s将SysDepart类型的list集合转换成SysDepartTreeModel类型的集合

jero-boot/jero-boot-single-startup/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jero-boot</artifactId>
         <groupId>com.jero.boot</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

jero-boot/jero-boot-single-startup/src/main/resources/application-dev.yml

@@ -131,14 +131,14 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
-#          url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+          url: jdbc:mysql://10.0.3.44:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
-#          username: root
-#          password: 123456
-#          driver-class-name: com.mysql.cj.jdbc.Driver
-          url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
           username: root
           password: 123456
           driver-class-name: com.mysql.cj.jdbc.Driver
+#          url: jdbc:mysql://127.0.0.1:3306/jero-boot?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+#          username: root
+#          password: 123456
+#          driver-class-name: com.mysql.cj.jdbc.Driver
           # 多数据源配置
           #multi-datasource1:
           #url: jdbc:mysql://localhost:3306/jero-boot2?useUnicode=true&characterEncoding=utf8&autoReconnect=true&zeroDateTimeBehavior=convertToNull&transformedBitIsBoolean=true&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai

jero-boot/jero-boot-single-startup/src/main/resources/banner.txt

@@ -9,6 +9,6 @@ ${AnsiColor.BRIGHT_BLUE}
 
 
 ${AnsiColor.BRIGHT_GREEN}
-jero  Boot Version: 2.4.2
+jero  Boot Version: 2.4.3
 Spring Boot Version: ${spring-boot.version}${spring-boot.formatted-version}
 ${AnsiColor.BLACK}

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/blob.ftl

@@ -29,5 +29,4 @@
 <#else>
     @ApiModelProperty(value = "${po.filedComment}")
     private ${po.fieldType} ${po.fieldName};
-
 </#if>

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/utils.ftl

@@ -15,7 +15,15 @@
     <#return text>
   </#if>
 </#function>
-<#---->
+<#--下划线转驼峰-->
+<#function dashedToCamel(str)>
+    <#assign text=""/>
+    <#assign strlist = str?split("_")/>
+    <#list strlist as v>
+        <#assign text=text+v?cap_first/>
+    </#list>
+    <#return text?uncap_first>
+</#function>
 <#-- 驼峰转下划线 -->
 <#function camelToDashed(str, case='normal')>
   <#return camelToChar(str, "_", case)>
@@ -61,8 +69,6 @@
         <#return true>
       </#if>
     </#if>
-  <#elseif po.defaultVal??>
-    <#return true>
   </#if>
   <#return false>
 </#function>
@@ -84,6 +90,15 @@
   </#if>
 </#function>
 
+<#-- ** 如果Blob就显示model方式 String * -->
+<#function autoStringSuffixForModel po>
+    <#if  po.fieldDbType=='Blob'>
+        <#return "${po.fieldName}String">
+    <#else>
+        <#return "${po.fieldName}">
+    </#if>
+</#function>
+
 <#-- ** 高级查询生成 * -->
 <#function superQueryFieldList po>
     <#assign superQuery_dictTable="">

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/common/validatorRulesTemplate/core.ftl

@@ -1,15 +1,7 @@
 <#include "../utils.ftl">
 <#if po.isShow == 'Y' && poHasCheck(po)>
     <#if po.fieldName != 'id'>
-          ${po.fieldName}: {
+           ${po.fieldName}: [
-          <#if po.defaultVal??>
-            <#if po.fieldDbType=="BigDecimal" || po.fieldDbType=="double" || po.fieldDbType=="int">
-            initialValue:${po.defaultVal},
-            <#else>
-            initialValue:"${po.defaultVal}",
-            </#if>
-          </#if>
-            rules: [
         <#assign fieldValidType = po.fieldValidType!''>
     <#-- 非空校验 -->
     <#if po.nullable == 'N' || fieldValidType == '*'>

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -2,6 +2,7 @@ package ${bussiPackage}.${entityPackage}.entity;
 
 import java.io.Serializable;
 import java.io.UnsupportedEncodingException;
+import java.util.Date;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -46,6 +47,8 @@ public class ${entityName} implements Serializable {
       <#elseif po.dictField?default("")?trim?length gt 1>
         <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
       </#if>
+    <#elseif po.classType=='sel_tree'>
+        <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
     </#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
@@ -54,13 +57,13 @@ public class ${entityName} implements Serializable {
   		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
 			<#else>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
@@ -81,34 +84,6 @@ public class ${entityName} implements Serializable {
   			</#if>
   		</#if>-->
     </#if>
-     <#if po.fieldValidType??>
-        <#if po.fieldValidType=="e">
-    @javax.validation.constraints.Email(message = "请输入正确的邮箱")
-            <#elseif po.fieldValidType=="m">
-    @javax.validation.constraints.Pattern(regexp = "^1(?:3\\d|4[4-9]|5[0-35-9]|6[67]|7[013-8]|8\\d|9\\d)\\d{8}$",message = "请输入正确的手机号")
-            <#elseif po.fieldValidType=="n6-16">
-    @javax.validation.constraints.Min(value = 6L,message = "数字长度应为6-16")
-    @javax.validation.constraints.Max(value = 16L,message = "数字长度应为6-16")
-            <#elseif po.fieldValidType=="*6-16">
-    @javax.validation.constraints.Pattern(regexp = "^.{6,16}$"message = "长度应为6-16")
-            <#elseif po.fieldValidType=="url">
-    @org.hibernate.validator.constraints.URL(message = "请输入正确的网址")
-            <#elseif po.fieldValidType=="p">
-    @javax.validation.constraints.Pattern(regexp = "^\\d{6}$",message = "请输入正确的邮政编码")
-            <#elseif po.fieldValidType=="s">
-    @javax.validation.constraints.Pattern(regexp = "^[a-zA-Z]{1}$",message = "请输入正确的字母")
-            <#elseif po.fieldValidType=="n">
-    @javax.validation.constraints.Pattern(regexp = "^\\d+$",message = "请输入正确的数字")
-            <#elseif po.fieldValidType=="z">
-    @javax.validation.constraints.Pattern(regexp = "^-?[1-9]\\d+$",message = "请输入正确的整数")
-            <#elseif po.fieldValidType=="*">
-    @javax.validation.constraints.NotNull(message = "不能为空")
-             <#elseif po.fieldValidType=="s6-18">
-    @org.hibernate.validator.constraints.Length(min = 6, max = 18, message = "字符串长度应为6-18")
-             <#elseif po.fieldValidType=="money">
-    @javax.validation.constraints.Pattern(regexp = "(^[1-9]([0-9]+)?(\\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\\.[0-9]([0-9])?$)",message = "请输入正确的金额")
-        </#if>
-     </#if>
     <#include "/common/blob.ftl">
 	</#list>
 }

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -50,7 +50,7 @@
             <#elseif po.classType=='pca'>
               <#if query_field_no gt 1>  </#if><j-area-linkage type="cascader" v-model="queryParam.${po.fieldName}" placeholder="请选择省市区"/>
             <#elseif po.classType=='popup'>
-              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')"/>
+              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')" :multi="${po.extendParams.popupMulti?c}"/>
 			<#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
 			<#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
 			<#if po.dictTable?default("")?trim?length gt 1>
@@ -58,10 +58,10 @@
 			<#elseif po.dictField?default("")?trim?length gt 1>
               <#if query_field_no gt 1>  </#if><j-dict-select-tag placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" dictCode="${po.dictField}"/>
 			<#else>
-              <#if query_field_no gt 1>  </#if><j-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-input>
+              <#if query_field_no gt 1>  </#if><a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
 			</#if>
 			<#else>
-              <#if query_field_no gt 1>  </#if><j-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></j-input>
+              <#if query_field_no gt 1>  </#if><a-input placeholder="请输入${po.filedComment}" v-model="queryParam.${po.fieldName}"></a-input>
 			</#if>
             <#if query_field_no gt 1>  </#if></a-form-item>
           <#if query_field_no gt 1>  </#if></a-col>
@@ -289,7 +289,7 @@
             <#elseif po.classType=='switch'>
             dataIndex: '${po.fieldName}',
             customRender: (text) => (text ? filterMultiDictText(this.dictOptions['${po.fieldName}'], text) : ''),
-            <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
+            <#elseif po.classType == 'sel_tree' || po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
             dataIndex: '${po.fieldName}_dictText'
             <#elseif po.classType=='cat_tree'>
             <#if list_need_category>
@@ -342,10 +342,9 @@
     <#if list_need_switch>
     <#list columns as po>
     <#if po.classType=='switch'>
-      <#if po.dictField?default("")?trim?length gt 1>
-      <#assign switch_extend_arr=po.dictField?eval>
-      <#else>
       <#assign switch_extend_arr=['Y','N']>
+      <#if po.dictField?default("")?contains("[")>
+        <#assign switch_extend_arr=po.dictField?eval>
       </#if>
       <#list switch_extend_arr as a>
        <#if a_index == 0>

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei

@@ -3,10 +3,12 @@
 <template>
   <a-spin :spinning="confirmLoading">
     <j-form-container :disabled="formDisabled">
-      <a-form :form="form" slot="detail">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+<#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
+<#assign bpm_flag=false>
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
 <#assign form_span = 12>
@@ -16,6 +18,9 @@
 <#assign form_span = 6>
 </#if>
 <#list columns as po>
+<#if po.fieldDbName=='bpm_status'>
+  <#assign bpm_flag=true>
+</#if>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
@@ -24,63 +29,65 @@
 		<#assign form_field_dictCode="${po.dictField}">
 	</#if>
           <a-col :span="${form_span}">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
 	<#if po.classType =='date'>
-              <j-date date-format="YYYY-MM-DD" show-type="day" placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}"  style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='datetime'>
-              <j-date date-format="YYYY-MM-DD HH:mm:ss" show-type="time" placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-date placeholder="请选择${po.filedComment}"  v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='time'>
-              <j-time date-format="YYYY-MM-DD HH:mm:ss" show-type="time" placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-time placeholder="请选择${po.filedComment}"  v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='popup'>
+	    <#assign form_popup=true>
               <j-popup
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                v-model="model.${po.fieldName}"
-                :trigger-change="true"
+                field="${po.fieldName}"
                 org-fields="${po.dictField}"
                 dest-fields="${Format.underlineToHump(po.dictText)}"
                 code="${po.dictTable}"
-                @callback="popupCallback"
+                :multi="${po.extendParams.popupMulti?c}"
+                @input="popupCallback"
                 <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.classType =='sel_depart'>
-              <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" multi <#if po.readonly=='Y'>disabled</#if> />
+              <j-select-depart v-model="model.${po.fieldName}" multi <#if po.readonly=='Y'>disabled</#if> />
 <#elseif po.classType =='switch'>
-              <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
+              <j-switch v-model="model.${po.fieldName}" <#if po.dictField != 'is_open'>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
 	<#elseif po.classType =='pca'>
-             <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if> />
+             <j-area-linkage type="cascader" v-model="model.${po.fieldName}" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if> />
 	<#elseif po.classType =='markdown'>
-              <j-markdown-editor v-decorator="[${autoStringSuffix(po)},{initialValue:''}]" id="${po.fieldName}"></j-markdown-editor>
+              <j-markdown-editor v-model="model.${autoStringSuffixForModel(po)}" id="${po.fieldName}"></j-markdown-editor>
     <#elseif po.classType =='password'>
-              <a-input-password v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <a-input-password v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='sel_user'>
-              <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-select-user-by-dep v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='textarea'>
-              <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <a-textarea v-model="model.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list' || po.classType=='radio'>
-              <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-dict-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-              <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-multi-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='sel_search'>
-              <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
+              <j-search-select-tag v-model="model.${po.fieldName}" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
     <#elseif po.classType=='cat_tree'>
     	<#assign form_cat_tree = true>
-              <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
+              <j-category-select v-model="model.${po.fieldName}" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
     	<#if po.dictText?default("")?trim?length gt 1>
     	<#assign form_cat_back = "${po.dictText}">
     	</#if>
 	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-              <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <a-input-number v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='file'>
-              <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
+              <j-upload v-model="model.${po.fieldName}"  <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
 	<#elseif po.classType=='image'>
-              <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
+              <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
 	<#elseif po.classType=='umeditor'>
-              <j-editor v-decorator="[${autoStringSuffix(po)},{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-editor v-model="model.${autoStringSuffixForModel(po)}" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.fieldDbType=='Blob'>
-              <a-input v-decorator="[${autoStringSuffix(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+              <a-input v-model="model.${autoStringSuffixForModel(po)}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
 		<#elseif po.classType == 'sel_tree'>
   	          <j-tree-select
                 ref="treeSelect"
                 placeholder="请选择${po.filedComment}"
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                v-model="model.${po.fieldName}"
                 <#if po.dictText??>
                 <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
                 dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
@@ -94,22 +101,19 @@
                 <#if po.readonly=='Y'>disabled</#if>>
               </j-tree-select>
 	<#else>
-              <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" :maxLength="${po.fieldLength}" <#if po.readonly=='Y'>disabled</#if> ></a-input>
+              <a-input v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if> ></a-input>
     </#if>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
 </#if>
 </#list>
-          <#if form_cat_tree && form_cat_back?length gt 1>
+      <#if bpm_flag>
-            <a-form-item v-show="false">
-              <a-input v-decorator="['${form_cat_back}']"></a-input>
-            </a-form-item>
-          </#if>
           <a-col v-if="showFlowSubmitButton" :span="24" style="text-align: center">
             <a-button @click="submitForm">提 交</a-button>
           </a-col>
+     </#if>
         </a-row>
-      </a-form>
+      </a-form-model>
     </j-form-container>
   </a-spin>
 </template>
@@ -117,7 +121,6 @@
 <script>
 
   import { httpAction, getAction } from '@/api/manage'
-  import pick from 'lodash.pick'
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
@@ -125,6 +128,7 @@
     components: {
     },
     props: {
+     <#if bpm_flag>
       //流程表单data
       formData: {
         type: Object,
@@ -137,6 +141,7 @@
         default: false,
         required: false
       },
+       </#if>
       //表单禁用
       disabled: {
         type: Boolean,
@@ -146,8 +151,9 @@
     },
     data () {
       return {
-        form: this.$form.createForm(this),
+        model:{
-        model: {},
+            <#include "/common/init/initValue.ftl">
+         },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -167,14 +173,17 @@
     },
     computed: {
       formDisabled(){
+       <#if bpm_flag>
         if(this.formBpm===true){
           if(this.formData.disabled===false){
             return false
           }
           return true
         }
+        </#if>
         return this.disabled
       },
+       <#if bpm_flag>
       showFlowSubmitButton(){
         if(this.formBpm===true){
           if(this.formData.disabled===false){
@@ -183,23 +192,25 @@
         }
         return false
       }
+     </#if>
     },
     created () {
+       //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      <#if bpm_flag>
       //如果是流程中表单，则需要加载流程表单data
       this.showFlowData();
+      </#if>
     },
     methods: {
       add () {
-        this.edit({});
+        this.edit(this.modelDefault);
       },
       edit (record) {
-        this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id'><#if po.fieldDbType=='Blob'>,'${po.fieldName}String'<#else>,'${po.fieldName}'</#if></#if></#list>))
-        })
       },
+        <#if bpm_flag>
       //渲染流程表单数据
       showFlowData(){
         if(this.formBpm === true){
@@ -211,11 +222,12 @@
           });
         }
       },
+       </#if>
       submitForm () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
+        this.$refs.form.validate(valid => {
-          if (!err) {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -226,9 +238,7 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let formData = Object.assign(this.model, values);
+            httpAction(httpurl,this.model,method).then((res)=>{
-            console.log("表单提交数据",formData)
-            httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -242,12 +252,14 @@
          
         })
       },
-      popupCallback(row){
+       <#if form_popup>
-        this.form.setFieldsValue(pick(row<#list columns as po><#if po.fieldName !='id'><#if po.fieldDbType=='Blob'>,'${po.fieldName}String'<#else>,'${po.fieldName}'</#if></#if></#list>))
+      popupCallback(value,row){
+         this.model = Object.assign(this.model, row);
       },
+       </#if>
       <#if form_cat_tree>
       handleCategoryChange(value,backObj){
-        this.form.setFieldsValue(backObj)
+         this.model = Object.assign(this.model, backObj);
       }
       </#if>
     }

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei

@@ -14,6 +14,7 @@
     placement="right"
     :closable="false"
     @close="close"
+    destroyOnClose
     :visible="visible">
     <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit" normal></${Format.humpToShortbar(entityName)}-form>
     <div class="drawer-footer">

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -41,6 +41,8 @@ public class ${entityName} implements Serializable {
 		<#elseif po.dictField?default("")?trim?length gt 1>
 			<#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
 	</#if>
+	<#elseif po.classType=='sel_tree'>
+		<#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
 	</#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
@@ -49,13 +51,13 @@ public class ${entityName} implements Serializable {
   		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
 			<#else>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/service/impl/${entityName}ServiceImpl.javai

@@ -35,6 +35,8 @@ public class ${entityName}ServiceImpl extends ServiceImpl<${entityName}Mapper, $
 
 	@Override
 	public void add${entityName}(${entityName} ${entityName?uncap_first}) {
+	   //新增时设置hasChild为0
+	    ${entityName?uncap_first}.set${hasChildrenField?cap_first}(I${entityName}Service.NOCHILD);
 		if(oConvertUtils.isEmpty(${entityName?uncap_first}.get${pidFieldName?cap_first}())){
 			${entityName?uncap_first}.set${pidFieldName?cap_first}(I${entityName}Service.ROOT_PID_VALUE);
 		}else{

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -45,7 +45,7 @@
             <#elseif po.classType=='sel_user'>
               <#if query_field_no gt 1>  </#if><j-select-user-by-dep placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}"/>
             <#elseif po.classType=='switch'>
-              <#if query_field_no gt 1>  </#if><j-switch placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if> query></j-switch>
+              <#if query_field_no gt 1>  </#if><j-switch placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" <#if po.dictField!= 'is_open'>:options="${po.dictField}"</#if> query></j-switch>
             <#elseif po.classType=='sel_depart'>
               <#if query_field_no gt 1>  </#if><j-select-depart placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}"/>
             <#elseif po.classType=='list_multi'>
@@ -59,7 +59,7 @@
             <#elseif po.classType=='pca'>
               <#if query_field_no gt 1>  </#if><j-area-linkage type="cascader" v-model="queryParam.${po.fieldName}" placeholder="请选择省市区"/>
             <#elseif po.classType=='popup'>
-              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')"/>
+              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')" :multi="${po.extendParams.popupMulti?c}"/>
             <#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
             <#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
             <#if po.dictTable?default("")?trim?length gt 1>
@@ -265,14 +265,22 @@
             <#elseif po.classType=='image'>
             dataIndex: '${po.fieldName}',
             scopedSlots: {customRender: 'imgSlot'}
-            <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
+            <#elseif po.classType == 'sel_tree' || po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
             dataIndex: '${po.fieldName}_dictText'
             <#elseif po.classType=='switch'>
             dataIndex: '${po.fieldName}',
-            <#if po.dictField?default("")?trim?length gt 1>
+            <#if po.dictField != 'is_open'>
             customRender: (text) => (!text ? "" : (text == ${po.dictField}[0] ? "是" : "否"))
             <#else>
             customRender: (text) => (!text ? "" : (text == "Y" ? "是" : "否"))
+            </#if>
+            <#elseif po.classType=='cat_tree'>
+            <#if list_need_category>
+            dataIndex: '${po.fieldName}',
+            customRender: (text) => (text ? filterMultiDictText(this.dictOptions['${po.fieldName}'], text) : '')
+            <#else>
+            dataIndex: '${po.fieldName}',
+            customRender: (text, record) => (text ? record['${po.dictText}'] : '')
             </#if>
 			<#else>
             dataIndex: '${po.fieldName}'
@@ -285,6 +293,7 @@
             title: '操作',
             dataIndex: 'action',
             align:"center",
+            fixed:"right",
             width:147,
             scopedSlots: { customRender: 'action' },
           }

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/default/tree/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -8,11 +8,11 @@
     switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel"
-    :destroyOnClose="true"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
 <#assign pidFieldName = "">
+<#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
 <#list columns as po>
@@ -23,13 +23,13 @@
 	<#elseif po.dictField?default("")?trim?length gt 1>
 		<#assign form_field_dictCode="${po.dictField}">
 	</#if>
-        <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
+        <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
 	<#if po.fieldDbName == tableVo.extendParams.pidField>
 		<#assign pidFieldName = po.fieldName>
           <j-tree-select
             ref="treeSelect"
             placeholder="请选择${po.filedComment}"
-            v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+            v-model="model.${po.fieldName}"
             dict="${tableVo.tableName},${tableVo.extendParams.textField},id"
             pidField="${tableVo.extendParams.pidField}"
             pidValue="0"
@@ -37,57 +37,59 @@
             <#if po.readonly=='Y'>disabled</#if>>
           </j-tree-select>
 	<#elseif po.classType =='date'>
-          <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+          <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='datetime'>
-          <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+          <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='time'>
-          <j-time placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+          <j-time placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='switch'>
-          <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if>></j-switch>
+          <j-switch v-model="model.${po.fieldName}" <#if po.dictField != 'is_open'>:options="${po.dictField}"</#if>></j-switch>
 	<#elseif po.classType =='popup'>
+	     <#assign form_popup=true>
           <j-popup
-            v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+            v-model="model.${po.fieldName}"
-            :trigger-change="true"
+            field="${po.fieldName}"
             org-fields="${po.dictField}"
             dest-fields="${Format.underlineToHump(po.dictText)}"
             code="${po.dictTable}"
-            @callback="popupCallback"
+            :multi="${po.extendParams.popupMulti?c}"
+            @input="popupCallback"
             <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='sel_depart'>
-          <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" <#if po.readonly=='Y'>disabled</#if>/>
+          <j-select-depart v-model="model.${po.fieldName}"  <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='sel_user'>
-          <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" <#if po.readonly=='Y'>disabled</#if>/>
+          <j-select-user-by-dep v-model="model.${po.fieldName}"  <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='textarea'>
-          <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+          <a-textarea v-model="model.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list' || po.classType=='radio'>
-          <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+          <j-dict-select-tag type="${po.classType}" v-model="model.${po.fieldName}"  dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-          <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+          <j-multi-select-tag type="${po.classType}" v-model="model.${po.fieldName}"  dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-          <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+          <a-input-number v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='file'>
-          <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
+          <j-upload v-model="model.${po.fieldName}"  <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
 	<#elseif po.classType=='image'>
-          <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
+          <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
   <#elseif po.classType=='sel_search'>
-          <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
+          <j-search-select-tag v-model="model.${po.fieldName}" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
 	<#elseif po.classType=='cat_tree'>
       <#assign form_cat_tree = true>
-          <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
+          <j-category-select v-model="model.${po.fieldName}" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
       <#if po.dictText?default("")?trim?length gt 1>
       <#assign form_cat_back = "${po.dictText}">
       </#if>
   <#elseif po.classType =='pca'>
-          <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if> />
+          <j-area-linkage type="cascader" v-model="model.${po.fieldName}" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if> />
 	<#elseif po.classType=='umeditor'>
-          <j-editor v-decorator="[${autoStringSuffix(po)},{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
+          <j-editor v-model="model.${autoStringSuffixForModel(po)}" <#if po.readonly=='Y'>disabled</#if>/>
   <#elseif po.classType =='markdown'>
-          <j-markdown-editor v-decorator="[${autoStringSuffix(po)},{initialValue:''}]" id="${po.fieldName}"></j-markdown-editor>
+          <j-markdown-editor v-model="model.${autoStringSuffixForModel(po)}" id="${po.fieldName}"></j-markdown-editor>
 	<#elseif po.classType == 'sel_tree'>
 	          <j-tree-select
               ref="treeSelect"
               placeholder="请选择${po.filedComment}"
-              v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+              v-model="model.${po.fieldName}"
               <#if po.dictText??>
               <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
               dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
@@ -101,18 +103,13 @@
               <#if po.readonly=='Y'>disabled</#if>>
             </j-tree-select>
 	<#else>
-          <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+          <a-input v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
-    </#if>
-        </a-form-item>
-        <#if form_cat_tree && form_cat_back?length gt 1>
-        <a-form-item v-show="false">
-          <a-input v-decorator="['${form_cat_back}']"></a-input>
-        </a-form-item>
     </#if>
+        </a-form-model-item>
 </#if>
 </#list>    
         
-      </a-form>
+      </a-form-model>
     </a-spin>
   </j-modal>
 </template>
@@ -120,7 +117,6 @@
 <script>
 
   import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
   import { validateDuplicateValue } from '@/utils/util'
   export default {
     name: "${entityName}Modal",
@@ -128,11 +124,12 @@
     },
     data () {
       return {
-        form: this.$form.createForm(this),
         title:"操作",
         width:800,
         visible: false,
-        model: {},
+        model:{
+           <#include "/common/init/initValue.ftl">
+         },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -154,28 +151,28 @@
       }
     },
     created () {
+       //备份model原始值
+       this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
       add (obj) {
-        this.edit(obj);
+        this.modelDefault.${pidFieldName}=''
+        this.edit(Object.assign(this.modelDefault , obj));
       },
       edit (record) {
-        this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>))
-        })
       },
       close () {
         this.$emit('close');
         this.visible = false;
+        this.$refs.form.clearValidate()
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
+       this.$refs.form.validate(valid => {
-          if (!err) {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -186,16 +183,12 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let old_pid = this.model[this.pidField]
+             if(this.model.id && this.model.id === this.model[this.pidField]){
-            let formData = Object.assign(this.model, values);
-            let new_pid = this.model[this.pidField]
-             if(this.model.id && this.model.id === new_pid){
               that.$message.warning("父级节点不能选择自己");
               that.confirmLoading = false;
               return;
             }
-            console.log("表单提交数据",formData)
+            httpAction(httpurl,this.model,method).then((res)=>{
-            httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 this.$emit('ok');
@@ -206,16 +199,24 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+             return false
           }
-         
         })
       },
       handleCancel () {
         this.close()
       },
-      popupCallback(row){
+      <#if form_popup>
-        this.form.setFieldsValue(pick(row<#list columns as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>))
+      popupCallback(value,row){
+         this.model = Object.assign(this.model, row);
       },
+      </#if>
+      <#if form_cat_tree>
+      handleCategoryChange(value,backObj){
+        this.model = Object.assign(this.model, backObj);
+       },
+      </#if>
       submitSuccess(formData,flag){
         if(!formData.id){
           let treeData = this.$refs.treeSelect.getCurrTreeData()

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/controller/${entityName}Controller.javai

@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
-import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.base.controller.JeecgController;
 import com.jero.common.api.vo.Result;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
 @RestController
 @RequestMapping("/${entityPackage}/${entityName?uncap_first}")
 @Slf4j
-public class ${entityName}Controller extends JeroController<${entityName}, I${entityName}Service> {
+public class ${entityName}Controller extends JeecgController<${entityName}, I${entityName}Service> {
 
 	@Autowired
 	private I${entityName}Service ${entityName?uncap_first}Service;

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -40,6 +40,8 @@ public class ${entityName} implements Serializable {
       <#elseif po.dictField?default("")?trim?length gt 1>
         <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
     </#if>
+    <#elseif po.classType=='sel_tree'>
+        <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
     </#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai

@@ -24,7 +24,7 @@ import java.io.UnsupportedEncodingException;
  */
 @Data
 @TableName("${subTab.tableName}")
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}")
 public class ${subTab.entityName} implements Serializable {
     private static final long serialVersionUID = 1L;
 

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -42,7 +42,7 @@
             <#elseif po.classType=='pca'>
               <#if query_field_no gt 1>  </#if><j-area-linkage type="cascader" v-model="queryParam.${po.fieldName}" placeholder="请选择省市区"/>
             <#elseif po.classType=='popup'>
-              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')"/>
+              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')" :multi="${po.extendParams.popupMulti?c}"/>
 			<#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
 			<#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
 			<#if po.dictTable?default("")?trim?length gt 1>
@@ -84,6 +84,9 @@
 <#if po.classType=='cat_tree' && po.dictText?default("")?trim?length == 0>
 <#assign list_need_category=true>
 </#if>
+<#if po.classType=='pca'>
+<#assign list_need_pca=true>
+</#if>
 </#list>
 <#-- 结束循环 -->
 <#t>
@@ -260,11 +263,11 @@
             <#elseif po.classType=='image'>
             dataIndex: '${po.fieldName}',
             scopedSlots: {customRender: 'imgSlot'}
-			<#elseif po.classType=='sel_search' || po.classType=='list_multi' || po.classType=='list' || po.classType=='radio' || po.classType=='checkbox' ||  po.classType=='sel_depart'>
+			<#elseif po.classType=='sel_tree' || po.classType=='sel_search' || po.classType=='list_multi' || po.classType=='list' || po.classType=='radio' || po.classType=='checkbox' ||  po.classType=='sel_depart'>
             dataIndex: '${po.fieldName}_dictText',
             <#elseif po.classType=='switch'>
             dataIndex: '${po.fieldName}',
-            <#if po.dictField?default("")?trim?length gt 1>
+            <#if po.dictField != 'is_open'>
             customRender: (text) => (!text ? "" : (text == ${po.dictField}[0] ? "是" : "否"))
             <#else>
             customRender: (text) => (!text ? "" : (text == "Y" ? "是" : "否"))

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/[1-n]List.vuei

@@ -82,12 +82,12 @@
 
 <script>
 
-  import { JeroListMixin } from '@/mixins/JeroListMixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
   import ${sub.entityName}Modal from './modules/${sub.entityName}Modal'
 
   export default {
     name: "${sub.entityName}List",
-    mixins:[JeroListMixin],
+    mixins:[JeecgListMixin],
     components: { ${sub.entityName}Modal },
     props:{
       mainId:{
@@ -157,7 +157,7 @@
             dataIndex: '${po.fieldName}_dictText',
 			<#elseif po.classType=='switch'>
             dataIndex: '${po.fieldName}',
-            <#if po.dictField?default("")?trim?length gt 1>
+            <#if po.dictField != 'is_open'>
             customRender: (text) => (!text ? "" : (text == ${po.dictField}[0] ? "是" : "否"))
             <#else>
             customRender: (text) => (!text ? "" : (text == "Y" ? "是" : "否"))

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -10,8 +10,9 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-row>
+<#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
 <#assign form_span = 24>
@@ -24,63 +25,65 @@
 		<#assign form_field_dictCode="${po.dictField}">
 	</#if>
           <a-col :span="${form_span}">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
 	<#if po.classType =='date'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='datetime'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='time'>
-               <j-time placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+               <j-time placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='popup'>
+	      <#assign form_popup=true>
               <j-popup
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                v-model="model.${po.fieldName}"
-                :trigger-change="true"
+               field="${po.fieldName}"
                 org-fields="${po.dictField}"
                 dest-fields="${Format.underlineToHump(po.dictText)}"
                 code="${po.dictTable}"
-                @callback="popupCallback"
+                :multi="${po.extendParams.popupMulti?c}"
+                @input="popupCallback"
                 <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.classType =='sel_depart'>
-              <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" multi <#if po.readonly=='Y'>disabled</#if>/>
+              <j-select-depart v-model="model.${po.fieldName}" multi <#if po.readonly=='Y'>disabled</#if>/>
 <#elseif po.classType =='switch'>
-              <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
+              <j-switch v-model="model.${po.fieldName}" <#if po.dictField!= 'is_open'>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
 	<#elseif po.classType =='pca'>
-		      <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if>/>
+		      <j-area-linkage type="cascader" v-model="model.${po.fieldName}" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='markdown'>
-	          <j-markdown-editor v-decorator="[${autoStringSuffix(po)},{initialValue:''}]" id="${po.fieldName}"></j-markdown-editor>
+	          <j-markdown-editor v-model="model.${autoStringSuffixForModel(po)}" id="${po.fieldName}"></j-markdown-editor>
     <#elseif po.classType =='password'>
-	          <a-input-password v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+	          <a-input-password v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='sel_user'>
-              <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-select-user-by-dep v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='textarea'>
-              <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <a-textarea v-model="model.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list' || po.classType=='radio'>
-              <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-dict-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-              <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-multi-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='sel_search'>
-              <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
+              <j-search-select-tag v-model="model.${po.fieldName}" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if> />
     <#elseif po.classType=='cat_tree'>
     	<#assign form_cat_tree = true>
-              <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
+              <j-category-select v-model="model.${po.fieldName}" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
     	<#if po.dictText?default("")?trim?length gt 1>
     	<#assign form_cat_back = "${po.dictText}">
     	</#if>
 	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-              <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <a-input-number v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='file'>
-              <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
+              <j-upload v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
 	<#elseif po.classType=='image'>
-              <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
+              <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
 	<#elseif po.classType=='umeditor'>
-              <j-editor v-decorator="[${autoStringSuffix(po)},{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-editor v-model="model.${autoStringSuffixForModel(po)}" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.fieldDbType=='Blob'>
-              <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+              <a-input v-model="model.${autoStringSuffixForModel(po)}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
     <#elseif po.classType == 'sel_tree'>
               <j-tree-select
                 ref="treeSelect"
                 placeholder="请选择${po.filedComment}"
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                v-model="model.${po.fieldName}"
                 <#if po.dictText??>
                 <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
                 dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
@@ -94,19 +97,14 @@
                 <#if po.readonly=='Y'>disabled</#if>>
               </j-tree-select>
 	<#else>
-              <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+              <a-input v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
     </#if>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
 </#if>
 </#list>
-        <#if form_cat_tree && form_cat_back?length gt 1>
-          <a-form-item v-show="false">
-            <a-input v-decorator="['${form_cat_back}']"></a-input>
-          </a-form-item>
-        </#if>
         </a-row>
-      </a-form>
+      </a-form-model>
     </a-spin>
   </j-modal>
 </template>
@@ -114,7 +112,6 @@
 <script>
 
   import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
@@ -123,11 +120,12 @@
     },
     data () {
       return {
-        form: this.$form.createForm(this),
         title:"操作",
         width:800,
         visible: false,
-        model: {},
+        model:{
+        <#include "/common/init/initValue.ftl">
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -147,28 +145,27 @@
       }
     },
     created () {
+    //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
       add () {
-        this.edit({});
+        this.edit(this.modelDefault);
       },
       edit (record) {
-        this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id'><#if po.fieldDbType=='Blob'>,'${po.fieldName}String'<#else>,'${po.fieldName}'</#if></#if></#list>))
-        })
       },
       close () {
         this.$emit('close');
         this.visible = false;
+        this.$refs.form.clearValidate();
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
+        this.$refs.form.validate(valid => {
-          if (!err) {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -179,9 +176,7 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let formData = Object.assign(this.model, values);
+            httpAction(httpurl,this.model,method).then((res)=>{
-            console.log("表单提交数据",formData)
-            httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -192,19 +187,22 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+             return false
           }
-         
         })
       },
       handleCancel () {
         this.close()
       },
-      popupCallback(row){
+       <#if form_popup>
-        this.form.setFieldsValue(pick(row<#list columns as po><#if po.fieldName !='id'><#if po.fieldDbType=='Blob'>,'${po.fieldName}String'<#else>,'${po.fieldName}'</#if></#if></#list>))
+      popupCallback(value,row){
+        this.model = Object.assign(this.model, row);
       },
+       </#if>
       <#if form_cat_tree>
       handleCategoryChange(value,backObj){
-        this.form.setFieldsValue(backObj)
+        this.model = Object.assign(backObj,this.model);
       }
       </#if>
 

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/erp/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Modal.vuei

@@ -12,8 +12,9 @@
     @cancel="handleCancel"
     cancelText="关闭">
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
         <a-row>
+<#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
 <#assign form_span = 24>
@@ -26,72 +27,69 @@
 		<#assign form_field_dictCode="${po.dictField}">
 	</#if>
           <a-col :span="${form_span}">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
 	<#if po.classType =='date'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='datetime'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='time'>
-               <j-time placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+               <j-time placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='popup'>
+	     <#assign form_popup=true>
               <j-popup
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                v-model="model.${po.fieldName}"
-                :trigger-change="true"
+                field="${po.fieldName}"
                 org-fields="${po.dictField}"
                 dest-fields="${Format.underlineToHump(po.dictText)}"
                 code="${po.dictTable}"
-                @callback="popupCallback"
+                :multi="${po.extendParams.popupMulti?c}"
+                @input="popupCallback"
                 <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.classType =='sel_depart'>
-              <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" multi <#if po.readonly=='Y'>disabled</#if>/>
+              <j-select-depart v-model="model.${po.fieldName}"multi <#if po.readonly=='Y'>disabled</#if>/>
 <#elseif po.classType =='switch'>
-              <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
+              <j-switch v-model="model.${po.fieldName}"<#if po.dictField!= 'is_open'>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
 	<#elseif po.classType =='pca'>
-		      <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if>/>
+		      <j-area-linkage type="cascader" v-model="model.${po.fieldName}"placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='markdown'>
-	          <j-markdown-editor v-decorator="[${autoStringSuffix(po)},{initialValue:''}]" id="${po.fieldName}"></j-markdown-editor>
+	          <j-markdown-editor v-model="model.${autoStringSuffixForModel(po)}" id="${po.fieldName}"></j-markdown-editor>
     <#elseif po.classType =='password'>
-	          <a-input-password v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+	          <a-input-password v-model="model.${po.fieldName}"placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='sel_user'>
-              <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-select-user-by-dep v-model="model.${po.fieldName}"<#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='textarea'>
-              <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <a-textarea v-model="model.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list' || po.classType=='radio'>
-              <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-dict-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-              <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-multi-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='sel_search'>
-              <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-search-select-tag v-model="model.${po.fieldName}"dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.classType=='cat_tree'>
     	<#assign form_cat_tree = true>
-              <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
+              <j-category-select v-model="model.${po.fieldName}"pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
     	<#if po.dictText?default("")?trim?length gt 1>
     	<#assign form_cat_back = "${po.dictText}">
     	</#if>
 	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-              <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <a-input-number v-model="model.${po.fieldName}"placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='file'>
-              <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
+              <j-upload v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
 	<#elseif po.classType=='image'>
-              <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
+              <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-model="model.${po.fieldName}"<#if po.readonly=='Y'>disabled</#if>></j-image-upload>
 	<#elseif po.classType=='umeditor'>
-              <j-editor v-decorator="[${autoStringSuffix(po)},{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-editor v-model="model.${autoStringSuffixForModel(po)}" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.fieldDbType=='Blob'>
-              <a-input v-decorator="['${po.fieldName}String'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+              <a-input v-model="model.${autoStringSuffixForModel(po)}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
 	<#else>
-              <a-input v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+              <a-input v-model="model.${po.fieldName}"placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
     </#if>
-            </a-form-item>
+            </a-form-model-item>
           </a-col>
 </#if>
 </#list>
-        <#if form_cat_tree && form_cat_back?length gt 1>
-          <a-form-item v-show="false">
-            <a-input v-decorator="['${form_cat_back}']"></a-input>
-          </a-form-item>
-        </#if>
         </a-row>
-      </a-form>
+      </a-form-model>
     </a-spin>
   </j-modal>
 </template>
@@ -99,7 +97,6 @@
 <script>
 
   import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
   import { validateDuplicateValue } from '@/utils/util'
 
   export default {
@@ -115,11 +112,12 @@
     },
     data () {
       return {
-        form: this.$form.createForm(this),
         title:"操作",
         width:800,
         visible: false,
-        model: {},
+        model:{
+        <#include "/common/init/initValueSub.ftl">
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 5 },
@@ -139,28 +137,27 @@
       }
     },
     created () {
+    //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
     },
     methods: {
       add () {
-        this.edit({});
+        this.edit(this.modelDefault);
       },
       edit (record) {
-        this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list sub.originalColumns as po><#if po.fieldName !='id'><#if po.fieldDbType=='Blob'>,'${po.fieldName}String'<#else>,'${po.fieldName}'</#if></#if></#list>))
-        })
       },
       close () {
         this.$emit('close');
         this.visible = false;
+        this.$refs.form.clearValidate();
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
+        this.$refs.form.validate(valid => {
-          if (!err) {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -171,12 +168,10 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let formData = Object.assign(this.model, values);
             <#list sub.foreignKeys as key>
-            formData['${key?uncap_first}'] = this.mainId
+            this.model['${key?uncap_first}'] = this.mainId
             </#list>
-            console.log("表单提交数据",formData)
+            httpAction(httpurl,this.model,method).then((res)=>{
-            httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -187,19 +182,22 @@
               that.confirmLoading = false;
               that.close();
             })
+          }else{
+             return false
           }
-
         })
       },
       handleCancel () {
         this.close()
       },
-      popupCallback(row){
+      <#if form_popup>
-        this.form.setFieldsValue(pick(row<#list sub.originalColumns as po><#if po.fieldName !='id'><#if po.fieldDbType=='Blob'>,'${po.fieldName}String'<#else>,'${po.fieldName}'</#if></#if></#list>))
+      popupCallback(value,row){
+       this.model = Object.assign(this.model, row);
       },
+       </#if>
       <#if form_cat_tree>
       handleCategoryChange(value,backObj){
-        this.form.setFieldsValue(backObj)
+        this.model = Object.assign(this.model,backObj);
       }
       </#if>
 

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -40,6 +40,8 @@ public class ${entityName} implements Serializable {
       <#elseif po.dictField?default("")?trim?length gt 1>
         <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
     </#if>
+    <#elseif po.classType=='sel_tree'>
+        <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
     </#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
@@ -48,13 +50,13 @@ public class ${entityName} implements Serializable {
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
 			<#else>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai

@@ -22,7 +22,7 @@ import java.io.UnsupportedEncodingException;
  * @Date:   ${.now?string["yyyy-MM-dd"]}
  * @Version: V1.0
  */
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}")
 @Data
 @TableName("${subTab.tableName}")
 public class ${subTab.entityName} implements Serializable {
@@ -41,6 +41,8 @@ public class ${subTab.entityName} implements Serializable {
 			<#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
 		<#elseif po.dictField?default("")?trim?length gt 1>
 			<#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
+		<#elseif po.classType=='sel_tree'>
+			<#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
 		</#if>
 	</#if>
 	/**${po.filedComment}*/
@@ -50,13 +52,13 @@ public class ${subTab.entityName} implements Serializable {
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
 			<#else>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -13,6 +13,8 @@
 <#assign list_need_dict=false>
 <#-- 是否有分类字典 -->
 <#assign list_need_category=false>
+<#-- 是否有省市区 -->
+<#assign list_need_pca=false>
 <#-- 是否有用户选择 -->
 <#assign query_sel_user=false>
 <#-- 是否有部门选择 -->
@@ -89,7 +91,7 @@
              ${indent}<j-multi-select-tag placeholder="请选择${po.filedComment}" dictCode="${query_field_dictCode?default("")}" v-model="queryParam.${po.fieldName}"/>
       <#-- popup组件 -->
       <#elseif po.classType=='popup'>
-             ${indent}<j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')"/>
+             ${indent}<j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')" :multi="${po.extendParams.popupMulti?c}"/>
       <#-- 下拉搜索框 -->
      <#elseif po.classType=='sel_search'>
      <#assign query_sel_search=true>
@@ -137,6 +139,10 @@
   <#if po.classType == 'cat_tree' && (po.dictText!"")?trim?length == 0>
     <#assign list_need_category=true>
   </#if>
+   <#-- 判断是否需要省市区 -->
+  <#if po.classType=='pca'>
+  <#assign list_need_pca=true>
+  </#if>
 </#list>
 <#-- 查询区域-结束循环 -->
 <#if query_field_index gt 2>
@@ -236,6 +242,12 @@
           </div>
         </template>
 
+        <#if list_need_pca>
+        <template slot="pcaSlot" slot-scope="text">
+          <div>{{ getPcaText(text) }}</div>
+        </template>
+        </#if>
+
         <template slot="fileSlot" slot-scope="text">
           <span v-if="!text" style="font-size: 12px;font-style: italic;">无文件</span>
           <a-button
@@ -316,6 +328,9 @@
 <#if query_sel_cat>
   import JCategorySelect from '@comp/jero/JCategorySelect'
 </#if>
+ <#if list_need_pca>
+  import Area from '@/components/_util/Area'
+  </#if>
   import '@/assets/less/TableExpand.less'
 
   export default {
@@ -379,13 +394,16 @@
     <#elseif po.classType=='umeditor'>
             dataIndex: '${po.fieldName}',
             scopedSlots: {customRender: 'htmlSlot'}
+    <#elseif po.classType=='pca'>
+            dataIndex: '${po.fieldName}',
+            scopedSlots: {customRender: 'pcaSlot'}
     <#elseif po.classType=='file'>
             dataIndex: '${po.fieldName}',
             scopedSlots: {customRender: 'fileSlot'}
     <#elseif po.classType=='image'>
             dataIndex: '${po.fieldName}',
             scopedSlots: {customRender: 'imgSlot'}
-    <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
+    <#elseif po.classType == 'sel_tree' || po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
             dataIndex: '${po.fieldName}_dictText'
     <#elseif po.classType=='cat_tree'>
       <#if list_need_category>
@@ -397,7 +415,7 @@
       </#if>
     <#elseif po.classType=='switch'>
             dataIndex: '${po.fieldName}',
-            <#if po.dictField?default("")?trim?length gt 1>
+            <#if po.dictField != 'is_open'>
             customRender: (text) => (!text ? "" : (text == ${po.dictField}[0] ? "是" : "否"))
             <#else>
             customRender: (text) => (!text ? "" : (text == "Y" ? "是" : "否"))
@@ -429,10 +447,16 @@
           exportXlsUrl: '${urlPrefix}/exportXls',
           importExcelUrl: '${urlPrefix}/importExcel',
         },
+        <#if list_need_pca>
+        pcaData:'',
+        </#if>
         superFieldList:[],
       }
     },
     created() {
+      <#if list_need_pca>
+      this.pcaData = new Area()
+      </#if>
       this.getSuperFieldList();
     },
     computed: {
@@ -441,7 +465,11 @@
       }
     },
     methods: {
-
+     <#if list_need_pca>
+      getPcaText(code){
+        return this.pcaData.getText(code);
+      },
+     </#if>
       initDictConfig() {
 <#list columns as po>
   <#if (po.isQuery=='Y' || po.isShowList=='Y') && po.classType!='popup'>

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -5,428 +5,55 @@
     :width="1200"
     :visible="visible"
     :maskClosable="false"
-    :confirmLoading="confirmLoading"
     switchFullscreen
     @ok="handleOk"
+    :okButtonProps="{ class:{'jee-hidden': disableSubmit} }"
     @cancel="handleCancel">
-    <a-spin :spinning="confirmLoading">
+    <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
-      <!-- 主表单区域 -->
-      <a-form :form="form">
-        <a-row>
-<#assign form_cat_tree = false>
-<#assign form_cat_back = "">
-<#assign form_span = 24>
-<#list columns as po>
-<#if po.isShow =='Y' && po.fieldName != 'id'>
-<#assign form_field_dictCode="">
-  <#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
-		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
-	<#elseif po.dictField?default("")?trim?length gt 1>
-		<#assign form_field_dictCode="${po.dictField}">
-	</#if>
-	<#if po.classType =='textarea'>
-          <a-col :span="24">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
-	<#else>
-          <a-col :xs="24" :sm="12">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
-	</#if>
-	<#if po.classType =='date'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='datetime'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='time'>
-              <j-time placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='popup'>
-              <j-popup
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
-                :trigger-change="true"
-                org-fields="${po.dictField}"
-                dest-fields="${Format.underlineToHump(po.dictText)}"
-                code="${po.dictTable}"
-                @callback="popupCallback"
-                <#if po.readonly=='Y'>disabled</#if>/>
-    <#elseif po.classType =='sel_depart'>
-              <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" multi <#if po.readonly=='Y'>disabled</#if>/>
-<#elseif po.classType =='switch'>
-              <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
-	<#elseif po.classType =='pca'>
-		      <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='markdown'>
-	          <j-markdown-editor v-decorator="[${autoStringSuffix(po)},{initialValue:''}]" id="${po.fieldName}"></j-markdown-editor>
-    <#elseif po.classType =='password'>
-	          <a-input-password v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='sel_user'>
-              <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType =='textarea'>
-              <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType=='list' || po.classType=='radio'>
-              <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-              <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType=='sel_search'>
-              <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if>/>
-    <#elseif po.classType=='cat_tree'>
-    	<#assign form_cat_tree = true>
-              <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
-    	<#if po.dictText?default("")?trim?length gt 1>
-    	<#assign form_cat_back = "${po.dictText}">
-    	</#if>
-	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-              <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-	<#elseif po.classType=='file'>
-              <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
-	<#elseif po.classType=='image'>
-              <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
-	<#elseif po.classType=='umeditor'>
-              <j-editor v-decorator="[${autoStringSuffix(po)},{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
-		<#elseif po.classType == 'sel_tree'>
-  	          <j-tree-select
-                ref="treeSelect"
-                placeholder="请选择${po.filedComment}"
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
-                <#if po.dictText??>
-                <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
-                dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
-                <#elseif po.dictText?split(',')[1]??>
-                pidField="${po.dictText?split(',')[1]}"
-                <#elseif po.dictText?split(',')[3]??>
-                hasChildField="${po.dictText?split(',')[3]}"
-                </#if>
-                </#if>
-                pidValue="${po.dictField}"
-                <#if po.readonly=='Y'>disabled</#if>>
-              </j-tree-select>
-	<#else>
-              <a-input v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
-    </#if>
-            </a-form-item>
-            <#if form_cat_tree && form_cat_back?length gt 1>
-            <a-form-item v-show="false">
-              <a-input v-decorator="['${form_cat_back}']"></a-input>
-            </a-form-item>
-            </#if>
-          </a-col>
-</#if>
-</#list>
-
-        </a-row>
-      </a-form>
-
-      <!-- 子表单区域 -->
-      <a-tabs v-model="activeKey" @change="handleChangeTabs">
-<#list subTables as sub><#rt/>
-  <#if sub.foreignRelationType =='1'>
-        <a-tab-pane tab="${sub.ftlDescription}" :key="refKeys[${sub_index}]" :forceRender="true">
-          <${Format.humpToShortbar(sub.entityName)}-form ref="${sub.entityName?uncap_first}Form" @validateError="validateError"></${Format.humpToShortbar(sub.entityName)}-form>
-        </a-tab-pane>
-      
-  <#else>
-        <a-tab-pane tab="${sub.ftlDescription}" :key="refKeys[${sub_index}]" :forceRender="true">
-          <j-editable-table
-            :ref="refKeys[${sub_index}]"
-            :loading="${sub.entityName?uncap_first}Table.loading"
-            :columns="${sub.entityName?uncap_first}Table.columns"
-            :dataSource="${sub.entityName?uncap_first}Table.dataSource"
-            :maxHeight="300"
-            :rowNumber="true"
-            :rowSelection="true"
-            :actionButton="true"/>
-        </a-tab-pane>
-        
-  </#if>
-</#list>
-      </a-tabs>
-
-    </a-spin>
   </j-modal>
 </template>
 
 <script>
-
+  import ${entityName}Form from './${entityName}Form'
-  import pick from 'lodash.pick'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
-  import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
-  import { validateDuplicateValue } from '@/utils/util'
-  <#list subTables as sub>
-  <#if sub.foreignRelationType =='1'>
-  import ${sub.entityName}Form from './${sub.entityName}Form.vue'
-  </#if>
-  </#list>
-
   export default {
     name: '${entityName}Modal',
-    mixins: [JEditableTableMixin],
     components: {
-    <#list subTables as sub>
+      ${entityName}Form
-    <#if sub.foreignRelationType =='1'>
-    ${sub.entityName}Form,
-    </#if>
-    </#list>
     },
     data() {
       return {
-        labelCol: {
+        title:'',
-          xs: { span: 24 },
+        visible: false,
-          sm: { span: 6 },
+        disableSubmit: false
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        labelCol2: {
-          xs: { span: 24 },
-          sm: { span: 3 },
-        },
-        wrapperCol2: {
-          xs: { span: 24 },
-          sm: { span: 20 },
-        },
-        // 新增时子表默认添加几行空数据
-        addDefaultRowNum: 1,
-        <#include "/common/validatorRulesTemplate/main.ftl">
-        refKeys: [<#list subTables as sub>'${sub.entityName?uncap_first}', </#list>],
-        tableKeys:[<#list subTables as sub><#if sub.foreignRelationType =='0'>'${sub.entityName?uncap_first}', </#if></#list>],
-        activeKey: '${subTables[0].entityName?uncap_first}',
-<#list subTables as sub><#rt/>
-        // ${sub.ftlDescription}
-        ${sub.entityName?uncap_first}Table: {
-          loading: false,
-          dataSource: [],
-          columns: [
-<#if sub.foreignRelationType =='0'>
-<#assign popupBackFields = "">
-
-<#-- 循环子表的列 开始 -->
-<#list sub.colums as col><#rt/>
-<#if col.isShow =='Y'>
-    <#if col.filedComment !='外键' >
-            {
-              title: '${col.filedComment}',
-              key: ${autoStringSuffix(col)},
-      <#if col.classType =='date'>
-              type: FormTypes.date,
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='datetime'>
-              type: FormTypes.datetime,
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif "int,decimal,double,"?contains(col.classType)>
-              type: FormTypes.inputNumber,
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='list' || col.classType =='radio'>
-              type: FormTypes.select,
-              <#if col.dictTable?default("")?trim?length gt 1>
-              dictCode:"${col.dictTable},${col.dictText},${col.dictField}",
-              <#else>
-              dictCode:"${col.dictField}",
-              </#if>
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='list_multi' || col.classType =='checkbox'>
-              type: FormTypes.list_multi,
-              <#if col.dictTable?default("")?trim?length gt 1>
-              dictCode:"${col.dictTable},${col.dictText},${col.dictField}",
-              <#else>
-              dictCode:"${col.dictField}",
-              </#if>
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='switch'>
-              type: FormTypes.checkbox,
-              <#if col.dictField?default("")?trim?length gt 1>
-              customValue:${col.dictField},
-              <#else>
-              customValue: ['Y', 'N'],
-              </#if>
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='sel_search'>
-              type: FormTypes.sel_search,
-              <#if col.dictTable?default("")?trim?length gt 1>
-              dictCode:"${col.dictTable},${col.dictText},${col.dictField}",
-              <#else>
-              dictCode:"${col.dictField}",
-              </#if>
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='image'>
-              type: FormTypes.image,
-              token:true,
-              responseName:"message",
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-              <#if col.uploadnum??>
-              number: ${col.uploadnum},
-              </#if>
-      <#elseif col.classType =='file'>
-              type: FormTypes.file,
-              token:true,
-              responseName:"message",
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-              <#if col.uploadnum??>
-              number: ${col.uploadnum},
-              </#if>
-      <#elseif col.classType =='popup'>
-        <#if popupBackFields?length gt 0>
-            <#assign popupBackFields = "${popupBackFields}"+","+"${col.dictText}">
-        <#else>
-            <#assign popupBackFields = "${col.dictText}">
-        </#if>
-              type: FormTypes.popup,
-              popupCode:"${col.dictTable}",
-              destFields:"${col.dictText}",
-              orgFields:"${col.dictField}",
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#else>
-              type: FormTypes.input,
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      </#if>
-      <#if col.classType =='list_multi' || col.classType =='checkbox'>
-              width:"250px",
-      <#else>
-              width:"200px",
-      </#if>
-      <#if col.classType =='file'>
-              placeholder: '请选择文件',
-      <#else>
-              placeholder: '请输入${'$'}{title}',
-      </#if>
-      <#if col.defaultVal??>
-        <#if col.fieldDbType=="BigDecimal" || col.fieldDbType=="double" || col.fieldDbType=="int">
-              defaultValue:${col.defaultVal},
-              <#else>
-              defaultValue:"${col.defaultVal}",
-        </#if>
-      <#else>
-              defaultValue:'',
-      </#if>
-      <#-- 子表的校验 -->
-      <#assign subFieldValidType = col.fieldValidType!''>
-      <#-- 非空校验 -->
-      <#if col.nullable == 'N' || subFieldValidType == '*'>
-              validateRules: [{ required: true, message: '${'$'}{title}不能为空' }],
-      <#-- 其他情况下，只要有值就被认为是正则校验 -->
-      <#elseif subFieldValidType?length gt 0>
-        <#assign subMessage = '格式不正确'>
-        <#if subFieldValidType == 'only' >
-          <#assign subMessage = '不能重复'>
-        </#if>
-              validateRules: [{ pattern: "${subFieldValidType}", message: "${'$'}{title}${subMessage}" }],
-      </#if>
-            },
-    </#if>
-</#if>
-</#list>
-<#-- 循环子表的列 结束 -->
-
-<#-- 处理popup的隐藏列 -->
-<#if popupBackFields?length gt 0>
-<#list popupBackFields?split(",") as item>
-<#if item?length gt 0>
-<#assign tempItemFlag = true>
-
-<#list sub.colums as col>
-<#if col.isShow =='Y' && col.fieldName == item>
-<#assign tempItemFlag = false>
-</#if>
-</#list>
-<#if tempItemFlag>
-            {
-              title: '${item}',
-              key: '${item}',
-              type:"hidden"
-            },
-</#if>
-</#if>
-</#list>
-</#if>
-</#if>
-          ]
-        },
-</#list>
-        url: {
-          add: "/${entityPackage}/${entityName?uncap_first}/add",
-          edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-<#list subTables as sub><#rt/>
-          ${sub.entityName?uncap_first}: {
-            list: '/${entityPackage}/${entityName?uncap_first}/query${sub.entityName}ByMainId'
-          },
-</#list>
-        }
       }
     },
-    methods: {
+    methods:{
-      getAllTable() {
+      add () {
-        let values = this.tableKeys.map(key => getRefPromise(this, key))
+        this.visible=true
-        return Promise.all(values)
+        this.$nextTick(()=>{
-      },
+          this.$refs.realForm.add();
-      /** 调用完edit()方法之后会自动调用此方法 */
-      editAfter() {
-        let fieldval = pick(this.model<#list columns as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>)
-        this.$nextTick(() => {
-          this.form.setFieldsValue(fieldval)
-<#list subTables as sub><#rt/>
-<#if sub.foreignRelationType =='1'>
-          this.$refs.${sub.entityName?uncap_first}Form.initFormData(this.url.${sub.entityName?uncap_first}.list,this.model.id)
-</#if>
-</#list>         
         })
-        // 加载子表数据
+      },
-        if (this.model.id) {
+      edit (record) {
-          let params = { id: this.model.id }
+        this.visible=true
-<#list subTables as sub><#rt/>
+        this.$nextTick(()=>{
-<#if sub.foreignRelationType =='0'>
+          this.$refs.realForm.edit(record);
-          this.requestSubTableData(this.url.${sub.entityName?uncap_first}.list, params, this.${sub.entityName?uncap_first}Table)
+        })
-</#if>
+      },
-</#list>
+      close () {
+        this.$emit('close');
+        this.visible = false;
+      },
+      handleOk () {
+        this.$refs.realForm.handleOk();
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
       }
-      },
-      /** 整理成formData */
-      classifyIntoFormData(allValues) {
-        let main = Object.assign(this.model, allValues.formValue)
-
-        return {
-          ...main, // 展开
-<#assign subManyIndex = 0>
-<#list subTables as sub><#rt/>
-<#if sub.foreignRelationType =='0'>
-          ${sub.entityName?uncap_first}List: allValues.tablesValue[${subManyIndex}].values,
-<#assign subManyIndex = subManyIndex+1>
-<#else>
-          ${sub.entityName?uncap_first}List: this.$refs.${sub.entityName?uncap_first}Form.getFormData(),
-</#if>
-</#list>
-        }
-      },
-      validateError(msg){
-        this.$message.error(msg)
-      },
-     popupCallback(row){
-       this.form.setFieldsValue(pick(row<#list columns as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>))
-     },
-   <#if form_cat_tree>
-     handleCategoryChange(value,backObj){
-       this.form.setFieldsValue(backObj)
-      }
-   </#if>
-
     }
   }
 </script>

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei

@@ -3,10 +3,10 @@
 <#if sub.foreignRelationType=='1'>
 #segment#${sub.entityName}Form.vue
 <template>
-  <div>
+  <j-form-container :disabled="disabled">
-    <a-form :form="form">
+    <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
       <a-row>
-
+<#assign form_popup = false>
 <#list sub.colums as po>
 <#if po.isShow =='Y'>
 <#assign form_field_dictCode="">
@@ -17,67 +17,77 @@
 	</#if>
 	<#if po.classType =='textarea'>
         <a-col :span="24">
-          <a-form-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
+          <a-form-model-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="${autoStringSuffixForModel(po)}">
 	<#else>
         <a-col :xs="24" :sm="12">
-          <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
+          <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
 	</#if>
 	<#if po.classType =='date'>
-            <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%"/>
+            <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%"/>
 	<#elseif po.classType =='datetime'>
-            <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+            <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
 	<#elseif po.classType =='time'>
-             <j-time placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+             <j-time placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='popup'>
+	      <#assign form_popup=true>
             <j-popup
-              v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+              v-model="model.${po.fieldName}"
-              :trigger-change="true"
+              field="${po.fieldName}"
               org-fields="${po.dictField}"
               dest-fields="${Format.underlineToHump(po.dictText)}"
               code="${po.dictTable}"
-              @callback="popupCallback"/>
+              :multi="${po.extendParams.popupMulti?c}"
+              @input="popupCallback"/>
     <#elseif po.classType =='switch'>
-            <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if>></j-switch>
+            <j-switch v-model="model.${po.fieldName}" <#if po.dictField!= 'is_open'>:options="${po.dictField}"</#if>></j-switch>
 	<#elseif po.classType =='sel_depart'>
-            <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true"/>
+            <j-select-depart v-model="model.${po.fieldName}" />
 	<#elseif po.classType =='sel_user'>
-            <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true"/>
+            <j-select-user-by-dep v-model="model.${po.fieldName}" />
 	<#elseif po.classType =='textarea'>
-            <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}"/>
+            <a-textarea v-model="model.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}"/>
 	<#elseif po.classType=='list' || po.classType=='radio'>
-            <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
+            <j-dict-select-tag type="${po.classType}" v-model="model.${po.fieldName}"  dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
 	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-            <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
+            <j-multi-select-tag type="${po.classType}" v-model="model.${po.fieldName}"  dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
 	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-            <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%"/>
+            <a-input-number v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" style="width: 100%"/>
 	<#elseif po.classType=='file'>
-            <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true"></j-upload>
+            <j-upload v-model="model.${po.fieldName}" ></j-upload>
     <#elseif po.classType=='image'>
-            <j-image-upload isMultiple v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"></j-image-upload>
+            <j-image-upload isMultiple v-model="model.${po.fieldName}"></j-image-upload>
 	<#else>
-            <a-input v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}"></a-input>
+            <a-input v-model="model.${autoStringSuffixForModel(po)}" placeholder="请输入${po.filedComment}"></a-input>
     </#if>
-          </a-form-item>
+          </a-form-model-item>
         </a-col>
 </#if>
 </#list>    
       </a-row>
-    </a-form>
+    </a-form-model>
-  </div>
+ </j-form-container>
 </template>
 <script>
-  import pick from 'lodash.pick'
   import { getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
+  import { VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
 
   export default {
     name: '${sub.entityName}Form',
     components: { 
     },
+    props:{
+      disabled: {
+        type: Boolean,
+        default: false,
+        required: false
+      }
+    },
     data () {
       return {
-        form: this.$form.createForm(this),
+        model:{
-        model: {},
+        <#include "/common/init/initValueSub.ftl">
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 6 },
@@ -98,11 +108,15 @@
         confirmLoading: false,
       }
     },
+    created () {
+    //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
     methods:{
       initFormData(url,id){
         this.clearFormData()
         if(!id){
-          this.edit({})
+          this.edit(this.modelDefault);
         }else{
           getAction(url,{id:id}).then(res=>{
             if(res.success){
@@ -116,39 +130,47 @@
       },
       edit(record){
         this.model = Object.assign({}, record)
-        console.log("${sub.entityName}Form-edit",this.model);
-        let fieldval = pick(this.model<#list sub.colums as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>)
-        this.$nextTick(() => {
-          this.form.setFieldsValue(fieldval)
-        })
       },
       getFormData(){
         let formdata_arr = []
-        this.form.validateFields((err, values) => {
+         this.$refs.form.validate(valid => {
-          if (!err) {
+          if (valid) {
-            let formdata = Object.assign(this.model, values)
             let isNullObj = true
-            Object.keys(formdata).forEach(key=>{
+            Object.keys(this.model).forEach(key=>{
-              if(formdata[key]){
+              if(this.model[key]){
                 isNullObj = false
               }
             })
             if(!isNullObj){
-              formdata_arr.push(formdata)
+              formdata_arr.push(this.model)
             }
           }else{
             this.$emit("validateError","${sub.ftlDescription}表单校验未通过");
+            return false
           }
         })
-        console.log("${sub.ftlDescription}表单数据集",formdata_arr);
         return formdata_arr;
       },
-      popupCallback(row){
+      validate(index){
-        this.form.setFieldsValue(pick(row<#list sub.colums as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>))
+        return new Promise((resolve, reject) => {
+          // 验证主表表单
+         this.$refs.form.validate(valid => {
+            !valid ? reject({ error: VALIDATE_NO_PASSED ,index}) : resolve()
+          })
+        }).then(values => {
+          return Promise.resolve()
+        }).catch(error => {
+          return Promise.reject(error)
+        })
+
       },
+      <#if form_popup>
+      popupCallback(value,row){
+        this.model = Object.assign(this.model, row);
+      },
+      </#if>
       clearFormData(){
-        this.form.resetFields()
+        this.$refs.form.clearValidate()
-        this.model={}
       }
     
     }

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/inner-table/onetomany/java/${bussiPackage}/${entityPackage}/vue/subTables/[1-n]SubTable.vuei

@@ -42,11 +42,11 @@
 
 <script>
   import { getAction } from '@api/manage'
-  import { JeroListMixin } from '@/mixins/JeroListMixin'
+  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 
   export default {
     name: '${sub.entityName}SubTable',
-    mixins: [JeroListMixin],
+    mixins: [JeecgListMixin],
     props: {
       record: {
         type: Object,
@@ -79,7 +79,7 @@
     <#elseif po.classType=='image'>
             dataIndex: '${po.fieldName}',
             scopedSlots: {customRender: 'imgSlot'}
-    <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
+    <#elseif po.classType == 'sel_tree' || po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
             dataIndex: '${po.fieldName}_dictText'
     <#elseif po.classType=='cat_tree'>
       <#if list_need_category>
@@ -91,7 +91,7 @@
       </#if>
       <#elseif po.classType=='switch'>
             dataIndex: '${po.fieldName}',
-            <#if po.dictField?default("")?trim?length gt 1>
+            <#if po.dictField != 'is_open'>
             customRender: (text) => (!text ? "" : (text == ${po.dictField}[0] ? "是" : "否"))
             <#else>
             customRender: (text) => (!text ? "" : (text == "Y" ? "是" : "否"))

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -40,6 +40,8 @@ public class ${entityName} implements Serializable {
       <#elseif po.dictField?default("")?trim?length gt 1>
         <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
     </#if>
+    <#elseif po.classType=='sel_tree'>
+        <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
     </#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
@@ -48,13 +50,13 @@ public class ${entityName} implements Serializable {
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
 			<#else>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai

@@ -21,7 +21,7 @@ import java.io.UnsupportedEncodingException;
  * @Date:   ${.now?string["yyyy-MM-dd"]}
  * @Version: V1.0
  */
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}")
 @Data
 @TableName("${subTab.tableName}")
 public class ${subTab.entityName} implements Serializable {
@@ -40,6 +40,8 @@ public class ${subTab.entityName} implements Serializable {
 			<#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
 		<#elseif po.dictField?default("")?trim?length gt 1>
 			<#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
+		<#elseif po.classType=='sel_tree'>
+			<#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
 		</#if>
 	</#if>
 	/**${po.filedComment}*/
@@ -49,13 +51,13 @@ public class ${subTab.entityName} implements Serializable {
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
     </#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
 			<#else>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -47,7 +47,7 @@
             <#elseif po.classType=='pca'>
               <#if query_field_no gt 1>  </#if><j-area-linkage type="cascader" v-model="queryParam.${po.fieldName}" placeholder="请选择省市区"/>
             <#elseif po.classType=='popup'>
-              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')"/>
+              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')" :multi="${po.extendParams.popupMulti?c}"/>
 			<#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
 			<#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
 			<#if po.dictTable?default("")?trim?length gt 1>
@@ -277,7 +277,7 @@
             <#elseif po.classType=='image'>
             dataIndex: '${po.fieldName}',
             scopedSlots: {customRender: 'imgSlot'}
-            <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
+            <#elseif po.classType == 'sel_tree' || po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
             dataIndex: '${po.fieldName}_dictText'
             <#elseif po.classType=='cat_tree'>
             <#if list_need_category>
@@ -289,7 +289,7 @@
             </#if>
             <#elseif po.classType=='switch'>
             dataIndex: '${po.fieldName}',
-            <#if po.dictField?default("")?trim?length gt 1>
+            <#if po.dictField != 'is_open'>
             customRender: (text) => (!text ? "" : (text == ${po.dictField}[0] ? "是" : "否"))
             <#else>
             customRender: (text) => (!text ? "" : (text == "Y" ? "是" : "否"))

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Form.vuei

@@ -3,10 +3,12 @@
   <a-spin :spinning="confirmLoading">
     <j-form-container :disabled="formDisabled">
       <!-- 主表单区域 -->
-      <a-form :form="form" slot="detail">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+<#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
+<#assign bpm_flag=false>
 <#assign form_span = 24>
 <#if tableVo.fieldRowNum==2>
     <#assign form_span = 12>
@@ -16,6 +18,9 @@
     <#assign form_span = 6>
 </#if>
 <#list columns as po>
+<#if po.fieldDbName=='bpm_status'>
+  <#assign bpm_flag=true>
+</#if>
 <#if po.isShow =='Y' && po.fieldName != 'id'>
 <#assign form_field_dictCode="">
 	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
@@ -25,65 +30,67 @@
 	</#if>
 	<#if po.classType =='textarea'>
           <a-col :span="24">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
+            <a-form-model-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="${autoStringSuffixForModel(po)}">
 	<#else>
           <a-col :span="${form_span}" >
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
 	</#if>
 	<#if po.classType =='date'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='datetime'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='time'>
-             <j-time placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+             <j-time placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='popup'>
+	     <#assign form_popup=true>
               <j-popup
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                v-model="model.${po.fieldName}"
-                :trigger-change="true"
+                field="${po.fieldName}"
                 org-fields="${po.dictField}"
                 dest-fields="${Format.underlineToHump(po.dictText)}"
                 code="${po.dictTable}"
-                @callback="popupCallback"
+                :multi="${po.extendParams.popupMulti?c}"
+                @input="popupCallback"
                 <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.classType =='sel_depart'>
-              <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" multi <#if po.readonly=='Y'>disabled</#if>/>
+              <j-select-depart v-model="model.${po.fieldName}" multi <#if po.readonly=='Y'>disabled</#if>/>
 <#elseif po.classType =='switch'>
-              <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
+              <j-switch v-model="model.${po.fieldName}" <#if po.dictField != 'is_open'>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
 	<#elseif po.classType =='pca'>
-		      <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if>/>
+		      <j-area-linkage type="cascader" v-model="model.${po.fieldName}" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='markdown'>
-	          <j-markdown-editor v-decorator="[${autoStringSuffix(po)},{initialValue:''}]" id="${po.fieldName}"></j-markdown-editor>
+	          <j-markdown-editor v-model="model.${autoStringSuffixForModel(po)}" id="${po.fieldName}"></j-markdown-editor>
     <#elseif po.classType =='password'>
-	          <a-input-password v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+	          <a-input-password v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='sel_user'>
-              <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-select-user-by-dep v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='textarea'>
-              <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <a-textarea v-model="model.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list' || po.classType=='radio'>
-              <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-dict-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-              <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-multi-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='sel_search'>
-              <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-search-select-tag v-model="model.${po.fieldName}" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if>/>
     <#elseif po.classType=='cat_tree'>
     	<#assign form_cat_tree = true>
-              <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
+              <j-category-select v-model="model.${po.fieldName}" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
     	<#if po.dictText?default("")?trim?length gt 1>
     	<#assign form_cat_back = "${po.dictText}">
     	</#if>
 	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-              <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <a-input-number v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType=='file'>
-              <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
+              <j-upload v-model="model.${autoStringSuffixForModel(po)}" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
 	<#elseif po.classType=='image'>
-              <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
+              <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-model="model.${po.fieldName}" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
 	<#elseif po.classType=='umeditor'>
-              <j-editor v-decorator="[${autoStringSuffix(po)},{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-editor v-model="model.${autoStringSuffixForModel(po)}" <#if po.readonly=='Y'>disabled</#if>/>
 		<#elseif po.classType == 'sel_tree'>
   	          <j-tree-select
                 ref="treeSelect"
                 placeholder="请选择${po.filedComment}"
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                v-model="model.${autoStringSuffixForModel(po)}"
                 <#if po.dictText??>
                 <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
                 dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
@@ -97,19 +104,14 @@
                 <#if po.readonly=='Y'>disabled</#if>>
               </j-tree-select>
 	<#else>
-              <a-input v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
+              <a-input v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
-    </#if>
-            </a-form-item>
-            <#if form_cat_tree && form_cat_back?length gt 1>
-            <a-form-item v-show="false">
-              <a-input v-decorator="['${form_cat_back}']"></a-input>
-            </a-form-item>
     </#if>
+            </a-form-model-item>
           </a-col>
 </#if>
 </#list>
         </a-row>
-      </a-form>
+      </a-form-model>
     </j-form-container>
       <!-- 子表单区域 -->
     <a-tabs v-model="activeKey" @change="handleChangeTabs">
@@ -137,17 +139,18 @@
   </#if>
 </#list>
     </a-tabs>
+    <#if bpm_flag>
     <a-row v-if="showFlowSubmitButton" style="text-align: center;width: 100%;margin-top: 16px;"><a-button @click="handleOk">提 交</a-button></a-row>
+    </#if>
   </a-spin>
 </template>
 
 <script>
 
-  import pick from 'lodash.pick'
   import { getAction } from '@/api/manage'
-  import { JVxeTableMixin } from '@/mixins/JVxeTableMixin.js'
+  import { JVxeTableModelMixin } from '@/mixins/JVxeTableModelMixin.js'
   import { JVXETypes } from '@/components/jero/JVxeTable'
-  import { getRefPromise} from '@/components/jero/JVxeTable/utils/vxeUtils.js'
+  import { getRefPromise,VALIDATE_FAILED} from '@/components/jero/JVxeTable/utils/vxeUtils.js'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jero/JFormContainer'
   <#list subTables as sub>
@@ -158,7 +161,7 @@
 
   export default {
     name: '${entityName}Form',
-    mixins: [JVxeTableMixin],
+    mixins: [JVxeTableModelMixin],
     components: {
       JFormContainer,
     <#list subTables as sub>
@@ -185,6 +188,9 @@
           xs: { span: 24 },
           sm: { span: 20 },
         },
+        model:{
+           <#include "/common/init/initValue.ftl">
+         },
         // 新增时子表默认添加几行空数据
         addDefaultRowNum: 1,
         <#include "/common/validatorRulesTemplate/main.ftl">
@@ -207,7 +213,7 @@
     <#if col.filedComment !='外键' >
             {
               title: '${col.filedComment}',
-              key:  ${autoStringSuffix(col)},
+              key: '${autoStringSuffixForModel(col)}',
       <#if col.classType =='date'>
               type: JVXETypes.date,
               <#if col.readonly=='Y'>
@@ -282,10 +288,10 @@
               </#if>
       <#elseif col.classType =='switch'>
               type: JVXETypes.checkbox,
-              <#if col.dictField?default("")?trim?length gt 1>
+               <#if col.dictField == 'is_open'>
-              customValue:${col.dictField},
-              <#else>
                 customValue: ['Y', 'N'],
+                <#else>
+                customValue: ${col.dictField},
                 </#if>
               <#if col.readonly=='Y'>
               disabled:true,
@@ -386,6 +392,7 @@
       }
     },
     props: {
+    <#if bpm_flag>
       //流程表单data
       formData: {
         type: Object,
@@ -398,6 +405,7 @@
         default: false,
         required: false
       },
+      </#if>
       //表单禁用
       disabled: {
         type: Boolean,
@@ -407,14 +415,17 @@
     },
     computed: {
       formDisabled(){
+         <#if bpm_flag>
         if(this.formBpm===true){
           if(this.formData.disabled===false){
             return false
           }
           return true
         }
+         </#if>
         return this.disabled
       },
+       <#if bpm_flag>
       showFlowSubmitButton(){
         if(this.formBpm===true){
           if(this.formData.disabled===false){
@@ -423,14 +434,16 @@
         }
         return false
       }
+      </#if>
     },
     created () {
+     <#if bpm_flag>
       //如果是流程中表单，则需要加载流程表单data
       this.showFlowData();
+     </#if>
     },
     methods: {
       addBefore(){
-        this.form.resetFields()
 <#list subTables as sub><#rt/>
   <#if sub.foreignRelationType =='1'>
         this.$refs.${sub.entityName?uncap_first}Form.clearFormData()
@@ -451,9 +464,7 @@
       },
       /** 调用完edit()方法之后会自动调用此方法 */
       editAfter() {
-        let fieldval = pick(this.model<#list columns as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>)
         this.$nextTick(() => {
-          this.form.setFieldsValue(fieldval)
 <#list subTables as sub><#rt/>
 <#if sub.foreignRelationType =='1'>
           this.$refs.${sub.entityName?uncap_first}Form.initFormData(this.url.${sub.entityName?uncap_first}.list,this.model.id)
@@ -470,6 +481,27 @@
 </#list>
         }
       },
+      //校验所有一对一子表表单
+        validateSubForm(allValues){
+            return new Promise((resolve,reject)=>{
+              Promise.all([
+          <#list subTables as sub><#rt/>
+            <#if sub.foreignRelationType =='1'>
+                  this.$refs.${sub.entityName?uncap_first}Form.validate(${sub_index}),
+            </#if>
+          </#list>
+              ]).then(() => {
+                resolve(allValues)
+              }).catch(e => {
+                if (e.error === VALIDATE_FAILED) {
+                  // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
+                  this.activeKey = e.index == null ? this.activeKey : this.refKeys[e.index]
+                } else {
+                  console.error(e)
+                }
+              })
+            })
+        },
       /** 整理成formData */
       classifyIntoFormData(allValues) {
         let main = Object.assign(this.model, allValues.formValue)
@@ -486,6 +518,7 @@
 </#list>
         }
       },
+      <#if bpm_flag>
       //渲染流程表单数据
       showFlowData(){
         if(this.formBpm === true){
@@ -497,15 +530,18 @@
           })
         }
       },
+      </#if>
       validateError(msg){
         this.$message.error(msg)
       },
-     popupCallback(row){
+     <#if form_popup>
-       this.form.setFieldsValue(pick(row<#list columns as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>))
+     popupCallback(value,row){
+      this.model = Object.assign(this.model, row);
      },
+    </#if>
    <#if form_cat_tree>
      handleCategoryChange(value,backObj){
-       this.form.setFieldsValue(backObj)
+      this.model = Object.assign(this.model, backObj);
       }
    </#if>
 

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/jvxe/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei

@@ -4,8 +4,9 @@
 #segment#${sub.entityName}Form.vue
 <template>
   <j-form-container :disabled="disabled">
-      <a-form :form="form" slot="detail">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+<#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
 <#assign form_span = 24>
@@ -26,81 +27,77 @@
 	</#if>
 	<#if po.classType =='textarea'>
           <a-col :span="24">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
+            <a-form-model-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="${autoStringSuffixForModel(po)}">
 	<#else>
           <a-col :span="${form_span}">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
 	</#if>
 	<#if po.classType =='date'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%"/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}"  style="width: 100%"/>
 	<#elseif po.classType =='datetime'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}"  :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
 	<#elseif po.classType =='time'>
-              <j-time placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-time placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}"  style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='popup'>
+	    <#assign form_popup=true>
               <j-popup
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                v-model="model.${po.fieldName}"
-                :trigger-change="true"
+                field="${po.fieldName}"
                 org-fields="${po.dictField}"
                 dest-fields="${Format.underlineToHump(po.dictText)}"
                 code="${po.dictTable}"
-                @callback="popupCallback"/>
+                :multi="${po.extendParams.popupMulti?c}"
+                @input="popupCallback"/>
     <#elseif po.classType =='sel_depart'>
-              <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" multi/>
+              <j-select-depart v-model="model.${po.fieldName}" multi/>
 <#elseif po.classType =='switch'>
-              <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if>></j-switch>
+              <j-switch v-model="model.${po.fieldName}" <#if po.dictField!= 'is_open'>:options="${po.dictField}"</#if>></j-switch>
 	<#elseif po.classType =='pca'>
-		      <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区"/>
+		      <j-area-linkage type="cascader" v-model="model.${po.fieldName}" placeholder="请输入省市区"/>
 	<#elseif po.classType =='markdown'>
-	          <j-markdown-editor v-decorator="[${autoStringSuffix(po)},{initialValue:''}]" id="${po.fieldName}"></j-markdown-editor>
+	          <j-markdown-editor v-model="model.${autoStringSuffixForModel(po)}" id="${po.fieldName}"></j-markdown-editor>
     <#elseif po.classType =='password'>
-	          <a-input-password v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}"/>
+	          <a-input-password v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}"/>
 	<#elseif po.classType =='sel_user'>
-              <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"/>
+              <j-select-user-by-dep v-model="model.${po.fieldName}"/>
 	<#elseif po.classType =='textarea'>
-              <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}"/>
+              <a-textarea v-model="model.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}"/>
 	<#elseif po.classType=='list' || po.classType=='radio'>
-              <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
+              <j-dict-select-tag type="${po.classType}" v-model="model.${po.fieldName}"  dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
 	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-              <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
+              <j-multi-select-tag type="${po.classType}" v-model="model.${po.fieldName}"  dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
 	<#elseif po.classType=='sel_search'>
-              <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" />
+              <j-search-select-tag v-model="model.${po.fieldName}" dict="${form_field_dictCode}" />
     <#elseif po.classType=='cat_tree'>
     	<#assign form_cat_tree = true>
-              <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if>/>
+              <j-category-select v-model="model.${po.fieldName}" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}" @change="handleCategoryChange"</#if>/>
     	<#if po.dictText?default("")?trim?length gt 1>
     	<#assign form_cat_back = "${po.dictText}">
     	</#if>
 	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-              <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%"/>
+              <a-input-number v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" style="width: 100%"/>
 	<#elseif po.classType=='file'>
-              <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true"></j-upload>
+              <j-upload v-model="model.${po.fieldName}" ></j-upload>
 	<#elseif po.classType=='image'>
-              <j-image-upload isMultiple v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"></j-image-upload>
+              <j-image-upload isMultiple v-model="model.${po.fieldName}"></j-image-upload>
 	<#elseif po.classType=='umeditor'>
-              <j-editor v-decorator="[${autoStringSuffix(po)},{trigger:'input'}]"/>
+              <j-editor v-model="model.${autoStringSuffixForModel(po)}"/>
 	<#else>
-              <a-input v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}"></a-input>
+              <a-input v-model="model.${autoStringSuffixForModel(po)}" placeholder="请输入${po.filedComment}"></a-input>
-    </#if>
-            </a-form-item>
-            <#if form_cat_tree && form_cat_back?length gt 1>
-            <a-form-item v-show="false">
-              <a-input v-decorator="['${form_cat_back}']"></a-input>
-            </a-form-item>
     </#if>
+            </a-form-model-item>
           </a-col>
 </#if>
 </#list>
         </a-row>
-      </a-form>
+      </a-form-model>
   </j-form-container>
 </template>
 <script>
-  import pick from 'lodash.pick'
   import { getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
   import JFormContainer from '@/components/jero/JFormContainer'
-
+ import { VALIDATE_FAILED } from '@/components/jero/JVxeTable/utils/vxeUtils.js'
   export default {
     name: '${sub.entityName}Form',
     components: {
@@ -115,8 +112,9 @@
     },
     data () {
       return {
-        form: this.$form.createForm(this),
+        model:{
-        model: {},
+         <#include "/common/init/initValueSub.ftl">
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 6 },
@@ -137,11 +135,15 @@
         confirmLoading: false,
       }
     },
+    created () {
+    //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
     methods:{
       initFormData(url,id){
         this.clearFormData()
         if(!id){
-          this.edit({})
+          this.edit(this.modelDefault)
         }else{
           getAction(url,{id:id}).then(res=>{
             if(res.success){
@@ -155,43 +157,49 @@
       },
       edit(record){
         this.model = Object.assign({}, record)
-        console.log("${sub.entityName}Form-edit",this.model);
-        let fieldval = pick(this.model<#list sub.colums as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>)
-        this.$nextTick(() => {
-          this.form.setFieldsValue(fieldval)
-        })
       },
       getFormData(){
         let formdata_arr = []
-        this.form.validateFields((err, values) => {
+        this.$refs.form.validate(valid => {
-          if (!err) {
+          if (valid) {
-            let formdata = Object.assign(this.model, values)
             let isNullObj = true
-            Object.keys(formdata).forEach(key=>{
+            Object.keys(this.model).forEach(key=>{
-              if(formdata[key]){
+              if(this.model[key]){
                 isNullObj = false
               }
             })
             if(!isNullObj){
-              formdata_arr.push(formdata)
+              formdata_arr.push(this.model)
             }
           }else{
             this.$emit("validateError","${sub.ftlDescription}表单校验未通过");
           }
         })
-        console.log("${sub.ftlDescription}表单数据集",formdata_arr);
         return formdata_arr;
       },
-      popupCallback(row){
+       validate(index){
-        this.form.setFieldsValue(pick(row<#list sub.colums as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>))
+        return new Promise((resolve, reject) => {
+          // 验证主表表单
+         this.$refs.form.validate(valid => {
+            !valid ? reject({ error: VALIDATE_FAILED ,index}) : resolve()
+          })
+        }).then(values => {
+          return Promise.resolve()
+        }).catch(error => {
+          return Promise.reject(error)
+        })
+
       },
+      <#if form_popup>
+      popupCallback(value,row){
+       this.model = Object.assign(this.model, row);
+      },
+      </#if>
       clearFormData(){
-        this.form.resetFields()
+        this.$refs.form.clearValidate()
-        this.model={}
       },
       <#if form_cat_tree>
       handleCategoryChange(value,backObj){
-        this.form.setFieldsValue(backObj);
       }
       </#if>
     }

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/${entityName}.javai

@@ -40,21 +40,23 @@ public class ${entityName} implements Serializable {
       <#elseif po.dictField?default("")?trim?length gt 1>
         <#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
     </#if>
+    <#elseif po.classType=='sel_tree'>
+        <#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
     </#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 	<#else>
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
 			<#else>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/entity/[1-n]Entity.javai

@@ -21,7 +21,7 @@ import java.io.UnsupportedEncodingException;
  * @Date:   ${.now?string["yyyy-MM-dd"]}
  * @Version: V1.0
  */
-@ApiModel(value="${tableName}对象", description="${tableVo.ftlDescription}")
+@ApiModel(value="${subTab.tableName}对象", description="${subTab.ftlDescription}")
 @Data
 @TableName("${subTab.tableName}")
 public class ${subTab.entityName} implements Serializable {
@@ -40,22 +40,24 @@ public class ${subTab.entityName} implements Serializable {
 			<#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText}", dicCode = "${po.dictField}"'>
 		<#elseif po.dictField?default("")?trim?length gt 1>
 			<#assign list_field_dictCode=', dicCode = "${po.dictField}"'>
+		<#elseif po.classType=='sel_tree'>
+			<#assign list_field_dictCode=', dictTable = "${po.dictTable}", dicText = "${po.dictText?split(",")[2]}", dicCode = "${po.dictText?split(",")[0]}"'>
 		</#if>
 	</#if>
 	/**${po.filedComment}*/
 	<#if po.fieldName == primaryKeyField>
-	@TableId(type = IdType.ID_WORKER_STR)
+	@TableId(type = IdType.ASSIGN_ID)
 	<#else>
 		<#if po.fieldDbType =='Date'>
 			<#if po.classType=='date'>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 15, format = "yyyy-MM-dd")
     </#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
 			<#else>
     <#if !excel_ignore_arr?seq_contains("${po.fieldName}")>
-	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss"${list_field_dictCode})
+	@Excel(name = "${po.filedComment}", width = 20, format = "yyyy-MM-dd HH:mm:ss")
 	</#if>
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/${entityName}List.vuei

@@ -42,7 +42,7 @@
             <#elseif po.classType=='pca'>
               <#if query_field_no gt 1>  </#if><j-area-linkage type="cascader" v-model="queryParam.${po.fieldName}" placeholder="请选择省市区"/>
             <#elseif po.classType=='popup'>
-              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')"/>
+              <#if query_field_no gt 1>  </#if><j-popup placeholder="请选择${po.filedComment}" v-model="queryParam.${po.fieldName}" code="${po.dictTable}" org-fields="${po.dictField}" dest-fields="${po.dictText}" :field="getPopupField('${po.dictText}')" :multi="${po.extendParams.popupMulti?c}"/>
 			<#elseif po.classType=='list' || po.classType=='radio' || po.classType=='checkbox'>
 			<#--  ---------------------------下拉或是单选 判断数据字典是表字典还是普通字典------------------------------- -->
 			<#if po.dictTable?default("")?trim?length gt 1>
@@ -261,7 +261,7 @@
             <#elseif po.classType=='image'>
             dataIndex: '${po.fieldName}',
             scopedSlots: {customRender: 'imgSlot'}
-            <#elseif po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
+            <#elseif po.classType == 'sel_tree' || po.classType=='list' || po.classType=='list_multi' || po.classType=='sel_search' || po.classType=='radio' || po.classType=='checkbox' || po.classType=='sel_depart' || po.classType=='sel_user'>
             dataIndex: '${po.fieldName}_dictText'
             <#elseif po.classType=='cat_tree'>
             <#if list_need_category>
@@ -273,7 +273,7 @@
             </#if>
             <#elseif po.classType=='switch'>
             dataIndex: '${po.fieldName}',
-            <#if po.dictField?default("")?trim?length gt 1>
+            <#if  po.dictField != 'is_open'>
             customRender: (text) => (!text ? "" : (text == ${po.dictField}[0] ? "是" : "否"))
             <#else>
             customRender: (text) => (!text ? "" : (text == "Y" ? "是" : "否"))

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -4,469 +4,56 @@
     :width="1200"
     :visible="visible"
     :maskClosable="false"
-    :confirmLoading="confirmLoading"
     switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel">
-    <a-spin :spinning="confirmLoading">
+     <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback" :disabled="disableSubmit"/>
-<#assign form_cat_tree = false>
-<#assign form_cat_back = "">
-<#assign form_span = 24>
-
-      <a-tabs v-model="activeKey" @change="handleChangeTabs">
-      <!--主表区域 -->
-       <a-tab-pane tab="${tableVo.ftlDescription}" :key="refKeys[0]" :forceRender="true">
-            <a-form :form="form">
-              <a-row>
-           <#list columns as po>
-           <#if po.isShow =='Y' && po.fieldName != 'id'>
-           <#assign form_field_dictCode="">
-           	<#if po.dictTable?default("")?trim?length gt 1 && po.dictText?default("")?trim?length gt 1 && po.dictField?default("")?trim?length gt 1>
-           		<#assign form_field_dictCode="${po.dictTable},${po.dictText},${po.dictField}">
-           	<#elseif po.dictField?default("")?trim?length gt 1>
-           		<#assign form_field_dictCode="${po.dictField}">
-           	</#if>
-           	<#if po.classType =='textarea'>
-                     <a-col :span="24">
-                       <a-form-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
-           	<#else>
-                     <a-col :xs="24" :sm="12">
-                       <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
-           	</#if>
-           	<#if po.classType =='date'>
-                         <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType =='datetime'>
-                         <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType =='time'>
-                         <j-time placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType =='popup'>
-                         <j-popup
-                           v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
-                           :trigger-change="true"
-                           org-fields="${po.dictField}"
-                           dest-fields="${Format.underlineToHump(po.dictText)}"
-                           code="${po.dictTable}"
-                           @callback="popupCallback"
-                           <#if po.readonly=='Y'>disabled</#if>/>
-               <#elseif po.classType =='sel_depart'>
-                         <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" multi <#if po.readonly=='Y'>disabled</#if>/>
-           <#elseif po.classType =='switch'>
-                         <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if> <#if po.readonly=='Y'>disabled</#if>></j-switch>
-           	<#elseif po.classType =='pca'>
-           		      <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType =='markdown'>
-           	          <j-markdown-editor v-decorator="[${autoStringSuffix(po)},{initialValue:''}]" id="${po.fieldName}"></j-markdown-editor>
-               <#elseif po.classType =='password'>
-           	          <a-input-password v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType =='sel_user'>
-                         <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType =='textarea'>
-                         <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType=='list' || po.classType=='radio'>
-                         <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-                         <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType=='sel_search'>
-                         <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" <#if po.readonly=='Y'>disabled</#if>/>
-               <#elseif po.classType=='cat_tree'>
-               	<#assign form_cat_tree = true>
-                         <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if> <#if po.readonly=='Y'>disabled</#if>/>
-               	<#if po.dictText?default("")?trim?length gt 1>
-               	<#assign form_cat_back = "${po.dictText}">
-               	</#if>
-           	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-                         <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType=='file'>
-                         <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" <#if po.readonly=='Y'>disabled</#if> <#if po.uploadnum??>:number=${po.uploadnum}</#if>></j-upload>
-           	<#elseif po.classType=='image'>
-                         <j-image-upload isMultiple <#if po.uploadnum??>:number=${po.uploadnum}</#if> v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.readonly=='Y'>disabled</#if>></j-image-upload>
-           	<#elseif po.classType=='umeditor'>
-                         <j-editor v-decorator="[${autoStringSuffix(po)},{trigger:'input'}]" <#if po.readonly=='Y'>disabled</#if>/>
-           	<#elseif po.classType == 'sel_tree'>
-           	          <j-tree-select
-                         ref="treeSelect"
-                         placeholder="请选择${po.filedComment}"
-                         v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
-                         <#if po.dictText??>
-                         <#if po.dictText?split(',')[2]?? && po.dictText?split(',')[0]??>
-                         dict="${po.dictTable},${po.dictText?split(',')[2]},${po.dictText?split(',')[0]}"
-                         <#elseif po.dictText?split(',')[1]??>
-                         pidField="${po.dictText?split(',')[1]}"
-                         <#elseif po.dictText?split(',')[3]??>
-                         hasChildField="${po.dictText?split(',')[3]}"
-                         </#if>
-                         </#if>
-                         pidValue="${po.dictField}"
-                         <#if po.readonly=='Y'>disabled</#if>>
-                       </j-tree-select>
-           	<#else>
-                         <a-input v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" <#if po.readonly=='Y'>disabled</#if>></a-input>
-               </#if>
-                       </a-form-item>
-                       <#if form_cat_tree && form_cat_back?length gt 1>
-                       <a-form-item v-show="false">
-                         <a-input v-decorator="['${form_cat_back}']"></a-input>
-                       </a-form-item>
-                       </#if>
-                     </a-col>
-           </#if>
-           </#list>
-
-                   </a-row>
-                 </a-form>
-
-        </a-tab-pane>
-      <!--子表单区域 -->
-<#list subTables as sub><#rt/>
-  <#if sub.foreignRelationType =='1'>
-        <a-tab-pane tab="${sub.ftlDescription}" :key="refKeys[${sub_index+1}]" :forceRender="true">
-          <${Format.humpToShortbar(sub.entityName)}-form ref="${sub.entityName?uncap_first}Form" @validateError="validateError"></${Format.humpToShortbar(sub.entityName)}-form>
-        </a-tab-pane>
-
-  <#else>
-        <a-tab-pane tab="${sub.ftlDescription}" :key="refKeys[${sub_index+1}]" :forceRender="true">
-          <j-editable-table
-            :ref="refKeys[${sub_index+1}]"
-            :loading="${sub.entityName?uncap_first}Table.loading"
-            :columns="${sub.entityName?uncap_first}Table.columns"
-            :dataSource="${sub.entityName?uncap_first}Table.dataSource"
-            :maxHeight="300"
-            :rowNumber="true"
-            :rowSelection="true"
-            :actionButton="true"/>
-        </a-tab-pane>
-
-  </#if>
-</#list>
-      </a-tabs>
-
-    </a-spin>
  </j-modal>
 </template>
 
 <script>
 
-  import pick from 'lodash.pick'
+  import ${entityName}Form from './${entityName}Form'
-  import { FormTypes,getRefPromise } from '@/utils/JEditableTableUtil'
-  import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
-  import { validateDuplicateValue } from '@/utils/util'
-   import { VALIDATE_NO_PASSED, validateFormAndTables } from '@/utils/JEditableTableUtil'
-  <#list subTables as sub>
-  <#if sub.foreignRelationType =='1'>
-  import ${sub.entityName}Form from './${sub.entityName}Form.vue'
-  </#if>
-  </#list>
 
   export default {
     name: '${entityName}Modal',
-    mixins: [JEditableTableMixin],
     components: {
-    <#list subTables as sub>
+      ${entityName}Form
-    <#if sub.foreignRelationType =='1'>
-    ${sub.entityName}Form,
-    </#if>
-    </#list>
     },
     data() {
       return {
-        labelCol: {
+        title:'',
-          xs: { span: 24 },
+        visible: false,
-          sm: { span: 6 },
+        disableSubmit: false
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        labelCol2: {
-          xs: { span: 24 },
-          sm: { span: 3 },
-        },
-        wrapperCol2: {
-          xs: { span: 24 },
-          sm: { span: 20 },
-        },
-        // 新增时子表默认添加几行空数据
-        addDefaultRowNum: 1,
-        <#include "/common/validatorRulesTemplate/main.ftl">
-        refKeys: ['${tableVo.entityName?uncap_first}',<#list subTables as sub>'${sub.entityName?uncap_first}', </#list>],
-        <#assign hasOne2Many = false>
-        tableKeys:[<#list subTables as sub><#if sub.foreignRelationType =='0'>'${sub.entityName?uncap_first}', <#assign hasOne2Many = true></#if></#list>],
-        activeKey: '${tableVo.entityName?uncap_first}',
-<#list subTables as sub><#rt/>
-        // ${sub.ftlDescription}
-        ${sub.entityName?uncap_first}Table: {
-          loading: false,
-          dataSource: [],
-          columns: [
-<#if sub.foreignRelationType =='0'>
-<#assign popupBackFields = "">
-
-<#-- 循环子表的列 开始 -->
-<#list sub.colums as col><#rt/>
-<#if col.isShow =='Y'>
-    <#if col.filedComment !='外键' >
-            {
-              title: '${col.filedComment}',
-              key: ${autoStringSuffix(col)},
-      <#if col.classType =='date'>
-              type: FormTypes.date,
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='datetime'>
-              type: FormTypes.datetime,
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif "int,decimal,double,"?contains(col.classType)>
-              type: FormTypes.inputNumber,
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='list' || col.classType =='radio'>
-              type: FormTypes.select,
-              <#if col.dictTable?default("")?trim?length gt 1>
-              dictCode:"${col.dictTable},${col.dictText},${col.dictField}",
-              <#else>
-              dictCode:"${col.dictField}",
-              </#if>
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='list_multi' || col.classType =='checkbox'>
-              type: FormTypes.list_multi,
-              <#if col.dictTable?default("")?trim?length gt 1>
-              dictCode:"${col.dictTable},${col.dictText},${col.dictField}",
-              <#else>
-              dictCode:"${col.dictField}",
-              </#if>
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='sel_search'>
-              type: FormTypes.sel_search,
-              <#if col.dictTable?default("")?trim?length gt 1>
-              dictCode:"${col.dictTable},${col.dictText},${col.dictField}",
-              <#else>
-              dictCode:"${col.dictField}",
-              </#if>
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='switch'>
-              type: FormTypes.checkbox,
-              <#if col.dictField?default("")?trim?length gt 1>
-              customValue:${col.dictField},
-              <#else>
-              customValue: ['Y', 'N'],
-              </#if>
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.classType =='image'>
-              type: FormTypes.image,
-              token:true,
-              responseName:"message",
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-              <#if col.uploadnum??>
-              number: ${col.uploadnum},
-              </#if>
-      <#elseif col.classType =='file'>
-              type: FormTypes.file,
-              token:true,
-              responseName:"message",
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-              <#if col.uploadnum??>
-              number: ${col.uploadnum},
-              </#if>
-      <#elseif col.classType =='popup'>
-        <#if popupBackFields?length gt 0>
-            <#assign popupBackFields = "${popupBackFields}"+","+"${col.dictText}">
-        <#else>
-            <#assign popupBackFields = "${col.dictText}">
-        </#if>
-              type: FormTypes.popup,
-              popupCode:"${col.dictTable}",
-              destFields:"${Format.underlineToHump(col.dictText)}",
-              orgFields:"${col.dictField}",
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#elseif col.fieldDbType=='int' || col.fieldDbType=='double' || col.fieldDbType=='BigDecimal'>
-              type: FormTypes.inputNumber,
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      <#else>
-              type: FormTypes.input,
-              <#if col.readonly=='Y'>
-              disabled:true,
-              </#if>
-      </#if>
-      <#if col.classType =='list_multi' || col.classType =='checkbox'>
-              width:"250px",
-      <#else>
-              width:"200px",
-      </#if>
-      <#if col.classType =='file'>
-              placeholder: '请选择文件',
-      <#else>
-              placeholder: '请输入${'$'}{title}',
-      </#if>
-      <#if col.defaultVal??>
-        <#if col.fieldDbType=="BigDecimal" || col.fieldDbType=="double" || col.fieldDbType=="int">
-              defaultValue:${col.defaultVal},
-              <#else>
-              defaultValue:"${col.defaultVal}",
-        </#if>
-      <#else>
-              defaultValue:'',
-      </#if>
-      <#-- 子表的校验 -->
-      <#assign subFieldValidType = col.fieldValidType!''>
-      <#-- 非空校验 -->
-      <#if col.nullable == 'N' || subFieldValidType == '*'>
-              validateRules: [{ required: true, message: '${'$'}{title}不能为空' }],
-      <#-- 其他情况下，只要有值就被认为是正则校验 -->
-      <#elseif subFieldValidType?length gt 0>
-        <#assign subMessage = '格式不正确'>
-        <#if subFieldValidType == 'only' >
-          <#assign subMessage = '不能重复'>
-        </#if>
-              validateRules: [{ pattern: "${subFieldValidType}", message: "${'$'}{title}${subMessage}" }],
-      </#if>
-            },
-    </#if>
-</#if>
-</#list>
-<#-- 循环子表的列 结束 -->
-
-<#-- 处理popup的隐藏列 -->
-<#if popupBackFields?length gt 0>
-<#list popupBackFields?split(",") as item>
-<#if item?length gt 0>
-<#assign tempItemFlag = true>
-
-<#list sub.colums as col>
-<#if col.isShow =='Y' && col.fieldName == item>
-<#assign tempItemFlag = false>
-</#if>
-</#list>
-<#if tempItemFlag>
-            {
-              title: '${item}',
-              key: '${item}',
-              type:"hidden"
-            },
-</#if>
-</#if>
-</#list>
-</#if>
-</#if>
-          ]
-        },
-</#list>
-        url: {
-          add: "/${entityPackage}/${entityName?uncap_first}/add",
-          edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-           ${tableVo.entityName?uncap_first}: {
-            list: '/${entityPackage}/${entityName?uncap_first}/queryById'
-           },
-<#list subTables as sub><#rt/>
-          ${sub.entityName?uncap_first}: {
-            list: '/${entityPackage}/${entityName?uncap_first}/query${sub.entityName}ByMainId'
-          },
-</#list>
-        }
       }
     },
-    methods: {
+    methods:{
-      getAllTable() {
+      add () {
-        <#if hasOne2Many==true>
+        this.visible=true
-        let values = this.tableKeys.map(key => getRefPromise(this, key))
+        this.$nextTick(()=>{
-        return Promise.all(values)
+          this.$refs.realForm.add();
-        <#else>
-        return new Promise(resolve => {
-          resolve([]);
-        })
-        </#if>
-      },
-      /** 调用完edit()方法之后会自动调用此方法 */
-      editAfter() {
-        let fieldval = pick(this.model<#list columns as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>)
-        this.$nextTick(() => {
-          this.form.setFieldsValue(fieldval)
-<#list subTables as sub><#rt/>
-<#if sub.foreignRelationType =='1'>
-          this.$refs.${sub.entityName?uncap_first}Form.initFormData(this.url.${sub.entityName?uncap_first}.list,this.model.id)
-</#if>
-</#list>
-        })
-        // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
-<#list subTables as sub><#rt/>
-<#if sub.foreignRelationType =='0'>
-          this.requestSubTableData(this.url.${sub.entityName?uncap_first}.list, params, this.${sub.entityName?uncap_first}Table)
-</#if>
-</#list>
-        }
-      },
-      /** 整理成formData */
-      classifyIntoFormData(allValues) {
-        let main = Object.assign(this.model, allValues.formValue)
-        return {
-          ...main, // 展开
-<#assign subManyIndex = 0>
-<#list subTables as sub><#rt/>
-<#if sub.foreignRelationType =='0'>
-          ${sub.entityName?uncap_first}List: allValues.tablesValue[${subManyIndex}].values,
-          <#assign subManyIndex = subManyIndex+1>
-<#else>
-          ${sub.entityName?uncap_first}List: this.$refs.${sub.entityName?uncap_first}Form.getFormData(),
-</#if>
-</#list>
-        }
-      },
-       /** 确定按钮点击事件 */
-            handleOk() {
-              /** 触发表单验证 */
-              this.getAllTable().then(tables => {
-                return validateFormAndTables(this.form, tables)
-              }).then(allValues => {
-                if (typeof this.classifyIntoFormData !== 'function') {
-                  throw this.throwNotFunction('classifyIntoFormData')
-                }
-                console.log("this.classifyIntoFormData",typeof this.classifyIntoFormData)
-                let formData = this.classifyIntoFormData(allValues)
-
-                // 发起请求
-                return this.request(formData)
-              }).catch(e => {
-                if (e.error === VALIDATE_NO_PASSED) {
-                  // 如果有未通过表单验证的子表，就自动跳转到它所在的tab
-                  this.activeKey = e.index == null ? this.refKeys[0] : this.refKeys[e.index+1]
-                } else {
-                  console.error(e)
-                }
         })
       },
-      validateError(msg){
+      edit (record) {
-        this.$message.error(msg)
+        this.visible=true
+        this.$nextTick(()=>{
+          this.$refs.realForm.edit(record);
+        })
       },
-     popupCallback(row){
+      close () {
-       this.form.setFieldsValue(pick(row<#list columns as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>))
+        this.$emit('close');
+        this.visible = false;
       },
-   <#if form_cat_tree>
+      handleOk () {
-     handleCategoryChange(value,backObj){
+        this.$refs.realForm.handleOk();
-       this.form.setFieldsValue(backObj)
+      },
+      submitCallback(){
+        this.$emit('ok');
+        this.visible = false;
+      },
+      handleCancel () {
+        this.close()
       }
-   </#if>
-
     }
   }
 </script>

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template-online/tab/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/[1-n]Form.vuei

@@ -4,8 +4,9 @@
 #segment#${sub.entityName}Form.vue
 <template>
   <j-form-container :disabled="disabled">
-      <a-form :form="form" slot="detail">
+      <a-form-model ref="form" :model="model" :rules="validatorRules" slot="detail">
         <a-row>
+<#assign form_popup = false>
 <#assign form_cat_tree = false>
 <#assign form_cat_back = "">
 <#assign form_span = 24>
@@ -26,80 +27,77 @@
 	</#if>
 	<#if po.classType =='textarea'>
           <a-col :span="24">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2">
+            <a-form-model-item label="${po.filedComment}" :labelCol="labelCol2" :wrapperCol="wrapperCol2" prop="${autoStringSuffixForModel(po)}">
 	<#else>
           <a-col :span="${form_span}">
-            <a-form-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol">
+            <a-form-model-item label="${po.filedComment}" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${autoStringSuffixForModel(po)}">
 	</#if>
 	<#if po.classType =='date'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%"/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%"/>
 	<#elseif po.classType =='datetime'>
-              <j-date placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
+              <j-date placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" style="width: 100%"/>
 	<#elseif po.classType =='time'>
-              <j-time placeholder="请选择${po.filedComment}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
+              <j-time placeholder="请选择${po.filedComment}" v-model="model.${po.fieldName}" style="width: 100%" <#if po.readonly=='Y'>disabled</#if>/>
 	<#elseif po.classType =='popup'>
+	       <#assign form_popup=true>
               <j-popup
-                v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"
+                v-model="model.${po.fieldName}"
-                :trigger-change="true"
+                field="${po.fieldName}"
                 org-fields="${po.dictField}"
                 dest-fields="${Format.underlineToHump(po.dictText)}"
                 code="${po.dictTable}"
-                @callback="popupCallback"/>
+                :multi="${po.extendParams.popupMulti?c}"
+                @input="popupCallback"/>
     <#elseif po.classType =='sel_depart'>
-              <j-select-depart v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" multi/>
+              <j-select-depart v-model="model.${po.fieldName}" multi/>
 <#elseif po.classType =='switch'>
-              <j-switch v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" <#if po.dictField?default("")?trim?length gt 1>:options="${po.dictField}"</#if>></j-switch>
+              <j-switch v-model="model.${po.fieldName}" <#if po.dictField!= 'is_open'>:options="${po.dictField}"</#if>></j-switch>
 	<#elseif po.classType =='pca'>
-		      <j-area-linkage type="cascader" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入省市区"/>
+		      <j-area-linkage type="cascader" v-model="model.${po.fieldName}" placeholder="请输入省市区"/>
 	<#elseif po.classType =='markdown'>
-	          <j-markdown-editor v-decorator="[${autoStringSuffix(po)},{initialValue:''}]" id="${po.fieldName}"></j-markdown-editor>
+	          <j-markdown-editor v-model="model.${autoStringSuffixForModel(po)}" id="${po.fieldName}"></j-markdown-editor>
     <#elseif po.classType =='password'>
-	          <a-input-password v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}"/>
+	          <a-input-password v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}"/>
 	<#elseif po.classType =='sel_user'>
-              <j-select-user-by-dep v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"/>
+              <j-select-user-by-dep v-model="model.${po.fieldName}"/>
 	<#elseif po.classType =='textarea'>
-              <a-textarea v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" rows="4" placeholder="请输入${po.filedComment}"/>
+              <a-textarea v-model="model.${autoStringSuffixForModel(po)}" rows="4" placeholder="请输入${po.filedComment}"/>
 	<#elseif po.classType=='list' || po.classType=='radio'>
-              <j-dict-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
+              <j-dict-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
 	<#elseif po.classType=='list_multi' || po.classType=='checkbox'>
-              <j-multi-select-tag type="${po.classType}" v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
+              <j-multi-select-tag type="${po.classType}" v-model="model.${po.fieldName}" dictCode="${form_field_dictCode}" placeholder="请选择${po.filedComment}"/>
 	<#elseif po.classType=='sel_search'>
-              <j-search-select-tag v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" dict="${form_field_dictCode}" />
+              <j-search-select-tag v-model="model.${po.fieldName}" dict="${form_field_dictCode}" />
     <#elseif po.classType=='cat_tree'>
     	<#assign form_cat_tree = true>
-              <j-category-select v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${po.dictText}" @change="handleCategoryChange"</#if>/>
+              <j-category-select v-model="model.${po.fieldName}" pcode="${po.dictField?default("")}" placeholder="请选择${po.filedComment}" <#if po.dictText?default("")?trim?length gt 1>back="${dashedToCamel(po.dictText)}" @change="handleCategoryChange"</#if>/>
     	<#if po.dictText?default("")?trim?length gt 1>
     	<#assign form_cat_back = "${po.dictText}">
     	</#if>
 	<#elseif po.fieldDbType=='int' || po.fieldDbType=='double' || po.fieldDbType=='BigDecimal'>
-              <a-input-number v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}" style="width: 100%"/>
+              <a-input-number v-model="model.${po.fieldName}" placeholder="请输入${po.filedComment}" style="width: 100%"/>
 	<#elseif po.classType=='file'>
-              <j-upload v-decorator="['${po.fieldName}'${autoWriteRules(po)}]" :trigger-change="true"></j-upload>
+              <j-upload v-model="model.${po.fieldName}"></j-upload>
 	<#elseif po.classType=='image'>
-              <j-image-upload isMultiple v-decorator="['${po.fieldName}'${autoWriteRules(po)}]"></j-image-upload>
+              <j-image-upload isMultiple v-model="model.${po.fieldName}"></j-image-upload>
 	<#elseif po.classType=='umeditor'>
-              <j-editor v-decorator="[${autoStringSuffix(po)},{trigger:'input'}]"/>
+              <j-editor v-model="model.${autoStringSuffixForModel(po)}"/>
 	<#else>
-              <a-input v-decorator="[${autoStringSuffix(po)}${autoWriteRules(po)}]" placeholder="请输入${po.filedComment}"></a-input>
+              <a-input v-model="model.${autoStringSuffixForModel(po)}" placeholder="请输入${po.filedComment}"></a-input>
-    </#if>
-            </a-form-item>
-            <#if form_cat_tree && form_cat_back?length gt 1>
-            <a-form-item v-show="false">
-              <a-input v-decorator="['${form_cat_back}']"></a-input>
-            </a-form-item>
     </#if>
+            </a-form-model-item>
           </a-col>
 </#if>
 </#list>
         </a-row>
-      </a-form>
+      </a-form-model>
   </j-form-container>
 </template>
 <script>
-  import pick from 'lodash.pick'
   import { getAction } from '@/api/manage'
   import { validateDuplicateValue } from '@/utils/util'
-  import JFormContainer from '@/components/Jero/JFormContainer'
+  import JFormContainer from '@/components/jero/JFormContainer'
+  import { VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
 
   export default {
     name: '${sub.entityName}Form',
@@ -115,8 +113,9 @@
     },
     data () {
       return {
-        form: this.$form.createForm(this),
+        model: {
-        model: {},
+        <#include "/common/init/initValueSub.ftl">
+        },
         labelCol: {
           xs: { span: 24 },
           sm: { span: 6 },
@@ -137,11 +136,15 @@
         confirmLoading: false,
       }
     },
+    created () {
+     //备份model原始值
+      this.modelDefault = JSON.parse(JSON.stringify(this.model));
+    },
     methods:{
       initFormData(url,id){
         this.clearFormData()
         if(!id){
-          this.edit({})
+         this.edit(this.modelDefault);
         }else{
           getAction(url,{id:id}).then(res=>{
             if(res.success){
@@ -156,42 +159,50 @@
       edit(record){
         this.model = Object.assign({}, record)
         console.log("${sub.entityName}Form-edit",this.model);
-        let fieldval = pick(this.model<#list sub.colums as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>)
-        this.$nextTick(() => {
-          this.form.setFieldsValue(fieldval)
-        })
       },
       getFormData(){
         let formdata_arr = []
-        this.form.validateFields((err, values) => {
+        this.$refs.form.validate(valid => {
-          if (!err) {
+          if (valid) {
-            let formdata = Object.assign(this.model, values)
             let isNullObj = true
-            Object.keys(formdata).forEach(key=>{
+            Object.keys(this.model).forEach(key=>{
-              if(formdata[key]){
+              if( this.model[key]){
                 isNullObj = false
               }
             })
             if(!isNullObj){
-              formdata_arr.push(formdata)
+              formdata_arr.push(this.model)
             }
           }else{
             this.$emit("validateError","${sub.ftlDescription}表单校验未通过");
+            return false
           }
         })
-        console.log("${sub.ftlDescription}表单数据集",formdata_arr);
         return formdata_arr;
       },
-      popupCallback(row){
+      validate(index){
-        this.form.setFieldsValue(pick(row<#list sub.colums as po><#if po.fieldName !='id'>,${autoStringSuffix(po)}</#if></#list>))
+        return new Promise((resolve, reject) => {
+          // 验证主表表单
+         this.$refs.form.validate(valid => {
+            !valid ? reject({ error: VALIDATE_NO_PASSED ,index}) : resolve()
+          })
+        }).then(values => {
+          return Promise.resolve()
+        }).catch(error => {
+          return Promise.reject(error)
+        })
       },
+      <#if form_popup>
+      popupCallback(value,row){
+      this.model = Object.assign(this.model, row);
+      },
+       </#if>
       clearFormData(){
-        this.form.resetFields()
+        this.$refs.form.clearValidate()
-        this.model={}
       },
       <#if form_cat_tree>
       handleCategoryChange(value,backObj){
-        this.form.setFieldsValue(backObj);
+        this.model = Object.assign(this.model,backObj);
       }
       </#if>
     }

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -10,35 +10,31 @@
     cancelText="关闭">
     
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
       
 <#list columns as po><#rt/>
 <#if po.fieldName !='id'><#rt/>
-        <a-form-item
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${po.fieldName}" label="${po.filedComment}">
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="${po.filedComment}">
           <#if po.fieldType =='date'>
-          <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+          <a-date-picker v-model="model.${po.fieldName}"/>
           <#elseif po.fieldType =='datetime'>
-          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+          <a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.${po.fieldName}" />
           <#elseif "int,decimal,double,"?contains(po.fieldType)>
-          <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+          <a-input-number v-model="model.${po.fieldName}"/>
           <#else>
-          <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+          <a-input placeholder="请输入${po.filedComment}" v-model="model.${po.fieldName}" />
           </#if>
-        </a-form-item>
+        </a-form-model-item>
 </#if>
 </#list>
 		
-      </a-form>
+      </a-form-model>
     </a-spin>
   </j-modal>
 </template>
 
 <script>
   import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
   import moment from "moment"
 
   export default {
@@ -58,12 +54,11 @@
         },
 
         confirmLoading: false,
-        form: this.$form.createForm(this),
         validatorRules:{
         <#list columns as po>
         <#if po.fieldName !='id'>
         <#if po.nullable =='N'>
-        ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
+        ${po.fieldName}:[{ required: true, message: '请输入${po.filedComment}!' }],
         </#if>
         </#if>
 	    </#list>
@@ -78,32 +73,23 @@
     },
     methods: {
       add () {
+        //初始化默认值
         this.edit({});
       },
       edit (record) {
-        this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
-		  //时间格式化
-          <#list columns as po>
-          <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
-          this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
-          </#if>
-          </#list>
-        });
-
       },
       close () {
         this.$emit('close');
         this.visible = false;
+        this.$refs.form.clearValidate();
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
+         this.$refs.form.validate(valid => {
-          if (!err) {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -114,18 +100,7 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let formData = Object.assign(this.model, values);
+            httpAction(httpurl,this.model,method).then((res)=>{
-            //时间格式化
-            <#list columns as po>
-            <#if po.fieldName !='id' && po.fieldType =='date'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
-            <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
-            </#if>
-            </#list>
-            
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -136,9 +111,8 @@
               that.confirmLoading = false;
               that.close();
             })
-
+          }else{
-
+             return false;
-
           }
         })
       },

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/one/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal__Style#Drawer.vuei

@@ -5,41 +5,39 @@
       placement="right"
       :closable="false"
       @close="close"
-      :visible="visible"
+      :visible="visible">
-  >
 
     <a-spin :spinning="confirmLoading">
-      <a-form :form="form">
+      <a-form-model ref="form" :model="model" :rules="validatorRules">
       
 <#list columns as po><#rt/>
 <#if po.fieldName !='id'><#rt/>
-        <a-form-item
+        <a-form-model-item :labelCol="labelCol" :wrapperCol="wrapperCol" prop="${po.fieldName}" label="${po.filedComment}">
-          :labelCol="labelCol"
-          :wrapperCol="wrapperCol"
-          label="${po.filedComment}">
           <#if po.fieldType =='date'>
-          <a-date-picker v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+          <a-date-picker v-model="model.${po.fieldName}" />
           <#elseif po.fieldType =='datetime'>
-          <a-date-picker showTime format='YYYY-MM-DD HH:mm:ss' v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+          <a-date-picker showTime valueFormat='YYYY-MM-DD HH:mm:ss' v-model="model.${po.fieldName}" />
           <#elseif "int,decimal,double,"?contains(po.fieldType)>
-          <a-input-number v-decorator="[ '${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+          <a-input-number v-model="model.${po.fieldName}" />
           <#else>
-          <a-input placeholder="请输入${po.filedComment}" v-decorator="['${po.fieldName}', <#if po.nullable =='N'>validatorRules.${po.fieldName} <#else>{}</#if>]" />
+          <a-input placeholder="请输入${po.filedComment}" v-model="model.${po.fieldName}" />
           </#if>
-        </a-form-item>
+        </a-form-model-item>
 </#if>
 </#list>
 		
-      </a-form>
+      </a-form-model>
     </a-spin>
+
+    <div class="drawer-bootom-button">
       <a-button type="primary" @click="handleOk">确定</a-button>
       <a-button type="primary" @click="handleCancel">取消</a-button>
+    </div>
   </a-drawer>
 </template>
 
 <script>
   import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
   import moment from "moment"
 
   export default {
@@ -59,12 +57,11 @@
         },
 
         confirmLoading: false,
-        form: this.$form.createForm(this),
         validatorRules:{
         <#list columns as po>
         <#if po.fieldName !='id'>
         <#if po.nullable =='N'>
-        ${po.fieldName}:{rules: [{ required: true, message: '请输入${po.filedComment}!' }]},
+        ${po.fieldName}:[{ required: true, message: '请输入${po.filedComment}!' }],
         </#if>
         </#if>
 	    </#list>
@@ -79,32 +76,23 @@
     },
     methods: {
       add () {
+        //初始化默认值
         this.edit({});
       },
       edit (record) {
-        this.form.resetFields();
         this.model = Object.assign({}, record);
         this.visible = true;
-        this.$nextTick(() => {
-          this.form.setFieldsValue(pick(this.model<#list columns as po><#if po.fieldName !='id' && po.fieldType?index_of("date")==-1>,'${po.fieldName}'</#if></#list>))
-		  //时间格式化
-          <#list columns as po>
-          <#if po.fieldName !='id' && po.fieldType?index_of("date")!=-1>
-          this.form.setFieldsValue({${po.fieldName}:this.model.${po.fieldName}?moment(this.model.${po.fieldName}):null})
-          </#if>
-          </#list>
-        });
-
       },
       close () {
         this.$emit('close');
         this.visible = false;
+        this.$refs.form.clearValidate();
       },
       handleOk () {
         const that = this;
         // 触发表单验证
-        this.form.validateFields((err, values) => {
+        this.$refs.form.validate(valid => {
-          if (!err) {
+          if (valid) {
             that.confirmLoading = true;
             let httpurl = '';
             let method = '';
@@ -115,18 +103,7 @@
               httpurl+=this.url.edit;
                method = 'put';
             }
-            let formData = Object.assign(this.model, values);
+            httpAction(httpurl,this.model,method).then((res)=>{
-            //时间格式化
-            <#list columns as po>
-            <#if po.fieldName !='id' && po.fieldType =='date'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format():null;
-            <#elseif po.fieldName !='id' && po.fieldType =='datetime'>
-            formData.${po.fieldName} = formData.${po.fieldName}?formData.${po.fieldName}.format('YYYY-MM-DD HH:mm:ss'):null;
-            </#if>
-            </#list>
-            
-            console.log(formData)
-            httpAction(httpurl,formData,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
                 that.$emit('ok');
@@ -137,9 +114,8 @@
               that.confirmLoading = false;
               that.close();
             })
-
+          }else{
-
+            return false;
-
          }
         })
       },
@@ -153,10 +129,22 @@
 </script>
 
 <style lang="less" scoped>
-/** Button按钮间距 */
+  /**Button按钮间距*/
   .ant-btn {
     margin-left: 30px;
     margin-bottom: 30px;
     float: right;
   }
+ /**抽屉按钮样式*/
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: -8px;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
 </style>

jero-boot/jero-boot-single-startup/src/main/resources/jero/code-template/onetomany/java/${bussiPackage}/${entityPackage}/vue/modules/${entityName}Modal.vuei

@@ -4,178 +4,54 @@
     :width="1200"
     :visible="visible"
     :maskClosable="false"
-    :confirmLoading="confirmLoading"
     switchFullscreen
     @ok="handleOk"
     @cancel="handleCancel">
-    <a-spin :spinning="confirmLoading">
+     <${Format.humpToShortbar(entityName)}-form ref="realForm" @ok="submitCallback"/>
-      <!-- 主表单区域 -->
-      <a-form :form="form">
-<#list columns as po><#rt/>
-  <#if po_index % 2 == 0 ><#rt/>
-        <a-row>
-    <#if po.fieldName !='id'>
-      <#list [po_index, po_index+1] as idx><#rt/>
-        <#if idx lt columns?size>
-          <a-col :xs="24" :sm="12">
-            <a-form-item
-              :labelCol="labelCol"
-              :wrapperCol="wrapperCol"
-              label="${columns[idx].filedComment}">
-            <#if columns[idx].fieldType =='date'>
-              <a-date-picker
-                placeholder="请输入${columns[idx].filedComment}"
-                style="width:100%"
-                v-decorator="[ '${columns[idx].fieldName}', <#if columns[idx].nullable =='N'>validatorRules.${columns[idx].fieldName} <#else>{}</#if>]"/>
-            <#elseif columns[idx].fieldType =='datetime'>
-              <a-date-picker
-                placeholder="请输入${columns[idx].filedComment}"
-                style="width:100%"
-                :showTime="true"
-                format="YYYY-MM-DD HH:mm:ss"
-                v-decorator="[ '${columns[idx].fieldName}', <#if columns[idx].nullable =='N'>validatorRules.${columns[idx].fieldName} <#else>{}</#if>]"/>
-            <#elseif "int,decimal,double,"?contains(columns[idx].fieldType)>
-              <a-input-number placeholder="请输入${columns[idx].filedComment}" style="width:100%" v-decorator="[ '${columns[idx].fieldName}', <#if columns[idx].nullable =='N'>validatorRules.${columns[idx].fieldName} <#else>{}</#if>]"/>
-            <#else>
-              <a-input placeholder="请输入${columns[idx].filedComment}" v-decorator="['${columns[idx].fieldName}', <#if columns[idx].nullable =='N'>validatorRules.${columns[idx].fieldName} <#else>{}</#if>]"/>
-            </#if>
-            </a-form-item>
-          </a-col>
-        </#if>
-      </#list><#rt/>
-    </#if><#rt/>
-        </a-row>
-  </#if><#rt/>
-</#list>
-      </a-form>
-
-      <!-- 子表单区域 -->
-      <a-tabs v-model="activeKey" @change="handleChangeTabs">
-<#list subTables as sub><#rt/>
-        <a-tab-pane tab="${sub.ftlDescription}" :key="refKeys[${sub_index}]" :forceRender="true">
-          <j-editable-table
-            :ref="refKeys[${sub_index}]"
-            :loading="${sub.entityName?uncap_first}Table.loading"
-            :columns="${sub.entityName?uncap_first}Table.columns"
-            :dataSource="${sub.entityName?uncap_first}Table.dataSource"
-            :maxHeight="300"
-            :rowNumber="true"
-            :rowSelection="true"
-            :actionButton="true"/>
-        </a-tab-pane>
-</#list>
-      </a-tabs>
-
-    </a-spin>
   </j-modal>
 </template>
 
 <script>
 
-  import moment from 'moment'
+ import ${entityName}Form from './${entityName}Form'
-  import pick from 'lodash.pick'
-  import { FormTypes } from '@/utils/JEditableTableUtil'
-  import { JEditableTableMixin } from '@/mixins/JEditableTableMixin'
-
  export default {
      name: '${entityName}Modal',
-    mixins: [JEditableTableMixin],
+     components: {
+       ${entityName}Form
+     },
      data() {
        return {
-        // 新增时子表默认添加几行空数据
+         title:'',
-        addDefaultRowNum: 1,
+         visible: false,
-        validatorRules: {
+         disableSubmit: false
-<#list columns as po>
-  <#if po.fieldName !='id'>
-    <#if po.nullable =='N'>
-          ${po.fieldName}: { rules: [{ required: true, message: '请输入${po.filedComment}!' }] },
-    </#if>
-  </#if>
-</#list>
-        },
-        refKeys: [<#list subTables as sub>'${sub.entityName?uncap_first}', </#list>],
-        activeKey: '${subTables[0].entityName?uncap_first}',
-<#list subTables as sub><#rt/>
-        // ${sub.ftlDescription}
-        ${sub.entityName?uncap_first}Table: {
-          loading: false,
-          dataSource: [],
-          columns: [
-<#list sub.colums as col><#rt/>
-    <#if col.filedComment !='外键'>
-            {
-              title: '${col.filedComment}',
-              key: '${col.fieldName}',
-      <#if col.fieldType =='date'>
-              type: FormTypes.date,
-      <#elseif col.fieldType =='datetime'>
-              type: FormTypes.datetime,
-      <#elseif "int,decimal,double,"?contains(col.fieldType)>
-              type: FormTypes.inputNumber,
-      <#else>
-              type: FormTypes.input,
-      </#if>
-              defaultValue: '',
-              placeholder: '请输入${'$'}{title}',
-      <#if col.nullable =='N'>
-              validateRules: [{ required: true, message: '${'$'}{title}不能为空' }],
-      </#if>
-            },
-    </#if>
-</#list>
-          ]
-        },
-</#list>
-        url: {
-          add: "/${entityPackage}/${entityName?uncap_first}/add",
-          edit: "/${entityPackage}/${entityName?uncap_first}/edit",
-<#list subTables as sub><#rt/>
-          ${sub.entityName?uncap_first}: {
-            list: '/${entityPackage}/${entityName?uncap_first}/query${sub.entityName}ByMainId'
-          },
-</#list>
-        }
        }
      },
-    methods: {
+     methods:{
- 
+       add () {
-      /** 调用完edit()方法之后会自动调用此方法 */
+         this.visible=true
-      editAfter() {
+         this.$nextTick(()=>{
-        this.$nextTick(() => {
+           this.$refs.realForm.add();
-          this.form.setFieldsValue(pick(this.model, <#list columns as col>'${col.fieldName}', </#list>))
-          // 时间格式化
-<#list columns as col><#rt/>
-	<#if col.fieldName !='id' && (col.fieldType =='date' || col.fieldType =='datetime')>
-          this.form.setFieldsValue({ ${col.fieldName}: this.model.${col.fieldName} ? moment(this.model.${col.fieldName}) : null })
-	</#if>
-</#list>  
          })
-        // 加载子表数据
-        if (this.model.id) {
-          let params = { id: this.model.id }
-<#list subTables as sub><#rt/>
-          this.requestSubTableData(this.url.${sub.entityName?uncap_first}.list, params, this.${sub.entityName?uncap_first}Table)
-</#list>
-        }
        },
- 
+       edit (record) {
-      /** 整理成formData */
+         this.visible=true
-      classifyIntoFormData(allValues) {
+         this.$nextTick(()=>{
-        let main = Object.assign(this.model, allValues.formValue)
+           this.$refs.realForm.edit(record);
-        //时间格式化
+         })
-<#list columns as col><#rt/>
+       },
-	<#if col.fieldName !='id' && col.fieldType =='date'>
+       close () {
-        main.${col.fieldName} = main.${col.fieldName} ? main.${col.fieldName}.format() : null;
+         this.$emit('close');
-	<#elseif col.fieldName !='id' && col.fieldType =='datetime'>
+         this.visible = false;
-        main.${col.fieldName} = main.${col.fieldName} ? main.${col.fieldName}.format('YYYY-MM-DD HH:mm:ss') : null;
+       },
-	</#if>
+       handleOk () {
-</#list>
+         this.$refs.realForm.handleOk();
-        return {
+       },
-          ...main, // 展开
+       submitCallback(){
-<#list subTables as sub><#rt/>
+         this.$emit('ok');
-          ${sub.entityName?uncap_first}List: allValues.tablesValue[${sub_index}].values,
+         this.visible = false;
-</#list>
+       },
-        }
+       handleCancel () {
+         this.close()
        }
      }
    }

jero-boot/jero-boot-starter/jero-boot-starter-job/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jero-boot-starter</artifactId>
         <groupId>com.jero.boot</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jero-boot-starter-job</artifactId>

jero-boot/jero-boot-starter/jero-boot-starter-lock/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>jero-boot-starter</artifactId>
         <groupId>com.jero.boot</groupId>
-        <version>2.4.2</version>
+        <version>2.4.3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jero-boot-starter-lock</artifactId>

jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/annotation/JLock.java

@@ -14,7 +14,7 @@ import java.lang.annotation.*;
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
 @Inherited
-public @interface DistributedLock {
+public @interface JLock {
 
     /**
      * 锁的模式:如果不设置,自动模式,当参数只有一个.使用 REENTRANT 参数多个 MULTIPLE
@@ -28,8 +28,7 @@ public @interface DistributedLock {
     String[] lockKey() default {};
 
     /**
-     * key的静态常量:当key的spel的值是LIST,数组时使用+号连接将会被spel认为这个变量是个字符串,只能产生一把锁,达不到我们的目的,<br />
+     * key的静态常量:当key的spel的值是LIST,数组时使用+号连接将会被spel认为这个变量是个字符串
-     * 而我们如果又需要一个常量的话.这个参数将会在拼接在每个元素的后面
      * @return
      */
     String keyConstant() default "";

jero-boot/jero-boot-starter/jero-boot-starter-lock/src/main/java/com/jero/boot/starter/lock/annotation/JRepeat.java

@@ -0,0 +1,36 @@
+package com.jero.boot.starter.lock.annotation;
+
+/**
+ * @author zyf
+ */
+
+import java.lang.annotation.*;
+
+/**
+ * 防止重复提交的注解
+ *
+ * @author 2019年6月18日
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ElementType.METHOD})
+@Documented
+public @interface JRepeat {
+
+    /**
+     * 超时时间
+     *
+     * @return
+     */
+    int lockTime();
+
+
+    /**
+     * redis 锁key的
+     *
+     * @return redis 锁key
+     */
+    String lockKey() default "";
+
+
+
+}