修改mysql脚本执行报错问题、支持生成大写QRTZ表

用户数据量较大时，功能测试报错 issues/3196
用户数据量较大时，功能测试报错（通过部门选择用户，左侧部门数据改成异步加载） issues/3196
2025-12-08 17:12:28 +08:00 · 2021-12-07 19:16:25 +08:00 · 2021-12-06 09:32:13 +08:00 · 2021-12-06 00:15:27 +08:00 · 2021-12-06 00:08:29 +08:00 · 2021-12-06 00:04:58 +08:00
393 changed files with 27735 additions and 15144 deletions
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -9,4 +9,9 @@



-友情提示： 未按格式要求发帖，会直接删掉。
+#### 友情提示（为了提高issue处理效率）：
+  - 未按格式要求发帖，会被直接删掉;
+  - 请自己初判问题描述是否清楚，是否方便我们调查处理；
+  - 针对问题请说明是Online在线功能(需说明用的主题模板)，还是生成的代码功能；
+  - 描述过于简单或模糊，导致无法处理的，会被直接删掉；
+  
--- a/9
+++ b/9
@ -198,4 +198,11 @@
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
   See the License for the specific language governing permissions and
-   limitations under the License.
+   limitations under the License.
+   
+  开源协议补充
+   1.允许基于本平台软件开展业务系统开发。
+   2.不得基于该平台软件的基础，修改包装成一个与JeecgBoot平台软件功能类似的产品进行发布、销售，或与JeecgBoot参与同类软件产品市场的竞争。
+	 违反此条款属于侵权行为，须赔偿侵权经济损失，同时立即停止著作权侵权行为。
+	 解释权归：http://www.jeecg.com
+	 
--- a/README.md
+++ b/README.md
@ -1,18 +1,19 @@


-![JEECG](https://static.oschina.net/uploads/img/201905/24164523_XDhg.png "JeecgBoot低代码开发平台")
+![JEECG](https://jeecgos.oss-cn-beijing.aliyuncs.com/files/site/jeecgfengm.png "JeecgBoot低代码开发平台")



 JEECG BOOT 低代码开发平台（前后端分离版本）
 ===============

-当前最新版本： 2.4.3（发布日期：2021-03-22）
+当前最新版本： 3.0（发布日期：2021-11-01）


 [![AUR](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg)](https://github.com/zhangdaiscott/jeecg-boot/blob/master/LICENSE)
 [![](https://img.shields.io/badge/Author-北京国炬软件-orange.svg)](http://www.jeecg.com)
-[![](https://img.shields.io/badge/version-2.4.3-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
+[![](https://img.shields.io/badge/Blog-官方博客-blue.svg)](https://jeecg.blog.csdn.net)
+[![](https://img.shields.io/badge/version-3.0-brightgreen.svg)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub stars](https://img.shields.io/github/stars/zhangdaiscott/jeecg-boot.svg?style=social&label=Stars)](https://github.com/zhangdaiscott/jeecg-boot)
 [![GitHub forks](https://img.shields.io/github/forks/zhangdaiscott/jeecg-boot.svg?style=social&label=Fork)](https://github.com/zhangdaiscott/jeecg-boot)

@ -23,7 +24,7 @@ JEECG BOOT 低代码开发平台（前后端分离版本）

 <h3 align="center">Java Low Code Platform for Enterprise web applications</h3>

-JeecgBoot 是一款基于代码生成器的`低代码`开发平台！前后端分离架构 SpringBoot2.x，SpringCloud，Ant Design&Vue，Mybatis-plus，Shiro，JWT，支持微服务。强大的代码生成器让前后端代码一键生成，实现低代码开发!  JeecgBoot 引领新的低代码开发模式(OnlineCoding-> 代码生成器-> 手工MERGE)， 帮助解决Java项目70%的重复工作，让开发更多关注业务。既能快速提高效率，节省研发成本，同时又不失灵活性！
+JeecgBoot 是一款基于代码生成器的`低代码平台`！前后端分离架构 SpringBoot2.x，SpringCloud，Ant Design&Vue，Mybatis-plus，Shiro，JWT，支持微服务。强大的代码生成器让前后端代码一键生成，实现低代码开发!  JeecgBoot 引领新的低代码开发模式(OnlineCoding-> 代码生成器-> 手工MERGE)， 帮助解决Java项目70%的重复工作，让开发更多关注业务。既能快速提高效率，节省研发成本，同时又不失灵活性！

 JeecgBoot 提供了一系列`低代码模块`，实现在线开发`真正的零代码`：Online表单开发、Online报表、报表配置能力、在线图表设计、大屏设计、移动配置能力、表单设计器、在线设计流程、流程自动化配置、插件能力（可插拔）等等！

@ -44,14 +45,16 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，

 - 技术官网：  [http://www.jeecg.com](http://www.jeecg.com)

- 开发文档：  [http://doc.jeecg.com](http://doc.jeecg.com)
-
- 微服务启动：  [单体升级为微服务启动文档2.4+](http://doc.jeecg.com/2043906)
-
 - 在线演示 ： [http://boot.jeecg.com](http://boot.jeecg.com)

+- 在线演示(VUE3beta版)：[http://boot3.jeecg.com](http://boot3.jeecg.com)
+
+- 开发文档：  [http://doc.jeecg.com](http://doc.jeecg.com)
+
 - 视频教程  ：[JeecgBoot入门视频](http://www.jeecg.com/doc/video)

+- 微服务启动：  [单体升级为微服务启动文档2.4+](http://doc.jeecg.com/2043906)
+
 - 常见问题：  [入门常见问题Q&A](http://jeecg.com/doc/qa)

 - 更新日志：  [版本日志](http://www.jeecg.com/doc/log)
@ -61,13 +64,13 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，
 交流互动
 -----------------------------------

- QQ交流群 ：  ③816531124、②769925425（满）、①284271917（满）
+- QQ交流群 ： ⑤860162132、④774126647(满)、③816531124(满)、②769925425(满)、①284271917(满)

 - 反馈问题：  [反馈问题，请按格式发Issues](https://github.com/zhangdaiscott/jeecg-boot/issues/new)

 - 参与开源：  [欢迎加入JEECG开源团队，共同进步！！](http://www.jeecg.com/doc/join)

- Online一分钟：  [1分钟快速学习](https://jeecg.blog.csdn.net/article/details/106078912)
+- Online一分钟：  [1分钟快速学习](https://my.oschina.net/jeecg/blog/3083313)


 为什么选择JEECG-BOOT?
@ -90,7 +93,7 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，
 * 16.页面校验自动生成(必须输入、数字校验、金额校验、时间空间等);
 * 17.支持SAAS服务模式，提供SaaS多租户架构方案。
 * 18.分布式文件服务，集成minio、阿里OSS等优秀的第三方，提供便捷的文件上传与管理，同时也支持本地存储。
-* 19.主流数据库兼容，一套代码完全兼容Mysql、Postgresql、Oracle三大主流数据库。
+* 19.主流数据库兼容，一套代码完全兼容Mysql、Postgresql、Oracle、Sqlserver、MariaDB、达梦等主流数据库。
 * 20.集成工作流activiti，并实现了只需在页面配置流程转向，可极大的简化bpm工作流的开发；用bpm的流程设计器画出了流程走向，一个工作流基本就完成了，只需写很少量的java代码；
 * 21.低代码能力：在线流程设计，采用开源Activiti流程引擎，实现在线画流程,自定义表单,表单挂靠,业务流转
 * 22.多数据源：及其简易的使用方式，在线配置数据源配置，便捷的从其他数据抓取数据；
@ -129,17 +132,33 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，

 - 依赖管理：Maven

- 数据库：MySQL5.7+  &  Oracle 11g & Sqlserver2017
-
 - 缓存：Redis

+- 数据库脚本：MySQL5.7+  &  Oracle 11g & Sqlserver2017（默认只提供这三个库脚本，其他库需要自己转）
+
+|  数据库   |  支持   |
+| --- | --- |
+|   MySQL   |  √   |
+|  Oracle11g   |  √   |
+|  Sqlserver2017   |  √   |
+|   PostgreSQL   |  √   |
+|   DB2、Informix   |  √   |
+|   MariaDB   |  √   |
+|  SQLite、Hsqldb、Derby、H2   |  √   |
+|   达梦、人大金仓、神通   |  √   |
+|   华为高斯、虚谷、瀚高数据库   |  √   |
+|   阿里云PolarDB、PPAS、HerdDB   |  √   |
+|  Hive、HBase、CouchBase   |  √   |
+

 #### 后端
 - 基础框架：Spring Boot 2.3.5.RELEASE

 - 微服务框架： Spring Cloud Alibaba 2.2.3.RELEASE

- 持久层框架：Mybatis-plus 3.4.1
+- 持久层框架：Mybatis-plus 3.4.3.1、Minidao 
+
+- 报表工具： jimureport 1.3.78

 - 安全框架：Apache Shiro 1.7.0，Jwt 3.11.0

@ -382,11 +401,11 @@ Jeecg-Boot低代码开发平台，可以应用在任何J2EE项目的开发中，
 - 拉取项目代码
 ```bash
 git clone https://github.com/zhangdaiscott/jeecg-boot.git
-cd  jeecg-boot/ant-design-jeecg-vue
+cd  jeecg-boot/ant-design-vue-jeecg
 ```

 1. 安装node.js
-2. 切换到ant-design-jeecg-vue文件夹下
+2. 切换到ant-design-vue-jeecg文件夹下
 ```
 # 安装yarn
 npm install -g yarn
@ -487,9 +506,9 @@ yarn run lint

 - [Vue](https://cn.vuejs.org/v2/guide)

- [路由/菜单说明](https://gitee.com/jeecg/jeecg-boot/tree/v1.1/ant-design-jeecg-vue/src/router/README.md)
+- [路由/菜单说明](https://gitee.com/jeecg/jeecg-boot/tree/v1.1/ant-design-vue-jeecg/src/router/README.md)

- [ANTD 默认配置项](https://gitee.com/jeecg/jeecg-boot/blob/v1.1/ant-design-jeecg-vue/src/defaultSettings.js)
+- [ANTD 默认配置项](https://gitee.com/jeecg/jeecg-boot/blob/v1.1/ant-design-vue-jeecg/src/defaultSettings.js)

 - 其他待补充...

--- a/ant-design-vue-jeecg/README.md
+++ b/ant-design-vue-jeecg/README.md
@ -1,13 +1,13 @@
 Ant Design Jeecg Vue
 ====

-当前最新版本： 2.4.3（发布日期：20210322）
+当前最新版本： 3.0.0（发布日期：2021-11-01）

 Overview
 ----

 基于 [Ant Design of Vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/) 实现的 Ant Design Pro  Vue 版
-Jeecg-boot 的前段UI框架，采用前后端分离方案，提供强大代码生成器的低代码平台。
+Jeecg-boot 的前端UI框架，采用前后端分离方案，提供强大代码生成器的低代码平台。
 前端页面代码和后端功能代码一键生成，不需要写任何代码，保持jeecg一贯的强大！！


@ -33,7 +33,7 @@ Jeecg-boot 的前段UI框架，采用前后端分离方案，提供强大代码
 - 拉取项目代码
 ```bash
 git clone https://github.com/zhangdaiscott/jeecg-boot.git
-cd  jeecg-boot/ant-design-jeecg-vue
+cd  jeecg-boot/ant-design-vue-jeecg
 ```

 - 安装依赖
@ -93,9 +93,9 @@ yarn run lint

 - [Vue](https://cn.vuejs.org/v2/guide)

- [路由/菜单说明](https://github.com/zhangdaiscott/jeecg-boot/tree/master/ant-design-jeecg-vue/src/router/README.md)
+- [路由/菜单说明](https://github.com/zhangdaiscott/jeecg-boot/tree/master/ant-design-vue-jeecg/src/router/README.md)

- [ANTD 默认配置项](https://github.com/zhangdaiscott/jeecg-boot/tree/master/ant-design-jeecg-vue/src/defaultSettings.js)
+- [ANTD 默认配置项](https://github.com/zhangdaiscott/jeecg-boot/tree/master/ant-design-vue-jeecg/src/defaultSettings.js)

 - 其他待补充...

--- a/ant-design-vue-jeecg/package-lock.json
+++ b/ant-design-vue-jeecg/package-lock.json
@ -1,26 +1,26 @@
 {
  "name": "vue-antd-jeecg",
-  "version": "2.4.3",
+  "version": "2.2.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
    "@ant-design/colors": {
      "version": "3.2.2",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/colors/download/@ant-design/colors-3.2.2.tgz",
-      "integrity": "sha1-WtQ9YZ6RHzSI66wwPWBuZqhCOQM=",
+      "resolved": "https://registry.npmjs.org/@ant-design/colors/-/colors-3.2.2.tgz",
+      "integrity": "sha512-YKgNbG2dlzqMhA9NtI3/pbY16m3Yl/EeWBRa+lB1X1YaYxHrxNexiQYCLTWO/uDvAjLFMEDU+zR901waBtMtjQ==",
      "requires": {
        "tinycolor2": "^1.4.1"
      }
    },
    "@ant-design/icons": {
      "version": "2.1.1",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/icons/download/@ant-design/icons-2.1.1.tgz?cache=0&sync_timestamp=1612952243741&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Ficons%2Fdownload%2F%40ant-design%2Ficons-2.1.1.tgz",
-      "integrity": "sha1-e5wI3/1PXUHbZn2dvl4BB9C9mko="
+      "resolved": "https://registry.npmjs.org/@ant-design/icons/-/icons-2.1.1.tgz",
+      "integrity": "sha512-jCH+k2Vjlno4YWl6g535nHR09PwCEmTBKAG6VqF+rhkrSPRLfgpU2maagwbZPLjaHuU5Jd1DFQ2KJpQuI6uG8w=="
    },
    "@ant-design/icons-vue": {
      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/@ant-design/icons-vue/download/@ant-design/icons-vue-2.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2F%40ant-design%2Ficons-vue%2Fdownload%2F%40ant-design%2Ficons-vue-2.0.0.tgz",
-      "integrity": "sha1-A1f1AQpATp80qHpLQbKgjfaR284=",
+      "resolved": "https://registry.npmjs.org/@ant-design/icons-vue/-/icons-vue-2.0.0.tgz",
+      "integrity": "sha512-2c0QQE5hL4N48k5NkPG5sdpMl9YnvyNhf0U7YkdZYDlLnspoRU7vIA0UK9eHBs6OpFLcJB6o8eJrIl2ajBskPg==",
      "requires": {
        "@ant-design/colors": "^3.1.0",
        "babel-runtime": "^6.26.0"
@ -1417,18 +1417,18 @@
      "dev": true
    },
    "@simonwep/pickr": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npm.taobao.org/@simonwep/pickr/download/@simonwep/pickr-1.7.4.tgz",
-      "integrity": "sha1-sU/NlFiQOIuHDNbbTWx41THyUUE=",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/@simonwep/pickr/-/pickr-1.7.1.tgz",
+      "integrity": "sha512-ftbskrPKAkRLYVj8IhV4Bn86g16It9Uq/p4G0FdjRz36pKKjW0JdxdDWDIVuAev0Urg8604Ho98js6JmjXdiZQ==",
      "requires": {
        "core-js": "^3.6.5",
-        "nanopop": "^2.1.0"
+        "nanopop": "^1.3.0"
      },
      "dependencies": {
        "core-js": {
-          "version": "3.9.1",
-          "resolved": "https://registry.npm.taobao.org/core-js/download/core-js-3.9.1.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-3.9.1.tgz",
-          "integrity": "sha1-zsjeWT246yqF/7Db3rMSy25UYK4="
+          "version": "3.6.5",
+          "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.6.5.tgz",
+          "integrity": "sha512-vZVEEwZoIsI+vPEuoF9Iqf5H7/M3eeQqWlQnYa8FSKKePuYTf5MWnxb5SDAzCa60b3JBRS5g9b+Dq7b1y/RCrA=="
        }
      }
    },
@ -1443,6 +1443,11 @@
        "string-width": "^2.0.0"
      }
    },
+    "@sphinxxxx/color-conversion": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz",
+      "integrity": "sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw=="
+    },
    "@tinymce/tinymce-vue": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-2.1.0.tgz",
@ -3730,6 +3735,11 @@
        "negotiator": "0.6.2"
      }
    },
+    "ace-builds": {
+      "version": "1.4.12",
+      "resolved": "https://registry.npmjs.org/ace-builds/-/ace-builds-1.4.12.tgz",
+      "integrity": "sha512-G+chJctFPiiLGvs3+/Mly3apXTcfgE45dT5yp12BcWZ1kUs+gm0qd3/fv4gsz6fVag4mM0moHVpjHDIgph6Psg=="
+    },
    "acorn": {
      "version": "5.7.4",
      "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
@ -3777,8 +3787,8 @@
    },
    "add-dom-event-listener": {
      "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/add-dom-event-listener/download/add-dom-event-listener-1.1.0.tgz",
-      "integrity": "sha1-apLbOg3Qq8JU4JXA8dwUrLuq4xA=",
+      "resolved": "https://registry.npmjs.org/add-dom-event-listener/-/add-dom-event-listener-1.1.0.tgz",
+      "integrity": "sha512-WCxx1ixHT0GQU9hb0KI/mhgRQhnU+U3GvwY6ZvVjYq8rsihIGoaIOUbY0yMPBxLH5MDtr0kz3fisWGNcbWW7Jw==",
      "requires": {
        "object-assign": "4.x"
      }
@ -3914,9 +3924,9 @@
      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
    },
    "ant-design-vue": {
-      "version": "1.7.4",
-      "resolved": "https://registry.npm.taobao.org/ant-design-vue/download/ant-design-vue-1.7.4.tgz",
-      "integrity": "sha1-hU6QmF3A+pzMbWgcEEVgwA6q+FU=",
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.6.3.tgz",
+      "integrity": "sha512-Zt0z0SXzHCgow0chv4OA8lONxVOzXf7iLmZxdVHlsS3IaPn5n8QNPCzBUh3z0IXBdaDPiX9tjELQCXf9vdXdlw==",
      "requires": {
        "@ant-design/icons": "^2.1.1",
        "@ant-design/icons-vue": "^2.0.0",
@ -4028,8 +4038,8 @@
    },
    "array-tree-filter": {
      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/array-tree-filter/download/array-tree-filter-2.1.0.tgz",
-      "integrity": "sha1-hzrAD+yDdJ8lWsjdCDgUtPYykZA="
+      "resolved": "https://registry.npmjs.org/array-tree-filter/-/array-tree-filter-2.1.0.tgz",
+      "integrity": "sha512-4ROwICNlNw/Hqa9v+rk5h22KjmzB1JGTMVKP2AKJBOCgb0yL0ASf0+YvCcLNNwquOHNX48jkeZIJ3a+oOQqKcw=="
    },
    "array-union": {
      "version": "1.0.2",
@ -4138,9 +4148,9 @@
      "dev": true
    },
    "async-validator": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npm.taobao.org/async-validator/download/async-validator-3.5.1.tgz?cache=0&sync_timestamp=1605751734916&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fasync-validator%2Fdownload%2Fasync-validator-3.5.1.tgz",
-      "integrity": "sha1-zWK5aIskZfSEIOJ620d2CrG1VZ8="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/async-validator/-/async-validator-3.3.0.tgz",
+      "integrity": "sha512-cAHGD9EL8aCqWXjnb44q94MWiDFzUo1tMhvLb2WzcpWqGiKugsjWG9cvl+jPgkPca7asNbsBU3fa0cwkI/P+Xg=="
    },
    "asynckit": {
      "version": "0.4.0",
@ -4501,8 +4511,8 @@
    },
    "babel-helper-vue-jsx-merge-props": {
      "version": "2.0.3",
-      "resolved": "https://registry.npm.taobao.org/babel-helper-vue-jsx-merge-props/download/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
-      "integrity": "sha1-Iq69OzOQIyjlEyk6jkmSs4T58bY="
+      "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz",
+      "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg=="
    },
    "babel-helpers": {
      "version": "6.24.1",
@ -5617,8 +5627,8 @@
    },
    "classnames": {
      "version": "2.2.6",
-      "resolved": "https://registry.npm.taobao.org/classnames/download/classnames-2.2.6.tgz",
-      "integrity": "sha1-Q5Nb/90pHzJtrQogUwmzjQD2UM4="
+      "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz",
+      "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q=="
    },
    "clean-css": {
      "version": "4.2.3",
@ -6079,7 +6089,7 @@
    },
    "component-classes": {
      "version": "1.2.6",
-      "resolved": "https://registry.npm.taobao.org/component-classes/download/component-classes-1.2.6.tgz",
+      "resolved": "https://registry.npmjs.org/component-classes/-/component-classes-1.2.6.tgz",
      "integrity": "sha1-xkI5TDYYpNiwuJGe/Mu9kw5c1pE=",
      "requires": {
        "component-indexof": "0.0.3"
@ -6092,7 +6102,7 @@
    },
    "component-indexof": {
      "version": "0.0.3",
-      "resolved": "https://registry.npm.taobao.org/component-indexof/download/component-indexof-0.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz",
      "integrity": "sha1-EdCRMSI5648yyPJa6csAL/6NPCQ="
    },
    "compressible": {
@ -8018,7 +8028,7 @@
    },
    "dom-closest": {
      "version": "0.2.0",
-      "resolved": "https://registry.npm.taobao.org/dom-closest/download/dom-closest-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/dom-closest/-/dom-closest-0.2.0.tgz",
      "integrity": "sha1-69n5HRvyLo1vR3h2u80+yQIWwM8=",
      "requires": {
        "dom-matches": ">=1.0.1"
@ -8035,13 +8045,13 @@
    },
    "dom-matches": {
      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/dom-matches/download/dom-matches-2.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/dom-matches/-/dom-matches-2.0.0.tgz",
      "integrity": "sha1-0nKLQWqHUzmA6wibhI0lPPI6dYw="
    },
    "dom-scroll-into-view": {
      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/dom-scroll-into-view/download/dom-scroll-into-view-2.0.1.tgz",
-      "integrity": "sha1-DezIUigB/Y0/HGujVadNOCxfmJs="
+      "resolved": "https://registry.npmjs.org/dom-scroll-into-view/-/dom-scroll-into-view-2.0.1.tgz",
+      "integrity": "sha512-bvVTQe1lfaUr1oFzZX80ce9KLDlZ3iU+XGNE/bz9HnGdklTieqsbmsLHe+rT2XWqopvL0PckkYqN7ksmm5pe3w=="
    },
    "dom-serializer": {
      "version": "0.2.2",
@ -10588,7 +10598,7 @@
    },
    "intersperse": {
      "version": "1.0.0",
-      "resolved": "https://registry.npm.taobao.org/intersperse/download/intersperse-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/intersperse/-/intersperse-1.0.0.tgz",
      "integrity": "sha1-8lYfsc/vn1J3zDNHoiiGtDUaUYE="
    },
    "invariant": {
@ -10759,13 +10769,13 @@
    },
    "is-mobile": {
      "version": "2.2.2",
-      "resolved": "https://registry.npm.taobao.org/is-mobile/download/is-mobile-2.2.2.tgz",
-      "integrity": "sha1-9snF1Q7gElTOBec5vdg18e1OmVQ="
+      "resolved": "https://registry.npmjs.org/is-mobile/-/is-mobile-2.2.2.tgz",
+      "integrity": "sha512-wW/SXnYJkTjs++tVK5b6kVITZpAZPtUrt9SF80vvxGiF/Oywal+COk1jlRkiVq15RFNEQKQY31TkV24/1T5cVg=="
    },
    "is-negative-zero": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npm.taobao.org/is-negative-zero/download/is-negative-zero-2.0.1.tgz",
-      "integrity": "sha1-PedGwY3aIxkkGlNnWQjY92bxHCQ="
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz",
+      "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE="
    },
    "is-number": {
      "version": "7.0.0",
@ -10886,8 +10896,8 @@
    },
    "ismobilejs": {
      "version": "1.1.1",
-      "resolved": "https://registry.npm.taobao.org/ismobilejs/download/ismobilejs-1.1.1.tgz",
-      "integrity": "sha1-xWygro5Sskyg8iul7zIVot27qg4="
+      "resolved": "https://registry.npmjs.org/ismobilejs/-/ismobilejs-1.1.1.tgz",
+      "integrity": "sha512-VaFW53yt8QO61k2WJui0dHf4SlL8lxBofUuUmwBo0ljPk0Drz2TiuDW4jo3wDcv41qy/SxrJ+VAzJ/qYqsmzRw=="
    },
    "isobject": {
      "version": "3.0.1",
@ -10900,12 +10910,22 @@
      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
      "dev": true
    },
+    "javascript-natural-sort": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
+      "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
+    },
    "javascript-stringify": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/javascript-stringify/-/javascript-stringify-1.6.0.tgz",
      "integrity": "sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=",
      "dev": true
    },
+    "jmespath": {
+      "version": "0.15.0",
+      "resolved": "https://registry.npmjs.org/jmespath/-/jmespath-0.15.0.tgz",
+      "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
+    },
    "js-base64": {
      "version": "2.6.3",
      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.6.3.tgz",
@ -10984,6 +11004,11 @@
      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
    },
+    "json-source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/json-source-map/-/json-source-map-0.6.1.tgz",
+      "integrity": "sha512-1QoztHPsMQqhDq0hlXY5ZqcEdUzxQEIxgFkKl4WUp2pgShObl+9ovi4kRh2TfvAfxAoHOJ9vIMEqk3k4iex7tg=="
+    },
    "json-stable-stringify-without-jsonify": {
      "version": "1.0.1",
      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@ -11006,7 +11031,7 @@
    },
    "json2mq": {
      "version": "0.2.0",
-      "resolved": "https://registry.npm.taobao.org/json2mq/download/json2mq-0.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/json2mq/-/json2mq-0.2.0.tgz",
      "integrity": "sha1-tje9O6nqvhIsg+lyBIOusQ0skEo=",
      "requires": {
        "string-convert": "^0.2.0"
@ -11025,6 +11050,21 @@
        "minimist": "^1.2.0"
      }
    },
+    "jsoneditor": {
+      "version": "9.0.3",
+      "resolved": "https://registry.npmjs.org/jsoneditor/-/jsoneditor-9.0.3.tgz",
+      "integrity": "sha512-4uwT7nmNBAlC2KUUpsHaX2GZ+KoOohjtE/HzGToufYASGjnMzkf6EcLS+pAwwVHLv7VUnXmAuMY4NaQ9cS25lA==",
+      "requires": {
+        "ace-builds": "^1.4.11",
+        "ajv": "^6.12.2",
+        "javascript-natural-sort": "^0.7.1",
+        "jmespath": "^0.15.0",
+        "json-source-map": "^0.6.1",
+        "mobius1-selectr": "^2.4.13",
+        "picomodal": "^3.0.0",
+        "vanilla-picker": "^2.10.1"
+      }
+    },
    "jsonfile": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
@ -11432,7 +11472,7 @@
    },
    "lodash.toarray": {
      "version": "4.4.0",
-      "resolved": "https://registry.npm.taobao.org/lodash.toarray/download/lodash.toarray-4.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/lodash.toarray/-/lodash.toarray-4.4.0.tgz",
      "integrity": "sha1-JMS/zWsvuji/0FlNsRedjptlZWE="
    },
    "lodash.transform": {
@ -12024,10 +12064,15 @@
        "minimist": "^1.2.5"
      }
    },
+    "mobius1-selectr": {
+      "version": "2.4.13",
+      "resolved": "https://registry.npmjs.org/mobius1-selectr/-/mobius1-selectr-2.4.13.tgz",
+      "integrity": "sha512-Mk9qDrvU44UUL0EBhbAA1phfQZ7aMZPjwtL7wkpiBzGh8dETGqfsh50mWoX9EkjDlkONlErWXArHCKfoxVg0Bw=="
+    },
    "moment": {
-      "version": "2.29.1",
-      "resolved": "https://registry.npm.taobao.org/moment/download/moment-2.29.1.tgz",
-      "integrity": "sha1-sr52n6MZQL6e7qZGnAdeNQBvo9M="
+      "version": "2.27.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.27.0.tgz",
+      "integrity": "sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ=="
    },
    "move-concurrently": {
      "version": "1.0.1",
@ -12064,8 +12109,8 @@
    },
    "mutationobserver-shim": {
      "version": "0.3.7",
-      "resolved": "https://registry.npm.taobao.org/mutationobserver-shim/download/mutationobserver-shim-0.3.7.tgz",
-      "integrity": "sha1-i/YzsMCwKRoRByVe0ywTCIqMW/M="
+      "resolved": "https://registry.npmjs.org/mutationobserver-shim/-/mutationobserver-shim-0.3.7.tgz",
+      "integrity": "sha512-oRIDTyZQU96nAiz2AQyngwx1e89iApl2hN5AOYwyxLUB47UYsU3Wv9lJWqH5y/QdiYkc5HQLi23ZNB3fELdHcQ=="
    },
    "mute-stream": {
      "version": "0.0.7",
@ -12110,9 +12155,9 @@
      }
    },
    "nanopop": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npm.taobao.org/nanopop/download/nanopop-2.1.0.tgz",
-      "integrity": "sha1-I0dlE87iQFiIr9LopLVAZrcLnmA="
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/nanopop/-/nanopop-1.3.0.tgz",
+      "integrity": "sha512-DQDhHyPhKLKrXOjVkChsAoWh/WpKuVINDKl4qvFbguqokRJWQBSNSlPzMS+Xy3yBQKeQ39rICMB2asDvdUiVxw=="
    },
    "natural-compare": {
      "version": "1.4.0",
@ -12151,8 +12196,8 @@
    },
    "node-emoji": {
      "version": "1.10.0",
-      "resolved": "https://registry.npm.taobao.org/node-emoji/download/node-emoji-1.10.0.tgz",
-      "integrity": "sha1-iIar0l2ce7YYAqZYUj0fjSqJsto=",
+      "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-1.10.0.tgz",
+      "integrity": "sha512-Yt3384If5H6BYGVHiHwTL+99OzJKHhgp82S8/dktEK73T26BazdgZ4JZh92xSVtGNJvz9UbXdNAc5hcrXV42vw==",
      "requires": {
        "lodash.toarray": "^4.4.0"
      }
@ -12410,8 +12455,8 @@
    },
    "omit.js": {
      "version": "1.0.2",
-      "resolved": "https://registry.npm.taobao.org/omit.js/download/omit.js-1.0.2.tgz",
-      "integrity": "sha1-kaFPDrqEBm36AVvzDkdMR/MLyFg=",
+      "resolved": "https://registry.npmjs.org/omit.js/-/omit.js-1.0.2.tgz",
+      "integrity": "sha512-/QPc6G2NS+8d4L/cQhbk6Yit1WTB6Us2g84A7A/1+w9d/eRGHyEqC5kkQtHVoHZ5NFWGG7tUGgrhVZwgZanKrQ==",
      "requires": {
        "babel-runtime": "^6.23.0"
      }
@ -12823,6 +12868,11 @@
      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
      "optional": true
    },
+    "picomodal": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/picomodal/-/picomodal-3.0.0.tgz",
+      "integrity": "sha1-+s0w9PvzSoCcHgTqUl8ATzmcC4I="
+    },
    "pify": {
      "version": "3.0.0",
      "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
@ -14630,8 +14680,8 @@
    },
    "raf": {
      "version": "3.4.1",
-      "resolved": "https://registry.npm.taobao.org/raf/download/raf-3.4.1.tgz",
-      "integrity": "sha1-B0LpmkplUvRF1z4+4DKK8P8e3jk=",
+      "resolved": "https://registry.npmjs.org/raf/-/raf-3.4.1.tgz",
+      "integrity": "sha512-Sq4CW4QhwOHE8ucn6J34MqtZCeWFP2aQSmrlroYgqAV1PjStIhJXxYuTgUIfkEk7zTLjmIjLmU5q+fbD1NnOJA==",
      "requires": {
        "performance-now": "^2.1.0"
      }
@ -15028,8 +15078,8 @@
    },
    "resize-observer-polyfill": {
      "version": "1.5.1",
-      "resolved": "https://registry.npm.taobao.org/resize-observer-polyfill/download/resize-observer-polyfill-1.5.1.tgz",
-      "integrity": "sha1-DpAg3T0hAkRY1OvSfiPkAmmBBGQ="
+      "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz",
+      "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg=="
    },
    "resolve": {
      "version": "1.17.0",
@ -15459,13 +15509,13 @@
    },
    "shallow-equal": {
      "version": "1.2.1",
-      "resolved": "https://registry.npm.taobao.org/shallow-equal/download/shallow-equal-1.2.1.tgz",
-      "integrity": "sha1-TBar+lYEOqINBQMk76aJQLDaedo="
+      "resolved": "https://registry.npmjs.org/shallow-equal/-/shallow-equal-1.2.1.tgz",
+      "integrity": "sha512-S4vJDjHHMBaiZuT9NPb616CSmLf618jawtv3sufLl6ivK8WocjAo58cXwbRV1cgqxH0Qbv+iUt6m05eqEa2IRA=="
    },
    "shallowequal": {
      "version": "1.1.0",
-      "resolved": "https://registry.npm.taobao.org/shallowequal/download/shallowequal-1.1.0.tgz",
-      "integrity": "sha1-GI1SHelbkIdAT9TctosT3wrk5/g="
+      "resolved": "https://registry.npmjs.org/shallowequal/-/shallowequal-1.1.0.tgz",
+      "integrity": "sha512-y0m1JoUZSlPAjXVtPPW70aZWfIL/dSP7AFkRnniLCrK/8MDKog3TySTBmckD+RObVxH0v4Tox67+F14PdED2oQ=="
    },
    "shebang-command": {
      "version": "1.2.0",
@ -15951,7 +16001,7 @@
    },
    "string-convert": {
      "version": "0.2.1",
-      "resolved": "https://registry.npm.taobao.org/string-convert/download/string-convert-0.2.1.tgz",
+      "resolved": "https://registry.npmjs.org/string-convert/-/string-convert-0.2.1.tgz",
      "integrity": "sha1-aYLMMEn7tM2F+LJFaLnZvznu/5c="
    },
    "string-width": {
@ -16481,9 +16531,9 @@
      "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
    },
    "tinycolor2": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npm.taobao.org/tinycolor2/download/tinycolor2-1.4.2.tgz?cache=0&sync_timestamp=1601056395015&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ftinycolor2%2Fdownload%2Ftinycolor2-1.4.2.tgz",
-      "integrity": "sha1-P2pNEHGtB2dtf6Ry4frECnGdiAM="
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/tinycolor2/-/tinycolor2-1.4.1.tgz",
+      "integrity": "sha1-9PrTM0R7wLB9TcjpIJ2POaisd+g="
    },
    "tinymce": {
      "version": "5.4.1",
@ -16956,6 +17006,14 @@
        "spdx-expression-parse": "^3.0.0"
      }
    },
+    "vanilla-picker": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/vanilla-picker/-/vanilla-picker-2.10.1.tgz",
+      "integrity": "sha512-Bo4HOKkSorcQoRB08HwDMb8X2jt3SsZw7gzFlbzXbhnaxdUVJBm3LOUudr7M1SCVwPCo8d3nq8ajiAg8lAoqPg==",
+      "requires": {
+        "@sphinxxxx/color-conversion": "^2.2.2"
+      }
+    },
    "vary": {
      "version": "1.1.2",
      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
@ -17220,8 +17278,8 @@
    },
    "vue-ref": {
      "version": "2.0.0",
-      "resolved": "https://registry.npm.taobao.org/vue-ref/download/vue-ref-2.0.0.tgz",
-      "integrity": "sha1-SDCE1zKr7RHaeWd4qCZqOvDqGpw="
+      "resolved": "https://registry.npmjs.org/vue-ref/-/vue-ref-2.0.0.tgz",
+      "integrity": "sha512-uKNKpFOVeWNqS2mrBZqnpLyXJo5Q+vnkex6JvpENvhXHFNBW/SJTP8vJywLuVT3DpxwXcF9N0dyIiZ4/NpTexQ=="
    },
    "vue-router": {
      "version": "3.3.4",
@ -17269,20 +17327,10 @@
      "resolved": "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz",
      "integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="
    },
-    "vxe-table": {
-      "version": "2.9.13",
-      "resolved": "https://registry.npm.taobao.org/vxe-table/download/vxe-table-2.9.13.tgz",
-      "integrity": "sha1-YZzVhRYN3ptSa5DOVSo1jss6YGA="
-    },
-    "vxe-table-plugin-antd": {
-      "version": "1.8.10",
-      "resolved": "https://registry.npm.taobao.org/vxe-table-plugin-antd/download/vxe-table-plugin-antd-1.8.10.tgz",
-      "integrity": "sha1-psAr/HzyJUYxETG4uFTAqtqwIOo="
-    },
    "warning": {
      "version": "4.0.3",
-      "resolved": "https://registry.npm.taobao.org/warning/download/warning-4.0.3.tgz",
-      "integrity": "sha1-Fungd+uKhtavfWSqHgX9hbRnjKM=",
+      "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+      "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
      "requires": {
        "loose-envify": "^1.0.0"
      }
@ -18128,11 +18176,6 @@
        "async-limiter": "~1.0.0"
      }
    },
-    "xe-utils": {
-      "version": "2.4.8",
-      "resolved": "https://registry.npm.taobao.org/xe-utils/download/xe-utils-2.4.8.tgz",
-      "integrity": "sha1-Dv2jyoH2tV9oqKMeJ2+xfaWcmLM="
-    },
    "xregexp": {
      "version": "4.3.0",
      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.3.0.tgz",
--- a/ant-design-vue-jeecg/package.json
+++ b/ant-design-vue-jeecg/package.json
@ -1,6 +1,6 @@
 {
  "name": "vue-antd-jeecg",
-  "version": "2.4.3",
+  "version": "3.0.0",
  "private": true,
  "scripts": {
    "pre": "cnpm install || yarn --registry https://registry.npm.taobao.org || npm install --registry https://registry.npm.taobao.org ",
@ -11,7 +11,7 @@
  },
  "dependencies": {
    "ant-design-vue": "^1.7.2",
-    "@jeecg/antd-online-mini": "2.4.3-RC",
+    "@jeecg/antd-online-mini": "3.0.0-RC",
    "@antv/data-set": "^0.11.4",
    "viser-vue": "^2.4.8",
    "axios": "^0.18.0",
@ -35,15 +35,16 @@
    "vue-splitpane": "^1.0.4",
    "vuedraggable": "^2.20.0",
    "codemirror": "^5.46.0",
-    "@tinymce/tinymce-vue": "^2.1.0",
-    "tinymce": "^5.3.2",
+    "@tinymce/tinymce-vue": "2.1.0",
+    "tinymce": "5.4.1",
    "@toast-ui/editor": "^2.1.2",
    "vue-area-linkage": "^5.1.0",
-    "area-data": "^5.0.6",
+    "china-area-data": "^5.0.1",
    "dom-align": "1.12.0",
    "xe-utils": "2.4.8",
    "vxe-table": "2.9.13",
-    "vxe-table-plugin-antd": "1.8.10"
+    "vxe-table-plugin-antd": "1.8.10",
+    "cron-parser": "^2.10.0"
  },
  "devDependencies": {
    "@babel/polyfill": "^7.2.5",
@ -96,10 +97,7 @@
      "vue/html-closing-bracket-newline": 0,
      "vue/no-parsing-error": 0,
      "no-tabs": 0,
-      "indent": [
-        "off",
-        2
-      ],
+      "indent": ["off", 2],
      "no-console": 0,
      "space-before-function-paren": 0
    }
--- a/ant-design-vue-jeecg/src/api/login.js
+++ b/ant-design-vue-jeecg/src/api/login.js
@ -71,4 +71,17 @@ export function thirdLogin(token,thirdType) {
      'Content-Type': 'application/json;charset=UTF-8'
    }
  })
+}
+
+/**
+ * 强退其他账号
+ * @param token
+ * @returns {*}
+ */
+export function forceLogout(parameter) {
+  return axios({
+    url: '/sys/online/forceLogout',
+    method: 'post',
+    data: parameter
+  })
 }
--- a/ant-design-vue-jeecg/src/api/manage.js
+++ b/ant-design-vue-jeecg/src/api/manage.js
@ -1,5 +1,6 @@
 import Vue from 'vue'
 import { axios } from '@/utils/request'
+import signMd5Utils from '@/utils/encryption/signMd5Utils'

 const api = {
  user: '/mock/api/user',
@ -13,19 +14,29 @@ export default api

 //post
 export function postAction(url,parameter) {
+  let sign = signMd5Utils.getSign(url, parameter);
+  //将签名和时间戳，添加在请求接口 Header
+  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
+
  return axios({
    url: url,
    method:'post' ,
-    data: parameter
+    data: parameter,
+    headers: signHeader
  })
 }

 //post method= {post | put}
 export function httpAction(url,parameter,method) {
+  let sign = signMd5Utils.getSign(url, parameter);
+  //将签名和时间戳，添加在请求接口 Header
+  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
+
  return axios({
    url: url,
    method:method ,
-    data: parameter
+    data: parameter,
+    headers: signHeader
  })
 }

@ -40,10 +51,15 @@ export function putAction(url,parameter) {

 //get
 export function getAction(url,parameter) {
+  let sign = signMd5Utils.getSign(url, parameter);
+  //将签名和时间戳，添加在请求接口 Header
+  let signHeader = {"X-Sign": sign,"X-TIMESTAMP": signMd5Utils.getDateTimeToString()};
+
  return axios({
    url: url,
    method: 'get',
-    params: parameter
+    params: parameter,
+    headers: signHeader
  })
 }

--- a/ant-design-vue-jeecg/src/components/JVxeCells/JVxeFileCell.vue
+++ b/ant-design-vue-jeecg/src/components/JVxeCells/JVxeFileCell.vue
@ -12,9 +12,9 @@
          <span style="margin-left:5px">{{ ellipsisFileName }}</span>
        </a-tooltip>

-        <a-tooltip v-else :title="file.name">
-          <a-icon type="paper-clip" style="color:red;"/>
-          <span style="color:red;margin-left:5px">{{ ellipsisFileName }}</span>
+        <a-tooltip v-else :title="file.message||'上传失败'">
+          <a-icon type="exclamation-circle" style="color:red;"/>
+          <span style="margin-left:5px">{{ ellipsisFileName }}</span>
        </a-tooltip>

        <template style="width: 30px">
@ -179,8 +179,19 @@
          value['responseName'] = file.response[this.responseName]
        }
        if (file.status === 'done') {
-          value['path'] = file.response[this.responseName]
-          this.handleChangeCommon(value)
+          if (typeof file.response.success === 'boolean') {
+            if (file.response.success) {
+              value['path'] = file.response[this.responseName]
+              this.handleChangeCommon(value)
+            } else {
+              value['status'] = 'error'
+              value['message'] = file.response.message || '未知错误'
+            }
+          } else {
+            // 考虑到如果设置action上传路径为非jeecg-boot后台，可能不会返回 success 属性的情况，就默认为成功
+            value['path'] = file.response[this.responseName]
+            this.handleChangeCommon(value)
+          }
        } else if (file.status === 'error') {
          value['message'] = file.response.message || '未知错误'
        }
--- a/ant-design-vue-jeecg/src/components/JVxeCells/JVxeImageCell.vue
+++ b/ant-design-vue-jeecg/src/components/JVxeCells/JVxeImageCell.vue
@ -10,20 +10,9 @@
        <template v-else-if="file['path']">
          <img class="j-editable-image" :src="imgSrc" alt="无图片" @click="handleMoreOperation"/>
        </template>
-        <template v-else>
-          <a-icon type="exclamation-circle" style="color: red;" @click="handleClickShowImageError"/>
-        </template>
-        <template slot="addonBefore" style="width: 30px">
-          <a-tooltip v-if="file.status==='uploading'" :title="`上传中(${Math.floor(file.percent)}%)`">
-            <a-icon type="loading"/>
-          </a-tooltip>
-          <a-tooltip v-else-if="file.status==='done'" title="上传完成">
-            <a-icon type="check-circle" style="color:#00DB00;"/>
-          </a-tooltip>
-          <a-tooltip v-else title="上传失败">
-            <a-icon type="exclamation-circle" style="color:red;"/>
-          </a-tooltip>
-        </template>
+        <a-tooltip v-else :title="file.message||'上传失败'" @click="handleClickShowImageError">
+          <a-icon type="exclamation-circle" style="color:red;"/>
+        </a-tooltip>

        <template style="width: 30px">
          <a-dropdown :trigger="['click']" placement="bottomRight" style="margin-left: 10px;">
@ -196,8 +185,19 @@
          value['responseName'] = file.response[this.responseName]
        }
        if (file.status === 'done') {
-          value['path'] = file.response[this.responseName]
-          this.handleChangeCommon(value)
+          if (typeof file.response.success === 'boolean') {
+            if (file.response.success) {
+              value['path'] = file.response[this.responseName]
+              this.handleChangeCommon(value)
+            } else {
+              value['status'] = 'error'
+              value['message'] = file.response.message || '未知错误'
+            }
+          } else {
+            // 考虑到如果设置action上传路径为非jeecg-boot后台，可能不会返回 success 属性的情况，就默认为成功
+            value['path'] = file.response[this.responseName]
+            this.handleChangeCommon(value)
+          }
        } else if (file.status === 'error') {
          value['message'] = file.response.message || '未知错误'
        }
--- a/ant-design-vue-jeecg/src/components/JVxeCells/JVxePopupCell.vue
+++ b/ant-design-vue-jeecg/src/components/JVxeCells/JVxePopupCell.vue
@ -6,7 +6,7 @@
 </template>

 <script>
-  import JVxeCellMixins, { vModel, dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins'
+  import JVxeCellMixins, { dispatchEvent, vModel } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins'

  export default {
    name: 'JVxePopupCell',
@ -22,6 +22,8 @@
          orgFields: col.orgFields,
          destFields: col.destFields,
          groupId: caseId,
+          param: col.param,
+          sorter: col.sorter,
        }
      },
    },
@ -48,7 +50,9 @@
    // 【组件增强】注释详见：JVxeCellMixins.js
    enhanced: {
      aopEvents: {
-        editActived: event => dispatchEvent(event, 'ant-input'),
+        editActived(event) {
+          dispatchEvent.call(this, event, 'ant-input')
+        },
      },
    },
  }
--- a/ant-design-vue-jeecg/src/components/JVxeCells/JVxeSelectDictSearchCell.js
+++ b/ant-design-vue-jeecg/src/components/JVxeCells/JVxeSelectDictSearchCell.js
@ -254,7 +254,9 @@ export const DictSearchInputCell = {
  // 【组件增强】注释详见：JVxeCellMixins.js
  enhanced: {
    aopEvents: {
-      editActived: event => dispatchEvent(event, 'ant-select'),
+      editActived(event) {
+        dispatchEvent.call(this, event, 'ant-select')
+      },
    },
  }
 }
--- a/ant-design-vue-jeecg/src/components/README.md
+++ b/ant-design-vue-jeecg/src/components/README.md
@ -39,5 +39,5 @@ UserMenu.vue:首页右上侧的内容
 ![输入图片说明](https://static.oschina.net/uploads/img/201904/12201226_laQK.png "在这里输入图片标题")
 ####16.trend包 趋势显示组件（如下图）
 ![输入图片说明](https://static.oschina.net/uploads/img/201904/12201600_Wo8K.png "在这里输入图片标题")
-![corn表达式](https://oscimg.oschina.net/oscnet/661f9ac09016395f9f49286143af3241623.jpg)
-![corn控件添加清除按钮](https://oscimg.oschina.net/oscnet/15096e49f2e29bd829e304d56770025d03c.jpg)
+![cron表达式](https://oscimg.oschina.net/oscnet/661f9ac09016395f9f49286143af3241623.jpg)
+![cron控件添加清除按钮](https://oscimg.oschina.net/oscnet/15096e49f2e29bd829e304d56770025d03c.jpg)
--- a/ant-design-vue-jeecg/src/components/_util/Area.js
+++ b/ant-design-vue-jeecg/src/components/_util/Area.js
@ -1,5 +1,4 @@
-import { pcaa } from 'area-data'
-
+import Vue from 'vue'
 /**
 * 省市区
 */
@ -8,7 +7,10 @@ export default class Area {
   * 构造器
   * @param express
   */
-  constructor() {
+  constructor(pcaa) {
+    if(!pcaa){
+      pcaa = Vue.prototype.$Jpcaa;
+    }
    let arr = []
    const province = pcaa['86']
    Object.keys(province).map(key=>{
@ -17,9 +19,11 @@ export default class Area {
      Object.keys(city).map(key2=>{
        arr.push({id:key2, text:city[key2], pid:key, index:2});
        const qu = pcaa[key2];
-        Object.keys(qu).map(key3=>{
-          arr.push({id:key3, text:qu[key3], pid:key2, index:3});
-        })
+        if(qu){
+          Object.keys(qu).map(key3=>{
+            arr.push({id:key3, text:qu[key3], pid:key2, index:3});
+          })
+        }
      })
    })
    this.all = arr;
--- a/ant-design-vue-jeecg/src/components/_util/StringUtil.js
+++ b/ant-design-vue-jeecg/src/components/_util/StringUtil.js
@ -32,4 +32,15 @@ export const cutStrByFullLength = (str = '', maxLength) => {
    }
    return pre
  }, '')
+}
+
+// 下划线转换驼峰
+export function underLinetoHump(name) {
+  return name.replace(/\_(\w)/g, function(all, letter){
+    return letter.toUpperCase();
+  });
+}
+// 驼峰转换下划线
+export function humptoUnderLine(name) {
+  return name.replace(/([A-Z])/g,"_$1").toLowerCase();
 }
--- a/ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue
+++ b/ant-design-vue-jeecg/src/components/dict/JDictSelectTag.vue
@ -25,7 +25,6 @@
    props: {
      dictCode: String,
      placeholder: String,
-      triggerChange: Boolean,
      disabled: Boolean,
      value: [String, Number],
      type: String,
@ -82,19 +81,17 @@
          }
        })
      },
-      handleInput(e) {
+      handleInput(e='') {
        let val;
-        if(this.tagType=="radio"){
+        if(Object.keys(e).includes('target')){
          val = e.target.value
        }else{
          val = e
        }
        console.log(val);
-        if(this.triggerChange){
-          this.$emit('change', val);
-        }else{
-          this.$emit('input', val);
-        }
+        this.$emit('change', val);
+        //LOWCOD-2146 【菜单】数据规则，选择自定义SQL 规则值无法输入空格
+        this.$emit('input', val);
      },
      setCurrentDictOptions(dictOptions){
        this.dictOptions = dictOptions
@ -102,6 +99,10 @@
      getCurrentDictOptions(){
        return this.dictOptions
      }
+    },
+    model:{
+      prop: 'value',
+      event: 'change'
    }
  }
 </script>
--- a/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue
+++ b/ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue
@ -48,7 +48,6 @@
    props:{
      disabled: Boolean,
      value: [String, Number],
-      dict: String,
      dictOptions: Array,
      async: Boolean,
      placeholder:{
@ -56,6 +55,11 @@
        default:"请选择",
        required:false
      },
+      dict:{
+        type: String,
+        default: '',
+        required: false
+      },
      popContainer:{
        type:String,
        default:'',
@ -65,7 +69,11 @@
        type: Number,
        default: 10,
        required: false
-      }
+      },
+      getPopupContainer: {
+        type:Function,
+        default: null
+      },
    },
    data(){
      this.loadData = debounce(this.loadData, 800);//消抖
@ -182,16 +190,20 @@
            }
          }
        }else{
-          //异步一开始也加载一点数据
-          this.loading=true
-          getAction(`/sys/dict/loadDict/${this.dict}`,{pageSize: this.pageSize, keyword:''}).then(res=>{
-            this.loading=false
-            if(res.success){
-              this.options = res.result
-            }else{
-              this.$message.warning(res.message)
-            }
-          })
+          if(!this.dict){
+            console.error('搜索组件未配置字典项')
+          }else{
+            //异步一开始也加载一点数据
+            this.loading=true
+            getAction(`/sys/dict/loadDict/${this.dict}`,{pageSize: this.pageSize, keyword:''}).then(res=>{
+              this.loading=false
+              if(res.success){
+                this.options = res.result
+              }else{
+                this.$message.warning(res.message)
+              }
+            })
+          }
        }
      },
      filterOption(input, option) {
@ -226,7 +238,9 @@
        return this.options
      },
      getParentContainer(node){
-        if(!this.popContainer){
+        if(typeof this.getPopupContainer === 'function'){
+          return this.getPopupContainer(node)
+        } else if(!this.popContainer){
          return node.parentNode
        }else{
          return document.querySelector(this.popContainer)
--- a/ant-design-vue-jeecg/src/components/jeecg/JAreaLinkage.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JAreaLinkage.vue
@ -29,7 +29,6 @@
 </template>

 <script>
-  import { pcaa } from 'area-data'
  import Area from '@/components/_util/Area'

  export default {
@ -53,7 +52,7 @@
    },
    data() {
      return {
-        pcaa,
+        pcaa: this.$Jpcaa,
        innerValue: [],
        usedListeners: ['change'],
        enums: {
@ -114,7 +113,7 @@
      /** 通过地区code获取子级 */
      loadDataByCode(value) {
        let options = []
-        let data = pcaa[value]
+        let data = this.pcaa[value]
        if (data) {
          for (let key in data) {
            if (data.hasOwnProperty(key)) {
@ -139,7 +138,7 @@
      },
      initAreaData(){
        if(!this.areaData){
-          this.areaData = new Area();
+          this.areaData = new Area(this.$Jpcaa);
        }
      },

--- a/ant-design-vue-jeecg/src/components/jeecg/JCodeEditor.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JCodeEditor.vue
@ -400,6 +400,10 @@
    .null-tip-hidden{
      display: none;
    }
+    /**选中样式偶然出现高度不够的情况*/
+    .CodeMirror-selected{
+      min-height: 19px !important;
+    }
  }

  /* 全屏样式 */
--- a/ant-design-vue-jeecg/src/components/jeecg/JCron.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JCron.vue
@ -1,7 +1,7 @@
 <template>
  <div class="components-input-demo-presuffix">
-    <a-input @click="openModal" placeholder="corn表达式" v-model="cron" @change="handleOK">
-      <a-icon slot="prefix" type="schedule" title="corn控件"/>
+    <a-input @click="openModal" placeholder="cron表达式" v-model="cron" @change="(e)=>handleOK(e.target.value)">
+      <a-icon slot="prefix" type="schedule" title="cron控件"/>
      <a-icon v-if="cron" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
    </a-input>
    <JCronModal ref="innerVueCron" :data="cron" @ok="handleOK"></JCronModal>
--- a/ant-design-vue-jeecg/src/components/jeecg/JDate.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JDate.vue
@ -8,7 +8,7 @@
    :showTime="showTime"
    :format="dateFormat"
    :getCalendarContainer="getCalendarContainer"
-  />
+    v-bind="$attrs"/>
 </template>
 <script>
  import moment from 'moment'
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/EasyCron.vue
@ -0,0 +1,316 @@
+<template>
+  <div class="j-easy-cron">
+    <div class="content">
+      <div>
+        <a-tabs size="small" v-model="curtab">
+          <a-tab-pane tab="秒" key="second" v-if="!hideSecond">
+            <second-ui v-model="second" :disabled="disabled"></second-ui>
+          </a-tab-pane>
+          <a-tab-pane tab="分" key="minute">
+            <minute-ui v-model="minute" :disabled="disabled"></minute-ui>
+          </a-tab-pane>
+          <a-tab-pane tab="时" key="hour">
+            <hour-ui v-model="hour" :disabled="disabled"></hour-ui>
+          </a-tab-pane>
+          <a-tab-pane tab="日" key="day">
+            <day-ui v-model="day" :week="week" :disabled="disabled"></day-ui>
+          </a-tab-pane>
+          <a-tab-pane tab="月" key="month">
+            <month-ui v-model="month" :disabled="disabled"></month-ui>
+          </a-tab-pane>
+          <a-tab-pane tab="周" key="week">
+            <week-ui v-model="week" :day="day" :disabled="disabled"></week-ui>
+          </a-tab-pane>
+          <a-tab-pane tab="年" key="year" v-if="!hideYear && !hideSecond">
+            <year-ui v-model="year" :disabled="disabled"></year-ui>
+          </a-tab-pane>
+        </a-tabs>
+      </div>
+      <a-divider/>
+      <!-- 执行时间预览 -->
+      <a-row :gutter="8">
+        <a-col :span="18" style="margin-top: 22px;">
+          <a-row :gutter="8">
+            <a-col :span="8" style="margin-bottom: 8px;">
+              <a-input addon-before="秒" v-model="inputValues.second" @blur="onInputBlur"/>
+            </a-col>
+            <a-col :span="8" style="margin-bottom: 8px;">
+              <a-input addon-before="分" v-model="inputValues.minute" @blur="onInputBlur"/>
+            </a-col>
+            <a-col :span="8" style="margin-bottom: 8px;">
+              <a-input addon-before="时" v-model="inputValues.hour" @blur="onInputBlur"/>
+            </a-col>
+            <a-col :span="8" style="margin-bottom: 8px;">
+              <a-input addon-before="日" v-model="inputValues.day" @blur="onInputBlur"/>
+            </a-col>
+            <a-col :span="8" style="margin-bottom: 8px;">
+              <a-input addon-before="月" v-model="inputValues.month" @blur="onInputBlur"/>
+            </a-col>
+            <a-col :span="8" style="margin-bottom: 8px;">
+              <a-input addon-before="周" v-model="inputValues.week" @blur="onInputBlur"/>
+            </a-col>
+            <a-col :span="8" style="margin-bottom: 8px;">
+              <a-input addon-before="年" v-model="inputValues.year" @blur="onInputBlur"/>
+            </a-col>
+            <a-col :span="16" style="margin-bottom: 8px;">
+              <a-input addon-before="Cron" v-model="inputValues.cron" @blur="onInputCronBlur"/>
+            </a-col>
+          </a-row>
+        </a-col>
+        <a-col :span="6">
+
+          <div>近十次执行时间（不含年）</div>
+          <a-textarea type="textarea" :value="preTimeList" :rows="5"/>
+        </a-col>
+      </a-row>
+    </div>
+  </div>
+</template>
+
+<script>
+import SecondUi from './tabs/second'
+import MinuteUi from './tabs/minute'
+import HourUi from './tabs/hour'
+import DayUi from './tabs/day'
+import WeekUi from './tabs/week'
+import MonthUi from './tabs/month'
+import YearUi from './tabs/year'
+import CronParser from 'cron-parser'
+import dateFormat from './format-date'
+import { simpleDebounce } from '@/utils/util'
+import ACol from 'ant-design-vue/es/grid/Col'
+
+export default {
+  name: 'easy-cron',
+  components: {
+    ACol,
+    SecondUi,
+    MinuteUi,
+    HourUi,
+    DayUi,
+    WeekUi,
+    MonthUi,
+    YearUi
+  },
+  props: {
+    cronValue: {
+      type: String,
+      default: ''
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    hideSecond: {
+      type: Boolean,
+      default: false
+    },
+    hideYear: {
+      type: Boolean,
+      default: false
+    },
+    remote: {
+      type: Function,
+      default: null
+    }
+  },
+  data() {
+    return {
+      curtab: this.hideSecond ? 'minute' : 'second',
+      second: '*',
+      minute: '*',
+      hour: '*',
+      day: '*',
+      month: '*',
+      week: '?',
+      year: '*',
+      inputValues: {second: '', minute: '', hour: '', day: '', month: '', week: '', year: '', cron: ''},
+      preTimeList: '执行预览，会忽略年份参数',
+    }
+  },
+  computed: {
+    cronValue_c() {
+      let result = []
+      if (!this.hideSecond) result.push(this.second ? this.second : '*')
+      result.push(this.minute ? this.minute : '*')
+      result.push(this.hour ? this.hour : '*')
+      result.push(this.day ? this.day : '*')
+      result.push(this.month ? this.month : '*')
+      result.push(this.week ? this.week : '?')
+      if (!this.hideYear && !this.hideSecond) result.push(this.year ? this.year : '*')
+      return result.join(' ')
+    },
+    cronValue_c2() {
+      const v = this.cronValue_c
+      if (this.hideYear || this.hideSecond) return v
+      const vs = v.split(' ')
+      if (vs.length >= 6) {
+        // 转成 Quartz 的规则
+        vs[5] = this.convertWeekToQuartz(vs[5])
+      }
+      return vs.slice(0, vs.length - 1).join(' ')
+    },
+  },
+  watch: {
+    cronValue(newVal, oldVal) {
+      if (newVal === this.cronValue_c) {
+        // console.info('same cron value: ' + newVal)
+        return
+      }
+      this.formatValue()
+    },
+    cronValue_c(newVal, oldVal) {
+      this.calTriggerList()
+      this.$emit('change', newVal)
+      this.assignInput()
+    },
+    minute() {
+      if (this.second === '*') {
+        this.second = '0'
+      }
+    },
+    hour() {
+      if (this.minute === '*') {
+        this.minute = '0'
+      }
+    },
+    day(day) {
+      if (day !== '?' && this.hour === '*') {
+        this.hour = '0'
+      }
+    },
+    week(week) {
+      if (week !== '?' && this.hour === '*') {
+        this.hour = '0'
+      }
+    },
+    month() {
+      if (this.day === '?' && this.week === '*') {
+        this.week = '1'
+      } else if (this.week === '?' && this.day === '*') {
+        this.day = '1'
+      }
+    },
+    year() {
+      if (this.month === '*') {
+        this.month = '1'
+      }
+    },
+  },
+  created() {
+    this.formatValue()
+    this.$nextTick(() => {
+      this.calTriggerListInner()
+    })
+  },
+  methods: {
+    assignInput() {
+      Object.assign(this.inputValues, {
+        second: this.second,
+        minute: this.minute,
+        hour: this.hour,
+        day: this.day,
+        month: this.month,
+        week: this.week,
+        year: this.year,
+        cron: this.cronValue_c,
+      })
+    },
+    formatValue() {
+      if (!this.cronValue) return
+      const values = this.cronValue.split(' ').filter(item => !!item)
+      if (!values || values.length <= 0) return
+      let i = 0
+      if (!this.hideSecond) this.second = values[i++]
+      if (values.length > i) this.minute = values[i++]
+      if (values.length > i) this.hour = values[i++]
+      if (values.length > i) this.day = values[i++]
+      if (values.length > i) this.month = values[i++]
+      if (values.length > i) this.week = values[i++]
+      if (values.length > i) this.year = values[i]
+      this.assignInput()
+    },
+    // Quartz 的规则：
+    // 1 = 周日，2 = 周一，3 = 周二，4 = 周三，5 = 周四，6 = 周五，7 = 周六
+    convertWeekToQuartz(week) {
+      let convert = (v) => {
+        if (v === '0') {
+          return '1'
+        }
+        if (v === '1') {
+          return '0'
+        }
+        return (Number.parseInt(v) - 1).toString()
+      }
+      // 匹配示例 1-7 or 1/7
+      let patten1 = /^([0-7])([-/])([0-7])$/
+      // 匹配示例 1,4,7
+      let patten2 = /^([0-7])(,[0-7])+$/
+      if (/^[0-7]$/.test(week)) {
+        return convert(week)
+      } else if (patten1.test(week)) {
+        return week.replace(patten1, ($0, before, separator, after) => {
+          if (separator === '/') {
+            return convert(before) + separator + after
+          } else {
+            return convert(before) + separator + convert(after)
+          }
+        })
+      } else if (patten2.test(week)) {
+        return week.split(',').map(v => convert(v)).join(',')
+      }
+      return week
+    },
+    calTriggerList: simpleDebounce(function () {
+      this.calTriggerListInner()
+    }, 500),
+    calTriggerListInner() {
+      // 设置了回调函数
+      if (this.remote) {
+        this.remote(this.cronValue_c, +new Date(), v => {
+          this.preTimeList = v
+        })
+        return
+      }
+      const format = 'yyyy-MM-dd hh:mm:ss'
+      const options = {
+        currentDate: dateFormat(new Date(), format)
+      }
+      const iter = CronParser.parseExpression(this.cronValue_c2, options)
+      const result = []
+      for (let i = 1; i <= 10; i++) {
+        result.push(dateFormat(new Date(iter.next()), format))
+      }
+      this.preTimeList = result.length > 0 ? result.join('\n') : '无执行时间'
+    },
+    onInputBlur(){
+      this.second = this.inputValues.second
+      this.minute = this.inputValues.minute
+      this.hour = this.inputValues.hour
+      this.day = this.inputValues.day
+      this.month = this.inputValues.month
+      this.week = this.inputValues.week
+      this.year = this.inputValues.year
+    },
+    onInputCronBlur(event){
+      this.$emit('change', event.target.value)
+    },
+  },
+  model: {
+    prop: 'cronValue',
+    event: 'change'
+  },
+}
+</script>
+
+<style scoped lang="less">
+  .j-easy-cron {
+
+    /deep/ .content {
+      .ant-checkbox-wrapper + .ant-checkbox-wrapper {
+        margin-left: 0;
+      }
+    }
+
+  }
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/InputCron.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/InputCron.vue
@ -0,0 +1,99 @@
+<template>
+  <div class="input-cron">
+    <a-input :placeholder="placeholder" v-model="editCronValue" :disabled="disabled">
+      <a slot="addonAfter" @click="showConfigDlg" class="config-btn" :disabled="disabled">
+        <a-icon type="setting"></a-icon>
+        选择
+      </a>
+    </a-input>
+    <j-modal :visible.sync="show" title="Cron表达式" width="800px">
+      <easy-cron
+        v-model="editCronValue"
+        :exeStartTime="exeStartTime"
+        :hideYear="hideYear"
+        :remote="remote"
+        :hideSecond="hideSecond"
+        style="width: 100%"
+      ></easy-cron>
+    </j-modal>
+  </div>
+</template>
+
+<script>
+import EasyCron from './EasyCron.vue'
+
+export default {
+  name: 'input-cron',
+  components: {EasyCron},
+  model: {
+    prop: 'cronValue',
+    event: 'change'
+  },
+  props: {
+    cronValue: {
+      type: String,
+      default: ''
+    },
+    width: {
+      type: String,
+      default: '800px'
+    },
+    placeholder: {
+      type: String,
+      default: '请输入cron表达式'
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    },
+    exeStartTime: {
+      type: [Number, String, Object],
+      default: 0
+    },
+    hideSecond: {
+      type: Boolean,
+      default: false
+    },
+    hideYear: {
+      type: Boolean,
+      default: false
+    },
+    remote: {
+      type: Function,
+      default: null
+    }
+  },
+  data() {
+    return {
+      editCronValue: this.cronValue,
+      show: false,
+    }
+  },
+  watch: {
+    cronValue(newVal, oldVal) {
+      if (newVal === this.editCronValue) {
+        return
+      }
+      this.editCronValue = newVal
+    },
+    editCronValue(newVal, oldVal) {
+      this.$emit('change', newVal)
+    }
+  },
+  methods: {
+    showConfigDlg() {
+      if (!this.disabled) {
+        this.show = true
+      }
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+  .config-btn {
+    cursor: pointer;
+  }
+
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/format-date.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/format-date.js
@ -0,0 +1,37 @@
+const dateFormat = (date, block) => {
+  if (!date) {
+    return ''
+  }
+
+  let format = block || 'yyyy-MM-dd'
+
+  date = new Date(date)
+
+  const map = {
+    M: date.getMonth() + 1, // 月份
+    d: date.getDate(), // 日
+    h: date.getHours(), // 小时
+    m: date.getMinutes(), // 分
+    s: date.getSeconds(), // 秒
+    q: Math.floor((date.getMonth() + 3) / 3), // 季度
+    S: date.getMilliseconds() // 毫秒
+  }
+
+  format = format.replace(/([yMdhmsqS])+/g, (all, t) => {
+    let v = map[t]
+    if (v !== undefined) {
+      if (all.length > 1) {
+        v = `0${v}`
+        v = v.substr(v.length - 2)
+      }
+      return v
+    } else if (t === 'y') {
+      return (date.getFullYear().toString()).substr(4 - all.length)
+    }
+    return all
+  })
+
+  return format
+}
+
+export default dateFormat
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/index.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/index.js
@ -0,0 +1,6 @@
+// 原开源项目地址：https://gitee.com/toktok/easy-cron
+
+import InputCron from './InputCron.vue'
+
+InputCron.name = 'JEasyCron'
+export default InputCron
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/const.js
@ -0,0 +1,21 @@
+export const WEEK_MAP_EN = {
+  'SUN': '0',
+  'MON': '1',
+  'TUE': '2',
+  'WED': '3',
+  'THU': '4',
+  'FRI': '5',
+  'SAT': '6'
+}
+
+export const replaceWeekName = (c) => {
+  // console.info('after: ' + c)
+  if (c) {
+    Object.keys(WEEK_MAP_EN).forEach(k => {
+      c = c.replace(new RegExp(k, 'g'), WEEK_MAP_EN[k])
+    })
+    c = c.replace(new RegExp('7', 'g'), '0')
+  }
+  // console.info('after: ' + c)
+  return c
+}
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/day.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/day.vue
@ -0,0 +1,101 @@
+<template>
+  <div class="config-list">
+    <a-radio-group v-model="type">
+      <div class="item">
+        <a-radio value="TYPE_NOT_SET" class="choice" :disabled="disableChoice">不设置</a-radio>
+        <span class="tip-info">日和周只能设置其中之一</span>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_EVERY" class="choice" :disabled="disableChoice">每日</a-radio>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_RANGE" class="choice" :disabled="disableChoice">区间</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_RANGE || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.start"/>
+        日
+        至
+        <a-input-number :disabled="type!==TYPE_RANGE || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.end"/>
+        日
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_LOOP" class="choice" :disabled="disableChoice">循环</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_LOOP || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.start"/>
+        日开始，间隔
+        <a-input-number :disabled="type!==TYPE_LOOP || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.interval"/>
+        日
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_WORK" class="choice" :disabled="disableChoice">工作日</a-radio>
+        本月
+        <a-input-number :disabled="type!==TYPE_WORK || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueWork"/>
+        日，最近的工作日
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_LAST" class="choice" :disabled="disableChoice">最后一日</a-radio>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_SPECIFY" class="choice" :disabled="disableChoice">指定</a-radio>
+        <div class="list">
+          <a-checkbox-group v-model="valueList">
+            <template v-for="i of specifyRange">
+              <a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{i}}</a-checkbox>
+            </template>
+          </a-checkbox-group>
+        </div>
+      </div>
+    </a-radio-group>
+  </div>
+</template>
+
+<script>
+import mixin from './mixin'
+
+export default {
+  name: 'day',
+  mixins: [mixin],
+  props: {
+    week: {
+      type: String,
+      default: '?'
+    }
+  },
+  data() {
+    return {}
+  },
+  computed: {
+    disableChoice() {
+      return (this.week && this.week !== '?') || this.disabled
+    }
+  },
+  watch: {
+    value_c(newVal, oldVal) {
+      // 数值变化
+      this.updateValue()
+    },
+    week(newVal, oldVal) {
+      // console.info('new week: ' + newVal)
+      this.updateValue()
+    }
+  },
+  methods: {
+    updateValue() {
+      this.$emit('change', this.disableChoice ? '?' : this.value_c)
+    }
+  },
+  created() {
+    this.DEFAULT_VALUE = '*'
+    this.minValue = 1
+    this.maxValue = 31
+    this.valueRange.start = 1
+    this.valueRange.end = 31
+    this.valueLoop.start = 1
+    this.valueLoop.interval = 1
+    this.parseProp(this.prop)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  @import "mixin.less";
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/hour.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/hour.vue
@ -0,0 +1,67 @@
+<template>
+  <div class="config-list">
+    <a-radio-group v-model="type">
+      <div class="item">
+        <a-radio value="TYPE_EVERY" class="choice" :disabled="disabled">每时</a-radio>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_RANGE" class="choice" :disabled="disabled">区间</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.start"/>
+        时
+        至
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.end"/>
+        时
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_LOOP" class="choice" :disabled="disabled">循环</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.start"/>
+        时开始，间隔
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.interval"/>
+        时
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_SPECIFY" class="choice" :disabled="disabled">指定</a-radio>
+        <div class="list">
+          <a-checkbox-group v-model="valueList">
+            <template v-for="i in specifyRange">
+              <a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{i}}</a-checkbox>
+            </template>
+          </a-checkbox-group>
+        </div>
+      </div>
+    </a-radio-group>
+  </div>
+</template>
+
+<script>
+import mixin from './mixin'
+
+export default {
+  name: 'minute',
+  mixins: [mixin],
+  data() {
+    return {}
+  },
+  watch: {
+    value_c(newVal, oldVal) {
+      this.$emit('change', newVal)
+    }
+  },
+  created() {
+    this.DEFAULT_VALUE = '*'
+    this.minValue = 0
+    this.maxValue = 23
+    this.valueRange.start = 0
+    this.valueRange.end = 23
+    this.valueLoop.start = 0
+    this.valueLoop.interval = 1
+    this.parseProp(this.prop)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  @import "mixin.less";
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/minute.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/minute.vue
@ -0,0 +1,67 @@
+<template>
+  <div class="config-list">
+    <a-radio-group v-model="type">
+      <div class="item">
+        <a-radio value="TYPE_EVERY" class="choice" :disabled="disabled">每分</a-radio>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_RANGE" class="choice" :disabled="disabled">区间</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.start"/>
+        分
+        至
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.end"/>
+        分
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_LOOP" class="choice" :disabled="disabled">循环</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.start"/>
+        分开始，间隔
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.interval"/>
+        分
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_SPECIFY" class="choice" :disabled="disabled">指定</a-radio>
+        <div class="list">
+          <a-checkbox-group v-model="valueList">
+            <template v-for="i in specifyRange">
+              <a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{i}}</a-checkbox>
+            </template>
+          </a-checkbox-group>
+        </div>
+      </div>
+    </a-radio-group>
+  </div>
+</template>
+
+<script>
+import mixin from './mixin'
+
+export default {
+  name: 'minute',
+  mixins: [mixin],
+  data() {
+    return {}
+  },
+  watch: {
+    value_c(newVal, oldVal) {
+      this.$emit('change', newVal)
+    }
+  },
+  created() {
+    this.DEFAULT_VALUE = '*'
+    this.minValue = 0
+    this.maxValue = 59
+    this.valueRange.start = 0
+    this.valueRange.end = 59
+    this.valueLoop.start = 0
+    this.valueLoop.interval = 1
+    this.parseProp(this.prop)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  @import "mixin.less";
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.js
@ -0,0 +1,162 @@
+// 主要用于日和星期的互斥使用
+const TYPE_NOT_SET = 'TYPE_NOT_SET'
+const TYPE_EVERY = 'TYPE_EVERY'
+const TYPE_RANGE = 'TYPE_RANGE'
+const TYPE_LOOP = 'TYPE_LOOP'
+const TYPE_WORK = 'TYPE_WORK'
+const TYPE_LAST = 'TYPE_LAST'
+const TYPE_SPECIFY = 'TYPE_SPECIFY'
+
+const DEFAULT_VALUE = '?'
+
+export default {
+  model: {
+    prop: 'prop',
+    event: 'change'
+  },
+  props: {
+    prop: {
+      type: String,
+      default: DEFAULT_VALUE
+    },
+    disabled: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    const type = TYPE_EVERY
+    return {
+      DEFAULT_VALUE,
+      // 类型
+      type,
+      // 启用日或者星期互斥用
+      TYPE_NOT_SET,
+      TYPE_EVERY,
+      TYPE_RANGE,
+      TYPE_LOOP,
+      TYPE_WORK,
+      TYPE_LAST,
+      TYPE_SPECIFY,
+      // 对于不同的类型，所定义的值也有所不同
+      valueRange: {
+        start: 0,
+        end: 0
+      },
+      valueLoop: {
+        start: 0,
+        interval: 1
+      },
+      valueWeek: {
+        start: 0,
+        end: 0
+      },
+      valueList: [],
+      valueWork: 1,
+      maxValue: 0,
+      minValue: 0
+    }
+  },
+  watch: {
+    prop (newVal, oldVal) {
+      if (newVal === this.value_c) {
+        // console.info('skip ' + newVal)
+        return
+      }
+      this.parseProp(newVal)
+    }
+  },
+  computed: {
+    value_c () {
+      let result = []
+      switch (this.type) {
+        case TYPE_NOT_SET:
+          result.push('?')
+          break
+        case TYPE_EVERY:
+          result.push('*')
+          break
+        case TYPE_RANGE:
+          result.push(`${this.valueRange.start}-${this.valueRange.end}`)
+          break
+        case TYPE_LOOP:
+          result.push(`${this.valueLoop.start}/${this.valueLoop.interval}`)
+          break
+        case TYPE_WORK:
+          result.push(`${this.valueWork}W`)
+          break
+        case TYPE_LAST:
+          result.push('L')
+          break
+        case TYPE_SPECIFY:
+          if (this.valueList.length === 0) {
+            this.valueList.push(this.minValue)
+          }
+          result.push(this.valueList.join(','))
+          break
+        default:
+          result.push(this.DEFAULT_VALUE)
+          break
+      }
+      return result.length > 0 ? result.join('') : this.DEFAULT_VALUE
+    },
+    // 指定值范围区间，介于最小值和最大值之间
+    specifyRange() {
+      let range = []
+      for (let i = this.minValue; i <= this.maxValue; i++) {
+        range.push(i)
+      }
+      return range
+    },
+  },
+  methods: {
+    parseProp (value) {
+      if (value === this.value_c) {
+        // console.info('same ' + value)
+        return
+      }
+      if (typeof (this.preProcessProp) === 'function') {
+        value = this.preProcessProp(value)
+      }
+      try {
+        if (!value || value === this.DEFAULT_VALUE) {
+          this.type = TYPE_EVERY
+        } else if (value.indexOf('?') >= 0) {
+          this.type = TYPE_NOT_SET
+        } else if (value.indexOf('-') >= 0) {
+          this.type = TYPE_RANGE
+          const values = value.split('-')
+          if (values.length >= 2) {
+            this.valueRange.start = parseInt(values[0])
+            this.valueRange.end = parseInt(values[1])
+          }
+        } else if (value.indexOf('/') >= 0) {
+          this.type = TYPE_LOOP
+          const values = value.split('/')
+          if (values.length >= 2) {
+            this.valueLoop.start = value[0] === '*' ? 0 : parseInt(values[0])
+            this.valueLoop.interval = parseInt(values[1])
+          }
+        } else if (value.indexOf('W') >= 0) {
+          this.type = TYPE_WORK
+          const values = value.split('W')
+          if (!values[0] && !isNaN(values[0])) {
+            this.valueWork = parseInt(values[0])
+          }
+        } else if (value.indexOf('L') >= 0) {
+          this.type = TYPE_LAST
+          const values = value.split('L')
+          this.valueLast = parseInt(values[0])
+        } else if (value.indexOf(',') >= 0 || !isNaN(value)) {
+          this.type = TYPE_SPECIFY
+          this.valueList = value.split(',').map(item => parseInt(item))
+        } else {
+          this.type = TYPE_EVERY
+        }
+      } catch (e) {
+        // console.info(e)
+        this.type = TYPE_EVERY
+      }
+    }
+  }
+}
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/mixin.less
@ -0,0 +1,35 @@
+
+.config-list {
+  text-align: left;
+  margin: 0 10px 10px 10px;
+}
+
+.item {
+  margin-top: 5px;
+}
+
+.choice {
+  padding: 5px 8px;
+}
+
+
+.w60 {
+  width: 60px;
+}
+.w80 {
+  width: 80px;
+}
+
+.list {
+  margin: 0 20px;
+}
+
+.list-check-item {
+  padding: 1px 3px;
+  width: 4em;
+}
+
+.tip-info {
+  color: #999
+}
+
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/month.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/month.vue
@ -0,0 +1,67 @@
+<template>
+  <div class="config-list">
+    <a-radio-group v-model="type">
+      <div class="item">
+        <a-radio value="TYPE_EVERY" class="choice" :disabled="disabled">每月</a-radio>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_RANGE" class="choice" :disabled="disabled">区间</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.start"/>
+        月
+        至
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.end"/>
+        月
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_LOOP" class="choice" :disabled="disabled">循环</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.start"/>
+        月开始，间隔
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.interval"/>
+        月
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_SPECIFY" class="choice" :disabled="disabled">指定</a-radio>
+        <div class="list">
+          <a-checkbox-group v-model="valueList">
+            <template v-for="i of specifyRange">
+              <a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{i}}</a-checkbox>
+            </template>
+          </a-checkbox-group>
+        </div>
+      </div>
+    </a-radio-group>
+  </div>
+</template>
+
+<script>
+import mixin from './mixin'
+
+export default {
+  name: 'month',
+  mixins: [mixin],
+  data() {
+    return {}
+  },
+  watch: {
+    value_c(newVal, oldVal) {
+      this.$emit('change', newVal)
+    }
+  },
+  created() {
+    this.DEFAULT_VALUE = '*'
+    this.minValue = 1
+    this.maxValue = 12
+    this.valueRange.start = 1
+    this.valueRange.end = 12
+    this.valueLoop.start = 1
+    this.valueLoop.interval = 1
+    this.parseProp(this.prop)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  @import "mixin.less";
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/second.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/second.vue
@ -0,0 +1,68 @@
+<template>
+  <div class="config-list">
+    <a-radio-group v-model="type">
+      <div class="item">
+        <a-radio value="TYPE_EVERY" class="choice" :disabled="disabled">每秒</a-radio>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_RANGE" class="choice" :disabled="disabled">区间</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.start"/>
+        秒
+        至
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueRange.end"/>
+        秒
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_LOOP" class="choice" :disabled="disabled">循环</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.start"/>
+        秒开始，间隔
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.interval"/>
+        秒
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_SPECIFY" class="choice" :disabled="disabled">指定</a-radio>
+        <div class="list">
+          <a-checkbox-group v-model="valueList">
+            <template v-for="i in specifyRange">
+              <a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{i}}</a-checkbox>
+            </template>
+          </a-checkbox-group>
+        </div>
+      </div>
+    </a-radio-group>
+  </div>
+</template>
+
+<script>
+import mixin from './mixin'
+
+export default {
+  name: 'second',
+  mixins: [mixin],
+  data() {
+    return {}
+  },
+  watch: {
+    value_c(newVal, oldVal) {
+      this.$emit('change', newVal)
+    }
+  },
+  created() {
+    this.DEFAULT_VALUE = '*'
+    this.minValue = 0
+    this.maxValue = 59
+    this.valueRange.start = 0
+    this.valueRange.end = 59
+    this.valueLoop.start = 0
+    this.valueLoop.interval = 1
+    // console.info('created')
+    this.parseProp(this.prop)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  @import "mixin.less";
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/week.vue
@ -0,0 +1,118 @@
+<template>
+  <div class="config-list">
+    <a-radio-group v-model="type">
+      <div class="item">
+        <a-radio value="TYPE_NOT_SET" class="choice" :disabled="disableChoice">不设置</a-radio>
+        <span class="tip-info">日和周只能设置其中之一</span>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_RANGE" class="choice" :disabled="disableChoice">区间</a-radio>
+        从
+        <a-select v-model="valueRange.start" class="w80" :disabled="type!==TYPE_RANGE || disableChoice">
+          <template v-for="(v, k) of WEEK_MAP">
+            <a-select-option :value="v">{{k}}</a-select-option>
+          </template>
+        </a-select>
+        至
+        <a-select v-model="valueRange.end" class="w80" :disabled="type!==TYPE_RANGE || disableChoice">
+          <template v-for="(v, k) of WEEK_MAP">
+            <a-select-option :value="v">{{k}}</a-select-option>
+          </template>
+        </a-select>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_LOOP" class="choice" :disabled="disableChoice">循环</a-radio>
+        从
+        <a-select v-model="valueLoop.start" class="w80" :disabled="type!==TYPE_LOOP || disableChoice">
+          <template v-for="(v, k) of WEEK_MAP">
+            <a-select-option :value="v">{{k}}</a-select-option>
+          </template>
+        </a-select>
+        开始，间隔
+        <a-input-number :disabled="type!==TYPE_LOOP || disableChoice" :max="maxValue" :min="minValue" :precision="0" class="w60" v-model="valueLoop.interval"/>
+        天
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_SPECIFY" class="choice" :disabled="disableChoice">指定</a-radio>
+        <div class="list">
+          <a-checkbox-group v-model="valueList">
+            <template v-for="i in specifyRange">
+              <a-checkbox class="list-check-item" :key="`key-${i}`" :value="i" :disabled="type!==TYPE_SPECIFY || disabled">{{i}}</a-checkbox>
+            </template>
+          </a-checkbox-group>
+        </div>
+      </div>
+    </a-radio-group>
+  </div>
+</template>
+
+<script>
+import mixin from './mixin'
+import { replaceWeekName, WEEK_MAP_EN } from './const.js'
+
+const WEEK_MAP = {
+  '周一': 2,
+  '周二': 3,
+  '周三': 4,
+  '周四': 5,
+  '周五': 6,
+  '周六': 7,
+  // 按照国人习惯，将周日放到每周的最后一天
+  '周日': 1,
+}
+
+export default {
+  name: 'week',
+  mixins: [mixin],
+  props: {
+    day: {
+      type: String,
+      default: '*'
+    }
+  },
+  data() {
+    return {
+      WEEK_MAP,
+      WEEK_MAP_EN
+    }
+  },
+  computed: {
+    disableChoice() {
+      return (this.day && this.day !== '?') || this.disabled
+    }
+  },
+  watch: {
+    value_c(newVal, oldVal) {
+      // 如果设置日，那么星期就直接不设置
+      this.updateValue()
+    },
+    day(newVal) {
+      // console.info('new day: ' + newVal)
+      this.updateValue()
+    }
+  },
+  methods: {
+    updateValue() {
+      this.$emit('change', this.disableChoice ? '?' : this.value_c)
+    },
+    preProcessProp(c) {
+      return replaceWeekName(c)
+    }
+  },
+  created() {
+    this.DEFAULT_VALUE = '*'
+    // 0,7表示周日 1表示周一
+    this.minValue = 1
+    this.maxValue = 7
+    this.valueRange.start = 1
+    this.valueRange.end = 7
+    this.valueLoop.start = 2
+    this.valueLoop.interval = 1
+    this.parseProp(this.prop)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  @import "mixin.less";
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/year.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/tabs/year.vue
@ -0,0 +1,60 @@
+<template>
+  <div class="config-list">
+    <a-radio-group v-model="type">
+      <div class="item">
+        <a-radio value="TYPE_EVERY" class="choice" :disabled="disabled">每年</a-radio>
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_RANGE" class="choice" :disabled="disabled">区间</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :min="0" :precision="0" class="w60" v-model="valueRange.start"/>
+        年
+        至
+        <a-input-number :disabled="type!==TYPE_RANGE || disabled" :min="1" :precision="0" class="w60" v-model="valueRange.end"/>
+        年
+      </div>
+      <div class="item">
+        <a-radio value="TYPE_LOOP" class="choice" :disabled="disabled">循环</a-radio>
+        从
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :min="0" :precision="0" class="w60" v-model="valueLoop.start"/>
+        年开始，间隔
+        <a-input-number :disabled="type!==TYPE_LOOP || disabled" :min="1" :precision="0" class="w60" v-model="valueLoop.interval"/>
+        年
+      </div>
+    </a-radio-group>
+  </div>
+</template>
+
+<script>
+import mixin from './mixin'
+
+export default {
+  name: 'year',
+  mixins: [mixin],
+  data() {
+    return {}
+  },
+  watch: {
+    value_c(newVal, oldVal) {
+      // console.info('change:' + newVal)
+      this.$emit('change', newVal)
+    }
+  },
+  created() {
+    const nowYear = (new Date()).getFullYear()
+    this.DEFAULT_VALUE = '*'
+    this.minValue = 0
+    this.maxValue = 0
+    this.valueRange.start = nowYear
+    this.valueRange.end = nowYear + 100
+    this.valueLoop.start = nowYear
+    this.valueLoop.interval = 1
+    // console.info('created')
+    this.parseProp(this.prop)
+  }
+}
+</script>
+
+<style lang="less" scoped>
+  @import "mixin.less";
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/validator.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEasyCron/validator.js
@ -0,0 +1,51 @@
+import CronParser from 'cron-parser'
+import { replaceWeekName } from './tabs/const'
+
+export default (rule, value, callback) => {
+  // 没填写就不校验
+  if (!value) {
+    callback()
+    return true
+  }
+  const values = value.split(' ').filter(item => !!item)
+  if (values.length > 7) {
+    callback(new Error('Cron表达式最多7项！'))
+    return false
+  }
+  // 检查第7项
+  let e = value
+  if (values.length === 7) {
+    const year = replaceWeekName(values[6])
+    if (year !== '*' && year !== '?') {
+      let yearValues = []
+      if (year.indexOf('-') >= 0) {
+        yearValues = year.split('-')
+      } else if (year.indexOf('/')) {
+        yearValues = year.split('/')
+      } else {
+        yearValues = [year]
+      }
+      // console.info(yearValues)
+      // 判断是否都是数字
+      const checkYear = yearValues.some(item => isNaN(item))
+      if (checkYear) {
+        callback(new Error('Cron表达式参数[年]错误：' + year))
+        return false
+      }
+    }
+    // 取其中的前六项
+    e = values.slice(0, 6).join(' ')
+  }
+  // 6位 没有年
+  // 5位没有秒、年
+  let result = true
+  try {
+    const iter = CronParser.parseExpression(e)
+    iter.next()
+    callback()
+  } catch (e) {
+    callback(new Error('Cron表达式错误：' + e))
+    result = false
+  }
+  return result
+}
--- a/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue
@ -1,5 +1,5 @@
 <!-- JEditableTable -->
-<!-- @version 1.6.1 -->
+<!-- @version 1.6.2 -->
 <!-- @author sjlei -->
 <template>
  <a-spin :spinning="loading">
@ -11,7 +11,33 @@
      <a-col>
        <!-- 操作按钮 -->
        <div v-if="actionButton" class="action-button">
-          <a-button v-if="buttonPermission('add')" type="primary" icon="plus" @click="handleClickAdd" :disabled="disabled">新增</a-button>
+          <a-button-group v-if="buttonPermission('add')">
+            <a-button type="primary" icon="plus" @click="handleClickAdd" :disabled="disabled">新增</a-button>
+            <a-popover v-if="addButtonSettings" placement="right" overlayClassName="j-add-btn-settings">
+              <a-row slot="title">
+                <a-col :span="12">选项</a-col>
+                <a-col :span="12" style="text-align: right;">
+                  <a-tooltip title="保存为默认值">
+                    <a-button type="link" icon="save" size="small" style="position: relative;left:4px;" @click="onAddButtonSettingsSave"/>
+                  </a-tooltip>
+                </a-col>
+              </a-row>
+              <template slot="content">
+                <a-form-model layout="horizontal" :labelCol="{span:8}" :wrapperCol="{span:16}">
+                  <a-form-model-item label="添加行数">
+                    <a-input-number v-model="settings.addRowNum" :min="1"/>
+                  </a-form-model-item>
+                  <a-form-model-item label="添加位置">
+                    <a-input-number v-model="settings.addIndex" :min="0" :max="rows.length"/>
+                    <p style="font-size: 12px;color:#aaa;line-height: 14px;text-align: right;margin: 0;">0 = 最底部</p>
+                  </a-form-model-item>
+                  <a-divider style="margin: 8px 0;"/>
+                  <a-checkbox v-model="settings.addScrollToBottom">添加后滚动到底部</a-checkbox>
+                </a-form-model>
+              </template>
+              <a-button icon="setting" type="primary"></a-button>
+            </a-popover>
+          </a-button-group>
          <span class="gap"></span>
          <template v-if="selectedRowIds.length>0">
            <a-popconfirm
@ -215,7 +241,7 @@
                          :value="departCompValues[id]"
                          :placeholder="replaceProps(col, col.placeholder)"
                          :trigger-change="true"
-                          :multi="true"
+                          :multi="isMultipleSelect(col)"
                          @change="(v)=>handleChangeDepartCommon(v,id,row,col)"
                        />
                        <span
@ -239,7 +265,7 @@
                          :value="userCompValues[id]"
                          :placeholder="replaceProps(col, col.placeholder)"
                          :trigger-change="true"
-                          :multi="true"
+                          :multi="isMultipleSelect(col)"
                          @change="(v)=>handleChangeUserCommon(v,id,row,col)"
                        />
                        <span
@ -277,8 +303,33 @@
                        >{{ jdateValues[id] }}</span>
                      </a-tooltip>
                    </template>
+
+                    <!-- time -->
+                    <template v-else-if="col.type === formTypes.time">
+                      <a-tooltip v-bind="buildTooltipProps(row, col, id)">
+                        <j-time
+                          v-if="isEditRow(row, col)"
+                          :id="id"
+                          :key="i"
+                          v-bind="buildProps(row,col)"
+                          style="width: 100%;"
+                          :value="jdateValues[id]"
+                          :getCalendarContainer="getParentContainer"
+                          :placeholder="replaceProps(col, col.placeholder)"
+                          allowClear
+                          @change="(v)=>handleChangeJDateCommon(v,id,row,col)"
+                        />
+                        <span
+                          v-else
+                          class="j-td-span no-edit"
+                          :class="{disabled: buildProps(row,col).disabled}"
+                          @click="handleEditRow(row, col)"
+                        >{{ jdateValues[id] }}</span>
+                      </a-tooltip>
+                    </template>
+
                    <!-- input_pop -->
-                    <template v-else-if="col.type === formTypes.input_pop">
+                    <template v-else-if="col.type === formTypes.input_pop||col.type === 'textarea'">
                      <a-tooltip v-bind="buildTooltipProps(row, col, id)">
                        <j-input-pop
                          v-if="isEditRow(row, col)"
@ -318,7 +369,7 @@
                            <a-tooltip v-else-if="file.status==='done'" title="上传完成">
                              <a-icon type="check-circle" style="color:#00DB00;"/>
                            </a-tooltip>
-                            <a-tooltip v-else title="上传失败">
+                            <a-tooltip v-else :title="file.message||'上传失败'">
                              <a-icon type="exclamation-circle" style="color:red;"/>
                            </a-tooltip>
                          </template>
@ -350,7 +401,7 @@
                        <a-tooltip v-bind="buildTooltipProps(row, col, id)">
                          <a-upload
                            name="file"
-                            :data="{'isup':1}"
+                            :data="{'isup':1, ...(col.data||{})}"
                            :multiple="false"
                            :action="col.action"
                            :headers="uploadGetHeaders(row,col)"
@ -381,6 +432,8 @@
                          :dest-fields="col.destFields"
                          :code="col.popupCode"
                          :groupId="caseId"
+                          :param="col.param"
+                          :sorter="col.sorter"
                          @input="(value,others)=>popupCallback(value,others,id,row,col,rowIndex)"
                        />
                        <span
@ -395,7 +448,7 @@

                    <!-- update-beign-author:taoyan date:0827 for：文件/图片逻辑新增 -->
                    <div v-else-if="col.type === formTypes.file" :key="i">
-                      <template v-if="uploadValues[id] != null" v-for="(file,fileKey) of [(uploadValues[id]||{})]">
+                      <template v-if="hasUploadValue(id)" v-for="(file,fileKey) of [(uploadValues[id]||{})]">
                        <div :key="fileKey" style="position: relative;">
                          <a-tooltip v-if="file.status==='uploading'" :title="`上传中(${Math.floor(file.percent)}%)`">
                            <a-icon type="loading" style="color:red;"/>
@ -407,9 +460,9 @@
                            <span style="margin-left:5px">{{ getEllipsisWord(file.name,5) }}</span>
                          </a-tooltip>

-                          <a-tooltip v-else :title="file.name">
-                            <a-icon type="paper-clip" style="color:red;"/>
-                            <span style="color:red;margin-left:5px">{{ getEllipsisWord(file.name,5) }}</span>
+                          <a-tooltip v-else :title="file.message||'上传失败'">
+                            <a-icon type="exclamation-circle" style="color:red;"/>
+                            <span style="margin-left:5px">{{ getEllipsisWord(file.name,5) }}</span>
                          </a-tooltip>

                          <template style="width: 30px">
@ -434,7 +487,7 @@
                        </div>
                      </template>

-                      <div :hidden="uploadValues[id] != null">
+                      <div :hidden="hasUploadValue(id)">
                        <a-tooltip v-bind="buildTooltipProps(row, col, id)">
                          <a-upload
                            name="file"
@ -454,7 +507,7 @@
                    </div>

                    <div v-else-if="col.type === formTypes.image" :key="i">
-                      <template v-if="uploadValues[id] != null" v-for="(file,fileKey) of [(uploadValues[id]||{})]">
+                      <template v-if="hasUploadValue(id)" v-for="(file,fileKey) of [(uploadValues[id]||{})]">
                        <div :key="fileKey" style="position: relative;">
                          <template v-if="!uploadValues[id] || !(uploadValues[id]['url'] || uploadValues[id]['path'] || uploadValues[id]['message'])">
                            <a-icon type="loading"/>
@ -462,20 +515,9 @@
                          <template v-else-if="uploadValues[id]['path']">
                            <img class="j-editable-image" :src="getCellImageView(id)" alt="无图片" @click="handleMoreOperation(id,'img',col)"/>
                          </template>
-                          <template v-else>
-                            <a-icon type="exclamation-circle" style="color: red;" @click="handleClickShowImageError(id)"/>
-                          </template>
-                          <template slot="addonBefore" style="width: 30px">
-                            <a-tooltip v-if="file.status==='uploading'" :title="`上传中(${Math.floor(file.percent)}%)`">
-                              <a-icon type="loading"/>
-                            </a-tooltip>
-                            <a-tooltip v-else-if="file.status==='done'" title="上传完成">
-                              <a-icon type="check-circle" style="color:#00DB00;"/>
-                            </a-tooltip>
-                            <a-tooltip v-else title="上传失败">
-                              <a-icon type="exclamation-circle" style="color:red;"/>
-                            </a-tooltip>
-                          </template>
+                          <a-tooltip v-else :title="file.message||'上传失败'" @click="handleClickShowImageError(id)">
+                            <a-icon type="exclamation-circle" style="color:red;"/>
+                          </a-tooltip>

                          <template style="width: 30px">
                            <a-dropdown :trigger="['click']" placement="bottomRight" :getPopupContainer="getParentContainer" style="margin-left: 10px;">
@ -503,7 +545,7 @@
                        </div>
                      </template>

-                      <div :hidden="uploadValues[id] != null">
+                      <div :hidden="hasUploadValue(id)">
                        <a-tooltip v-bind="buildTooltipProps(row, col, id)">
                          <a-upload
                            name="file"
@ -595,6 +637,33 @@
                    </template>
                    <!-- select搜索 -end -->

+                    <!-- select异步搜索 -begin -->
+                    <template v-else-if="col.type === formTypes.sel_search_async">
+                      <a-tooltip v-bind="buildTooltipProps(row, col, id)">
+                        <j-search-select-tag
+                          v-if="isEditRow(row, col)"
+                          :id="id"
+                          :key="i"
+                          :value="searchSelectAsyncValues[id]"
+                          :placeholder="replaceProps(col, col.placeholder)"
+                          :dict="col.dict"
+                          :async="true"
+                          :getPopupContainer="getParentContainer"
+                          v-bind="buildProps(row,col)"
+                          style="width: 100%;"
+                          @change="(v)=>handleSearchSelectAsyncChange(v,id,row,col)"
+                        >
+                        </j-search-select-tag>
+                        <span
+                          v-else
+                          class="j-td-span no-edit"
+                          :class="{disabled: buildProps(row,col).disabled}"
+                          @click="handleEditRow(row, col)"
+                        >{{ searchSelectAsyncValues[id] }}</span>
+                      </a-tooltip>
+                    </template>
+                    <!-- select异步搜索 -end -->
+
                    <div v-else-if="col.type === formTypes.slot" :key="i">
                      <a-tooltip v-bind="buildTooltipProps(row, col, id)">
                        <slot
@ -615,7 +684,7 @@
                    </div>

                    <!-- else (normal) -->
-                    <span v-else :key="i" v-bind="buildProps(row,col)">{{ inputValues[rowIndex][col.key] }}</span>
+                    <span class="comp-normal" v-else :key="i" :title="inputValues[rowIndex][col.key]" v-bind="buildProps(row,col)">{{ inputValues[rowIndex][col.key] }}</span>
                  </template>
                </div>
              </div>
@ -672,13 +741,13 @@
  import Draggable from 'vuedraggable'
  import { ACCESS_TOKEN } from '@/store/mutation-types'
  import { FormTypes, VALIDATE_NO_PASSED } from '@/utils/JEditableTableUtil'
-  import { cloneObject, randomString, randomNumber, getEventPath } from '@/utils/util'
+  import { cloneObject, getEventPath, randomNumber, randomString } from '@/utils/util'
  import JDate from '@/components/jeecg/JDate'
  import { filterDictText, initDictOptions } from '@/components/dict/JDictSelectUtil'
-  import { getFileAccessHttpUrl } from '@/api/manage';
+  import { getFileAccessHttpUrl } from '@/api/manage'
  import JInputPop from '@/components/jeecg/minipop/JInputPop'
  import JFilePop from '@/components/jeecg/minipop/JFilePop'
-  import { getNoAuthCols } from "@/utils/authFilter"
+  import { getNoAuthCols } from '@/utils/authFilter'

  // 行高，需要在实例加载完成前用到
  let rowHeight = 61
@ -709,6 +778,11 @@
        type: Boolean,
        default: false
      },
+      // 是否显示添加按钮选项
+      addButtonSettings: {
+        type: Boolean,
+        default: false
+      },
      // 是否显示行号
      rowNumber: {
        type: Boolean,
@ -814,6 +888,7 @@
        metaCheckboxValues: {},
        multiSelectValues: {},
        searchSelectValues: {},
+        searchSelectAsyncValues: {},
        // 绑定左侧选择框已选择的id
        selectedRowIds: [],
        // 存储被删除行的id
@ -836,7 +911,16 @@
        lastPushTimeMap: new Map(),
        number:0,
        //不显示的按钮编码
-        excludeCode:[]
+        excludeCode:[],
+        // 选项配置
+        settings: {
+          // 添加行数
+          addRowNum: 1,
+          // 添加位置（下标），0 = 最底部
+          addIndex: 0,
+          // 添加后滚动到底部
+          addScrollToBottom: false,
+        },
      }
    },
    created() {
@ -851,6 +935,7 @@
          event.stopPropagation()
        }
      }
+      this.getSavedAddButtonSettings()
    },
    // 计算属性
    computed: {
@ -1003,7 +1088,11 @@

    },
    methods: {
-
+      // 判断文件/图片是否存在
+      hasUploadValue(id){
+        let flag = this.uploadValues[id] != null && this.uploadValues[id].toString().length>0
+        return flag;
+      },
      getElement(id, noCaseId = false) {
        if (!this.el[id]) {
          this.el[id] = document.getElementById((noCaseId ? '' : this.caseId) + id)
@ -1048,6 +1137,10 @@
        this.inputValues = []
        this.rows = []
        this.deleteIds = []
+        this.selectedRowIds = []
+        this.tooltips = {}
+        this.notPassedIds = []
+        // 重置values
        this.selectValues = {}
        this.checkboxValues = {}
        this.jdateValues = {}
@ -1055,14 +1148,16 @@
        this.departCompValues = {}
        this.userCompValues = {}
        this.slotValues = {}
-        this.selectedRowIds = []
-        this.tooltips = {}
-        this.notPassedIds = []
-        this.uploadValues = []
-        this.popupValues = []
-        this.radioValues = []
-        this.multiSelectValues = []
-        this.searchSelectValues = []
+        //update-begin-author:shunjlei date:20210415 for:类型赋值错误
+        this.uploadValues = {}
+        this.popupValues = {}
+        this.radioValues = {}
+        this.multiSelectValues = {}
+        this.searchSelectValues = {}
+        this.searchSelectAsyncValues = {}
+        //update-end-author:shunjlei date:20210415 for:类型赋值错误
+
+        // 重置滚动条
        this.scrollTop = 0
        this.$nextTick(() => {
          this.getElement('tbody').scrollTop = 0
@ -1136,6 +1231,7 @@
        let radioValues = { ...this.radioValues }
        let multiSelectValues = { ...this.multiSelectValues }
        let searchSelectValues = { ...this.searchSelectValues }
+        let searchSelectAsyncValues = { ...this.searchSelectAsyncValues }
        // 禁用行的id
        let disabledRowIds = (this.disabledRowIds || [])
        dataSource.forEach((data, newValueIndex) => {
@ -1207,7 +1303,7 @@
                selectValues[inputId] = undefined
              }

-            } else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
+            } else if (column.type === FormTypes.date || column.type === FormTypes.datetime || column.type === FormTypes.time) {
              jdateValues[inputId] = sourceValue

            } else if (column.type === FormTypes.slot) {
@ -1219,12 +1315,14 @@
              departCompValues[inputId] = sourceValue
            } else if (column.type === FormTypes.sel_user) {
              userCompValues[inputId] = sourceValue
-            } else if (column.type === FormTypes.input_pop) {
+            } else if (column.type === FormTypes.input_pop || column.type === 'textarea') {
              jInputPopValues[inputId] = sourceValue
            } else if (column.type === FormTypes.radio) {
              radioValues[inputId] = sourceValue
            } else if (column.type === FormTypes.sel_search) {
              searchSelectValues[inputId] = sourceValue
+            } else if (column.type === FormTypes.sel_search_async) {
+              searchSelectAsyncValues[inputId] = sourceValue
            } else if (column.type === FormTypes.list_multi) {
              if (typeof sourceValue === 'string' && sourceValue.length > 0) {
                multiSelectValues[inputId] = sourceValue.split(',')
@ -1245,6 +1343,8 @@
                  status: 'done',
                  path: sourceValue
                }
+              } else {
+                uploadValues[inputId] = null
              }
            } else {
              value[column.key] = sourceValue
@ -1309,6 +1409,7 @@
        this.radioValues = radioValues
        this.multiSelectValues = multiSelectValues
        this.searchSelectValues = searchSelectValues
+        this.searchSelectAsyncValues = searchSelectAsyncValues
        // 重新计算所有统计列
        this.recalcAllStatisticsColumns()
        // 更新到 dom
@ -1370,22 +1471,18 @@
        let tbody = this.getElement('tbody')
        let offsetHeight = tbody.offsetHeight
        let realScrollTop = tbody.scrollTop + offsetHeight
-        if (forceScrollToBottom === false) {
-          // 只有滚动条在底部的时候才自动滚动
-          if (!((tbody.scrollHeight - realScrollTop) <= 10)) {
-            return
-          }
+        if (forceScrollToBottom) {
+          this.$nextTick(() => {
+            this.resetScrollTop(this.$refs.scrollView.scrollHeight)
+          })
        }
-        this.$nextTick(() => {
-          tbody.scrollTop = tbody.scrollHeight
-        })
      },
      /**
       * 在指定位置添加一行
       * @param insertIndex 添加位置下标
       * @param num 添加的行数，默认1
       */
-      insert(insertIndex, num = 1) {
+      insert(insertIndex, num = 1, forceScrollToBottom = false) {
        if (this.checkTooFastClick('insert', 1500)) {
          return
        }
@ -1413,6 +1510,12 @@
          num, insertIndex,
          target: this
        })
+        // 设置滚动条位置
+        if (forceScrollToBottom) {
+          this.$nextTick(() => {
+            this.resetScrollTop(this.$refs.scrollView.scrollHeight)
+          })
+        }
      },
      /** 删除被选中的行 */
      removeSelectedRows() {
@ -1514,7 +1617,7 @@
                value[column.key] = selected
              }

-            } else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
+            } else if (column.type === FormTypes.date || column.type === FormTypes.datetime || column.type === FormTypes.time) {
              value[column.key] = this.jdateValues[inputId]

            } else if (column.type === FormTypes.sel_depart) {
@ -1523,7 +1626,7 @@
            } else if (column.type === FormTypes.sel_user) {
              value[column.key] = this.userCompValues[inputId]

-            } else if (column.type === FormTypes.input_pop) {
+            } else if (column.type === FormTypes.input_pop || column.type === 'textarea') {
              value[column.key] = this.jInputPopValues[inputId]

            } else if (column.type === FormTypes.upload) {
@ -1543,6 +1646,8 @@
              value[column.key] = this.radioValues[inputId]
            } else if (column.type === FormTypes.sel_search) {
              value[column.key] = this.searchSelectValues[inputId]
+            } else if (column.type === FormTypes.sel_search_async) {
+              value[column.key] = this.searchSelectAsyncValues[inputId]
            } else if (column.type === FormTypes.list_multi) {
              if (!this.multiSelectValues[inputId] || this.multiSelectValues[inputId].length === 0) {
                value[column.key] = ''
@ -1671,6 +1776,7 @@
          radioValues: this.radioValues,
          multiSelectValues: this.multiSelectValues,
          searchSelectValues: this.searchSelectValues,
+          searchSelectAsyncValues: this.searchSelectAsyncValues,
        })
      },
      /** 设置某行某列的值 */
@ -1716,13 +1822,13 @@
                      }
                      this.$set(this.checkboxValues, key, sourceValue)
                      edited = true
-                    } else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
+                    } else if (column.type === FormTypes.date || column.type === FormTypes.datetime || column.type === FormTypes.time) {
                      edited = this.setOneValue(this.jdateValues, modelKey, newValue)
                    } else if (column.type === FormTypes.sel_depart) {
                      edited = this.setOneValue(this.departCompValues, modelKey, newValue)
                    } else if (column.type === FormTypes.sel_user) {
                      edited = this.setOneValue(this.userCompValues, modelKey, newValue)
-                    } else if (column.type === FormTypes.input_pop) {
+                    } else if (column.type === FormTypes.input_pop || column.type === 'textarea') {
                      edited = this.setOneValue(this.jInputPopValues, modelKey, newValue)
                    } else if (column.type === FormTypes.slot) {
                      edited = this.setOneValue(this.slotValues, modelKey, newValue)
@ -1736,6 +1842,8 @@
                      edited = this.setOneValue(this.multiSelectValues, modelKey, newValue, true)
                    } else if (column.type === FormTypes.sel_search) {
                      edited = this.setOneValue(this.searchSelectValues, modelKey, newValue)
+                    } else if (column.type === FormTypes.sel_search_async) {
+                      edited = this.setOneValue(this.searchSelectAsyncValues, modelKey, newValue)
                    } else {
                      edited = false
                    }
@ -2048,7 +2156,12 @@

      },
      handleClickAdd() {
-        this.add()
+        let {addRowNum, addIndex, addScrollToBottom} = this.settings
+        if (addIndex <= 0) {
+          this.add(addRowNum, addScrollToBottom)
+        } else {
+          this.insert(addIndex, addRowNum, addScrollToBottom)
+        }
      },
      handleConfirmDelete() {
        this.removeSelectedRows()
@ -2059,6 +2172,29 @@
      clearSelection() {
        this.selectedRowIds = []
      },
+      // 获取当前选中的行
+      getSelection() {
+        return this.selectedRowIds.map(id => this.getCleanId(id))
+      },
+      // 设置当前选中的行
+      async setSelection(selectedRowIds) {
+        if (Array.isArray(selectedRowIds) && selectedRowIds.length > 0) {
+          // 兼容IE
+          await this.getElementPromise('tbody')
+          await this.$nextTick()
+          this.selectedRowIds = selectedRowIds.map(id => {
+            let temp = id
+            if (!this.hasCaseId(id)) {
+              temp = this.caseId + id
+            }
+            return temp
+          })
+        }
+      },
+      // 切换全选状态
+      toggleSelectionAll() {
+        this.handleChangeCheckedAll()
+      },
      /** 用于搜索下拉框中的内容 */
      handleSelectFilterOption(input, option, column) {
        if (column.allowSearch === true || column.allowInput === true) {
@ -2266,11 +2402,7 @@
        this.validateOneInput(value, row, column, this.notPassedIds, true, 'change')

        // 触发valueChange 事件
-        if (showTime) {
-          this.elemValueChange(FormTypes.datetime, row, column, value)
-        } else {
-          this.elemValueChange(FormTypes.date, row, column, value)
-        }
+        this.elemValueChange(column.type, row, column, value)
      },
      //部门组件值改变
      handleChangeDepartCommon(value, id, row, column){
@ -2306,7 +2438,21 @@
          value['responseName'] = file.response[column.responseName]
        }
        if (file.status === 'done') {
-          value['path'] = file.response[column.responseName]
+          if (typeof file.response.success === 'boolean') {
+            // 如果文件上传，被拦截器拦下，还会返回最外层的status = done
+            // 但是内部的success会返回false并携带异常信息
+            // 整个上传操作还是失败的
+            // https://github.com/zhangdaiscott/jeecg-boot/issues/2691
+            if (file.response.success) {
+              value['path'] = file.response[column.responseName]
+            } else {
+              value['status'] = 'error'
+              value['message'] = file.response.message || '未知错误'
+            }
+          } else {
+            // 考虑到如果设置action上传路径为非jeecg-boot后台，可能不会返回 success 属性的情况，就默认为成功
+            value['path'] = file.response[column.responseName]
+          }
        } else if (file.status === 'error') {
          value['message'] = file.response.message || '未知错误'
        }
@ -2368,6 +2514,25 @@
          })
        }
      },
+
+      /** 添加按钮设置保存为默认值 */
+      onAddButtonSettingsSave() {
+        let obj = {
+          addRowNum: this.settings.addRowNum,
+          addIndex: this.settings.addIndex,
+          addScrollToBottom: this.settings.addScrollToBottom,
+        }
+        this.$ls.set('jet-add-btn-settings', obj)
+        this.$message.success('保存成功')
+      },
+      /** 获取保存的添加按钮默认值 */
+      getSavedAddButtonSettings() {
+        let obj= this.$ls.get('jet-add-btn-settings')
+        if (obj) {
+          Object.assign(this.settings, obj)
+        }
+      },
+
      /** 记录用到数据绑定的组件的值 */
      bindValuesChange(value, id, key) {
        this.$set(this[key], id, value)
@ -2619,6 +2784,11 @@
        if (col.type === FormTypes.select && (col.allowInput === true || col.allowSearch === true)) {
          props['showSearch'] = true
        }
+        if (col.type === FormTypes.sel_depart || col.type === FormTypes.sel_user) {
+          let { storeField, textField } = this.getStoreAndTextField(col)
+          props['store'] = storeField
+          props['text'] = textField
+        }

        // 判断是否是禁用的列
        props['disabled'] = (typeof col['disabled'] === 'boolean' ? col['disabled'] : props['disabled'])
@ -2636,6 +2806,42 @@
        return props
      },

+      /**获取部门选择 、用户选择的存储字段、展示字段*/
+      getStoreAndTextField(col){
+        let storeField = '', textField = ''
+        if(col.type === FormTypes.sel_depart){
+          storeField = 'id'
+          textField = 'departName'
+        }else if(col.type === FormTypes.sel_user){
+          storeField = 'username'
+          textField = 'realname'
+        }
+        if(col.fieldExtendJson){
+          // online逻辑
+          let tempJson = JSON.parse(col.fieldExtendJson)
+          if(tempJson){
+            if(tempJson.store){
+              storeField = tempJson.store
+            }
+            if(tempJson.text){
+              textField = tempJson.text
+            }
+          }
+        }else{
+          // 实际开发逻辑
+          if(col.store){
+            storeField = col.store
+          }
+          if(col.text){
+            textField = col.text
+          }
+        }
+        return {
+          storeField,
+          textField
+        }
+      },
+
      /** 辅助方法：防止过快点击，如果点击过快的话就返回 true */
      checkTooFastClick(key = 'default', ms = 300) {
        let nowTime = Date.now()
@ -2731,6 +2937,11 @@
        this.validateOneInput(value, row, column, this.notPassedIds, true, 'change')
        this.elemValueChange(FormTypes.sel_search, row, column, value)
      },
+      handleSearchSelectAsyncChange(value, id, row, column) {
+        this.searchSelectAsyncValues = this.bindValuesChange(value, id, 'searchSelectAsyncValues')
+        this.validateOneInput(value, row, column, this.notPassedIds, true, 'change')
+        this.elemValueChange(FormTypes.sel_search_async, row, column, value)
+      },
      filterOption(input, option) {
        return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0
      },
@ -2844,6 +3055,21 @@
        }else{
          return this.excludeCode.indexOf(code)<0
        }
+      },
+      // 判断用户、部门组件是否多选
+      isMultipleSelect(column){
+        let jsonStr = column.fieldExtendJson
+        if(jsonStr){
+          // online
+          let config = JSON.parse(jsonStr)
+          if(config && config['multiSelect']==false){
+            return false
+          }
+        }else if(column.multi==false){
+          // 实际开发
+          return false
+        }
+        return true;
      }

    },
@ -2992,6 +3218,8 @@
        border-bottom: @border;
        transition: background-color 300ms;
        width: 100%;
+        height: 61px;
+        overflow: hidden;
        position: absolute;
        left: 0;
        z-index: 10;
@ -3101,6 +3329,12 @@
          }
        }

+        .comp-normal {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+
        .j-td-span {
          position: relative;
          padding: 4px 11px;
@ -3220,3 +3454,19 @@
  }

 </style>
+<style lang="less">
+// 新增按钮配置气泡的样式
+.j-add-btn-settings {
+  width: 240px;
+
+  .ant-form {
+    .ant-form-item {
+      margin-bottom: 0;
+
+      .ant-input-number {
+        width: 100%;
+      }
+    }
+  }
+}
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JEditor.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JEditor.vue
@ -134,9 +134,17 @@
        }else{
          //update--begin--autor:wangshuai-----date:20200724------for：富文本编辑器切换tab无法修改------
          let tabLayout = getVmParentByName(this, 'TabLayout')
-          tabLayout.excuteCallback(()=>{
-            this.reload()
-          })
+          //update--begin--autor:liusq-----date:20210713------for：处理特殊情况excuteCallback不能使用------
+          try {
+            tabLayout.excuteCallback(() => {
+              this.reload()
+            })
+          } catch (error) {
+            if (tabLayout) {
+              this.reload()
+            }
+          }
+          //update--end--autor:liusq-----date:20210713------for：处理特殊情况excuteCallback不能使用------
          //update--begin--autor:wangshuai-----date:20200724------for：文本编辑器切换tab无法修改------
        }
      },
--- a/ant-design-vue-jeecg/src/components/jeecg/JImportModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JImportModal.vue
@ -6,6 +6,13 @@
    :confirmLoading="uploading"
    @cancel="handleClose">

+    <div style="margin: 0px 0px 5px 1px" v-if="online">
+      <span style="display: inline-block;height: 32px;line-height: 32px;vertical-align: middle;">是否开启校验:</span>
+      <span style="display: inline-block;height: 32px;margin-left: 6px">
+         <a-switch :checked="validateStatus==1" @change="handleChangeValidateStatus" checked-children="是" un-checked-children="否" size="small"/>
+      </span>
+    </div>
+
    <a-upload
      name="file"
      :multiple="true"
@ -47,6 +54,12 @@
        type: String,
        default: '',
        required: false
+      },
+      //是否online导入
+      online:{
+        type: Boolean,
+        default: false,
+        required: false
      }
    },
    data(){
@ -55,7 +68,8 @@
        uploading:false,
        fileList:[],
        uploadAction:'',
-        foreignKeys:''
+        foreignKeys:'',
+        validateStatus: 0
      }
    },
    watch: {
@ -78,6 +92,7 @@
        this.uploading = false
        this.visible = true
        this.foreignKeys = arg;
+        this.validateStatus = 0
      },
      handleRemove(file) {
        const index = this.fileList.indexOf(file);
@ -98,6 +113,9 @@
        if(this.foreignKeys && this.foreignKeys.length>0){
          formData.append('foreignKeys',this.foreignKeys);
        }
+        if(this.online==true){
+          formData.append('validateStatus',this.validateStatus);
+        }
        fileList.forEach((file) => {
          formData.append('files[]', file);
        });
@ -105,14 +123,41 @@
        postAction(this.uploadAction, formData).then((res) => {
          this.uploading = false
          if(res.success){
-            this.$message.success(res.message)
+            if(res.code == 201){
+              this.errorTip(res.message, res.result)
+            }else{
+              this.$message.success(res.message)
+            }
            this.visible=false
            this.$emit('ok')
          }else{
            this.$message.warning(res.message)
          }
        })
-      }
+      },
+      // 是否开启校验 开关改变事件
+      handleChangeValidateStatus(checked){
+        this.validateStatus = checked==true?1:0
+      },
+      // 错误信息提示
+      errorTip(tipMessage, fileUrl) {
+        const h = this.$createElement;
+        let href = window._CONFIG['domianURL'] + fileUrl
+        this.$warning({
+          title: '导入成功,但是有错误数据!',
+          content: h('div', {}, [
+            h('div', tipMessage),
+            h('span', '具体详情请 '),
+            h('a', {
+              attrs: {
+                href: href,
+                target: '_blank'
+              },
+            },'点击下载'),
+          ]),
+          onOk() {},
+        });
+      },

    }
  }
--- a/ant-design-vue-jeecg/src/components/jeecg/JModal/JModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JModal/JModal.vue
@ -47,10 +47,10 @@

 <script>

-  import { getClass, getStyle } from '@/utils/props-util'
-  import { triggerWindowResizeEvent } from '@/utils/util'
+import { getClass, getStyle } from '@/utils/props-util'
+import { triggerWindowResizeEvent } from '@/utils/util'

-  export default {
+export default {
    name: 'JModal',
    props: {
      title: String,
@ -169,6 +169,7 @@
 </script>

 <style lang="less">
+  
  .j-modal-box {
    &.fullscreen {
      top: 0;
--- a/ant-design-vue-jeecg/src/components/jeecg/JModal/JPrompt.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JModal/JPrompt.vue
@ -0,0 +1,124 @@
+<template>
+  <j-modal :visible="visible" :confirmLoading="loading" :after-close="afterClose" v-bind="modalProps" @ok="onOk" @cancel="onCancel">
+    <a-spin :spinning="loading">
+      <div v-html="content"></div>
+      <a-form-model ref="form" :model="model" :rules="rules">
+        <a-form-model-item prop="input">
+          <a-input ref="input" v-model="model.input" v-bind="inputProps" @pressEnter="onInputPressEnter"/>
+        </a-form-model-item>
+      </a-form-model>
+    </a-spin>
+  </j-modal>
+</template>
+
+<script>
+import pick from 'lodash.pick'
+
+export default {
+  name: 'JPrompt',
+  data() {
+    return {
+      visible: false,
+      loading: false,
+      content: '',
+      // 弹窗参数
+      modalProps: {
+        title: '',
+      },
+      inputProps: {
+        placeholder: '',
+      },
+      // form model
+      model: {
+        input: '',
+      },
+      // 校验
+      rule: [],
+      // 回调函数
+      callback: {},
+    }
+  },
+  computed: {
+    rules() {
+      return {
+        input: this.rule
+      }
+    },
+  },
+  methods: {
+    show(options) {
+      this.content = options.content
+      if (Array.isArray(options.rule)) {
+        this.rule = options.rule
+      }
+      if (options.defaultValue != null) {
+        this.model.input = options.defaultValue
+      }
+      // 取出常用的弹窗参数
+      let pickModalProps = pick(options, 'title', 'centered', 'cancelText', 'closable', 'mask', 'maskClosable', 'okText', 'okType', 'okButtonProps', 'cancelButtonProps', 'width', 'wrapClassName', 'zIndex', 'dialogStyle', 'dialogClass')
+      this.modalProps = Object.assign({}, pickModalProps, options.modalProps)
+      // 取出常用的input参数
+      let pickInputProps = pick(options, 'placeholder', 'allowClear')
+      this.inputProps = Object.assign({}, pickInputProps, options.inputProps)
+      // 回调函数
+      this.callback = pick(options, 'onOk', 'onOkAsync', 'onCancel')
+      this.visible = true
+      this.$nextTick(() => this.$refs.input.focus())
+    },
+
+    onOk() {
+      this.$refs.form.validate((ok, err) => {
+        if (ok) {
+          let event = {value: this.model.input, target: this}
+          // 异步方法优先级高于同步方法
+          if (typeof this.callback.onOkAsync === 'function') {
+            this.callback.onOkAsync(event)
+          } else if (typeof this.callback.onOk === 'function') {
+            this.callback.onOk(event)
+            this.close()
+          } else {
+            this.close()
+          }
+        }
+      })
+    },
+    onCancel() {
+      if (typeof this.callback.onCancel === 'function') {
+        this.callback.onCancel(this.model.input)
+      }
+      this.close()
+    },
+
+    onInputPressEnter() {
+      this.onOk()
+    },
+
+    close() {
+      this.visible = this.loading ? this.visible : false
+    },
+
+    forceClose() {
+      this.visible = false
+    },
+
+    showLoading() {
+      this.loading = true
+    },
+    hideLoading() {
+      this.loading = false
+    },
+
+    afterClose(e) {
+      if (typeof this.modalProps.afterClose === 'function') {
+        this.modalProps.afterClose(e)
+      }
+      this.$emit('after-close', e)
+    },
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JModal/index.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JModal/index.js
@ -0,0 +1,18 @@
+import JModal from './JModal'
+import JPrompt from './JPrompt'
+
+export default {
+  install(Vue) {
+    Vue.component(JModal.name, JModal)
+
+    const JPromptExtend = Vue.extend(JPrompt)
+    Vue.prototype.$JPrompt = function (options = {}) {
+      // 创建prompt实例
+      const vm = new JPromptExtend().$mount()
+      vm.show(options)
+      // 关闭后销毁
+      vm.$on('after-close', () => vm.$destroy())
+      return vm
+    }
+  },
+}
--- a/ant-design-vue-jeecg/src/components/jeecg/JPopup.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JPopup.vue
@ -10,6 +10,7 @@
      ref="jPopupOnlReport"
      :code="code"
      :multi="multi"
+      :sorter="sorter"
      :groupId="uniqGroupId"
      :param="param"
      @ok="callBack"
@ -47,6 +48,11 @@
        default: '',
        required: false
      },
+      /** 排序列，指定要排序的列，使用方式：列名=desc|asc */
+      sorter: {
+        type: String,
+        default: ''
+      },
      width: {
        type: Number,
        default: 1200,
@ -167,9 +173,11 @@
            let tempDestArr = []
            for(let rw of rows){
              let val = rw[orgFieldsArr[i]]
-              if(!val){
+              // update--begin--autor:liusq-----date:20210713------for：处理val等于0的情况issues/I3ZL4T------
+              if(typeof val=='undefined'|| val==null || val.toString()==""){
                val = ""
              }
+              // update--end--autor:liusq-----date:20210713------for：处理val等于0的情况issues/I3ZL4T------
              tempDestArr.push(val)
            }
            res[destFieldsArr[i]] = tempDestArr.join(",")
--- a/ant-design-vue-jeecg/src/components/jeecg/JSelectMultiple.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JSelectMultiple.vue
@ -1,7 +1,7 @@
 <template>
-  <a-select :value="arrayValue" @change="onChange" mode="multiple" :placeholder="placeholder">
+  <a-select :value="arrayValue" @change="onChange" mode="multiple" :placeholder="placeholder" allowClear>
    <a-select-option
-      v-for="(item,index) in options"
+      v-for="(item,index) in selectOptions"
      :key="index"
      :getPopupContainer="getParentContainer"
      :value="item.value">
@ -12,6 +12,8 @@

 <script>
  //option {label:,value:}
+  import { getAction } from '@api/manage'
+
  export default {
    name: 'JSelectMultiple',
    props: {
@ -31,7 +33,8 @@
      },
      options:{
        type: Array,
-        required: true
+        default:()=>[],
+        required: false
      },
      triggerChange:{
        type: Boolean,
@ -48,12 +51,22 @@
        default:'',
        required:false
      },
+      dictCode:{
+        type:String,
+        required:false
+      },
    },
    data(){
      return {
-        arrayValue:!this.value?[]:this.value.split(this.spliter)
+        arrayValue:!this.value?[]:this.value.split(this.spliter),
+        dictOptions: [],
      }
    },
+    computed:{
+      selectOptions(){
+        return this.dictOptions.length > 0 ? this.dictOptions : this.options
+      },
+    },
    watch:{
      value (val) {
        if(!val){
@ -63,6 +76,11 @@
        }
      }
    },
+    mounted(){
+      if (this.dictCode) {
+        this.loadDictOptions()
+      }
+    },
    methods:{
      onChange (selectedValue) {
        if(this.triggerChange){
@ -77,7 +95,18 @@
        }else{
          return document.querySelector(this.popContainer)
        }
-      }
+      },
+      // 根据字典code查询字典项
+      loadDictOptions(){
+        getAction(`/sys/dict/getDictItems/${this.dictCode}`,{}).then(res=>{
+          if (res.success) {
+            this.dictOptions = res.result.map(item => ({value: item.value, label: item.text}))
+          } else {
+            console.error('getDictItems error: : ', res)
+            this.dictOptions = []
+          }
+        })
+      },
    },

  }
--- a/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue
@ -379,7 +379,7 @@
          this.$message.warn("不能查询空条件")
        }
      },
-      emitCallback(event = {}) {
+      emitCallback(event = {}, loadStatus = true) {
        let { params = [], matchType = this.matchType } = event
        this.superQueryFlag = (params && params.length > 0)
        for (let param of params) {
@ -388,7 +388,7 @@
          }
        }
        console.debug('---高级查询参数--->', { params, matchType })
-        this.$emit(this.callback, params, matchType)
+        this.$emit(this.callback, params, matchType, loadStatus)
      },
      handleCancel() {
        this.close()
@ -412,8 +412,9 @@
        this.queryParamsModel.splice(index, 1)
      },
      handleSelected(node, item) {
-        let { type, options, dictCode, dictTable, dictText, customReturnField, popup } = node.dataRef
+        let { type, dbType, options, dictCode, dictTable, dictText, customReturnField, popup } = node.dataRef
        item['type'] = type
+        item['dbType'] = dbType
        item['options'] = options
        item['dictCode'] = dictCode
        item['dictTable'] = dictTable
@ -427,9 +428,13 @@
      handleOpen() {
        this.show()
      },
+      handleOutReset(loadStaus=true) {
+        this.resetLine()
+        this.emitCallback({}, loadStaus)
+      },
      handleReset() {
        this.resetLine()
-        this.emitCallback()
+        this.emitCallback({}, true)
      },
      handleSave() {
        let queryParams = this.removeEmptyObject(this.queryParamsModel)
--- a/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JUpload.vue
@ -12,12 +12,12 @@

    <a-upload
      name="file"
-      :multiple="true"
+      :multiple="multiple"
      :action="uploadAction"
      :headers="headers"
      :data="{'biz':bizPath}"
      :fileList="fileList"
-      :beforeUpload="beforeUpload"
+      :beforeUpload="doBeforeUpload"
      @change="handleChange"
      :disabled="disabled"
      :returnUrl="returnUrl"
@ -135,6 +135,13 @@
        required:false,
        default: true
      },
+      multiple: {
+        type: Boolean,
+        default: true
+      },
+      beforeUpload: {
+        type: Function
+      },
    },
    watch:{
      value:{
@ -238,7 +245,7 @@
        }
        this.$emit('change', path);
      },
-      beforeUpload(file){
+      doBeforeUpload(file){
        this.uploadGoOn=true
        var fileType = file.type;
        if(this.fileType===FILE_TYPE_IMG){
@ -248,7 +255,10 @@
            return false;
          }
        }
-        //TODO 扩展功能验证文件大小
+        // 扩展 beforeUpload 验证
+        if (typeof this.beforeUpload === 'function') {
+          return this.beforeUpload(file)
+        }
        return true
      },
      handleChange(info) {
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeTable.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/JVxeTable.js
@ -13,7 +13,7 @@ import JVxeDetailsModal from './JVxeDetailsModal'
 import JVxePagination from './JVxePagination'
 import { cloneObject, getVmParentByName, pushIfNotExist, randomString, simpleDebounce } from '@/utils/util'
 import { UtilTools } from 'vxe-table/packages/tools/src/utils'
-import { getNoAuthCols } from "@/utils/authFilter"
+import { getNoAuthCols } from '@/utils/authFilter'

 export default {
  name: 'JVxeTable',
@ -95,6 +95,11 @@ export default {
    // 是否异步删除行，如果你要实现异步删除，那么需要把这个选项开启，
    // 在remove事件里调用confirmRemove方法才会真正删除（除非删除的全是新增的行）
    asyncRemove: PropTypes.bool.def(false),
+    // 是否一直显示组件，如果为false则只有点击的时候才出现组件
+    // 注：该参数不能动态修改；如果行、列字段多的情况下，会根据机器性能造成不同程度的卡顿。
+    alwaysEdit: PropTypes.bool.def(false),
+    // 联动配置，数组，详情配置见文档
+    linkageConfig: PropTypes.array.def(() => []),
  },
  data() {
    return {
@ -148,7 +153,10 @@ export default {
      // 允许执行刷新特效的行ID
      reloadEffectRowKeysMap: {},
      //配置了但是没有授权的按钮和列 集合
-      excludeCode:[]
+      excludeCode:[],
+      // 联动下拉选项（用于隔离不同的下拉选项）
+      // 内部联动配置，map
+      _innerLinkageConfig: null,
    }
  },
  computed: {
@ -175,6 +183,18 @@ export default {
            renderOptions.target = this
          }
        }
+        // 处理联动列，联动列只能作用于 select 组件
+        if (column.$type === JVXETypes.select && this._innerLinkageConfig != null) {
+          // 判断当前列是否是联动列
+          if (this._innerLinkageConfig.has(column.key)) {
+            renderOptions.linkage = {
+              config: this._innerLinkageConfig.get(column.key),
+              getLinkageOptionsSibling: this.getLinkageOptionsSibling,
+              getLinkageOptionsAsync: this.getLinkageOptionsAsync,
+              linkageSelectChange: this.linkageSelectChange,
+            }
+          }
+        }
        if (column.editRender) {
          Object.assign(column.editRender, renderOptions)
        }
@ -275,15 +295,21 @@ export default {
      immediate: true,
      async handler() {
        let vxe = await getRefPromise(this, 'vxe')
-        // 阻断vue监听大数据，提高性能

-        // 开启了排序就自动计算排序值
-        if (this.dragSort) {
-          this.dataSource.forEach((data, idx) => {
+        this.dataSource.forEach((data, idx) => {
+          // 开启了排序就自动计算排序值
+          if (this.dragSort) {
            this.$set(data, this.dragSortKey, idx + 1)
-          })
-        }
+          }
+          // 处理联动回显数据
+          if (this._innerLinkageConfig != null) {
+            for (let configItem of this._innerLinkageConfig.values()) {
+              this.autoSetLinkageOptionsByData(data, '', configItem, 0)
+            }
+          }
+        })

+        // 阻断vue监听大数据，提高性能
        vxe.loadData(this.dataSource)

        // TODO 解析disabledRows
@ -354,7 +380,7 @@ export default {
                  col.visible = false
                } else if (enhanced.switches.editRender) {
                  renderName = 'editRender'
-                  renderOptions.type = enhanced.switches.visible ? 'visible' : 'default'
+                  renderOptions.type = (enhanced.switches.visible || this.alwaysEdit) ? 'visible' : 'default'
                }
              } else {
                renderOptions.name = JVXETypes._prefix + JVXETypes.normal
@ -466,7 +492,40 @@ export default {
        this._innerColumns = _innerColumns
        this._innerEditRules = _innerEditRules
      }
-    }
+    },
+    // watch linkageConfig
+    // 整理多级联动配置
+    linkageConfig: {
+      immediate: true,
+      handler() {
+        if (Array.isArray(this.linkageConfig) && this.linkageConfig.length > 0) {
+          // 获取联动的key顺序
+          let getLcKeys = (key, arr) => {
+            let col = this._innerColumns.find(col => col.key === key)
+            if (col) {
+              arr.push(col.key)
+              if (col.linkageKey) {
+                return getLcKeys(col.linkageKey, arr)
+              }
+            }
+            return arr
+          }
+          let configMap = new Map()
+          this.linkageConfig.forEach(lc => {
+            let keys = getLcKeys(lc.key, [])
+            // 多个key共享一个，引用地址
+            let configItem = {
+              ...lc, keys,
+              optionsMap: new Map()
+            }
+            keys.forEach(k => configMap.set(k, configItem))
+          })
+          this._innerLinkageConfig = configMap
+        } else {
+          this._innerLinkageConfig = null
+        }
+      }
+    },
  },
  created() {
  },
@ -665,7 +724,24 @@ export default {
    async loadNewData(dataSource) {
      if (Array.isArray(dataSource)) {
        let {xTable} = this.$refs.vxe.$refs
-        return await xTable.loadData(dataSource)
+        // issues/2784
+        // 先清空所有数据
+        xTable.loadData([])
+
+        dataSource.forEach((data, idx) => {
+          // 开启了排序就自动计算排序值
+          if (this.dragSort) {
+            this.$set(data, this.dragSortKey, idx + 1)
+          }
+          // 处理联动回显数据
+          if (this._innerLinkageConfig != null) {
+            for (let configItem of this._innerLinkageConfig.values()) {
+              this.autoSetLinkageOptionsByData(data, '', configItem, 0)
+            }
+          }
+        })
+        // 再新增
+        return xTable.insertAt(dataSource)
      }
      return []
    },
@ -790,6 +866,7 @@ export default {
     * 添加一行或多行
     *
     * @param rows
+     * @param isOnlJs 是否是onlineJS增强触发的
     * @return
     */
    async addRows(rows = {}, isOnlJs) {
@ -889,6 +966,89 @@ export default {
      this.$emit(name, event)
    },

+    /** 【多级联动】获取同级联动下拉选项 */
+    getLinkageOptionsSibling(row, col, config, request) {
+      // 如果当前列不是顶级列
+      let key = ''
+      if (col.key !== config.key) {
+        // 就找出联动上级列
+        let idx = config.keys.findIndex(k => col.key === k)
+        let parentKey = config.keys[idx - 1]
+        key = row[parentKey]
+        // 如果联动上级列没有选择数据，就直接返回空数组
+        if (key === '' || key == null) {
+          return []
+        }
+      } else {
+        key = 'root'
+      }
+      let options = config.optionsMap.get(key)
+      if (!Array.isArray(options)) {
+        if (request) {
+          let parent = key === 'root' ? '' : key
+          return this.getLinkageOptionsAsync(config, parent)
+        } else {
+          options = []
+        }
+      }
+      return options
+    },
+    /** 【多级联动】获取联动下拉选项（异步） */
+    getLinkageOptionsAsync(config, parent) {
+      return new Promise(resolve => {
+        let key = parent ? parent : 'root'
+        let options
+        if (config.optionsMap.has(key)) {
+          options = config.optionsMap.get(key)
+          if (options instanceof Promise) {
+            options.then(opt => {
+              config.optionsMap.set(key, opt)
+              resolve(opt)
+            })
+          } else {
+            resolve(options)
+          }
+        } else if (typeof config.requestData === 'function') {
+          // 调用requestData方法，通过传入parent来获取子级
+          let promise = config.requestData(parent)
+          config.optionsMap.set(key, promise)
+          promise.then(opt => {
+            config.optionsMap.set(key, opt)
+            resolve(opt)
+          })
+        } else {
+          resolve([])
+        }
+      })
+    },
+    // 【多级联动】 用于回显数据，自动填充 optionsMap
+    autoSetLinkageOptionsByData(data, parent, config, level) {
+      if (level === 0) {
+        this.getLinkageOptionsAsync(config, '')
+      } else {
+        this.getLinkageOptionsAsync(config, parent)
+      }
+      if (config.keys.length - 1 > level) {
+        let value = data[config.keys[level]]
+        if (value) {
+          this.autoSetLinkageOptionsByData(data, value, config, level + 1)
+        }
+      }
+    },
+    // 【多级联动】联动组件change时，清空下级组件
+    linkageSelectChange(row, col, config, value) {
+      if (col.linkageKey) {
+        this.getLinkageOptionsAsync(config, value)
+        let idx = config.keys.findIndex(k => k === col.key)
+        let values = {}
+        for (let i = idx; i < config.keys.length; i++) {
+          values[config.keys[i]] = ''
+        }
+        // 清空后几列的数据
+        this.setValues([{rowKey: row.id, values}])
+      }
+    },
+
    /** 加载数据字典并合并到 options */
    _loadDictConcatToOptions(column) {
      initDictOptions(column.dictCode).then((res) => {
@ -1076,11 +1236,20 @@ export default {
      // 添加默认值
      xTable.tableFullColumn.forEach(column => {
        let col = column.own
-        if (record[col.key] == null || record[col.key] === '') {
+        if (col.key && (record[col.key] == null || record[col.key] === '')) {
          // 设置默认值
          let createValue = getEnhancedMixins(col.$type || col.type, 'createValue')
          record[col.key] = createValue({row: record, column, $table: xTable})
        }
+        // update-begin--author:sunjianlei---date:20210819------for: 处理联动列，联动列只能作用于 select 组件
+        if (col.$type === JVXETypes.select && this._innerLinkageConfig != null) {
+          // 判断当前列是否是联动列
+          if (this._innerLinkageConfig.has(col.key)) {
+            let configItem = this._innerLinkageConfig.get(col.key)
+            this.getLinkageOptionsAsync(configItem, '')
+          }
+        }
+        // update-end--author:sunjianlei---date:20210819------for: 处理联动列，联动列只能作用于 select 组件
      })
      return record
    },
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDateCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDateCell.vue
@ -55,7 +55,9 @@
    // 【组件增强】注释详见：JVxeCellMixins.js
    enhanced: {
      aopEvents: {
-        editActived: event => dispatchEvent(event, 'ant-calendar-picker', el => el.children[0].dispatchEvent(event.$event)),
+        editActived(event) {
+          dispatchEvent.call(this, event, 'ant-calendar-picker', el => el.children[0].dispatchEvent(event.$event))
+        },
      },
    }
  }
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue
@ -16,6 +16,8 @@
        :multi="multi"
        :rootOpened="rootOpened"
        :depart-id="departIds"
+        :store="storeField()"
+        :text="textField()"
        @ok="handleOK"
        @initComp="initComp"/>
    <span style="display: inline-block;height:100%;padding-left:14px" v-if="departIds" >
@ -68,7 +70,7 @@
        }
      },
      multi(){
-        if(this.cellProps.multi==false){
+        if(this.cellProps.multi==false || this.originColumn.multi===false){
          return false
        }else{
          return true
@ -101,15 +103,17 @@
      handleEmpty(){
        this.handleOK('')
      },
-      handleOK(rows, idstr) {
+      handleOK(rows) {
        let value = ''
        if (!rows && rows.length <= 0) {
          this.departNames = ''
          this.departIds = ''
        } else {
-          value = rows.map(row => row[this.customReturnField]).join(',')
-          this.departNames = rows.map(row => row['departName']).join(',')
-          this.departIds = idstr
+          let storeField = this.storeField();
+          let textField = this.textField();
+          value = rows.map(row => row[storeField]).join(',')
+          this.departNames = rows.map(row => row[textField]).join(',')
+          this.departIds = value
        }
        this.handleChangeCommon(this.departIds)
      },
@ -118,6 +122,34 @@
      },
      handleChange(value) {
        this.handleChangeCommon(value)
+      },
+      storeField(){
+        if(this.originColumn){
+          const str = this.originColumn.fieldExtendJson
+          if(str){
+            let json = JSON.parse(str)
+            if(json && json.store){
+              return json.store
+            }
+          }else if(this.originColumn.store){
+            return this.originColumn.store
+          }
+        }
+        return 'id'
+      },
+      textField(){
+        if(this.originColumn){
+          const str = this.originColumn.fieldExtendJson
+          if(str){
+            let json = JSON.parse(str)
+            if(json && json.text){
+              return json.text
+            }
+          }else if(this.originColumn.text){
+            return this.originColumn.text
+          }
+        }
+        return 'departName'
      }
    },
    enhanced: {
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDragSortCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeDragSortCell.vue
@ -34,7 +34,7 @@
        return this.rowIndex === 0
      },
      disabledMoveDown() {
-        return this.rowIndex === (this.rows.length - 1)
+        return this.rowIndex === (this.fullDataLength - 1)
      },
    },
    methods: {
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeSelectCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeSelectCell.vue
@ -7,11 +7,16 @@
    v-bind="selectProps"
    style="width: 100%;"
    @blur="handleBlur"
-    @change="handleChangeCommon"
+    @change="handleChange"
    @search="handleSearchSelect"
  >

-    <template v-for="option of originColumn.options">
+    <div v-if="loading" slot="notFoundContent">
+      <a-icon type="loading"  />
+      <span>&nbsp;加载中…</span>
+    </div>
+
+    <template v-for="option of selectOptions">
      <a-select-option :key="option.value" :value="option.value" :disabled="option.disabled">
        <span>{{option.text || option.label || option.title|| option.value}}</span>
      </a-select-option>
@ -23,10 +28,18 @@
 <script>
  import JVxeCellMixins, { dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins'
  import { JVXETypes } from '@comp/jeecg/JVxeTable/index'
+  import { filterDictText } from '@comp/dict/JDictSelectUtil'

  export default {
    name: 'JVxeSelectCell',
    mixins: [JVxeCellMixins],
+    data(){
+      return {
+        loading: false,
+        // 异步加载的options（用于多级联动）
+        asyncOptions: null,
+      }
+    },
    computed: {
      selectProps() {
        let props = {...this.cellProps}
@ -37,6 +50,32 @@
        }
        return props
      },
+      // 下拉选项
+      selectOptions() {
+        if (this.asyncOptions) {
+          return this.asyncOptions
+        }
+        let {linkage} = this.renderOptions
+        if (linkage) {
+          let {getLinkageOptionsSibling, config} = linkage
+          let res = getLinkageOptionsSibling(this.row, this.originColumn, config, true)
+          // 当返回Promise时，说明是多级联动
+          if (res instanceof Promise) {
+            this.loading = true
+            res.then(opt => {
+              this.asyncOptions = opt
+              this.loading = false
+            }).catch(e => {
+              console.error(e)
+              this.loading = false
+            })
+          } else {
+            this.asyncOptions = null
+            return res
+          }
+        }
+        return this.originColumn.options
+      },
    },
    created() {
      let multiple = [JVXETypes.selectMultiple, JVXETypes.list_multi]
@ -54,6 +93,15 @@
    },
    methods: {

+      handleChange(value) {
+        // 处理下级联动
+        let linkage = this.renderOptions.linkage
+        if (linkage) {
+          linkage.linkageSelectChange(this.row, this.originColumn, linkage.config, value)
+        }
+        this.handleChangeCommon(value)
+      },
+
      /** 处理blur失去焦点事件 */
      handleBlur(value) {
        let {allowInput, options} = this.originColumn
@ -116,9 +164,32 @@
    // 【组件增强】注释详见：JVxeCellMixins.js
    enhanced: {
      aopEvents: {
-        editActived: event => dispatchEvent(event, 'ant-select'),
+        editActived(event) {
+          dispatchEvent.call(this, event, 'ant-select')
+        },
+      },
+      translate: {
+        enabled: true,
+        async handler(value,) {
+          let options
+          let {linkage} = this.renderOptions
+          // 判断是否是多级联动，如果是就通过接口异步翻译
+          if (linkage) {
+            let {getLinkageOptionsSibling, config} = linkage
+            options = getLinkageOptionsSibling(this.row, this.originColumn, config, true)
+            if (options instanceof Promise) {
+              return new Promise(resolve => {
+                options.then(opt => {
+                  resolve(filterDictText(opt, value))
+                })
+              })
+            }
+          } else {
+            options = this.column.own.options
+          }
+          return filterDictText(options, value)
+        },
      },
-      translate: {enabled: true},
      getValue(value) {
        if (Array.isArray(value)) {
          return value.join(',')
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeTextareaCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeTextareaCell.vue
@ -23,7 +23,9 @@
        autofocus: '.ant-input',
      },
      aopEvents: {
-        editActived: event => dispatchEvent(event, 'anticon-fullscreen'),
+        editActived(event) {
+          dispatchEvent.call(this, event, 'anticon-fullscreen')
+        },
      },
    },
  }
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeTimeCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeTimeCell.vue
@ -0,0 +1,57 @@
+<template>
+  <a-time-picker
+    ref="timePicker"
+    :value="innerDateValue"
+    allowClear
+    dropdownClassName="j-vxe-date-picker"
+    style="min-width: 0;"
+    v-bind="cellProps"
+    @change="handleChange"
+  />
+</template>
+
+<script>
+  import moment from 'moment'
+  import JVxeCellMixins, { dispatchEvent } from '@/components/jeecg/JVxeTable/mixins/JVxeCellMixins'
+
+  export default {
+    name: 'JVxeTimeCell',
+    mixins: [JVxeCellMixins],
+    props: {},
+    data() {
+      return {
+        innerDateValue: null,
+        dateFormat: 'HH:mm:ss'
+      }
+    },
+    watch: {
+      innerValue: {
+        immediate: true,
+        handler(val) {
+          if (val == null || val === '') {
+            this.innerDateValue = null
+          } else {
+            this.innerDateValue = moment(val, this.dateFormat)
+          }
+        }
+      }
+    },
+    methods: {
+      handleChange(mom, dateStr) {
+        this.handleChangeCommon(dateStr)
+      }
+    },
+    // 【组件增强】注释详见：JVxeCellMixins.js
+    enhanced: {
+      aopEvents: {
+        editActived(event) {
+          dispatchEvent.call(this, event, 'ant-calendar-picker', el => el.children[0].dispatchEvent(event.$event))
+        },
+      },
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeUploadCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeUploadCell.vue
@ -14,7 +14,7 @@
          <a-tooltip v-else-if="file.status === 'done'" title="上传完成">
            <a-icon type="check-circle" style="color:#00DB00;"/>
          </a-tooltip>
-          <a-tooltip v-else title="上传失败">
+          <a-tooltip v-else :title="file.message||'上传失败'">
            <a-icon type="exclamation-circle" style="color:red;"/>
          </a-tooltip>
        </template>
@ -118,8 +118,17 @@
          value['responseName'] = file.response[col.responseName]
        }
        if (file.status === 'done') {
-          value['path'] = file.response[col.responseName]
-          this.handleChangeCommon(value)
+          if (typeof file.response.success === 'boolean') {
+            if (file.response.success) {
+              value['path'] = file.response[col.responseName]
+            } else {
+              value['status'] = 'error'
+              value['message'] = file.response.message || '未知错误'
+            }
+          } else {
+            // 考虑到如果设置action上传路径为非jeecg-boot后台，可能不会返回 success 属性的情况，就默认为成功
+            value['path'] = file.response[col.responseName]
+          }
        } else if (file.status === 'error') {
          value['message'] = file.response.message || '未知错误'
        }
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue
@ -16,6 +16,8 @@
      :multi="multi"
      :user-ids="userIds"
      @ok="selectOK"
+      :store="storeField"
+      :text="textField"
      @initComp="initComp"/>
    <span style="display: inline-block;height:100%;padding-left:14px" v-if="userIds" >
      <span @click="openSelect" style="display: inline-block;vertical-align: middle">{{ userNames }}</span>
@ -77,6 +79,30 @@
        }else{
          return true
        }
+      },
+      storeField(){
+        if(this.originColumn){
+          const str = this.originColumn.fieldExtendJson
+          if(str){
+            let json = JSON.parse(str)
+            if(json && json.store){
+              return json.store
+            }
+          }
+        }
+        return 'username'
+      },
+      textField(){
+        if(this.originColumn){
+          const str = this.originColumn.fieldExtendJson
+          if(str){
+            let json = JSON.parse(str)
+            if(json && json.text){
+              return json.text
+            }
+          }
+        }
+        return 'realname'
      }
    },
    watch: {
@ -102,12 +128,8 @@
          this.userNames = ''
          this.userIds = ''
        } else {
-          let temp = ''
-          for (let item of rows) {
-            temp += ',' + item.realname
-          }
-          this.userNames = temp.substring(1)
-          this.userIds = idstr
+          this.userIds = rows.map(row => row[this.storeField]).join(',')
+          this.userNames = rows.map(row => row[this.textField]).join(',')
        }
        this.handleChangeCommon(this.userIds)
      },
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/index.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/index.js
@ -6,6 +6,7 @@ import JVxeSlotCell from './components/cells/JVxeSlotCell'
 import JVxeNormalCell from './components/cells/JVxeNormalCell'
 import JVxeInputCell from './components/cells/JVxeInputCell'
 import JVxeDateCell from './components/cells/JVxeDateCell'
+import JVxeTimeCell from './components/cells/JVxeTimeCell'
 import JVxeSelectCell from './components/cells/JVxeSelectCell'
 import JVxeCheckboxCell from './components/cells/JVxeCheckboxCell'
 import JVxeUploadCell from './components/cells/JVxeUploadCell'
@ -32,6 +33,7 @@ export const AllCells = {
  ...mapCell(JVXETypes.selectMultiple, JVxeSelectCell),  // 下拉多选
  ...mapCell(JVXETypes.date, JVxeDateCell),
  ...mapCell(JVXETypes.datetime, JVxeDateCell),
+  ...mapCell(JVXETypes.time, JVxeTimeCell),
  ...mapCell(JVXETypes.upload, JVxeUploadCell),
  ...mapCell(JVXETypes.textarea, JVxeTextareaCell),

--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/jvxeTypes.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/jvxeTypes.js
@ -22,6 +22,7 @@ export const JVXETypes = {
  select: 'select',
  date: 'date',
  datetime: 'datetime',
+  time: 'time',
  checkbox: 'checkbox',
  upload: 'upload',
  // 下拉搜索
--- a/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/mixins/JVxeCellMixins.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/JVxeTable/mixins/JVxeCellMixins.js
@ -36,6 +36,9 @@ export default {
    rows() {
      return this.params.data
    },
+    fullDataLength() {
+      return this.params.$table.tableFullData.length
+    },
    rowIndex() {
      return this.params.rowIndex
    },
@ -70,6 +73,16 @@ export default {
        props['disabled'] = true
      }

+      // update-begin-author:taoyan date:20211011 for: online表单，附表用户选择器{"multiSelect":false}不生效，单表可以生效 #3036
+      let jsonStr = col['fieldExtendJson']
+      if(jsonStr){
+        let fieldExtendJson = JSON.parse(jsonStr)
+        if(fieldExtendJson && fieldExtendJson['multiSelect']==false){
+          props['multi'] = false
+        }
+      }
+      // update-end-author:taoyan date:20211011 for: online表单，附表用户选择器{"multiSelect":false}不生效，单表可以生效 #3036
+
      return props
    },
  },
@ -99,7 +112,13 @@ export default {

        // 判断是否启用翻译
        if (this.renderType === JVXERenderType.spaner && this.enhanced.translate.enabled) {
-          this.innerValue = this.enhanced.translate.handler.call(this, value)
+          let res = this.enhanced.translate.handler.call(this, value)
+          // 异步翻译，目前仅【多级联动】使用
+          if (res instanceof Promise) {
+            res.then(value => this.innerValue = value)
+          } else {
+            this.innerValue = res
+          }
        }
      },
    },
@ -291,6 +310,10 @@ export function vModel(value, row, property) {

 /** 模拟触发事件 */
 export function dispatchEvent({cell, $event}, className, handler) {
+  // alwaysEdit 下不模拟触发事件，否者会导致触发两次
+  if (this && this.alwaysEdit) {
+    return
+  }
  window.setTimeout(() => {
    let element = cell.getElementsByClassName(className)
    if (element && element.length > 0) {
@ -298,9 +321,7 @@ export function dispatchEvent({cell, $event}, className, handler) {
        handler(element[0])
      } else {
        // 模拟触发点击事件
-        console.log($event)
        if($event){
-          console.log("$event===>",$event)
          element[0].dispatchEvent($event)
        }
      }
--- a/ant-design-vue-jeecg/src/components/jeecg/index.js
+++ b/ant-design-vue-jeecg/src/components/jeecg/index.js
@ -26,18 +26,24 @@ import JSlider from './JSlider.vue'
 import JSwitch from './JSwitch.vue'
 import JTime from './JTime.vue'
 import JTreeTable from './JTreeTable.vue'
-
+import JEasyCron from '@/components/jeecg/JEasyCron'
 //jeecgbiz
 import JSelectDepart from '../jeecgbiz/JSelectDepart.vue'
 import JSelectMultiUser from '../jeecgbiz/JSelectMultiUser.vue'
 import JSelectPosition from '../jeecgbiz/JSelectPosition.vue'
 import JSelectRole from '../jeecgbiz/JSelectRole.vue'
 import JSelectUserByDep from '../jeecgbiz/JSelectUserByDep.vue'
+//引入需要全局注册的js函数和变量
+import { Modal, notification,message } from 'ant-design-vue'
+import lodash_object from 'lodash'
+import debounce from 'lodash/debounce'
+import pick from 'lodash.pick'
+import data from 'china-area-data'

 export default {
  install(Vue) {
+    Vue.use(JModal)
    Vue.component('JMarkdownEditor', JMarkdownEditor)
-    Vue.component(JModal.name, JModal)
    Vue.component('JPopupOnlReport', JPopupOnlReport)
    Vue.component('JFilePop', JFilePop)
    Vue.component('JInputPop', JInputPop)
@ -71,5 +77,15 @@ export default {
    Vue.component('JSelectPosition', JSelectPosition)
    Vue.component('JSelectRole', JSelectRole)
    Vue.component('JSelectUserByDep', JSelectUserByDep)
+    Vue.component(JEasyCron.name, JEasyCron)
+
+    //注册全局js函数和变量
+    Vue.prototype.$Jnotification = notification
+    Vue.prototype.$Jmodal = Modal
+    Vue.prototype.$Jmessage = message
+    Vue.prototype.$Jlodash = lodash_object
+    Vue.prototype.$Jdebounce= debounce
+    Vue.prototype.$Jpick = pick
+    Vue.prototype.$Jpcaa = data
  }
 }
--- a/ant-design-vue-jeecg/src/components/jeecg/minipop/JInputPop.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/minipop/JInputPop.vue
@ -7,7 +7,7 @@
        <a-icon type="close" @click="visible=false"/>
      </span>
    </div>
-    <a-input :value="inputContent" :disabled="disabled" @change="handleInputChange">
+    <a-input :value="inputContent" :disabled="disabled" @change="handleInputChange" :placeholder="placeholder">
      <a-icon slot="suffix" type="fullscreen" @click.stop="pop" />
    </a-input>
    <div slot="content">
@ -53,6 +53,10 @@
        type: Boolean,
        default: false,
      },
+      placeholder:{
+        type:String,
+        required:false
+      }

    },
    data(){
--- a/ant-design-vue-jeecg/src/components/jeecg/modal/JCronModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/modal/JCronModal.vue
@ -1,6 +1,6 @@
 <template>
  <a-modal
-          title="corn表达式"
+          title="cron表达式"
          :width="modalWidth"
          :visible="visible"
          :confirmLoading="confirmLoading"
--- a/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue
+++ b/ant-design-vue-jeecg/src/components/jeecg/modal/JPopupOnlReport.vue
@ -74,11 +74,12 @@
  import {filterObj} from '@/utils/util'
  import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
  import { httpGroupRequest } from '@/api/GroupRequest.js'
+  import md5 from 'md5'

  const MODAL_WIDTH = 1200;
  export default {
    name: 'JPopupOnlReport',
-    props: ['multi', 'code', 'groupId', 'param'],
+    props: ['multi', 'code', 'sorter', 'groupId', 'param'],
    components:{
    },
    data(){
@ -122,8 +123,9 @@
        cgRpConfigId:"",
        modalWidth:MODAL_WIDTH,
        tableScroll:{x:true},
-        dynamicParam:{}
-
+        dynamicParam:{},
+        // 排序字段，默认无排序
+        iSorter: null,
      }
    },
    mounted() {
@ -136,10 +138,35 @@
      param:{
        deep:true,
        handler(){
-          this.dynamicParamHandler()
-          this.loadData();
+          // update--begin--autor:liusq-----date:20210706------for：JPopup组件在modal中使用报错#2729------
+          if(this.visible){
+            this.dynamicParamHandler()
+            this.loadData();
+          }
+          // update--begin--autor:liusq-----date:20210706------for：JPopup组件在modal中使用报错#2729------
        },
-      }
+      },
+      sorter: {
+        immediate: true,
+        handler() {
+          if (this.sorter) {
+            let arr = this.sorter.split('=')
+            if (arr.length === 2 && ['asc', 'desc'].includes(arr[1].toLowerCase())) {
+              this.iSorter = {column: arr[0], order: arr[1].toLowerCase()}
+              // 排序字段受控
+              this.table.columns.forEach(col => {
+                if (col.dataIndex === this.iSorter.column) {
+                  this.$set(col, 'sortOrder', this.iSorter.order === 'asc' ? 'ascend' : 'descend')
+                } else {
+                  this.$set(col, 'sortOrder', false)
+                }
+              })
+            } else {
+              console.warn('【JPopup】sorter参数不合法')
+            }
+          }
+        },
+      },
    },
    computed:{
      showSearchFlag(){
@ -167,6 +194,10 @@
                  return filterMultiDictText(this.dictOptions[dictCode], text+"");
                }
              }
+              // 排序字段受控
+              if (this.iSorter && currColumns[a].dataIndex === this.iSorter.column) {
+                currColumns[a].sortOrder = this.iSorter.order === 'asc' ? 'ascend' : 'descend'
+              }
            }
            this.table.columns = [...currColumns]
            this.initQueryInfo()
@ -253,7 +284,7 @@
           paramTarget['self_'+key] = this.dynamicParam[key]
         })
        }
-        let param = Object.assign(paramTarget, this.queryParam, this.sorter);
+        let param = Object.assign(paramTarget, this.queryParam, this.iSorter);
        param.pageNo = this.table.pagination.current;
        param.pageSize = this.table.pagination.pageSize;
        return filterObj(param);
@ -288,8 +319,18 @@
      handleChangeInTable(pagination, filters, sorter) {
        //分页、排序、筛选变化时触发
        if (Object.keys(sorter).length > 0) {
-          this.sorter.column = sorter.field
-          this.sorter.order = 'ascend' == sorter.order ? 'asc' : 'desc'
+          this.iSorter = {
+            column: sorter.field,
+            order: 'ascend' === sorter.order ? 'asc' : 'desc'
+          }
+          // 排序字段受控
+          this.table.columns.forEach(col => {
+            if (col.dataIndex === sorter.field) {
+              this.$set(col, 'sortOrder',sorter.order)
+            } else {
+              this.$set(col, 'sortOrder', false)
+            }
+          })
        }
        this.table.pagination = pagination
        this.loadData()
@ -350,9 +391,12 @@
           }
           //update-end---author:liusq     Date:20210203  for：pop选择器列主键问题 issues/I29P9Q------------
         })
-        if(res.length>50){
+        // update-begin---author:taoyan   Date:20211025 for：jpopup 表格key重复BUG /issues/3121
+        res = md5(res)
+        /*if(res.length>50){
          res = res.substring(0,50)
-        }
+        }*/
+        // update-end---author:taoyan   Date:20211025 for：jpopup 表格key重复BUG /issues/3121
        return res
      },

--- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectBizComponent/JSelectBizComponentModal.vue
@ -62,8 +62,9 @@
  import { getAction } from '@/api/manage'
  import Ellipsis from '@/components/Ellipsis'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import { cloneObject, pushIfNotExist } from '@/utils/util'
+  import { pushIfNotExist } from '@/utils/util'
  import JSelectBizQueryItem from './JSelectBizQueryItem'
+  import {cloneDeep} from 'lodash'

  export default {
    name: 'JSelectBizComponentModal',
@ -177,11 +178,24 @@
    computed: {
      // 表头
      innerColumns() {
-        let columns = cloneObject(this.columns)
+        let columns = cloneDeep(this.columns)
        columns.forEach(column => {
          // 给所有的列加上过长裁剪
          if (this.ellipsisLength !== -1) {
-            column.customRender = (text) => this.renderEllipsis(text)
+            // JSelectBizComponent columns 建议开放customRender等方法类配置
+            // https://github.com/jeecgboot/jeecg-boot/issues/3203
+            let myCustomRender = column.customRender
+            column.customRender = (text, record, index) => {
+              let value = text
+              if (typeof myCustomRender === 'function') {
+                // noinspection JSVoidFunctionReturnValueUsed
+                value = myCustomRender(text, record, index)
+              }
+              if (typeof value === 'string') {
+                return this.renderEllipsis(value)
+              }
+              return value
+            }
          }
        })
        return columns
@ -192,7 +206,7 @@
        deep: true,
        immediate: true,
        handler(val) {
-          this.innerValue = cloneObject(val)
+          this.innerValue = cloneDeep(val)
          this.selectedRowKeys = []
          this.valueWatchHandler(val)
          this.queryOptionsByValue(val)
--- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectDepart.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectDepart.vue
@ -1,9 +1,9 @@
 <template>
  <div class="components-input-demo-presuffix">
    <!---->
-    <a-input @click="openModal" placeholder="请点击选择部门" v-model="departNames" readOnly :disabled="disabled">
+    <a-input @click="openModal" placeholder="请点击选择部门" v-model="textVals" readOnly :disabled="disabled">
      <a-icon slot="prefix" type="cluster" title="部门选择控件"/>
-      <a-icon v-if="departIds" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
+      <a-icon v-if="storeVals" slot="suffix" type="close-circle" @click="handleEmpty" title="清空"/>
    </a-input>

    <j-select-depart-modal
@ -11,7 +11,10 @@
      :modal-width="modalWidth"
      :multi="multi"
      :rootOpened="rootOpened"
-      :depart-id="departIds"
+      :depart-id="value"
+      :store="storeField"
+      :text="textField"
+      :treeOpera="treeOpera"
      @ok="handleOK"
      @initComp="initComp"/>
  </div>
@ -19,6 +22,7 @@

 <script>
  import JSelectDepartModal from './modal/JSelectDepartModal'
+  import { underLinetoHump } from '@/components/_util/StringUtil'
  export default {
    name: 'JSelectDepart',
    components:{
@ -52,56 +56,71 @@
      // 自定义返回字段，默认返回 id
      customReturnField: {
        type: String,
-        default: 'id'
+        default: ''
      },
      backDepart: {
        type: Boolean,
        default: false,
        required: false
+      },
+      // 存储字段 [key field]
+      store: {
+        type: String,
+        default: 'id',
+        required: false
+      },
+      // 显示字段 [label field]
+      text: {
+        type: String,
+        default: 'departName',
+        required: false
+      },
+      treeOpera: {
+        type: Boolean,
+        default: false,
+        required: false
      }
+      
    },
    data(){
      return {
        visible:false,
        confirmLoading:false,
-        departNames:"",
-        departIds:''
+        storeVals: '', //[key values]
+        textVals: '' //[label values]
+      }
+    },
+    computed:{
+      storeField(){
+        let field = this.customReturnField
+        if(!field){
+          field = this.store;
+        }
+        return underLinetoHump(field)
+      },
+      textField(){
+        return underLinetoHump(this.text)
      }
    },
    mounted(){
-      this.departIds = this.value
+      this.storeVals = this.value
    },
    watch:{
      value(val){
-        //update-begin-author:wangshuai date:20201124 for:组件 JSelectDepart.vue不是默认id时新内容编辑问题 gitee I247X2
-        // if (this.customReturnField === 'id') {
-          this.departIds = val
-        // }
-        //update-end-author:wangshuai date:20201124 for:组件 JSelectDepart.vue不是默认id时新内容编辑问题 gitee I247X2
+        this.storeVals = val
      }
    },
    methods:{
-      initComp(departNames){
-        this.departNames = departNames
-        //update-begin-author:lvdandan date:20200513 for:TESTA-438 部门选择组件自定义返回值，数据无法回填
-        //TODO 当返回字段为部门名称时会有问题,因为部门名称不唯一
-        //返回字段不为id时，根据返回字段获取id
-        if(this.customReturnField !== 'id' && this.value){
-          const dataList = this.$refs.innerDepartSelectModal.dataList;
-          console.log('this.value',this.value)
-          this.departIds = this.value.split(',').map(item => {
-            const data = dataList.filter(d=>d[this.customReturnField] === item)
-            return data.length > 0 ? data[0].id : ''
-          }).join(',')
-        }
-        //update-end-author:lvdandan date:20200513 for:TESTA-438 部门选择组件自定义返回值，数据无法回填
+      initComp(textVals){
+        this.textVals = textVals
      },
      //返回选中的部门信息
      backDeparInfo(){
        if(this.backDepart===true){
-          if(this.departIds && this.departIds.length>0){
-            let arr1 = this.departIds.split(',')
-            let arr2 = this.departNames.split(',')
+          //LOWCOD-2147 【用户管理】选择部门和上级以后，负责部门没有数据可选 (陶炎改造自定义返回字段导致)
+          if(this.storeVals && this.storeVals.length>0){
+            let arr1 = this.storeVals.split(',')
+            let arr2 = this.textVals.split(',')
            let info = []
            for(let i=0;i<arr1.length;i++){
              info.push({
@ -116,17 +135,21 @@
      openModal(){
        this.$refs.innerDepartSelectModal.show()
      },
-      handleOK(rows, idstr) {
-        let value = ''
+      handleOK(rows) {
        if (!rows && rows.length <= 0) {
-          this.departNames = ''
-          this.departIds = ''
+          this.textVals = ''
+          this.storeVals = ''
        } else {
-          value = rows.map(row => row[this.customReturnField]).join(',')
-          this.departNames = rows.map(row => row['departName']).join(',')
-          this.departIds = idstr
+          let arr1 = []
+          let arr2 = []
+          for(let dep of rows){
+            arr1.push(dep[this.storeField])
+            arr2.push(dep[this.textField])
+          }
+          this.storeVals = arr1.join(',')
+          this.textVals = arr2.join(',')
        }
-        this.$emit("change", value)
+        this.$emit("change", this.storeVals)
        this.backDeparInfo()
      },
      getDepartNames(){
--- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectUserByDep.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectUserByDep.vue
@ -1,19 +1,28 @@
 <template>
  <div>
    <a-input-search
-      v-model="userNames"
+      v-model="textVals"
      placeholder="请先选择用户"
      readOnly
      unselectable="on"
      @search="onSearchDepUser">
      <a-button slot="enterButton" :disabled="disabled">选择用户</a-button>
    </a-input-search>
-    <j-select-user-by-dep-modal ref="selectModal" :modal-width="modalWidth" :multi="multi" @ok="selectOK" :user-ids="value" @initComp="initComp"/>
+    <j-select-user-by-dep-modal
+      ref="selectModal"
+      :modal-width="modalWidth"
+      :multi="multi"
+      @ok="selectOK"
+      :user-ids="value"
+      :store="storeField"
+      :text="textField"
+      @initComp="initComp"/>
  </div>
 </template>

 <script>
  import JSelectUserByDepModal from './modal/JSelectUserByDepModal'
+  import { underLinetoHump } from '@/components/_util/StringUtil'

  export default {
    name: 'JSelectUserByDep',
@ -42,20 +51,44 @@
        type: Boolean,
        default: false,
        required: false
+      },
+      // 存储字段 [key field]
+      store: {
+        type: String,
+        default: 'username',
+        required: false
+      },
+      // 显示字段 [label field]
+      text: {
+        type: String,
+        default: 'realname',
+        required: false
      }
    },
    data() {
      return {
-        userIds: "",
-        userNames: ""
+        storeVals: '', //[key values]
+        textVals: '' //[label values]
+      }
+    },
+    computed:{
+      storeField(){
+        let field = this.customReturnField
+        if(!field){
+          field = this.store;
+        }
+        return underLinetoHump(field)
+      },
+      textField(){
+        return underLinetoHump(this.text)
      }
    },
    mounted() {
-      this.userIds = this.value
+      this.storeVals = this.value
    },
    watch: {
      value(val) {
-        this.userIds = val
+        this.storeVals = val
      }
    },
    model: {
@ -63,15 +96,15 @@
      event: 'change'
    },
    methods: {
-      initComp(userNames) {
-        this.userNames = userNames
+      initComp(textVals) {
+        this.textVals = textVals
      },
      //返回选中的用户信息
      backDeparInfo(){
        if(this.backUser===true){
-          if(this.userIds && this.userIds.length>0){
-            let arr1 = this.userIds.split(',')
-            let arr2 = this.userNames.split(',')
+          if(this.storeVals && this.storeVals.length>0){
+            let arr1 = this.storeVals.split(',')
+            let arr2 = this.textVals.split(',')
            let info = []
            for(let i=0;i<arr1.length;i++){
              info.push({
@ -86,21 +119,22 @@
      onSearchDepUser() {
        this.$refs.selectModal.showModal()
      },
-      selectOK(rows, idstr) {
+      selectOK(rows) {
        console.log("当前选中用户", rows)
-        console.log("当前选中用户ID", idstr)
        if (!rows) {
-          this.userNames = ''
-          this.userIds = ''
+          this.storeVals = ''
+          this.textVals = ''
        } else {
-          let temp = ''
+          let temp1 = []
+          let temp2 = []
          for (let item of rows) {
-            temp += ',' + item.realname
+            temp1.push(item[this.storeField])
+            temp2.push(item[this.textField])
          }
-          this.userNames = temp.substring(1)
-          this.userIds = idstr
+          this.storeVals = temp1.join(',')
+          this.textVals = temp2.join(',')
        }
-        this.$emit("change", this.userIds)
+        this.$emit("change", this.storeVals)
      }
    }
  }
--- a/ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectDepartModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectDepartModal.vue
@ -6,6 +6,7 @@
    :confirmLoading="confirmLoading"
    @ok="handleSubmit"
    @cancel="handleCancel"
+    @update:fullscreen="isFullscreen"
    wrapClassName="j-depart-select-modal"
    switchFullscreen
    cancelText="关闭">
@ -13,9 +14,9 @@
      <a-input-search style="margin-bottom: 1px" placeholder="请输入部门名称按回车进行搜索" @search="onSearch" />
      <a-tree
        checkable
-        class="my-dept-select-tree"
+        :class="treeScreenClass"
        :treeData="treeData"
-        :checkStrictly="true"
+        :checkStrictly="checkStrictly"
        @check="onCheck"
        @select="onSelect"
        @expand="onExpand"
@ -32,8 +33,23 @@
          <span v-else>{{title}}</span>
        </template>
      </a-tree>
-
    </a-spin>
+    <!--底部父子关联操作和确认取消按钮-->
+    <template slot="footer" v-if="treeOpera && multi">
+      <div class="drawer-bootom-button">
+        <a-dropdown style="float: left" :trigger="['click']" placement="topCenter">
+          <a-menu slot="overlay">
+            <a-menu-item key="1" @click="switchCheckStrictly(1)">父子关联</a-menu-item>
+            <a-menu-item key="2" @click="switchCheckStrictly(2)">取消关联</a-menu-item>
+          </a-menu>
+          <a-button>
+            树操作 <a-icon type="up" />
+          </a-button>
+        </a-dropdown>
+        <a-button @click="handleCancel" type="primary" style="margin-right: 0.8rem">关闭</a-button>
+        <a-button @click="handleSubmit" type="primary" >确认</a-button>
+      </div>
+    </template>
  </j-modal>
 </template>

@ -41,7 +57,7 @@
  import { queryDepartTreeList } from '@/api/api'
  export default {
    name: 'JSelectDepartModal',
-    props:['modalWidth','multi','rootOpened','departId'],
+    props:['modalWidth','multi','rootOpened','departId', 'store', 'text','treeOpera'],
    data(){
      return {
        visible:false,
@ -52,7 +68,9 @@
        dataList:[],
        checkedKeys:[],
        checkedRows:[],
-        searchValue:""
+        searchValue:"",
+        checkStrictly: true,
+        fullscreen:false
      }
    },
    created(){
@ -64,15 +82,18 @@
      },
      visible: {
        handler() {
-          if (this.departId) {
-            this.checkedKeys = this.departId.split(",");
-            // console.log('this.departId', this.departId)
-          } else {
-            this.checkedKeys = [];
-          }
+          this.initDepartComponent(true)
        }
      }
    },
+    computed:{
+      treeScreenClass() {
+        return {
+          'my-dept-select-tree': true,
+          'fullscreen': this.fullscreen,
+        }
+      },
+    },
    methods:{
      show(){
        this.visible=true
@ -80,6 +101,7 @@
        this.checkedKeys=[]
      },
      loadDepart(){
+        // 这个方法是找到所有的部门信息
        queryDepartTreeList().then(res=>{
          if(res.success){
            let arr = [...res.result]
@ -92,20 +114,23 @@
          }
        })
      },
-      initDepartComponent(){
-        let names = ''
+      initDepartComponent(flag){
+        let arr = []
+        //该方法两个地方用 1.visible改变事件重新设置选中项 2.组件编辑页面回显
+        let fieldName = flag==true?'key':this.text
        if(this.departId){
-          let currDepartId = this.departId
+          let arr2 = this.departId.split(',')
          for(let item of this.dataList){
-            if(currDepartId.indexOf(item.key)>=0){
-              names+=","+item.title
+            if(arr2.indexOf(item[this.store])>=0){
+              arr.push(item[fieldName])
            }
          }
-          if(names){
-            names = names.substring(1)
-          }
        }
-        this.$emit("initComp",names)
+        if(flag==true){
+          this.checkedKeys = [...arr]
+        }else{
+          this.$emit("initComp", arr.join(','))
+        }
      },
      reWriterWithSlot(arr){
        for(let item of arr){
@ -129,8 +154,11 @@
            }
          }
          this.expandedKeys=[...keys]
+          //全部keys
+          //this.allTreeKeys = [...keys]
        }else{
          this.expandedKeys=[]
+          //this.allTreeKeys = []
        }
      },
      onCheck (checkedKeys,info) {
@ -139,25 +167,32 @@
          this.checkedKeys = [...arr]
          this.checkedRows = (this.checkedKeys.length === 0) ? [] : [info.node.dataRef]
        }else{
-          this.checkedKeys = checkedKeys.checked
+          if(this.checkStrictly){
+            this.checkedKeys = checkedKeys.checked
+          }else{
+            this.checkedKeys = checkedKeys
+          }
          this.checkedRows = this.getCheckedRows(this.checkedKeys)
        }
      },
      onSelect(selectedKeys,info) {
-        let keys = []
-        keys.push(selectedKeys[0])
-        if(!this.checkedKeys || this.checkedKeys.length===0 || !this.multi){
-          this.checkedKeys = [...keys]
-          this.checkedRows=[info.node.dataRef]
-        }else{
-          let currKey = info.node.dataRef.key
-          if(this.checkedKeys.indexOf(currKey)>=0){
-            this.checkedKeys = this.checkedKeys.filter(item=> item !==currKey)
+        //取消关联的情况下才走onSelect的逻辑
+        if(this.checkStrictly){
+          let keys = []
+          keys.push(selectedKeys[0])
+          if(!this.checkedKeys || this.checkedKeys.length===0 || !this.multi){
+            this.checkedKeys = [...keys]
+            this.checkedRows=[info.node.dataRef]
          }else{
-            this.checkedKeys.push(...keys)
+            let currKey = info.node.dataRef.key
+            if(this.checkedKeys.indexOf(currKey)>=0){
+              this.checkedKeys = this.checkedKeys.filter(item=> item !==currKey)
+            }else{
+              this.checkedKeys.push(...keys)
+            }
          }
+          this.checkedRows = this.getCheckedRows(this.checkedKeys)
        }
-        this.checkedRows = this.getCheckedRows(this.checkedKeys)
      },
      onExpand (expandedKeys) {
        this.expandedKeys = expandedKeys
@ -235,6 +270,16 @@
          }
        }
        return rows
+      },
+      switchCheckStrictly (v) {
+        if(v==1){
+          this.checkStrictly = false
+        }else if(v==2){
+          this.checkStrictly = true
+        }
+      },
+      isFullscreen(val){
+        this.fullscreen=val
      }
    }
  }
@ -244,8 +289,22 @@
 <style lang="less" scoped>
  // 限制部门选择树高度，避免部门太多时点击确定不便
  .my-dept-select-tree{
-    height: 350px;
+    height:350px;
+    
+    &.fullscreen{
+      height: calc(100vh - 250px);
+    }
    overflow-y: scroll;
  }
-
+  .drawer-bootom-button {
+    position: absolute;
+    bottom: 0;
+    width: 100%;
+    border-top: 1px solid #e8e8e8;
+    padding: 10px 16px;
+    text-align: right;
+    left: 0;
+    background: #fff;
+    border-radius: 0 0 2px 2px;
+  }
 </style>
--- a/ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/modal/JSelectUserByDepModal.vue
@ -21,8 +21,8 @@
            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
            :treeData="departTree"
            :expandAction="false"
-            :expandedKeys.sync="expandedKeys"
            @select="onDepSelect"
+            :load-data="onLoadDepartment"
          />
        </a-card>
      </a-col>
@ -56,13 +56,14 @@
 </template>

 <script>
-  import {filterObj} from '@/utils/util'
-  import {queryDepartTreeList, getUserList, queryUserByDepId} from '@/api/api'
+  import { pushIfNotExist, filterObj } from '@/utils/util'
+  import {queryDepartTreeList, getUserList, queryUserByDepId, queryDepartTreeSync} from '@/api/api'
+  import { getAction } from '@/api/manage'

  export default {
    name: 'JSelectUserByDepModal',
    components: {},
-    props: ['modalWidth', 'multi', 'userIds'],
+    props: ['modalWidth', 'multi', 'userIds', 'store', 'text'],
    data() {
      return {
        queryParam: {
@ -106,6 +107,7 @@
        ],
        scrollTrigger: {},
        dataSource: [],
+        selectionRows: [],
        selectedRowKeys: [],
        selectUserRows: [],
        selectUserIds: [],
@ -157,45 +159,43 @@
        if (this.userIds) {
          // 这里最后加一个 , 的原因是因为无论如何都要使用 in 查询，防止后台进行了模糊匹配，导致查询结果不准确
          let values = this.userIds.split(',') + ','
-          getUserList({
-            username: values,
-            pageNo: 1,
-            pageSize: values.length
-          }).then((res) => {
-            if (res.success) {
-              let selectedRowKeys = []
-              let realNames = []
-              res.result.records.forEach(user => {
-                realNames.push(user['realname'])
+          let param = {[this.store]: values}
+          getAction('/sys/user/getMultiUser', param).then((list)=>{
+            this.selectionRows = []
+            let selectedRowKeys = []
+            let textArray = []
+            if(list && list.length>0){
+              for(let user of list){
+                textArray.push(user[this.text])
                selectedRowKeys.push(user['id'])
-              })
-              this.selectedRowKeys = selectedRowKeys
-              this.$emit('initComp', realNames.join(','))
+                this.selectionRows.push(user)
+              }
            }
+            this.selectedRowKeys = selectedRowKeys
+            this.$emit('initComp', textArray.join(','))
          })
+
        } else {
          // JSelectUserByDep组件bug issues/I16634
          this.$emit('initComp', '')
+          // 前端用户选择单选无法置空的问题 #2610
+          this.selectedRowKeys = []
        }
      },
      async loadData(arg) {
        if (arg === 1) {
          this.ipagination.current = 1;
        }
-        if (this.selectedDepIds && this.selectedDepIds.length > 0) {
-          await this.initQueryUserByDepId(this.selectedDepIds)
-        } else {
-          this.loading = true
-          let params = this.getQueryParams()//查询条件
-          await getUserList(params).then((res) => {
-            if (res.success) {
-              this.dataSource = res.result.records
-              this.ipagination.total = res.result.total
-            }
-          }).finally(() => {
-            this.loading = false
-          })
-        }
+        let params = this.getQueryParams()//查询条件
+        this.loading = true
+        getAction('/sys/user/queryUserComponentData', params).then(res=>{
+          if (res.success) {
+            this.dataSource = res.result.records
+            this.ipagination.total = res.result.total
+          }
+        }).finally(() => {
+          this.loading = false
+        })
      },
      // 触发屏幕自适应
      resetScreenSize() {
@ -218,6 +218,7 @@
        param.field = this.getQueryField();
        param.pageNo = this.ipagination.current;
        param.pageSize = this.ipagination.pageSize;
+        param.departId = this.selectedDepIds.join(',')
        return filterObj(param);
      },
      getQueryField() {
@ -229,13 +230,13 @@
      },
      searchReset(num) {
        let that = this;
+        that.selectedRowKeys = [];
+        that.selectUserIds = [];
+        that.selectedDepIds = [];
        if (num !== 0) {
          that.queryParam = {};
          that.loadData(1);
        }
-        that.selectedRowKeys = [];
-        that.selectUserIds = [];
-        that.selectedDepIds = [];
      },
      close() {
        this.searchReset(0);
@ -253,35 +254,32 @@
      handleSubmit() {
        let that = this;
        this.getSelectUserRows();
-        that.$emit('ok', that.selectUserRows, that.selectUserIds);
+        that.$emit('ok', that.selectUserRows);
        that.searchReset(0)
        that.close();
      },
      //获取选择用户信息
-      getSelectUserRows(rowId) {
-        let dataSource = this.dataSource;
-        let userIds = "";
-        this.selectUserRows = [];
-        for (let i = 0, len = dataSource.length; i < len; i++) {
-          if (this.selectedRowKeys.includes(dataSource[i].id)) {
-            this.selectUserRows.push(dataSource[i]);
-            userIds = userIds + "," + dataSource[i].username
+      getSelectUserRows() {
+        this.selectUserRows = []
+        for (let row of this.selectionRows) {
+          if (this.selectedRowKeys.includes(row.id)) {
+            this.selectUserRows.push(row)
          }
        }
-        this.selectUserIds = userIds.substring(1);
+        this.selectUserIds = this.selectUserRows.map(row => row.username).join(',')
      },
      // 点击树节点,筛选出对应的用户
      onDepSelect(selectedDepIds) {
        if (selectedDepIds[0] != null) {
-          this.initQueryUserByDepId(selectedDepIds); // 调用方法根据选选择的id查询用户信息
          if (this.selectedDepIds[0] !== selectedDepIds[0]) {
            this.selectedDepIds = [selectedDepIds[0]];
          }
+          this.loadData(1);
        }
      },
      onSelectChange(selectedRowKeys, selectionRows) {
        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectionRows;
+        selectionRows.forEach(row => pushIfNotExist(this.selectionRows, row, 'id'))
      },
      onSearch() {
        this.loadData(1);
@ -299,14 +297,35 @@
        })
      },
      queryDepartTree() {
-        queryDepartTreeList().then((res) => {
+        //update-begin-author:taoyan date:20211202 for: 异步加载部门树 https://github.com/jeecgboot/jeecg-boot/issues/3196
+        this.expandedKeys = []
+        this.departTree = []
+        queryDepartTreeSync().then((res) => {
          if (res.success) {
-            this.departTree = res.result;
-            // 默认展开父节点
-            this.expandedKeys = this.departTree.map(item => item.id)
+            for (let i = 0; i < res.result.length; i++) {
+              let temp = res.result[i]
+              this.departTree.push(temp)
+            }
          }
        })
      },
+      onLoadDepartment(treeNode){
+        return new Promise(resolve => {
+          queryDepartTreeSync({pid:treeNode.dataRef.id}).then((res) =>  {
+            if (res.success) {
+              //判断chidlren是否为空，并修改isLeaf属性值
+              if(res.result.length == 0){
+                treeNode.dataRef['isLeaf']=true
+                return;
+              }else{
+                treeNode.dataRef['children']= res.result;
+              }
+            }
+          })
+          resolve();
+        });
+      },
+      //update-end-author:taoyan date:20211202 for: 异步加载部门树 https://github.com/jeecgboot/jeecg-boot/issues/3196
      modalFormOk() {
        this.loadData();
      }
@ -327,4 +346,4 @@
    cursor: pointer;
    transition: color .3s;
  }
-</style>
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecgbiz/thirdApp/JThirdAppButton.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/thirdApp/JThirdAppButton.vue
@ -0,0 +1,214 @@
+<template>
+  <span v-if="syncToApp || syncToLocal">
+    <j-third-app-dropdown v-if="enabledTypes.wechatEnterprise" type="wechatEnterprise" name="企微" v-bind="bindAttrs" v-on="bindEvents"/>
+    <j-third-app-dropdown v-if="enabledTypes.dingtalk" type="dingtalk" name="钉钉" v-bind="bindAttrs" v-on="bindEvents"/>
+  </span>
+  <span v-else>未设置任何同步方向</span>
+</template>
+
+<script>
+import { getAction } from '@/api/manage'
+import { cloneObject } from '@/utils/util'
+import JThirdAppDropdown from './JThirdAppDropdown'
+
+const backEndUrl = {
+  // 获取启用的第三方App
+  getEnabledType: '/sys/thirdApp/getEnabledType',
+  // 企业微信
+  wechatEnterprise: {
+    user: '/sys/thirdApp/sync/wechatEnterprise/user',
+    depart: '/sys/thirdApp/sync/wechatEnterprise/depart',
+  },
+  // 钉钉
+  dingtalk: {
+    user: '/sys/thirdApp/sync/dingtalk/user',
+    depart: '/sys/thirdApp/sync/dingtalk/depart',
+  }
+}
+
+export default {
+  name: 'JThirdAppButton',
+  components: {JThirdAppDropdown},
+  props: {
+    // 同步类型，可以是 user、depart
+    bizType: {
+      type: String,
+      required: true,
+    },
+    // 是否允许同步到第三方APP
+    syncToApp: Boolean,
+    // 是否允许第三方APP同步到本地
+    syncToLocal: Boolean,
+    // 选择的行
+    selectedRowKeys: Array,
+  },
+  data() {
+    return {
+      enabledTypes: {},
+      attrs: {
+        dingtalk: {},
+      },
+    }
+  },
+  computed: {
+    bindAttrs() {
+      return {
+        syncToApp: this.syncToApp,
+        syncToLocal: this.syncToLocal
+      }
+    },
+    bindEvents() {
+      return {
+        'to-app': this.onToApp,
+        'to-local': this.onToLocal,
+      }
+    },
+  },
+  created() {
+    this.loadEnabledTypes()
+  },
+  methods: {
+    handleMenuClick() {
+      console.log(arguments)
+    },
+    onToApp(e) {
+      this.doSync(e.type, '/toApp')
+    },
+    onToLocal(e) {
+      this.doSync(e.type, '/toLocal')
+    },
+    // 获取启用的第三方App
+    async loadEnabledTypes() {
+      this.enabledTypes = await loadEnabledTypes()
+    },
+    // 开始同步第三方App
+    doSync(type, direction) {
+      let urls = backEndUrl[type]
+      if (!(urls && urls[this.bizType])) {
+        console.warn('配置出错')
+        return
+      }
+      let url = urls[this.bizType] + direction
+
+      let selectedRowKeys = this.selectedRowKeys
+      let content = '确定要开始同步全部数据吗？可能花费较长时间！'
+      if (Array.isArray(selectedRowKeys) && selectedRowKeys.length > 0) {
+        content = `确定要开始同步这 ${selectedRowKeys.length} 项吗？`
+      } else {
+        selectedRowKeys = []
+      }
+      return new Promise((resolve, reject) => {
+        let model = this.$confirm({
+          title: '同步',
+          content,
+          onOk: () => {
+            model.update({
+              keyboard: false,
+              okText: '同步中…',
+              cancelButtonProps: {props: {disabled: true}}
+            })
+            return getAction(url, {
+              ids: selectedRowKeys.join(',')
+            }).then(res => {
+              let options = null
+              if (res.result) {
+                options = {
+                  width: 600,
+                  title: res.message,
+                  content: (h) => {
+                    let nodes
+                    let successInfo = [
+                      `成功信息如下：`,
+                      this.renderTextarea(h, res.result.successInfo.map((v, i) => `${i + 1}. ${v}`).join('\n')),
+                    ]
+                    if (res.success) {
+                      nodes = [
+                        ...successInfo,
+                        h('br'),
+                        `无失败信息！`,
+                      ]
+                    } else {
+                      nodes = [
+                        `失败信息如下：`,
+                        this.renderTextarea(h, res.result.failInfo.map((v, i) => `${i + 1}. ${v}`).join('\n')),
+                        h('br'),
+                        ...successInfo,
+                      ]
+                    }
+                    return nodes
+                  }
+                }
+              }
+              if (res.success) {
+                if (options != null) {
+                  this.$success(options)
+                } else {
+                  this.$message.success(res.message)
+                }
+                this.$emit('sync-ok')
+              } else {
+                if (options != null) {
+                  this.$warning(options)
+                } else {
+                  this.$message.warning(res.message)
+                }
+                this.$emit('sync-error')
+              }
+            }).catch(() => model.destroy()).finally(() => {
+              resolve()
+              this.$emit('sync-finally', {
+                type,
+                direction,
+                isToApp: direction === '/toApp',
+                isToLocal: direction === '/toLocal',
+              })
+            })
+          },
+          onCancel() {
+            resolve()
+          },
+        })
+      })
+    },
+    renderTextarea(h, value) {
+      return h('a-textarea', {
+        props: {
+          value: value,
+          readOnly: true,
+          autosize: {minRows: 5, maxRows: 10},
+        },
+        style: {
+          // 关闭textarea的自动换行，使其可以左右滚动
+          whiteSpace: 'pre',
+          overflow: 'auto',
+        }
+      })
+    }
+  },
+}
+
+// 启用了哪些第三方App（在此缓存）
+let enabledTypes = null
+
+// 获取启用的第三方App
+export async function loadEnabledTypes() {
+  // 获取缓存
+  if (enabledTypes != null) {
+    return cloneObject(enabledTypes)
+  } else {
+    let {success, result} = await getAction(backEndUrl.getEnabledType)
+    if (success) {
+      // 在此缓存
+      enabledTypes = cloneObject(result)
+      return result
+    } else {
+      console.warn('getEnabledType查询失败：', res)
+    }
+  }
+  return {}
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/ant-design-vue-jeecg/src/components/jeecgbiz/thirdApp/JThirdAppDropdown.vue
+++ b/ant-design-vue-jeecg/src/components/jeecgbiz/thirdApp/JThirdAppDropdown.vue
@ -0,0 +1,34 @@
+<template>
+  <a-dropdown v-if="syncToApp && syncToLocal">
+    <a-button type="primary" icon="sync">同步{{name}}</a-button>
+    <a-menu slot="overlay" @click="handleMenuClick">
+      <a-menu-item v-if="syncToApp" key="to-app">同步到{{name}}</a-menu-item>
+      <a-menu-item v-if="syncToLocal" key="to-local">同步到本地</a-menu-item>
+    </a-menu>
+  </a-dropdown>
+  <a-button v-else-if="syncToApp" type="primary" icon="sync" @click="handleMenuClick({key:'to-app'})">同步{{name}}</a-button>
+  <a-button v-else type="primary" icon="sync" @click="handleMenuClick({key:'to-local'})">同步{{name}}到本地</a-button>
+</template>
+
+<script>
+
+/* JThirdAppButton 的子组件，不可单独使用 */
+export default {
+  name: 'JThirdAppDropdown',
+  props: {
+    type: String,
+    name: String,
+    syncToApp: Boolean,
+    syncToLocal: Boolean,
+  },
+  methods: {
+    handleMenuClick(event) {
+      this.$emit(event.key, {type: this.type})
+    },
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/ant-design-vue-jeecg/src/components/layouts/IframePageView.vue
+++ b/ant-design-vue-jeecg/src/components/layouts/IframePageView.vue
@ -38,16 +38,20 @@
        //url = "http://www.baidu.com"
        console.log("------url------"+url)
        if (url !== null && url !== undefined) {
-          this.url = url;
+          //-----------------------------------------------------------------------------------------
+          //url支持通过 ${token}方式传递当前登录TOKEN
+          let tokenStr = "${token}";
+          if(url.indexOf(tokenStr)!=-1) {
+            let token = Vue.ls.get(ACCESS_TOKEN);
+            this.url = url.replace(tokenStr, token);
+          } else {
+            this.url = url
+          }
+          //-----------------------------------------------------------------------------------------
+
          /*update_begin author:wuxianquan date:20190908 for:判断打开方式，新窗口打开时this.$route.meta.internalOrExternal==true */
          if(this.$route.meta.internalOrExternal != undefined && this.$route.meta.internalOrExternal==true){
            this.closeCurrent();
-            //外部url加入token
-            let tokenStr = "${token}";
-            if(url.indexOf(tokenStr)!=-1){
-              let token = Vue.ls.get(ACCESS_TOKEN);
-               this.url = url.replace(tokenStr,token);
-            }
            window.open(this.url);
          }
          /*update_end author:wuxianquan date:20190908 for:判断打开方式，新窗口打开时this.$route.meta.internalOrExternal==true */
--- a/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
+++ b/ant-design-vue-jeecg/src/components/layouts/TabLayout.vue
@ -36,9 +36,10 @@
  import Contextmenu from '@/components/menu/Contextmenu'
  import { mixin, mixinDevice } from '@/utils/mixin.js'
  import { triggerWindowResizeEvent } from '@/utils/util'
-  const indexKey = '/dashboard/analysis'
  import Vue from 'vue'
-  import { CACHE_INCLUDED_ROUTES } from "@/store/mutation-types"
+  import { CACHE_INCLUDED_ROUTES } from '@/store/mutation-types'
+
+  const indexKey = '/dashboard/analysis'

  export default {
    name: 'TabLayout',
@ -86,13 +87,6 @@
      // 复制一个route对象出来，不能影响原route
      let currentRoute = Object.assign({}, this.$route)
      currentRoute.meta = Object.assign({}, currentRoute.meta)
-      // update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
-      let storeKey = 'route:title:' + currentRoute.fullPath
-      let routeTitle = this.$ls.get(storeKey)
-      if (routeTitle) {
-        currentRoute.meta.title = routeTitle
-      }
-      // update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
      this.pageList.push(currentRoute)
      this.linkList.push(currentRoute.fullPath)
      this.activePage = currentRoute.fullPath
@ -225,10 +219,20 @@
            cacheRouterArray.splice(cacheRouterArray.findIndex(item => item === componentName), 1)
            Vue.ls.set(CACHE_INCLUDED_ROUTES, cacheRouterArray)
          }
+          this.emitPageClosed(removeRoute[0])
        }
        //update-end--Author:scott  Date:20201015 for：路由缓存问题，关闭了tab页时再打开就不刷新 #842

      },
+      // 触发 page-closed （页面关闭）全局事件
+      emitPageClosed(closedRoute) {
+        this.$root.$emit('page-closed', {
+          closedRoute,
+          pageList: this.pageList,
+          linkList: this.linkList,
+          activePage: this.activePage
+        })
+      },
      onContextmenu(e) {
        const pagekey = this.getPageKey(e.target)
        if (pagekey !== null) {
--- a/ant-design-vue-jeecg/src/components/lazy_antd.js
+++ b/ant-design-vue-jeecg/src/components/lazy_antd.js
@ -57,7 +57,8 @@ import {
  Cascader,
  Slider,
  Transfer,
-  Rate
+  Rate,
+  Collapse,
 } from 'ant-design-vue'
 import Viser from 'viser-vue'

@ -112,6 +113,7 @@ Vue.use(Cascader)
 Vue.use(Slider)
 Vue.use(Transfer)
 Vue.use(Rate)
+Vue.use(Collapse)

 Vue.prototype.$confirm = Modal.confirm
 Vue.prototype.$message = message
--- a/ant-design-vue-jeecg/src/components/menu/SideMenu.vue
+++ b/ant-design-vue-jeecg/src/components/menu/SideMenu.vue
@ -11,6 +11,7 @@
      :menu="menus"
      :theme="theme"
      @select="onSelect"
+      @updateMenuTitle="onUpdateMenuTitle"
      :mode="mode"
      :style="smenuStyle">
    </s-menu>
@ -19,7 +20,7 @@
 </template>

 <script>
-  import ALayoutSider from "ant-design-vue/es/layout/Sider"
+  import ALayoutSider from 'ant-design-vue/es/layout/Sider'
  import Logo from '../tools/Logo'
  import SMenu from './index'
  import { mixin, mixinDevice } from '@/utils/mixin.js'
@ -68,6 +69,9 @@
    methods: {
      onSelect (obj) {
        this.$emit('menuSelect', obj)
+      },
+      onUpdateMenuTitle (obj) {
+        this.$emit('updateMenuTitle', obj)
      }
    }
  }
--- a/ant-design-vue-jeecg/src/components/menu/index.js
+++ b/ant-design-vue-jeecg/src/components/menu/index.js
@ -82,18 +82,49 @@ export default {
      } else {
        this.selectedKeys = [routes.pop().path]
      }
-      const openKeys = []
+      let openKeys = []
      if (this.mode === 'inline') {
        routes.forEach(item => {
          openKeys.push(item.path)
        })
      }
+
+      // update-begin-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+      // 包含冒号的是动态菜单
+      if (this.selectedKeys[0].includes(':')) {
+        let selectedKey = this.$route.fullPath
+        this.selectedKeys = [selectedKey]
+        let newOpenKeys = []
+        this.fullOpenKeys(this.menu, selectedKey, newOpenKeys)
+        if (newOpenKeys.length > 0) {
+          openKeys = newOpenKeys.reverse()
+        }
+      }
+      // update-end-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+
      //update-begin-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
      if(!this.selectedKeys || this.selectedKeys[0].indexOf(":")<0){
        this.collapsed ? (this.cachedOpenKeys = openKeys) : (this.openKeys = openKeys)
      }
      //update-end-author:taoyan date:20190510 for:online表单菜单点击展开的一级目录不对
    },
+    // update-begin-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+    // 递归查找当前选中的菜单和父级菜单，填充openKeys
+    fullOpenKeys(menus, selectedKey, openKeys) {
+      for (let item of menus) {
+        if (item.path === selectedKey) {
+          openKeys.push(item.path)
+          this.$emit('updateMenuTitle', item)
+          return true
+        } else if (Array.isArray(item.children)) {
+          if (this.fullOpenKeys(item.children, selectedKey, openKeys)) {
+            openKeys.push(item.path)
+            return true
+          }
+        }
+      }
+    },
+    // update-end-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题

    // render
    renderItem (menu) {
--- a/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
+++ b/ant-design-vue-jeecg/src/components/page/GlobalHeader.vue
@ -31,7 +31,9 @@
            <s-menu
              mode="horizontal"
              :menu="menus"
-              :theme="theme"></s-menu>
+              :theme="theme"
+              @updateMenuTitle="handleUpdateMenuTitle"
+            ></s-menu>
          </div>
          <a-icon
            v-else
@ -155,8 +157,15 @@
            this.topMenuStyle.headerIndexLeft = { 'width': `calc(100% - ${rightWidth})` }
          }
        }
-      }
+      },
      //update-begin--author:sunjianlei---date:20190508------for: 顶部导航栏过长时显示更多按钮-----
+
+      // update-begin-author:sunjianlei date:20210508 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+      handleUpdateMenuTitle(value) {
+        this.$emit('updateMenuTitle', value)
+      },
+      // update-end-author:sunjianlei date:20210508 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+
    }
  }
 </script>
--- a/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
+++ b/ant-design-vue-jeecg/src/components/page/GlobalLayout.vue
@ -16,6 +16,7 @@
          v-if="device === 'mobile'"
          :menus="menus"
          @menuSelect="menuSelect"
+          @updateMenuTitle="handleUpdateMenuTitle"
          :theme="navTheme"
          :collapsed="false"
          :collapsible="true"></side-menu>
@ -26,6 +27,7 @@
        mode="inline"
        :menus="menus"
        @menuSelect="myMenuSelect"
+        @updateMenuTitle="handleUpdateMenuTitle"
        :theme="navTheme"
        :collapsed="collapsed"
        :collapsible="true"></side-menu>
@ -45,6 +47,7 @@
          mode="inline"
          :menus="menus"
          @menuSelect="menuSelect"
+          @updateMenuTitle="handleUpdateMenuTitle"
          :theme="navTheme"
          :collapsed="false"
          :collapsible="true"></side-menu>
@ -62,6 +65,7 @@
        :collapsed="collapsed"
        :device="device"
        @toggle="toggle"
+        @updateMenuTitle="handleUpdateMenuTitle"
      />

      <!-- layout content -->
@ -85,15 +89,14 @@
  import SideMenu from '@/components/menu/SideMenu'
  import GlobalHeader from '@/components/page/GlobalHeader'
  import GlobalFooter from '@/components/page/GlobalFooter'
+  import { triggerWindowResizeEvent } from '@/utils/util'
+  import { mapActions, mapState } from 'vuex'
+  import { mixin, mixinDevice } from '@/utils/mixin.js'
  // update-start---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效，但还一直转圈，显示主题 正在编译 ------
  // import SettingDrawer from '@/components/setting/SettingDrawer'
  // 注释这个因为在个人设置模块已经加载了SettingDrawer页面
  // update-end ---- author:os_chengtgen -- date:20190830 --  for:issues/463 -编译主题颜色已生效，但还一直转圈，显示主题 正在编译 ------

-  import { triggerWindowResizeEvent } from '@/utils/util'
-  import { mapState, mapActions } from 'vuex'
-  import { mixin, mixinDevice } from '@/utils/mixin.js'
-
  export default {
    name: 'GlobalLayout',
    components: {
@ -160,10 +163,6 @@
        //此处触发动态路由被点击事件
        this.findMenuBykey(this.menus,value.key)
        this.$emit("dynamicRouterShow",value.key,this.activeMenu.meta.title)
-        // update-begin-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
-        let storeKey = 'route:title:' + this.activeMenu.path
-        this.$ls.set(storeKey, this.activeMenu.meta.title)
-        // update-end-author:sunjianlei date:20191223 for: 修复刷新后菜单Tab名字显示异常
      },
      findMenuBykey(menus,key){
        for(let i of menus){
@ -173,8 +172,17 @@
            this.findMenuBykey(i.children,key)
          }
        }
-      }
+      },
      //update-end-author:taoyan date:20190430 for:动态路由title显示配置的菜单title而不是其对应路由的title
+
+      // update-begin-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+      handleUpdateMenuTitle(value) {
+        this.findMenuBykey(this.menus, value.path)
+        this.activeMenu.meta.title = value.meta.title
+        this.$emit('dynamicRouterShow', value.path, this.activeMenu.meta.title)
+      },
+      // update-end-author:sunjianlei date:20210409 for: 修复动态功能测试菜单、带参数菜单标题错误、展开错误的问题
+
    }
  }

--- a/ant-design-vue-jeecg/src/components/tools/Logo.vue
+++ b/ant-design-vue-jeecg/src/components/tools/Logo.vue
@ -1,6 +1,6 @@
 <template>
  <div class="logo">
-    <router-link :to="{name:'dashboard'}">
+    <router-link :to="routerLinkTo">

      <!-- update-begin- author:sunjianlei --- date:20190814 --- for: logo颜色根据主题颜色变化 -->
      <img v-if="navTheme === 'dark'" src="~@/assets/logo-white.png" alt="logo">
@ -28,7 +28,12 @@
        type: Boolean,
        default: true,
        required: false
-      }
+      },
+      // 点击Logo跳转地址
+      routerLinkTo: {
+        type: Object,
+        default: () => ({name: 'dashboard'}),
+      },
    }
  }
 </script>
--- a/ant-design-vue-jeecg/src/components/tools/UserMenu.vue
+++ b/ant-design-vue-jeecg/src/components/tools/UserMenu.vue
@ -185,8 +185,8 @@
            return that.Logout({}).then(() => {
              // update-begin author:wangshuai date:20200601 for: 退出登录跳转登录页面
              that.$router.push({ path: '/user/login' });
+              window.location.reload()
              // update-end author:wangshuai date:20200601 for: 退出登录跳转登录页面
-              //window.location.reload()
            }).catch(err => {
              that.$message.error({
                title: '错误',
@ -225,11 +225,17 @@
      // update_begin author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
      searchMethods(value) {
        let route = this.searchMenuOptions.filter(item => item.id === value)[0]
-        if (route.meta.internalOrExternal === true || route.component.includes('layouts/IframePageView')) {
+        //update-begin-author:taoyan date:20210528 for: 【菜单问题】配置一个iframe地址的菜单，内部打开，在搜索菜单上打开却新开了一个窗口
+        if (route.meta.internalOrExternal === true) {
          window.open(route.meta.url, '_blank')
        } else {
-          this.$router.push({ path: route.path })
+          if(route.component.includes('layouts/IframePageView')){
+            this.$router.push(route)
+          }else{
+            this.$router.push({ path: route.path })
+          }
        }
+        //update-end-author:taoyan date:20210528 for: 【菜单问题】配置一个iframe地址的菜单，内部打开，在搜索菜单上打开却新开了一个窗口
        this.searchMenuVisible = false
      },
      // update_end author:sunjianlei date:20191230 for: 解决外部链接打开失败的问题
--- a/ant-design-vue-jeecg/src/config/router.config.js
+++ b/ant-design-vue-jeecg/src/config/router.config.js
@ -347,6 +347,21 @@ export const constantRouterMap = [
  //   ]
  // },

+  {
+    // OAuth2 APP页面路由
+    path: '/oauth2-app',
+    component: BlankLayout,
+    redirect: '/oauth2-app/login',
+    children: [
+      {
+        // OAuth2 登录路由
+        path: 'login',
+        name: 'login',
+        component: () => import(/* webpackChunkName: "oauth2-app.login" */ '@/views/user/oauth2/OAuth2Login')
+      },
+    ]
+  },
+
  {
    path: '/test',
    component: BlankLayout,
--- a/ant-design-vue-jeecg/src/main.js
+++ b/ant-design-vue-jeecg/src/main.js
@ -20,6 +20,7 @@ import 'ant-design-vue/dist/antd.less';  // or 'ant-design-vue/dist/antd.less'
 import '@/permission' // permission control
 import '@/utils/filter' // base filter
 import Print from 'vue-print-nb-jeecg'
+/*import '@babel/polyfill'*/
 import preview from 'vue-photo-preview'
 import 'vue-photo-preview/dist/skin.css'
 import SSO from '@/cas/sso.js'
--- a/ant-design-vue-jeecg/src/mixins/JEditableTableMixin.js
+++ b/ant-design-vue-jeecg/src/mixins/JEditableTableMixin.js
@ -53,6 +53,7 @@ export const JEditableTableMixin = {
        this.tableReset();
        resolve();
      }).then(() => {
+        if (typeof this.addBefore === 'function') this.addBefore()
        // 默认新增空数据
        let rowNum = this.addDefaultRowNum
        if (typeof rowNum !== 'number') {
--- a/ant-design-vue-jeecg/src/mixins/JEditableTableModelMixin.js
+++ b/ant-design-vue-jeecg/src/mixins/JEditableTableModelMixin.js
@ -51,6 +51,7 @@ export const JEditableTableModelMixin = {
        this.tableReset();
        resolve();
      }).then(() => {
+        if (typeof this.addBefore === 'function') this.addBefore()
        // 默认新增空数据
        let rowNum = this.addDefaultRowNum
        if (typeof rowNum !== 'number') {
--- a/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
+++ b/ant-design-vue-jeecg/src/mixins/JeecgListMixin.js
@ -8,7 +8,6 @@ import { deleteAction, getAction,downFile,getFileAccessHttpUrl } from '@/api/man
 import Vue from 'vue'
 import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
 import store from '@/store'
-import {Modal} from 'ant-design-vue'

 export const JeecgListMixin = {
  data(){
@ -94,11 +93,11 @@ export const JeecgListMixin = {
            this.ipagination.total = 0;
          }
          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
-        }
-        if(res.code===510){
+        }else{
          this.$message.warning(res.message)
        }
-        this.loading = false;
+      }).finally(() => {
+        this.loading = false
      })
    },
    initDictConfig(){
@ -296,10 +295,12 @@ export const JeecgListMixin = {
    },
    /* 导入 */
    handleImportExcel(info){
+      this.loading = true;
      if (info.file.status !== 'uploading') {
        console.log(info.file, info.fileList);
      }
      if (info.file.status === 'done') {
+        this.loading = false;
        if (info.file.response.success) {
          // this.$message.success(`${info.file.name} 文件上传成功`);
          if (info.file.response.code === 201) {
@ -321,11 +322,12 @@ export const JeecgListMixin = {
          this.$message.error(`${info.file.name} ${info.file.response.message}.`);
        }
      } else if (info.file.status === 'error') {
+        this.loading = false;
        if (info.file.response.status === 500) {
          let data = info.file.response
          const token = Vue.ls.get(ACCESS_TOKEN)
          if (token && data.message.includes("Token失效")) {
-            Modal.error({
+            this.$error({
              title: '登录已过期',
              content: '很抱歉，登录已过期，请重新登录',
              okText: '重新登录',
--- a/ant-design-vue-jeecg/src/mixins/OnlineCommonUtil.js
+++ b/ant-design-vue-jeecg/src/mixins/OnlineCommonUtil.js
@ -1,10 +1,12 @@
 import { formatDate } from '@/utils/util'
 import Area from '@/components/_util/Area'
+import { postAction } from '@/api/manage'

 const onlUtil = {
  data(){
    return {
-      mixin_pca:''
+      mixin_pca:'',
+      flowCodePre: 'onl_'
    }
  },
  created(){
--- a/ant-design-vue-jeecg/src/permission.js
+++ b/ant-design-vue-jeecg/src/permission.js
@ -4,19 +4,20 @@ import store from './store'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import notification from 'ant-design-vue/es/notification'
-import { ACCESS_TOKEN,INDEX_MAIN_PAGE_PATH } from '@/store/mutation-types'
-import { generateIndexRouter } from "@/utils/util"
+import { ACCESS_TOKEN,INDEX_MAIN_PAGE_PATH, OAUTH2_LOGIN_PAGE_PATH } from '@/store/mutation-types'
+import { generateIndexRouter, isOAuth2AppEnv } from '@/utils/util'

 NProgress.configure({ showSpinner: false }) // NProgress Configuration

 const whiteList = ['/user/login', '/user/register', '/user/register-result','/user/alteration'] // no redirect whitelist
+whiteList.push(OAUTH2_LOGIN_PAGE_PATH)

 router.beforeEach((to, from, next) => {
  NProgress.start() // start progress bar

  if (Vue.ls.get(ACCESS_TOKEN)) {
    /* has token */
-    if (to.path === '/user/login') {
+    if (to.path === '/user/login' || to.path === OAUTH2_LOGIN_PAGE_PATH) {
      next({ path: INDEX_MAIN_PAGE_PATH })
      NProgress.done()
    } else {
@ -59,10 +60,18 @@ router.beforeEach((to, from, next) => {
    }
  } else {
    if (whiteList.indexOf(to.path) !== -1) {
-      // 在免登录白名单，直接进入
-      next()
+      // 在免登录白名单，如果进入的页面是login页面并且当前是OAuth2app环境，就进入OAuth2登录页面
+      if (to.path === '/user/login' && isOAuth2AppEnv()) {
+        next({path: OAUTH2_LOGIN_PAGE_PATH})
+      } else {
+        // 在免登录白名单，直接进入
+        next()
+      }
+      NProgress.done()
    } else {
-      next({ path: '/user/login', query: { redirect: to.fullPath } })
+      // 如果当前是在OAuth2APP环境，就跳转到OAuth2登录页面
+      let path = isOAuth2AppEnv() ? OAUTH2_LOGIN_PAGE_PATH : '/user/login'
+      next({ path: path, query: { redirect: to.fullPath } })
      NProgress.done() // if current page is login will not trigger afterEach hook, so manually handle it
    }
  }
--- a/ant-design-vue-jeecg/src/store/getters.js
+++ b/ant-design-vue-jeecg/src/store/getters.js
@ -16,7 +16,8 @@ const getters = {
  enhanceJs:(state) => (code) => {
    state.enhance.enhanceJs[code] = Vue.ls.get(ENHANCE_PRE+code);
    return state.enhance.enhanceJs[code]
-  }
+  },
+  sysSafeMode: state => state.user.sysSafeMode,

 }

--- a/ant-design-vue-jeecg/src/store/index.js
+++ b/ant-design-vue-jeecg/src/store/index.js
@ -3,9 +3,9 @@ import Vuex from 'vuex'

 import app from './modules/app'
 import user from './modules/user'
-import permission from './modules/permission'
 import enhance from './modules/enhance'
 import online from './modules/online'
+import permission from './modules/permission'
 import getters from './getters'

 Vue.use(Vuex)
@ -16,7 +16,7 @@ export default new Vuex.Store({
    user,
    permission,
    enhance,
-    online
+    online,
  },
  state: {

--- a/ant-design-vue-jeecg/src/store/modules/user.js
+++ b/ant-design-vue-jeecg/src/store/modules/user.js
@ -14,7 +14,9 @@ const user = {
    welcome: '',
    avatar: '',
    permissionList: [],
-    info: {}
+    info: {},
+    // 系统安全模式
+    sysSafeMode: null,
  },

  mutations: {
@ -38,6 +40,13 @@ const user = {
    SET_TENANT: (state, id) => {
      state.tenantid = id
    },
+    SET_SYS_SAFE_MODE: (state, sysSafeMode) => {
+      if (typeof sysSafeMode === 'boolean') {
+        state.sysSafeMode = sysSafeMode
+      } else {
+        state.sysSafeMode = false
+      }
+    },
  },

  actions: {
@ -124,20 +133,22 @@ const user = {
          sessionStorage.setItem(USER_AUTH,JSON.stringify(authData));
          sessionStorage.setItem(SYS_BUTTON_AUTH,JSON.stringify(allAuthData));
          if (menuData && menuData.length > 0) {
-            //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
-            menuData.forEach((item, index) => {
-              if (item["children"]) {
-                let hasChildrenMenu = item["children"].filter((i) => {
-                  return !i.hidden || i.hidden == false
-                })
-                if (hasChildrenMenu == null || hasChildrenMenu.length == 0) {
-                  item["hidden"] = true
-                }
-              }
-            })
-            //console.log(" menu show json ", menuData)
-            //update--end--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
+            // //update--begin--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
+            // menuData.forEach((item, index) => {
+            //   if (item["children"]) {
+            //     let hasChildrenMenu = item["children"].filter((i) => {
+            //       return !i.hidden || i.hidden == false
+            //     })
+            //     if (hasChildrenMenu == null || hasChildrenMenu.length == 0) {
+            //       item["hidden"] = true
+            //     }
+            //   }
+            // })
+            // //console.log(" menu show json ", menuData)
+            // //update--end--autor:qinfeng-----date:20200109------for：JEECG-63 一级菜单的子菜单全部是隐藏路由，则一级菜单不显示------
            commit('SET_PERMISSIONLIST', menuData)
+            // 设置系统安全模式
+            commit('SET_SYS_SAFE_MODE', response.result.sysSafeMode)
          } else {
            reject('getPermissionList: permissions must be a non-null array !')
          }
@ -159,6 +170,7 @@ const user = {
        Vue.ls.remove(USER_NAME)
        Vue.ls.remove(UI_CACHE_DB_DICT_DATA)
        Vue.ls.remove(CACHE_INCLUDED_ROUTES)
+        Vue.ls.remove(TENANT_ID)
        //console.log('logoutToken: '+ logoutToken)
        logout(logoutToken).then(() => {
          if (process.env.VUE_APP_SSO == 'true') {
--- a/ant-design-vue-jeecg/src/store/mutation-types.js
+++ b/ant-design-vue-jeecg/src/store/mutation-types.js
@ -17,6 +17,7 @@ export const ENCRYPTED_STRING = 'ENCRYPTED_STRING'
 export const ENHANCE_PRE = 'enhance_'
 export const UI_CACHE_DB_DICT_DATA = 'UI_CACHE_DB_DICT_DATA'
 export const INDEX_MAIN_PAGE_PATH = '/dashboard/analysis'
+export const OAUTH2_LOGIN_PAGE_PATH = '/oauth2-app/login'
 export const TENANT_ID = 'TENANT_ID'
 export const ONL_AUTH_FIELDS = 'ONL_AUTH_FIELDS'
 //路由缓存问题，关闭了tab页时再打开就不刷新 #842
--- a/ant-design-vue-jeecg/src/utils/JEditableTableUtil.js
+++ b/ant-design-vue-jeecg/src/utils/JEditableTableUtil.js
@ -8,12 +8,14 @@ const FormTypes = {
  select: 'select',
  date: 'date',
  datetime: 'datetime',
+  time: 'time',
  upload: 'upload',
  file: 'file',
  image: 'image',
  popup:'popup',
  list_multi:"list_multi",
  sel_search:"sel_search",
+  sel_search_async:"sel_search_async",
  radio:'radio',
  checkbox_meta:"checkbox_meta",
  input_pop:'input_pop',
--- a/ant-design-vue-jeecg/src/utils/encryption/signMd5Utils.js
+++ b/ant-design-vue-jeecg/src/utils/encryption/signMd5Utils.js
@ -0,0 +1,129 @@
+import md5 from 'md5'
+//签名密钥串(前后端要一致，正式发布请自行修改)
+const signatureSecret = "dd05f1c54d63749eda95f9fa6d49v442a";
+
+export default class signMd5Utils {
+  /**
+   * json参数升序
+   * @param jsonObj 发送参数
+   */
+
+  static sortAsc(jsonObj) {
+    let arr = new Array();
+    let num = 0;
+    for (let i in jsonObj) {
+      arr[num] = i;
+      num++;
+    }
+    let sortArr = arr.sort();
+    let sortObj = {};
+    for (let i in sortArr) {
+      sortObj[sortArr[i]] = jsonObj[sortArr[i]];
+    }
+    return sortObj;
+  }
+
+
+  /**
+   * @param url 请求的url,应该包含请求参数(url的?后面的参数)
+   * @param requestParams 请求参数(POST的JSON参数)
+   * @returns {string} 获取签名
+   */
+  static getSign(url, requestParams) {
+    let urlParams = this.parseQueryString(url);
+    let jsonObj = this.mergeObject(urlParams, requestParams);
+    //console.log("sign jsonObj: ",jsonObj)
+    let requestBody = this.sortAsc(jsonObj);
+    console.log("sign requestBody: ",requestBody)
+    return md5(JSON.stringify(requestBody) + signatureSecret).toUpperCase();
+  }
+
+  /**
+   * @param url 请求的url
+   * @returns {{}} 将url中请求参数组装成json对象(url的?后面的参数)
+   */
+  static parseQueryString(url) {
+    let urlReg = /^[^\?]+\?([\w\W]+)$/,
+      paramReg = /([^&=]+)=([\w\W]*?)(&|$|#)/g,
+      urlArray = urlReg.exec(url),
+      result = {};
+
+    // 获取URL上最后带逗号的参数变量 sys/dict/getDictItems/sys_user,realname,username
+    //【这边条件没有encode】带条件参数例子：/sys/dict/getDictItems/sys_user,realname,id,username!='admin'%20order%20by%20create_time
+    let lastpathVariable = url.substring(url.lastIndexOf('/') + 1);
+    if(lastpathVariable.includes(",")){
+      if(lastpathVariable.includes("?")){
+        lastpathVariable = lastpathVariable.substring(0, lastpathVariable.indexOf("?"));
+      }
+      //解决Sign 签名校验失败 #2728
+      result["x-path-variable"] = decodeURIComponent(lastpathVariable);
+    }
+    if (urlArray && urlArray[1]) {
+      let paramString = urlArray[1], paramResult;
+      while ((paramResult = paramReg.exec(paramString)) != null) {
+        //数字值转为string类型，前后端加密规则保持一致
+        if(this.myIsNaN(paramResult[2])){
+          paramResult[2] = paramResult[2].toString()
+        }
+        result[paramResult[1]] = paramResult[2];
+      }
+    }
+    return result;
+  }
+
+  /**
+   * @returns {*} 将两个对象合并成一个
+   */
+  static mergeObject(objectOne, objectTwo) {
+    if (objectTwo && Object.keys(objectTwo).length > 0) {
+      for (let key in objectTwo) {
+        if (objectTwo.hasOwnProperty(key) === true) {
+          //数字值转为string类型，前后端加密规则保持一致
+          if(this.myIsNaN(objectTwo[key])){
+            objectTwo[key] = objectTwo[key].toString()
+          }
+          objectOne[key] = objectTwo[key];
+        }
+      }
+    }
+    return objectOne;
+  }
+
+  static urlEncode(param, key, encode) {
+    if (param == null) return '';
+    let paramStr = '';
+    let t = typeof (param);
+    if (t == 'string' || t == 'number' || t == 'boolean') {
+      paramStr += '&' + key + '=' + ((encode == null || encode) ? encodeURIComponent(param) : param);
+    } else {
+      for (let i in param) {
+        let k = key == null ? i : key + (param instanceof Array ? '[' + i + ']' : '.' + i);
+        paramStr += this.urlEncode(param[i], k, encode);
+      }
+    }
+    return paramStr;
+  };
+
+  static getDateTimeToString() {
+    const date_ = new Date()
+    const year = date_.getFullYear()
+    let month = date_.getMonth() + 1
+    let day = date_.getDate()
+    if (month < 10) month = '0' + month
+    if (day < 10) day = '0' + day
+    let hours = date_.getHours()
+    let mins = date_.getMinutes()
+    let secs = date_.getSeconds()
+    const msecs = date_.getMilliseconds()
+    if (hours < 10) hours = '0' + hours
+    if (mins < 10) mins = '0' + mins
+    if (secs < 10) secs = '0' + secs
+    if (msecs < 10) secs = '0' + msecs
+    return year + '' + month + '' + day + '' + hours + '' + mins + '' + secs
+  }
+    // true:数值型的，false：非数值型
+  static myIsNaN(value) {
+    return typeof value === 'number' && !isNaN(value);
+  }
+
+}
--- a/ant-design-vue-jeecg/src/utils/request.js
+++ b/ant-design-vue-jeecg/src/utils/request.js
@ -2,7 +2,7 @@ import Vue from 'vue'
 import axios from 'axios'
 import store from '@/store'
 import { VueAxios } from './axios'
-import {Modal, notification} from 'ant-design-vue'
+import router from '@/router/index'
 import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"

 /**
@ -28,7 +28,7 @@ const err = (error) => {
    console.log("------异常响应------",error.response.status)
    switch (error.response.status) {
      case 403:
-        notification.error({ message: '系统提示', description: '拒绝访问',duration: 4})
+        Vue.prototype.$Jnotification.error({ message: '系统提示', description: '拒绝访问',duration: 4})
        break
      case 500:
        console.log("------error.response------",error.response)
@ -39,40 +39,43 @@ const err = (error) => {
          break;
        }
        // update-end- --- author:liusq ------ date:20200910 ---- for:处理Blob情况----
-        //notification.error({ message: '系统提示', description:'Token失效，请重新登录!',duration: 4})
        if(token && data.message.includes("Token失效")){
          // update-begin- --- author:scott ------ date:20190225 ---- for:Token失效采用弹框模式，不直接跳转----
-          Modal.error({
-            title: '登录已过期',
-            content: '很抱歉，登录已过期，请重新登录',
-            okText: '重新登录',
-            mask: false,
-            onOk: () => {
-              store.dispatch('Logout').then(() => {
-                Vue.ls.remove(ACCESS_TOKEN)
-                try {
-                  let path = window.document.location.pathname
-                  console.log("location pathname -> "+path)
-                  if(path!="/" && path.indexOf('/user/login')==-1){
+          if (/wxwork|dingtalk/i.test(navigator.userAgent)) {
+            Vue.prototype.$Jmessage.loading('登录已过期，正在重新登陆', 0)
+          } else {
+            Vue.prototype.$Jmodal.error({
+              title: '登录已过期',
+              content: '很抱歉，登录已过期，请重新登录',
+              okText: '重新登录',
+              mask: false,
+              onOk: () => {
+                store.dispatch('Logout').then(() => {
+                  Vue.ls.remove(ACCESS_TOKEN)
+                  try {
+                    let path = window.document.location.pathname
+                    console.log('location pathname -> ' + path)
+                    if (path != '/' && path.indexOf('/user/login') == -1) {
+                      window.location.reload()
+                    }
+                  } catch (e) {
                    window.location.reload()
                  }
-                }catch (e) {
-                  window.location.reload()
-                }
-              })
-            }
-          })
+                })
+              }
+            })
+          }
          // update-end- --- author:scott ------ date:20190225 ---- for:Token失效采用弹框模式，不直接跳转----
        }
        break
      case 404:
-          notification.error({ message: '系统提示', description:'很抱歉，资源未找到!',duration: 4})
+          Vue.prototype.$Jnotification.error({ message: '系统提示', description:'很抱歉，资源未找到!',duration: 4})
        break
      case 504:
-        notification.error({ message: '系统提示', description: '网络超时'})
+        Vue.prototype.$Jnotification.error({ message: '系统提示', description: '网络超时'})
        break
      case 401:
-        notification.error({ message: '系统提示', description:'未授权，请重新登录',duration: 4})
+        Vue.prototype.$Jnotification.error({ message: '系统提示', description:'很抱歉，登录已过期，请重新登录',duration: 4})
        if (token) {
          store.dispatch('Logout').then(() => {
            setTimeout(() => {
@ -82,13 +85,19 @@ const err = (error) => {
        }
        break
      default:
-        notification.error({
+        Vue.prototype.$Jnotification.error({
          message: '系统提示',
          description: data.message,
          duration: 4
        })
        break
    }
+  } else if (error.message) {
+    if (error.message.includes('timeout')) {
+      Vue.prototype.$Jnotification.error({message: '系统提示', description: '网络超时'})
+    } else {
+      Vue.prototype.$Jnotification.error({message: '系统提示', description: error.message})
+    }
  }
  return Promise.reject(error)
 };
@ -99,6 +108,14 @@ service.interceptors.request.use(config => {
  if (token) {
    config.headers[ 'X-Access-Token' ] = token // 让每个请求携带自定义 token 请根据实际情况自行修改
  }
+
+  // update-begin--author:sunjianlei---date:20200723---for 如果当前在low-app环境，并且携带了appId，就向Header里传递appId
+  const $route = router.currentRoute
+  if ($route && $route.name && $route.name.startsWith('low-app') && $route.params.appId) {
+    config.headers['X-Low-App-ID'] = $route.params.appId
+  }
+  // update-end--author:sunjianlei---date:20200723---for 如果当前在low-app环境，并且携带了appId，就向Header里传递appId
+
  //update-begin-author:taoyan date:2020707 for:多租户
  let tenantid = Vue.ls.get(TENANT_ID)
  if (!tenantid) {
--- a/ant-design-vue-jeecg/src/utils/util.js
+++ b/ant-design-vue-jeecg/src/utils/util.js
@ -1,5 +1,7 @@
+import Vue from 'vue'
 import * as api from '@/api/api'
 import { isURL } from '@/utils/validate'
+import { ACCESS_TOKEN } from '@/store/mutation-types'
 import onlineCommons from '@jeecg/antd-online-mini'

 export function timeFix() {
@ -145,6 +147,7 @@ function  generateChildRouters (data) {
      component: componentPath,
      //component: resolve => require(['@/' + component+'.vue'], resolve),
      hidden:item.hidden,
+      //component:()=> import(`@/views/${item.component}.vue`),
      meta: {
        title:item.meta.title ,
        icon: item.meta.icon,
@ -559,4 +562,68 @@ export function removeArrayElement(array, prod, value) {
  if(index>=0){
    array.splice(index, 1);
  }
+}
+
+/** 判断是否是OAuth2APP环境 */
+export function isOAuth2AppEnv() {
+  return /wxwork|dingtalk/i.test(navigator.userAgent)
+}
+
+/**
+ * 获取积木报表打印地址
+ * @param url
+ * @param id
+ * @param open 是否自动打开
+ * @returns {*}
+ */
+export function getReportPrintUrl(url, id, open) {
+  // URL支持{{ window.xxx }}占位符变量
+  url = url.replace(/{{([^}]+)?}}/g, (s1, s2) => eval(s2))
+  if (url.includes('?')) {
+    url += '&'
+  } else {
+    url += '?'
+  }
+  url += `id=${id}`
+  url += `&token=${Vue.ls.get(ACCESS_TOKEN)}`
+  if (open) {
+    window.open(url)
+  }
+  return url
+}
+
+/**
+ * JS实现AOP切面
+ *
+ * @param obj 包含函数的对象
+ * @param funcName 要切面的函数名
+ * @param callback 执行方法前的回调，用于切面，callback的返回值就是funcName最终的返回值
+ */
+export function aspectAroundFunction(obj, funcName, callback) {
+  if (typeof callback !== 'function' || !obj) {
+    console.warn('【aspectAroundFunction】obj或callback格式不正确')
+    return
+  }
+  // 保存原来的函数
+  let func = obj[funcName]
+  if (typeof func !== 'function') {
+    console.warn('【aspectAroundFunction】' + funcName + '不是一个方法')
+    return
+  }
+  // 赋值新方法
+  // 实现当外部调用 funcName 时，首先调用我定义的新方法
+  // 然后调用传入的callback方法，以决定是否执行 funcName，以及更改参数、返回值
+  obj[funcName] = function (...args) {
+    return callback({
+      args,
+      // 只有执行 proceed 才会真正执行给定的 funcName 方法
+      proceed() {
+        try {
+          return func.apply(obj, args)
+        } catch (e) {
+          console.error(e)
+        }
+      },
+    })
+  }
 }
--- a/ant-design-vue-jeecg/src/views/account/settings/AvatarModal.vue
+++ b/ant-design-vue-jeecg/src/views/account/settings/AvatarModal.vue
@ -1,5 +1,5 @@
 <template>
-  <a-modal :visible="visible" title="修改头像" :maskClosable="false" :confirmLoading="confirmLoading" :width="800">
+  <a-modal :visible="visible" title="修改头像" :maskClosable="false" :confirmLoading="confirmLoading" :width="800" @cancel="cancelHandel">
    <a-row>
      <a-col :xs="24" :md="12" :style="{height: '350px'}">
        <vue-cropper
--- a/ant-design-vue-jeecg/src/views/jeecg/JVxeDemo/JVxeDemo3.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/JVxeDemo/JVxeDemo3.vue
@ -8,123 +8,155 @@
    :height="484"
    :dataSource="dataSource"
    :columns="columns"
-    @valueChange="handleValueChange"
+    :linkage-config="linkageConfig"
  />
 </template>

 <script>
-  import moment from 'moment'
-  import { randomNumber, randomUUID } from '@/utils/util'
-  import { JVXETypes } from '@/components/jeecg/JVxeTable'
+import { JVXETypes } from '@/components/jeecg/JVxeTable'
+import { getAction } from '@api/manage'

-  export default {
-    name: 'JVxeDemo2',
-    data() {
-      return {
-        columns: [
-          {
-            title: '省/直辖市/自治区',
-            key: 's1',
-            type: JVXETypes.select,
-            width: '240px',
-            options: [],
-            placeholder: '请选择${title}'
-          },
-          {
-            title: '市',
-            key: 's2',
-            type: JVXETypes.select,
-            width: '240px',
-            options: [],
-            placeholder: '请选择${title}'
-          },
-          {
-            title: '县/区',
-            key: 's3',
-            type: JVXETypes.select,
-            width: '240px',
-            options: [],
-            placeholder: '请选择${title}'
-          }
-        ],
-        dataSource: [],
-    
-        mockData: [
-          { text: '北京市', value: '110000', parent: null },
-          { text: '天津市', value: '120000', parent: null },
-          { text: '河北省', value: '130000', parent: null },
-          { text: '上海市', value: '310000', parent: null },
-      
-          { text: '北京市', value: '110100', parent: '110000' },
-          { text: '天津市市', value: '120100', parent: '120000' },
-          { text: '石家庄市', value: '130100', parent: '130000' },
-          { text: '唐山市', value: '130200', parent: '130000' },
-          { text: '秦皇岛市', value: '130300', parent: '130000' },
-          { text: '上海市', value: '310100', parent: '310000' },
-      
-          { text: '东城区', value: '110101', parent: '110100' },
-          { text: '西城区', value: '110102', parent: '110100' },
-          { text: '朝阳区', value: '110105', parent: '110100' },
-          { text: '和平区', value: '120101', parent: '120100' },
-          { text: '河东区', value: '120102', parent: '120100' },
-          { text: '河西区', value: '120103', parent: '120100' },
-          { text: '黄浦区', value: '310101', parent: '310100' },
-          { text: '徐汇区', value: '310104', parent: '310100' },
-          { text: '长宁区', value: '310105', parent: '310100' },
-          { text: '长安区', value: '130102', parent: '130100' },
-          { text: '桥西区', value: '130104', parent: '130100' },
-          { text: '新华区', value: '130105', parent: '130100' },
-          { text: '路南区', value: '130202', parent: '130200' },
-          { text: '路北区', value: '130203', parent: '130200' },
-          { text: '古冶区', value: '130204', parent: '130200' },
-          { text: '海港区', value: '130302', parent: '130300' },
-          { text: '山海关区', value: '130303', parent: '130300' },
-          { text: '北戴河区', value: '130304', parent: '130300' },
-        ]
-      }
-
-    },
-    created() {
-      // 初始化数据
-      this.columns[0].options = this.request(null)
-    },
-    methods: {
-      
-      request(parentId) {
-        return this.mockData.filter(i => i.parent === parentId)
-      },
-  
-      /** 当选项被改变时，联动其他组件 */
-      handleValueChange(event) {
-        const { type, row, column, value, target } = event
-        console.log("event",event)
-        if (type === JVXETypes.select) {
-      
-          // 第一列
-          if (column.key === 's1') {
-            // 设置第二列的 options
-            console.log('this.request(value)::',this.request(value))
-            target.$refs.vxe.columns[3].options = this.request(value)
-            // 清空后两列的数据
-            target.setValues([{
-              rowKey: row.id,
-              values: { s2: '', s3: '' }
-            }])
-            target.$refs.vxe.columns[4].options = []
-          } else
-          // 第二列
-          if (column.key === 's2') {
-            target.$refs.vxe.columns[4].options = this.request(value)
-            target.setValues([{
-              rowKey: row.id,
-              values: { s3: '' }
-            }])
-          }
+export default {
+  name: 'JVxeDemo2',
+  data() {
+    return {
+      // 联动配置
+      linkageConfig: [
+        {requestData: this.requestData, key: 's1'},
+        // 可配置多个联动
+        {requestData: this.loadMenu, key: 'menu1',},
+      ],
+      columns: [
+        {
+          title: '性别',
+          key: 'sex',
+          type: JVXETypes.select,
+          dictCode: 'sex',
+          width: '180px',
+          placeholder: '请选择${title}',
+        },
+        {
+          title: '省/直辖市/自治区',
+          key: 's1',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
+          // 联动字段（即下一级的字段）
+          linkageKey: 's2',
+        },
+        {
+          title: '市',
+          key: 's2',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
+          // 联动字段（即下一级的字段）
+          linkageKey: 's3',
+        },
+        {
+          title: '县/区',
+          key: 's3',
+          type: JVXETypes.select,
+          width: '180px',
+          options: [],
+          placeholder: '请选择${title}',
+        },
+        {
+          title: '一级菜单',
+          key: 'menu1',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
+          // 联动字段（即下一级的字段）
+          linkageKey: 'menu2',
+        },
+        {
+          title: '二级菜单',
+          key: 'menu2',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
+          // 联动字段（即下一级的字段）
+          linkageKey: 'menu3',
+        },
+        {
+          title: '三级菜单',
+          key: 'menu3',
+          type: JVXETypes.select,
+          width: '180px',
+          placeholder: '请选择${title}',
        }
-    
-      }
+      ],
+      dataSource: [
+        {sex: '1', s1: '110000', s2: '110100', s3: '110101'},
+        {sex: '2', s1: '130000', s2: '130300', s3: '130303'},
+      ],
+      // 模拟数据
+      mockData: [
+        {text: '北京市', value: '110000', parent: ''},
+        {text: '天津市', value: '120000', parent: ''},
+        {text: '河北省', value: '130000', parent: ''},
+        {text: '上海市', value: '310000', parent: ''},
+
+        {text: '北京市', value: '110100', parent: '110000'},
+        {text: '天津市市', value: '120100', parent: '120000'},
+        {text: '石家庄市', value: '130100', parent: '130000'},
+        {text: '唐山市', value: '130200', parent: '130000'},
+        {text: '秦皇岛市', value: '130300', parent: '130000'},
+        {text: '上海市', value: '310100', parent: '310000'},
+
+        {text: '东城区', value: '110101', parent: '110100'},
+        {text: '西城区', value: '110102', parent: '110100'},
+        {text: '朝阳区', value: '110105', parent: '110100'},
+        {text: '和平区', value: '120101', parent: '120100'},
+        {text: '河东区', value: '120102', parent: '120100'},
+        {text: '河西区', value: '120103', parent: '120100'},
+        {text: '黄浦区', value: '310101', parent: '310100'},
+        {text: '徐汇区', value: '310104', parent: '310100'},
+        {text: '长宁区', value: '310105', parent: '310100'},
+        {text: '长安区', value: '130102', parent: '130100'},
+        {text: '桥西区', value: '130104', parent: '130100'},
+        {text: '新华区', value: '130105', parent: '130100'},
+        {text: '路南区', value: '130202', parent: '130200'},
+        {text: '路北区', value: '130203', parent: '130200'},
+        {text: '古冶区', value: '130204', parent: '130200'},
+        {text: '海港区', value: '130302', parent: '130300'},
+        {text: '山海关区', value: '130303', parent: '130300'},
+        {text: '北戴河区', value: '130304', parent: '130300'},
+      ],
    }
+  },
+  methods: {
+    /**
+     * 模拟从后台查询数据
+     */
+    requestData(parent) {
+      return new Promise((resolve, reject) => {
+        let data = this.mockData.filter(i => i.parent === parent)
+        setTimeout(() => {
+          resolve(data)
+        }, 500)
+      })
+    },
+
+    async loadMenu(parent) {
+      let res
+      // 如果parent为空，则查询第一级菜单
+      if (parent === '') {
+        res = await getAction('/sys/permission/getSystemMenuList')
+      } else {
+        res = await getAction('/sys/permission/getSystemSubmenu', {parentId: parent})
+      }
+      if (res.success) {
+        // 返回的数据里必须包含 value 和 text 字段
+        return res.result.map(item => ({value: item.id, text: item.name}))
+      }
+      this.$message.warning('loadMenu失败：' + res.message)
+      return []
+    },
+
  }
+}
 </script>

 <style scoped>
--- a/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/SelectDemo.vue
@ -2,26 +2,35 @@
  <a-card :bordered="false" style="height:100%;padding-bottom:200px; ">

    <div class="table-page-search-wrapper">
-      <a-form layout="inline" :form="form">
+      <a-form-model ref="form" :model="formData" layout="inline">


        <!--  字典下拉 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="性别">
+            <a-form-model-item label="性别" prop="sex">
              <j-dict-select-tag v-model="formData.sex" title="性别" dictCode="sex" placeholder="请选择性别"/>
              <!--  <j-dict-select-tag title="性别" dictCode="sex" disabled/>-->
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中值：{{ formData.sex}}</a-col>
        </a-row>

+        <a-row :gutter="24">
+          <a-col :span="12">
+            <a-form-model-item label="性别2" prop="sex2">
+              <j-dict-select-tag v-model="formData.sex2" type="radioButton" title="性别2" dictCode="sex" placeholder="请选择性别2"/>
+            </a-form-model-item>
+          </a-col>
+          <a-col :span="12">选中值：{{ formData.sex2}}</a-col>
+        </a-row>
+
        <!--  字典表下拉 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="字典表下拉">
+            <a-form-model-item label="字典表下拉" prop="user">
              <j-dict-select-tag v-model="formData.user" placeholder="请选择用户" dictCode="sys_user,realname,id"/>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中值：{{ formData.user}}</a-col>
        </a-row>
@ -29,9 +38,9 @@
        <!--  带条件字典表下拉 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="字典表下拉(带条件)">
+            <a-form-model-item label="字典表下拉(带条件)" prop="user2">
              <j-dict-select-tag v-model="formData.user2" placeholder="请选择用户" dictCode="sys_user,realname,id,username!='admin' order by create_time"/>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中值：{{ formData.user2}}</a-col>
        </a-row>
@ -40,10 +49,10 @@
        <!-- 字典搜索  -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="字典搜索(同步)">
+            <a-form-model-item label="字典搜索(同步)" prop="searchValue">
              <j-search-select-tag placeholder="请做出你的选择" v-model="formData.searchValue" :dictOptions="searchOptions">
              </j-search-select-tag>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中值：{{ formData.searchValue}}</a-col>
        </a-row>
@ -51,7 +60,7 @@
        <!--  字典搜索 异步加载 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="字典搜索(异步)">
+            <a-form-model-item label="字典搜索(异步)" prop="asyncSelectValue">
              <j-search-select-tag
                placeholder="请做出你的选择"
                v-model="formData.asyncSelectValue"
@ -59,7 +68,7 @@
                :pageSize="6"
                :async="true">
              </j-search-select-tag>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中值：{{ formData.asyncSelectValue}}</a-col>
        </a-row>
@ -67,13 +76,13 @@
        <!--  JMultiSelectTag -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="字典下拉(多选)">
+            <a-form-model-item label="字典下拉(多选)" prop="selMuti">
              <j-multi-select-tag
                v-model="formData.selMuti"
                dictCode="sex"
                placeholder="请选择">
              </j-multi-select-tag>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">多选组合(v-model)：{{ formData.selMuti }}</a-col>
        </a-row>
@ -81,48 +90,48 @@
        <!--  部门选择控件 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="选择部门 自定义返回值">
-              <j-select-depart v-model="orgCodes" :trigger-change="true" customReturnField="orgCode" :multi="true"></j-select-depart>
-            </a-form-item>
+            <a-form-model-item label="选择部门 自定义返回值" prop="orgCodes">
+              <j-select-depart v-model="formData.orgCodes" :trigger-change="true" customReturnField="orgCode" :multi="true"></j-select-depart>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">选中的部门Code(v-decorator):{{ orgCodes }}</a-col>
+          <a-col :span="12">选中的部门Code(v-model):{{ formData.orgCodes }}</a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="选择部门">
-              <j-select-depart v-model="departId" :multi="true"></j-select-depart>
-            </a-form-item>
+            <a-form-model-item label="选择部门" prop="departId">
+              <j-select-depart v-model="formData.departId" :multi="true"></j-select-depart>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">选中的部门ID(v-model):{{ departId }}</a-col>
+          <a-col :span="12">选中的部门ID(v-model):{{ formData.departId }}</a-col>
        </a-row>

        <!--  通过部门选择用户控件 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="选择用户">
-              <j-select-user-by-dep v-model="userIds" :multi="true"></j-select-user-by-dep>
-            </a-form-item>
+            <a-form-model-item label="选择用户" prop="userIds">
+              <j-select-user-by-dep v-model="formData.userIds" :multi="true"></j-select-user-by-dep>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">选中的用户(v-model):{{ userIds }}</a-col>
+          <a-col :span="12">选中的用户(v-model):{{ formData.userIds }}</a-col>
        </a-row>

        <!--  用户选择控件 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="选择用户">
-              <j-select-multi-user v-model="multiUser" :query-config="selectUserQueryConfig"/>
-            </a-form-item>
+            <a-form-model-item label="选择用户" prop="multiUser">
+              <j-select-multi-user v-model="formData.multiUser" :query-config="selectUserQueryConfig"/>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">选中的用户(v-model):{{ multiUser }}</a-col>
+          <a-col :span="12">选中的用户(v-model):{{ formData.multiUser }}</a-col>
        </a-row>

        <!-- 角色选择 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="选择角色">
+            <a-form-model-item label="选择角色" prop="selectRole">
              <j-select-role v-model="formData.selectRole" @change="changeMe"/>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中值：{{ formData.selectRole}}</a-col>
        </a-row>
@ -130,9 +139,9 @@
        <!-- 职务选择 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="选择职务">
+            <a-form-model-item label="选择职务" prop="selectPosition">
              <j-select-position  :buttons="false" v-model="formData.selectPosition" />
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中值：{{ formData.selectPosition}}</a-col>
        </a-row>
@ -140,90 +149,90 @@
        <!--  JCheckbox -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="多选组合">
+            <a-form-model-item label="多选组合" prop="jCheckbox">
              <j-checkbox
-                v-model="jcheckbox.values"
-                :options="jcheckbox.options"
+                v-model="formData.jCheckbox"
+                :options="jCheckboxOptions"
              />
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">多选组合(v-model)：{{ jcheckbox.values }}</a-col>
+          <a-col :span="12">多选组合(v-model)：{{ formData.jCheckbox }}</a-col>
        </a-row>

        <!--  JCodeEditor -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="代码输入框" style="min-height: 120px">
+            <a-form-model-item label="代码输入框" style="min-height: 120px" prop="jCodeEditor">
              <j-code-editor
                language="javascript"
-                v-model="jcodedditor.value"
+                v-model="formData.jCodeEditor"
                :fullScreen="true"
                style="min-height: 100px"/>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">代码输入框(v-model)：{{ jcodedditor.value }}</a-col>
+          <a-col :span="12">代码输入框(v-model)：{{ formData.jCodeEditor }}</a-col>
        </a-row>

        <!--  JDate -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="日期选择框">
-              <j-date v-model="jdate.value" :showTime="true" dateFormat="YYYY-MM-DD HH:mm:ss"/>
-            </a-form-item>
+            <a-form-model-item label="日期选择框" prop="jDate">
+              <j-date v-model="formData.jDate" :showTime="true" dateFormat="YYYY-MM-DD HH:mm:ss"/>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">日期选择框(v-model)：{{ jdate.value }}</a-col>
+          <a-col :span="12">日期选择框(v-model)：{{ formData.jDate }}</a-col>
        </a-row>

        <!-- JEditor -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="富文本编辑器" style="min-height: 300px">
-              <j-editor v-model="jeditor.value"/>
-            </a-form-item>
+            <a-form-model-item label="富文本编辑器" style="min-height: 300px" prop="jEditor">
+              <j-editor v-model="formData.jEditor"/>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">富文本编辑器(v-model)：{{ jeditor.value }}</a-col>
+          <a-col :span="12">富文本编辑器(v-model)：{{ formData.jEditor }}</a-col>
        </a-row>

        <!-- JEllipsis -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="过长剪切">
-              <j-ellipsis :value="jellipsis.value" :length="30"/>
-            </a-form-item>
+            <a-form-model-item label="过长剪切" prop="jEllipsis">
+              <j-ellipsis :value="formData.jEllipsis" :length="30"/>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">过长剪切：{{ jellipsis.value }}</a-col>
+          <a-col :span="12">过长剪切：{{ formData.jEllipsis }}</a-col>
        </a-row>

        <!-- JSlider -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="滑块验证码">
+            <a-form-model-item label="滑块验证码" prop="jSlider">
              <j-slider @onSuccess="handleJSliderSuccess"/>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">滑块验证码验证通过：{{ jslider.value }}</a-col>
+          <a-col :span="12">滑块验证码验证通过：{{ formData.jSlider }}</a-col>
        </a-row>

        <!-- JSelectMultiple -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="多选下拉框">
-              <j-select-multiple v-model="jselectMultiple.value" :options="jselectMultiple.options"/>
-            </a-form-item>
+            <a-form-model-item label="多选下拉框" prop="jSelectMultiple">
+              <j-select-multiple v-model="formData.jSelectMultiple" :options="jSelectMultipleOptions"/>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">多选下拉框(v-model)：{{ jselectMultiple.value }}</a-col>
+          <a-col :span="12">多选下拉框(v-model)：{{ formData.jSelectMultiple }}</a-col>
        </a-row>

        <!-- JSelectMultiple -->
        <a-row :gutter="24">
          <a-col>

-            <a-form-item label="JModal弹窗">
+            <a-form-model-item label="JModal弹窗">
              <a-button style="margin-right: 8px;" @click="()=>modal.visible=true">点击弹出JModal</a-button>
              <span style="margin-right: 8px;">全屏化：<a-switch v-model="modal.fullscreen"/></span>
              <span style="margin-right: 8px;">允许切换全屏：<a-switch v-model="modal.switchFullscreen"/></span>

-            </a-form-item>
+            </a-form-model-item>

            <j-modal
              :visible.sync="modal.visible"
@ -244,40 +253,42 @@

        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="树字典">
-              <j-tree-dict v-model="formData.treeDict" placeholder="请选择树字典" parentCode="B01" />
-            </a-form-item>
+            <a-form-model-item label="树字典" prop="treeDict">
+              <j-tree-dict v-model="formData.treeDict" placeholder="请选择树字典" parentCode="A01" />
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中的值(v-model)：{{ formData.treeDict }}</a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="下拉树选择">
+            <a-form-model-item label="下拉树选择" prop="treeSelect">
              <j-tree-select
                v-model="formData.treeSelect"
                placeholder="请选择菜单"
                dict="sys_permission,name,id"
                pidField="parent_id"
+                hasChildField="is_leaf"
                pidValue=""
              />
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中的值(v-model)：{{ formData.treeSelect }}</a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="下拉树多选">
+            <a-form-model-item label="下拉树多选" prop="treeSelectMultiple">
              <j-tree-select
                v-model="formData.treeSelectMultiple"
                placeholder="请选择菜单"
                dict="sys_permission,name,id"
                pidField="parent_id"
+                hasChildField="is_leaf"
                pidValue=""
                multiple
              />
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中的值(v-model)：{{ formData.treeSelectMultiple }}</a-col>
        </a-row>
@ -285,9 +296,9 @@
        <!-- 分类字典树 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="分类字典树">
+            <a-form-model-item label="分类字典树" prop="selectCategory">
              <j-category-select v-model="formData.selectCategory" pcode="B01" :multiple="true"/>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选中的值(v-model)：{{ formData.selectCategory }}</a-col>
        </a-row>
@ -295,23 +306,23 @@
        <!-- VueCron -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="cron表达式">
-              <j-cron ref="innerVueCron" v-decorator="['cronExpression', { initialValue: '* * * * * ? *' }]" @change="setCorn"></j-cron>
-            </a-form-item>
+            <a-form-model-item label="cron表达式" prop="cronExpression">
+               <j-easy-cron v-model="formData.cronExpression"></j-easy-cron>
+            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="高级查询">
+            <a-form-model-item label="高级查询">
              <j-super-query :fieldList="superQuery.fieldList" />
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="高级查询（自定义按钮）">
+            <a-form-model-item label="高级查询（自定义按钮）">
              <j-super-query :fieldList="superQuery.fieldList">
                <!--
                    v-slot:button 可以更高自由的定制按钮
@ -334,34 +345,34 @@
                  </a-button-group>
                </template>
              </j-super-query>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="图片上传">
-              <j-image-upload v-model="imgList"></j-image-upload>
-            </a-form-item>
+            <a-form-model-item label="图片上传" prop="imgList">
+              <j-image-upload bizPath="scott/pic" v-model="formData.imgList"></j-image-upload>
+            </a-form-model-item>
          </a-col>
-          <a-col :span="12">选中的值(v-model)：{{ imgList }}</a-col>
+          <a-col :span="12">选中的值(v-model)：{{ formData.imgList }}</a-col>
        </a-row>
        <a-row :gutter="24" style="margin-top: 65px;margin-bottom:50px;">
          <a-col :span="12">
-            <a-form-item label="文件上传">
-              <j-upload v-model="fileList"></j-upload>
-            </a-form-item>
+            <a-form-model-item label="文件上传" prop="fileList">
+              <j-upload v-model="formData.fileList"></j-upload>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">
            选中的值(v-model)：
-            <j-ellipsis :value="fileList" :length="30" v-if="fileList.length>0"/>
+            <j-ellipsis :value="formData.fileList" :length="30" v-if="formData.fileList.length>0"/>
          </a-col>
        </a-row>

        <!-- 特殊查询组件 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="特殊查询组件">
+            <a-form-model-item label="特殊查询组件" prop="jInput">
              <a-row>
                <a-col :span="15">
                  <j-input v-model="formData.jInput" :type="jInput.type"/>
@ -371,27 +382,27 @@
                  <a-select v-model="jInput.type" :options="jInput.options"></a-select>
                </a-col>
              </a-row>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">输入的值(v-model)：{{ formData.jInput }}</a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="15">
-            <a-form-item label="MarkdownEditor" style="min-height: 300px">
-              <j-markdown-editor v-model="content"></j-markdown-editor>
-            </a-form-item>
+            <a-form-model-item label="MarkdownEditor" prop="content" style="min-height: 300px">
+              <j-markdown-editor v-model="formData.content"></j-markdown-editor>
+            </a-form-model-item>
          </a-col>
          <a-col :span="9">
-            输入的值(v-model)：{{ content }}
+            输入的值(v-model)：{{ formData.content }}
          </a-col>
        </a-row>

        <!-- 省市县级联 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="省市县级联">
+            <a-form-model-item label="省市县级联" prop="areaLinkage1">
              <j-area-linkage v-model="formData.areaLinkage1" type="cascader"/>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">输入的值(v-model)：{{ formData.areaLinkage1 }}</a-col>
        </a-row>
@ -400,9 +411,9 @@
        <!-- 省市县级联 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="省市县级联">
+            <a-form-model-item label="省市县级联" prop="areaLinkage2">
              <j-area-linkage v-model="formData.areaLinkage2" type="select"/>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">输入的值(v-model)：{{ formData.areaLinkage2 }}</a-col>
        </a-row>
@ -410,23 +421,23 @@
        <!-- 功能示例：关闭当前页面 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="功能示例：关闭当前页面">
+            <a-form-model-item label="功能示例：关闭当前页面">
              <a-button type="primary" @click="handleCloseCurrentPage">点击关闭当前页面</a-button>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
        </a-row>

        <!-- JPopup示例 -->
        <a-row :gutter="24">
          <a-col :span="12">
-            <a-form-item label="JPopup示例">
+            <a-form-model-item label="JPopup示例" prop="jPopup">
              <j-popup v-model="formData.jPopup" code="demo" field="name" orgFields="name" destFields="name" :multi="true"/>
-            </a-form-item>
+            </a-form-model-item>
          </a-col>
          <a-col :span="12">选择的值(v-model)：{{ formData.jPopup }}</a-col>
        </a-row>

-      </a-form>
+      </a-form-model>
    </div>

  </a-card>
@ -448,6 +459,7 @@
  import JSelectMultiple from '@/components/jeecg/JSelectMultiple'
  import JTreeDict from "../../components/jeecg/JTreeDict.vue";
  import JCron from "@/components/jeecg/JCron.vue";
+  import JEasyCron from "@/components/jeecg/JEasyCron";
  import JTreeSelect from '@/components/jeecg/JTreeSelect'
  import JSuperQuery from '@/components/jeecg/JSuperQuery'
  import JUpload from '@/components/jeecg/JUpload'
@ -480,7 +492,7 @@
      JCheckbox,
      JCodeEditor,
      JDate, JEditor, JEllipsis, JSlider, JSelectMultiple,
-      JCron, JTreeSelect, JSuperQuery, JMultiSelectTag,
+      JCron, JEasyCron,JTreeSelect, JSuperQuery, JMultiSelectTag,
      JSearchSelectTag
    },
    data() {
@ -490,49 +502,35 @@
        formData: {
          areaLinkage1: '110105',
          areaLinkage2: '140221',
-          sex: 1
-        },
-        form: this.$form.createForm(this),
-        departId: '57197590443c44f083d42ae24ef26a2c,a7d7e77e06c84325a40932163adcdaa6',
-        orgCodes: 'A02A01,A02A02',
-        userIds: 'admin',
-        multiUser: 'admin,jeecg',
-        jcheckbox: {
-          values: 'spring,jeecgboot',
-          options: [
-            { label: 'Jeecg', value: 'jeecg' },
-            { label: 'Jeecg-Boot', value: 'jeecgboot' },
-            { label: 'Spring', value: 'spring', disabled: true },
-            { label: 'MyBaits', value: 'mybatis' }
-          ]
-        },
-        jcodedditor: {
-          value: `function sayHi(word) {
-  alert(word)
-}
-sayHi('hello, world!')`
-        },
-        jdate: {
-          value: '2019-5-10 15:33:06'
-        },
-        jeditor: {
-          value: '<h2 style="text-align: center;">富文本编辑器</h2> <p>这里是富文本编辑器。</p>'
-        },
-        jellipsis: {
-          value: '这是一串很长很长的文字段落。这是一串很长很长的文字段落。这是一串很长很长的文字段落。这是一串很长很长的文字段落。'
-        },
-        jslider: {
-          value: false
-        },
-        jselectMultiple: {
-          options: [
-            { text: '字符串', value: 'String' },
-            { text: '整数型', value: 'Integer' },
-            { text: '浮点型', value: 'Double' },
-            { text: '布尔型', value: 'Boolean' }
-          ],
-          value: 'Integer,Boolean'
+          sex: 1,
+          orgCodes: 'A02A01,A02A02',
+          departId: '57197590443c44f083d42ae24ef26a2c,a7d7e77e06c84325a40932163adcdaa6',
+          userIds: 'admin',
+          multiUser: 'admin,jeecg',
+          jCheckbox: 'spring,jeecgboot',
+          jCodeEditor: `function sayHi(word) {\n  alert(word)\n}\nsayHi('hello, world!')`,
+          jDate: '2019-5-10 15:33:06',
+          jEditor: '<h2 style="text-align: center;">富文本编辑器</h2> <p>这里是富文本编辑器。</p>',
+          jEllipsis: '这是一串很长很长的文字段落。这是一串很长很长的文字段落。这是一串很长很长的文字段落。这是一串很长很长的文字段落。',
+          jSlider: false,
+          jSelectMultiple: 'Integer,Boolean',
+          imgList:[],
+          fileList:[],
+          content: '',
+          cronExpression: '* * * * * ? *',
        },
+        jCheckboxOptions: [
+          {label: 'Jeecg', value: 'jeecg'},
+          {label: 'Jeecg-Boot', value: 'jeecgboot'},
+          {label: 'Spring', value: 'spring', disabled: true},
+          {label: 'MyBaits', value: 'mybatis'}
+        ],
+        jSelectMultipleOptions: [
+          {text: '字符串', value: 'String'},
+          {text: '整数型', value: 'Integer'},
+          {text: '浮点型', value: 'Double'},
+          {text: '布尔型', value: 'Boolean'}
+        ],
        modal: {
          title: '这里是标题',
          visible: false,
@ -556,8 +554,6 @@ sayHi('hello, world!')`
            },
          ]
        },
-        fileList:[],
-        imgList:[],
        jInput: {
          type: 'like',
          options: [
@ -567,7 +563,6 @@ sayHi('hello, world!')`
            { value: 'le', label: '小于等于（le)' },
          ],
        },
-        content: '',
        searchOptions:[{
          text:"选项一",
          value:"1"
@ -599,10 +594,10 @@ sayHi('hello, world!')`
      handleChange() {
      },
      getDepartIdValue() {
-        return this.form.getFieldValue('departId')
+        return this.formData.departId
      },
      getOrgCodesValue() {
-        return this.form.getFieldValue('orgCodes')
+        return this.formData.orgCodes
      },
      changeMe() {
        console.log('you so ...  , change Me')
@ -626,12 +621,7 @@ sayHi('hello, world!')`
        this.selectedDepUsers = selectedDepUsers
      },
      handleJSliderSuccess(value) {
-        this.jslider.value = value
-      },
-      setCorn(data){
-        this.$nextTick(() => {
-          this.form.cronExpression = data;
-        })
+        this.formData.jSlider = value
      },

      handleCloseCurrentPage() {
--- a/ant-design-vue-jeecg/src/views/jeecg/ThirdAppMessageTest.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/ThirdAppMessageTest.vue
@ -0,0 +1,208 @@
+<template>
+  <a-card :bordered="false">
+    <a-spin :spinning="loading">
+      <a-form-model ref="form" :model="model" :rules="rules">
+        <a-tabs>
+          <a-tab-pane tab="消息选项" key="1">
+            <a-form-model-item label="测试APP" prop="app" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-select v-model="model.app" placeholder="请选择测试APP" :options="appOptions"/>
+            </a-form-model-item>
+            <a-form-model-item label="发送给所有人" prop="sendAll" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-switch checkedChildren="是" unCheckedChildren="否" v-model="model.sendAll" @change="onSendAllChange"/>
+            </a-form-model-item>
+            <a-form-model-item label="接收人" prop="receiver" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <j-select-multi-user v-model="model.receiver" :disabled="model.sendAll" placeholder="请选择接收人"/>
+            </a-form-model-item>
+            <a-form-model-item label="消息内容" prop="content" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-textarea :rows="5" v-model="model.content" placeholder="请输入消息内容"/>
+            </a-form-model-item>
+            <div style="text-align: center;">
+              <a-button type="primary" size="large" @click="onSend" style="width: 120px;">发送</a-button>
+            </div>
+          </a-tab-pane>
+        </a-tabs>
+
+        <a-tabs>
+          <a-tab-pane tab="测试结果（刷新自动清空）" key="1">
+            <a-table
+              rowKey="id"
+              bordered
+              size="middle"
+              :columns="columns"
+              :dataSource="dataSource"
+            >
+              <div slot="action" slot-scope="text, record">
+                <template v-if="record.app==='DINGTALK'">
+                  <a-popconfirm v-if="!record.recalled" title="确定吗？" @confirm="handleRecall(record)">
+                    <a @click="">撤回</a>
+                  </a-popconfirm>
+                  <span v-else>已撤回</span>
+                </template>
+                <template v-else>-</template>
+              </div>
+            </a-table>
+
+          </a-tab-pane>
+        </a-tabs>
+      </a-form-model>
+    </a-spin>
+  </a-card>
+</template>
+
+<script>
+import { loadEnabledTypes } from '@/components/jeecgbiz/thirdApp/JThirdAppButton'
+import { postAction } from '@/api/manage'
+import { randomUUID } from '@/utils/util'
+
+export default {
+  name: 'ThirdAppMessageTest',
+  data() {
+    return {
+      loading: false,
+      labelCol: {span: 6},
+      wrapperCol: {span: 12},
+      model: {
+        sendAll: false,
+      },
+      enabledTypes: {},
+      columns: [
+        {
+          title: '#',
+          dataIndex: '',
+          key: 'rowIndex',
+          width: 60,
+          align: 'center',
+          customRender: (t, r, index) => {
+            return this.dataSource.length - index
+          }
+        },
+        {
+          title: '测试APP',
+          align: 'center',
+          dataIndex: 'app',
+          customRender: (t, r, index) => {
+            if (t === 'WECHAT_ENTERPRISE') {
+              return '企业微信'
+            }
+            if (t === 'DINGTALK') {
+              return '钉钉'
+            } else {
+              return t
+            }
+          }
+        },
+        {
+          title: '接收人',
+          align: 'center',
+          dataIndex: 'receiver',
+          customRender: (t, r, index) => {
+            return r.sendAll ? '【全体】' : t
+          }
+        },
+        {
+          title: '消息内容',
+          align: 'center',
+          dataIndex: 'content'
+        },
+        {
+          title: 'response',
+          align: 'center',
+          dataIndex: 'response'
+        },
+        {
+          title: '操作',
+          dataIndex: 'action',
+          align: 'center',
+          fixed: 'right',
+          width: 80,
+          scopedSlots: {customRender: 'action'}
+        }
+      ],
+      dataSource: [],
+    }
+  },
+  computed: {
+    rules() {
+      return {
+        app: [{required: true, message: '请选择测试APP'}],
+        url: [{required: this.show, message: '请输入菜单路径!'}],
+        receiver: [{required: !this.model.sendAll, message: '请选择接收人'}],
+        content: [{required: true, message: '消息内容不能为空'}]
+      }
+    },
+    appOptions() {
+      return [
+        {
+          label: `企业微信${this.enabledTypes.wechatEnterprise ? '' : '（已禁用）'}`,
+          value: 'WECHAT_ENTERPRISE',
+          disabled: !this.enabledTypes.wechatEnterprise
+        },
+        {
+          label: `钉钉${this.enabledTypes.dingtalk ? '' : '（已禁用）'}`,
+          value: 'DINGTALK',
+          disabled: !this.enabledTypes.dingtalk
+        },
+      ]
+    },
+  },
+  created() {
+    this.loadEnabledTypes()
+  },
+  methods: {
+
+    // 获取启用的第三方App
+    async loadEnabledTypes() {
+      this.enabledTypes = await loadEnabledTypes()
+    },
+
+    onSendAllChange() {
+      this.$refs.form.clearValidate('receiver')
+    },
+
+    onSend() {
+      this.$refs.form.validate((ok, err) => {
+        if (ok) {
+          this.loading = true
+          postAction('/sys/thirdApp/sendMessageTest', this.model).then(({success, result, message}) => {
+            if (success) {
+              let response = ''
+              try {
+                response = JSON.stringify(result)
+              } catch (e) {
+                response = result
+              }
+              this.dataSource.unshift(Object.assign({id: randomUUID()}, this.model, {response}))
+            } else {
+              this.$message.warning(message)
+            }
+          }).finally(() => this.loading = false)
+        }
+      })
+    },
+
+    handleRecall(record) {
+      try {
+        let response = JSON.parse(record.response)
+        postAction('/sys/thirdApp/recallMessageTest', {
+          app: record.app,
+          msg_task_id: response.result
+        }).then(res => {
+          if (res.success) {
+            this.$set(record, 'recalled', true)
+            this.$message.success(res.message)
+          } else {
+            this.$message.warning(res.message)
+          }
+        }).catch(e => this.$message.warning(e.message || e))
+      } catch (e) {
+        this.$message.warning(e.message || e)
+      }
+    },
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>
--- a/ant-design-vue-jeecg/src/views/jeecg/helloworld.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/helloworld.vue
@ -1,38 +1,38 @@
 <template>
  <a-card :bordered="false">
-    <a-form @submit="handleSubmit" :form="form">
+    <a-form-model ref="form" :model="model" :rules="rules" @submit="handleSubmit">
      <a-row>
      <a-col :md="24" :sm="24">
-      <a-form-item label="Note" :labelCol="{ span: 7 }" :wrapperCol="{ span: 15 }">
-        <a-input v-decorator="['note',{rules: [{ required: true, message: 'Please input your note!' }]}]"/>
-      </a-form-item>
+      <a-form-model-item label="Note" prop="note" :labelCol="{ span: 7 }" :wrapperCol="{ span: 15 }">
+        <a-input v-model="model.note"/>
+      </a-form-model-item>
      </a-col>
      </a-row>
      <a-row>
      <a-col :md="24" :sm="24">
-      <a-form-item label="Gender" :labelCol="{ span: 7 }" :wrapperCol="{ span: 15 }">
-        <a-select v-decorator="['gender',{rules: [{ required: true, message: 'Please select your gender!' }]}]" placeholder="Select a option and change input text above" @change="this.handleSelectChange">
+      <a-form-model-item label="Gender" prop="gender" :labelCol="{ span: 7 }" :wrapperCol="{ span: 15 }">
+        <a-select v-model="model.gender" placeholder="Select a option and change input text above" @change="handleSelectChange">
          <a-select-option value="male">male</a-select-option>
          <a-select-option value="female">female</a-select-option>
        </a-select>
-      </a-form-item>
+      </a-form-model-item>
      </a-col>
      </a-row>
      <a-row>
      <a-col :md="24" :sm="24">
-      <a-form-item label="Gender" :labelCol="{ span: 7 }" :wrapperCol="{ span: 15 }">
+      <a-form-model-item label="Gender" prop="cascader" :labelCol="{ span: 7 }" :wrapperCol="{ span: 15 }">
        <a-cascader :options="areaOptions" @change="onChange" :showSearch="{filter}" placeholder="Please select" />
-      </a-form-item>
+      </a-form-model-item>
      </a-col>
      </a-row>
-      <a-form-item :wrapperCol="{ span: 12, offset: 5 }">
+      <a-form-model-item :wrapperCol="{ span: 12, offset: 5 }">
        <a-col :md="24" :sm="24">
-          <a-form-item :wrapperCol="{ span: 12, offset: 5 }">
+          <a-form-model-item :wrapperCol="{ span: 12, offset: 5 }">
            <a-button type="primary" htmlType="submit">Submit</a-button>
-          </a-form-item>
+          </a-form-model-item>
        </a-col>
-      </a-form-item>
-    </a-form>
+      </a-form-model-item>
+    </a-form-model>
  </a-card>
 </template>

@ -43,24 +43,27 @@
    data () {
      return {
        formLayout: 'horizontal',
-        form: this.$form.createForm(this),
+        model: {},
+        rules: {
+          note: [{required: true, message: 'Please input your note!'}],
+          gender:[{ required: true, message: 'Please select your gender!' }]
+        },
        areaOptions:[]
      }
    },
    methods: {
      handleSubmit (e) {
        e.preventDefault()
-        this.form.validateFields((err, values) => {
-          if (!err) {
-            console.log('Received values of form: ', values)
+        this.$refs.form.validate((ok, err) => {
+          if (ok) {
+            console.log('Received values of form: ', this.model)
+            this.$message.success('succeed!')
          }
        })
      },
      handleSelectChange (value) {
        console.log(value)
-        this.form.setFieldsValue({
-          note: `Hi, ${value === 'male' ? 'man' : 'lady'}!`,
-        })
+        this.model.note = `Hi, ${value === 'male' ? 'man' : 'lady'}!`
      },
      onChange(value, selectedOptions) {
        console.log(value, selectedOptions);
--- a/ant-design-vue-jeecg/src/views/jeecg/modules/JEditableTable/DefaultTable.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/modules/JEditableTable/DefaultTable.vue
@ -99,7 +99,11 @@
            placeholder: '点击上传',
            token: true,
            responseName: 'message',
-            action: window._CONFIG['domianURL'] + '/sys/common/upload'
+            action: window._CONFIG['domianURL'] + '/sys/common/upload',
+            data: {
+              biz: 'temp',
+              // 更多扩展参数
+            },
          },
          {
            title: '字段类型',
--- a/ant-design-vue-jeecg/src/views/jeecg/modules/VueCronModal.vue
+++ b/ant-design-vue-jeecg/src/views/jeecg/modules/VueCronModal.vue
@ -1,6 +1,6 @@
 <template>
  <a-modal
-    title="corn表达式"
+    title="cron表达式"
    :width="modalWidth"
    :visible="visible"
    :confirmLoading="confirmLoading"
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
zhangdaiscott	a39bb0ce5f	修改mysql脚本执行报错问题、支持生成大写QRTZ表	2021-12-07 19:16:25 +08:00
zhangdaiscott	a43ccf6f31	用户数据量较大时，功能测试报错 issues/3196	2021-12-06 09:32:13 +08:00
zhangdaiscott	1e2a74a65f	用户数据量较大时，功能测试报错（通过部门选择用户，左侧部门数据改成异步加载） issues/3196	2021-12-06 00:15:27 +08:00
zhangdaiscott	6c362861a0	【#3203】JSelectBizComponent columns 建议开放customRender等方法类配置]	2021-12-06 00:08:29 +08:00
zhangdaiscott	2a5ec11660	【issues/I4IFWX】定时任务表达式，”星期“一栏错误]	2021-12-06 00:04:58 +08:00
zhangdaiscott	509be1e382	Result OK(String msg)方法会造成兼容性问题 issues/I4IP3D issues/3195	2021-11-22 15:13:59 +08:00
zhangdaiscott	80601e0ccd	修改Dockerfile，将代码生成模板文件直接放到与jar包同级目录，确保发布后，代码生成功能直接可用，不需要做二次处理	2021-11-22 09:35:33 +08:00
zhangdaiscott	435f467646	富文本框JEditor，属性设置下拉选层级显示 #3170	2021-11-18 09:37:13 +08:00
zhangdaiscott	644c6801a0	富文本框JEditor，属性设置下拉选层级显示 #3170	2021-11-18 09:36:54 +08:00
zhangdaiscott	1f75c124f1	在线表单的href跳转不能进行筛选 #3154 online 报表 bug #3162	2021-11-17 09:40:50 +08:00
zhangdaiscott	bcbdd383ae	瘦jar打包方式下，所有 excel 文件导入失败 issues/I4CMHK	2021-11-17 09:17:38 +08:00
zhangdaiscott	7a1d4cda96	自定义树控件只显示父节点，子节点无法展开 (此处还原不可再改) /issues/I4HZAL	2021-11-16 21:17:17 +08:00
zhangdaiscott	8bae42049c	jeecg.path.webapp配置无效 issues/3126	2021-11-16 21:16:58 +08:00
zhangdaiscott	09a63610cf	oracle数据库，在线表单编辑保存会报错issues/I4HW20	2021-11-16 18:08:12 +08:00
zhangdaiscott	46e024bfbc	暂时删除vue3模板，因为vue3前端项目未正式发布，减少大家的误解	2021-11-08 15:25:38 +08:00
zhangdaiscott	c767f094fc	我的部门下面的用户分配角色报错(无角色的情况下)	2021-11-06 19:04:20 +08:00
zhangdaiscott	42e0a938da	我的部门空数据的时候报错	2021-11-06 19:02:53 +08:00
zhangdaiscott	3f4b40ea74	云存储上传文件,不自定义域名出问题	2021-11-06 19:01:04 +08:00
zhangdaiscott	f210df80e6	严重bug,解决部分功能操作,提示文本空问题	2021-11-06 19:00:08 +08:00
zhangdaiscott	0f79e8efef	严重bug,解决【用户管理】选择部门和上级以后，负责部门没有数据可选	2021-11-06 18:59:24 +08:00
zhangdaiscott	d6251419e6	严重bug,解决菜单数据规则，选择自定义SQL 规则值无法输入空格问题	2021-11-06 18:58:57 +08:00
zhangdaiscott	7db5f7f3e9	1	2021-11-05 12:53:35 +08:00
zhangdaiscott	cd79eb7597	开源协议补充：不得基于该平台软件的基础，修改包装成一个与JeecgBoot平台软件功能类似的产品进行发布、销售，或与JeecgBoot参与同类软件产品市场的竞争	2021-11-05 12:40:39 +08:00
zhangdaiscott	812cbce06b	在线演示(VUE3beta版)	2021-10-29 09:40:25 +08:00
zhangdaiscott	3b92086047	JeecgBoot低代码平台 3.0版本发布—新里程牌开始，迎接VUE3到来！！	2021-10-27 14:33:50 +08:00
zhangdaiscott	0fa24b8518	JeecgBoot低代码平台 3.0版本发布—新里程牌开始，迎接VUE3版本到来！！	2021-10-27 11:48:19 +08:00
zhangdaiscott	7e7ea37857	JeecgBoot低代码平台 3.0版本发布—新里程牌开始，迎接VUE3版本到来！！	2021-10-27 11:33:09 +08:00
zhangdaiscott	e550843fd1	JeecgBoot低代码平台 3.0版本发布—新里程牌开始，迎接VUE3版本到来！！	2021-10-27 10:55:52 +08:00
zhangdaiscott	3cb20a6a43	JeecgBoot低代码平台 3.0版本发布—新里程牌开始，迎接VUE3版本到来！！	2021-10-27 10:28:39 +08:00
zhangdaiscott	0acea1abff	JeecgBoot低代码平台 3.0版本发布—新里程牌开始，迎接VUE3版本到来！！	2021-10-27 10:28:15 +08:00
zhangdaiscott	9760185bf6	JeecgBoot低代码平台 3.0版本发布—新里程牌开始，迎接VUE3版本到来！！	2021-10-27 10:26:33 +08:00
zhangdaiscott	75be8dd5b1	online下拉搜索组件，配置字典sql带'=' 提示sign失败问题处理	2021-10-21 16:31:10 +08:00
zhangdaiscott	a7893c4941	qq群满了，新增⑤860162132	2021-10-19 13:23:47 +08:00
zhangdaiscott	ef97f700ab	授权首页菜单后，自定义首页功能不生效 #3069	2021-10-16 19:41:55 +08:00
zhangdaiscott	6fb01abbc5	online学习视频修改	2021-10-14 16:13:02 +08:00
zhangdaiscott	fe1b58ade2	还原long精度改造，导致了两个严重问题 1表单的日期字段，不能显示日期格式 2前端分页插件报错	2021-09-26 17:35:30 +08:00
zhangdaiscott	1998867ca6	Long转json精度丢失的配置未生效	2021-09-14 18:12:16 +08:00
zhangdaiscott	a351204865	暂时还原代码,改的有问题 [Long转json精度丢失的配置未生效]	2021-09-14 17:48:53 +08:00
zhangdaiscott	4da1948cb0	路由网关禁用Demo配置后，系统仍可以通过网关路由到Demo服务。issues/I49457	2021-09-14 17:24:45 +08:00
zhangdaiscott	55ebea88af	消息队列中报微服务异常 issues/I4977W	2021-09-14 17:08:24 +08:00
zhangdaiscott	4b830b37c9	消息队列中报微服务异常 issues/I4977W	2021-09-14 16:43:14 +08:00
zhangdaiscott	537cc05601	Long转json精度丢失的配置未生效issues/I49DNI	2021-09-14 16:32:31 +08:00
zhangdaiscott	8f9f27c550	同步钉钉人员到本地错误 #2990	2021-09-14 10:09:56 +08:00
zhangdaiscott	57f72dd4d0	issues/I48I0E 省市三级联动列表无法显示	2021-09-11 18:45:23 +08:00
zhangdaiscott	e2e19fa456	内容更新	2021-09-03 12:09:01 +08:00
zhangdaiscott	98a5148e52	【issues/I471XE】钉钉人员同步时手机号未能正确同步	2021-08-31 22:29:01 +08:00
zhangdaiscott	c2ae049ad7	issues/2959 微服务版集成企业微信单点登录	2021-08-31 22:28:28 +08:00
zhangdaiscott	b44acde9b5	【issues/2939】JEditable 下子表 addBefore()方法，在其中自定义调用其他方法不生效	2021-08-31 22:28:04 +08:00
zhangdaiscott	db467f22a7	docker文档调整	2021-08-27 18:08:08 +08:00
zhangdaiscott	53c91fc349	README.MD 里面前端目录写错了 issues/I477T1	2021-08-27 09:37:07 +08:00
zhangdaiscott	92028a7e44	JVXETable提供更便捷的三级联动机制,解决联动展示与选择BUG #2867	2021-08-20 11:13:42 +08:00
zhangdaiscott	8ce40fa3d4	升级2.4.6后Online表单开发无法使用“一对多”的“ERP主题” issues/I468JY	2021-08-18 20:23:53 +08:00
zhangdaiscott	05c7f76484	列表点击详情，出现id，好难看 #2922	2021-08-18 16:25:10 +08:00
zhangdaiscott	71a1e9a63b	oline在线内嵌子表主表与附表，设置扩展参数限制宽度不起作用 #2881 online java 增强当设置的增强过多时，显示异常 #2880 文本太长时，会遮挡页面issues/I44F0R	2021-08-18 15:59:44 +08:00
zhangdaiscott	0606aa560a	mybatisPlus升级，拦截器排除写法修改	2021-08-17 13:48:26 +08:00
zhangdaiscott	1bbca48ba8	sqlserver同步数据库报错，SQL to parse以后与sqlserver不兼容 #2915 【升级mybatisPlus导致，多租户插件SqlServer下给添加字段sql多加了一个column】	2021-08-17 13:35:30 +08:00
zhangdaiscott	d0c15f2302	解决新版IE11兼容问题	2021-08-17 11:50:00 +08:00
zhangdaiscott	c9ff5d51b4	解决2.4.6新版问题：js增强点击无效 #2912	2021-08-16 16:38:00 +08:00
zhangdaiscott	cce5d785e4	解决升级到2.4.6后button type='danger'时的样式 #2909	2021-08-15 10:14:25 +08:00
zhangdaiscott	234022d905	修复低级bug #2906	2021-08-14 19:39:42 +08:00
zhangdaiscott	ab529aaf6c	2.4.6版本发布	2021-08-13 20:36:27 +08:00
zhangdaiscott	07c6d1a23d	2.4.6 版本发布	2021-08-13 20:35:59 +08:00
zhangdaiscott	8f780e180e	JeecgBoot 2.4.6版本发布	2021-08-13 16:55:43 +08:00
zhangdaiscott	87f17b9fc5	JeecgBoot 2.4.6版本发布	2021-08-13 16:18:52 +08:00
zhangdaiscott	5a93d001b4	JeecgBoot 2.4.6版本发布(gateway默认采用database中的路由配置)	2021-08-13 16:18:31 +08:00
zhangdaiscott	d822552e0c	JeecgBoot 2.4.6版本发布(调整nacos配置)	2021-08-13 16:18:03 +08:00
zhangdaiscott	832fa30cc9	JeecgBoot 2.4.6版本发布	2021-08-13 15:28:22 +08:00
zhangdaiscott	3af1b390f1	JeecgBoot 2.4.6版本发布	2021-08-13 15:27:53 +08:00
zhangdaiscott	a3695151dc	JeecgBoot 2.4.6版本发布	2021-08-13 15:27:32 +08:00
zhangdaiscott	c269d7637f	JeecgBoot 2.4.6版本发布	2021-08-13 15:26:35 +08:00
zhangdaiscott	664413e5d7	JeecgBoot 2.4.6版本发布	2021-08-13 15:26:20 +08:00
zhangdaiscott	986f909628	issue格式要求	2021-08-09 16:25:21 +08:00
zhangdaiscott	221940cc5f	issue格式要求，发issue请详细	2021-08-09 16:13:32 +08:00
zhangdaiscott	2a392fb738	issue格式要求	2021-08-02 18:06:14 +08:00
zhangdaiscott	2b47cd0c34	升级下说明	2021-07-28 17:28:51 +08:00
zhangdaiscott	1900f3fe77	Sign 签名校验失败 #2728	2021-07-01 12:45:17 +08:00
zhangdaiscott	37fe6fea69	表字典接口存在SQL注入漏洞，增加签名拦截器自定义组件验签失败 issues/I3XNK1	2021-06-25 15:30:47 +08:00
zhangdaiscott	3fbb5ee4ad	登录账号提示修改	2021-06-25 13:41:33 +08:00
zhangdaiscott	b1958fd295	HW21-0499 表字典接口存在SQL注入漏洞，增加签名拦截器	2021-06-25 11:50:34 +08:00
zhangdaiscott	8b3d83ae0b	HW21-0499 表字典接口存在SQL注入漏洞，增加签名拦截器	2021-06-21 20:37:23 +08:00
zhangdaiscott	081c2615be	HW21-0499 表字典接口存在SQL注入漏洞，增加签名拦截器	2021-06-21 20:37:09 +08:00
zhangdaiscott	f97c675771	online表单数据源配置，数据库类型识别错误 #2671	2021-06-21 19:29:37 +08:00
zhangdaiscott	1beddbf8e8	online表单数据源配置，不支持数据库密码加密 #2672	2021-06-21 19:29:21 +08:00
zhangdaiscott	8921e84303	群满，加新群 ④774126647	2021-06-17 17:44:43 +08:00
zhangdaiscott	43329545d8	【gitee/I3HTFI】自定义树控件的表单里的外键直接显示id不显示name 新增监控在线用户阿里监控去掉广告	2021-06-17 10:39:59 +08:00
zhangdaiscott	50333488a5	解决issue#2639 2.4.5升级后出现后端排序报错	2021-06-07 18:21:13 +08:00
zhangdaiscott	624444e3b9	用户添加页面无法修改手机号	2021-06-04 16:52:07 +08:00
zhangdaiscott	1cd0f2627d	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-04 11:14:53 +08:00
zhangdaiscott	18007b0524	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-03 14:04:31 +08:00
zhangdaiscott	d92861ad77	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-03 13:59:37 +08:00
zhangdaiscott	8a6181b108	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-02 16:25:47 +08:00
zhangdaiscott	6840772959	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-02 15:51:21 +08:00
zhangdaiscott	1bc7ee3345	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-02 15:38:47 +08:00
zhangdaiscott	5f25f726c2	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-02 15:38:28 +08:00
zhangdaiscott	9b14d2d6a5	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-02 15:38:14 +08:00
zhangdaiscott	130f2bc4be	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-02 15:37:49 +08:00
zhangdaiscott	832bc376be	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-02 15:32:35 +08:00
zhangdaiscott	432385fc14	新增一种 Cron表达式选择组件	2021-06-02 15:28:23 +08:00
zhangdaiscott	4d5ac2b518	JeecgBoot低代码平台 2.4.5 版本发布，钉钉与企业微信集成版本	2021-06-02 15:26:58 +08:00
zhangdaiscott	b83c26b8fd	熔断默认时间改成3秒	2021-06-02 15:25:58 +08:00
zhangdaiscott	b59fc67696	新增图表API接口	2021-06-02 15:22:45 +08:00
zhangdaiscott	af3afc7263	删除不需要的底层工具包	2021-06-02 15:21:16 +08:00
zhangdaiscott	63c3dd26f5	即将发布新版	2021-06-02 09:37:32 +08:00
zhangdaiscott	892196fe9a	外部URL菜单加载为空为空	2021-04-14 22:01:47 +08:00
zhangdaiscott	bbda918cde	升级jimureport，修复已知bug	2021-04-13 16:15:10 +08:00
zhangdaiscott	003ec82f48	阿里oos桶名字修改	2021-04-13 16:14:47 +08:00
zhangdaiscott	4992faf66c	minidao db类型说明、阿里oos桶名字修改	2021-04-13 16:14:35 +08:00
zhangdaiscott	34c612d9e4	兼容数据库说明	2021-04-13 16:11:58 +08:00
zhangdaiscott	844f1e228c	外部url菜单，内部打开是，也支持通过 ${token}方式传递当前登录TOKEN	2021-04-07 14:07:41 +08:00
zhangdaiscott	cf5fde80d4	nacos建表语句优化	2021-04-06 14:06:55 +08:00
zhangdaiscott	49ea36c50f	升级脚本到积木报表的最新版本	2021-04-06 14:06:35 +08:00
zhangdaiscott	f6e2b67c61	升级SQL:积木报表的示例	2021-04-05 19:01:12 +08:00
zhangdaiscott	69a4a7df6d	重构登录注册页面为a-form-model模式	2021-04-05 18:58:36 +08:00
zhangdaiscott	649f99664e	积木报表升级到最新版本1.3.1-beta2	2021-04-05 18:53:14 +08:00