JEECG-BOOT 2.0.2版本发布

README.md

@@ -6,7 +6,7 @@
 Jeecg-Boot 快速开发平台（前后端分离版本）
 ===============
 
-当前最新版本： 2.0.1（发布日期：20190603）
+当前最新版本： 2.0.2（发布日期：20190708）
 
 [![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-Scott-orange.svg)](https://blog.csdn.net/zhangdaiscott)
@@ -21,7 +21,7 @@ Jeecg-Boot 快速开发平台（前后端分离版本）
 
 <h4 align="center">Java RAD framework for enterprise web applications</h4>
 
-Jeecg-Boot 是一款基于代码生成器的智能开发平台！采用前后端分离架构：SpringBoot，Mybatis，Shiro，JWT，Vue&Ant Design。强大的代码生成器让前端和后台代码一键生成，不需要写任何代码，保持jeecg一贯的强大，绝对是全栈开发福音！！ JeecgBoot在提高UI能力的同时，降低了前后分离的开发成本，JeecgBoot还独创在线开发模式（No代码概念），一系列在线智能开发：在线配置表单、在线配置报表、在线图表设计、在线设计流程等等。
+Jeecg-Boot 是一款基于SpringBoot+代码生成器的快速开发平台！前后端分离架构：SpringBoot,Ant Design Vue,Mybatis,Shiro,JWT。强大的代码生成器让前端和后台代码一键生成，不需要写任何代码，保持jeecg一贯的强大，绝对是全栈开发福音！！ JeecgBoot在提高UI能力的同时，降低了前后分离的开发成本，JeecgBoot还独创在线开发模式（No代码概念），一系列在线智能开发：在线配置表单、在线配置报表、在线图表设计、在线设计流程等等。
 
 JEECG宗旨是: 简单功能由Online Coding配置实现（在线配置表单、在线配置报表、在线图表设计、在线设计流程、在线设计表单），复杂功能由代码生成器生成进行手工Merge，既保证了智能又兼顾了灵活; 
 业务流程采用工作流来实现、扩展出任务接口，供开发编写业务逻辑，表单提供多种解决方案： 表单设计器、online配置表单、编码表单。同时实现了流程与表单的分离设计（松耦合）、并支持任务节点灵活配置，既保证了公司流程的保密性，又减少了开发人员的工作量。
@@ -44,7 +44,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
 
 - 入门必看：  [JeecgBoot常见问题大全](http://www.jeecg.org/forum.php?mod=viewthread&tid=7816&extra=page%3D1)
 
-- QQ交流群 ：  ②769925425、①284271917
+- QQ交流群 ：  ①284271917、②769925425
 
 - 参与开源：  [欢迎技术爱好者，加入JEECG开源团队](http://jeecg.com/#/doc/canyu-os)
 
@@ -72,7 +72,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
 * 14.在线流程设计，采用开源Activiti流程引擎，实现在线画流程,自定义表单,表单挂靠,业务流转
 * 15.多数据源：及其简易的使用方式，在线配置数据源配置，便捷的从其他数据抓取数据；
 * 16.国际化：支持多语言，开发国际化项目非常方便；
-* 17.自定义表单，支持用户自定义表单布局，支持单表，一对多表单、支持select、radio、checkbox、textarea、date、popup、列表、宏等控件
+* 17.表单设计器，支持用户自定义表单布局，支持单表，一对多表单、支持select、radio、checkbox、textarea、date、popup、列表、宏等控件
 * 18.专业接口对接机制，统一采用restful接口方式，集成swagger-ui在线接口文档，Jwt token安全验证，方便客户端对接
 * 19.接口安全机制，可细化控制接口授权，非常简便实现不同客户端只看自己数据等控制
 * 20.高级组合查询功能，在线配置支持主子表关联查询，可保存查询历史
@@ -96,7 +96,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
 #### 后端
 - 基础框架：Spring Boot 2.1.3.RELEASE
 
-- 持久层框架：Mybatis-plus_3.0.6
+- 持久层框架：Mybatis-plus_3.1.2
 
 - 安全框架：Apache Shiro 1.4.0，Jwt_3.7.0
 
@@ -111,7 +111,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
 
 #### 前端
  
-- [Vue 2.5.22](https://cn.vuejs.org/),[Vuex](https://vuex.vuejs.org/zh/),[Vue Router](https://router.vuejs.org/zh/)
+- [Vue 2.6.10](https://cn.vuejs.org/),[Vuex](https://vuex.vuejs.org/zh/),[Vue Router](https://router.vuejs.org/zh/)
 - [Axios](https://github.com/axios/axios)
 - [ant-design-vue](https://vuecomponent.github.io/ant-design-vue/docs/vue/introduce-cn/)
 - [webpack](https://www.webpackjs.com/),[yarn](https://yarnpkg.com/zh-Hans/)
@@ -150,6 +150,12 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
 │  ├─表单权限（控制字段禁用、隐藏）
 │  ├─部门管理
 │  └─字典管理
+│  └─树分类字典
+│  └─系统公告
+│  └─我的组织机构
+├─消息中心
+│  ├─消息管理
+│  ├─模板管理
 ├─智能化功能
 │  ├─代码生成器功能（一键生成前后端代码，生成后无需修改直接用，绝对是后端开发福音）
 │  ├─代码生成器模板（提供4套模板，分别支持单表和一对多模型，不同风格选择）
@@ -204,8 +210,7 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
 │  └─省略显示组件
 │  └─时间控件
 │  └─高级查询
-│  └─通用选择用户组件
-│  └─通过组织机构选择用户组件
+│  └─用户选择组件
 │  └─报表组件封装
 │  └─字典组件
 │  └─下拉多选组件
@@ -215,6 +220,9 @@ Jeecg-Boot快速开发平台，可以应用在任何J2EE项目的开发中，尤
 │  └─封装曲线、柱状图、饼状图、折线图等等报表的组件（经过封装，使用简单）
 │  └─在线code编辑器
 │  └─上传文件组件
+│  └─验证码组件
+│  └─树列表组件
+│  └─表单禁用组件
 │  └─等等
 │─更多页面模板
 │  ├─各种高级表单

ant-design-jeecg-vue/src/assets/logo.svg

-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="200px" height="200px" viewBox="0 0 200 200" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 47.1 (45422) - http://www.bohemiancoding.com/sketch -->
-    <title>Group 28 Copy 5</title>
-    <desc>Created with Sketch.</desc>
-    <defs>
-        <linearGradient x1="62.1023273%" y1="0%" x2="108.19718%" y2="37.8635764%" id="linearGradient-1">
-            <stop stop-color="#4285EB" offset="0%"></stop>
-            <stop stop-color="#2EC7FF" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="69.644116%" y1="0%" x2="54.0428975%" y2="108.456714%" id="linearGradient-2">
-            <stop stop-color="#29CDFF" offset="0%"></stop>
-            <stop stop-color="#148EFF" offset="37.8600687%"></stop>
-            <stop stop-color="#0A60FF" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="69.6908165%" y1="-12.9743587%" x2="16.7228981%" y2="117.391248%" id="linearGradient-3">
-            <stop stop-color="#FA816E" offset="0%"></stop>
-            <stop stop-color="#F74A5C" offset="41.472606%"></stop>
-            <stop stop-color="#F51D2C" offset="100%"></stop>
-        </linearGradient>
-        <linearGradient x1="68.1279872%" y1="-35.6905737%" x2="30.4400914%" y2="114.942679%" id="linearGradient-4">
-            <stop stop-color="#FA8E7D" offset="0%"></stop>
-            <stop stop-color="#F74A5C" offset="51.2635191%"></stop>
-            <stop stop-color="#F51D2C" offset="100%"></stop>
-        </linearGradient>
-    </defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="logo" transform="translate(-20.000000, -20.000000)">
-            <g id="Group-28-Copy-5" transform="translate(20.000000, 20.000000)">
-                <g id="Group-27-Copy-3">
-                    <g id="Group-25" fill-rule="nonzero">
-                        <g id="2">
-                            <path d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C99.2571609,26.9692191 101.032305,26.9692191 102.20193,28.1378823 L129.985225,55.8983314 C134.193707,60.1033528 141.017005,60.1033528 145.225487,55.8983314 C149.433969,51.69331 149.433969,44.8756232 145.225487,40.6706018 L108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z" id="Shape" fill="url(#linearGradient-1)"></path>
-                            <path d="M91.5880863,4.17652823 L4.17996544,91.5127728 C-0.519240605,96.2081146 -0.519240605,103.791885 4.17996544,108.487227 L91.5880863,195.823472 C96.2872923,200.518814 103.877304,200.518814 108.57651,195.823472 L145.225487,159.204632 C149.433969,154.999611 149.433969,148.181924 145.225487,143.976903 C141.017005,139.771881 134.193707,139.771881 129.985225,143.976903 L102.20193,171.737352 C101.032305,172.906015 99.2571609,172.906015 98.0875359,171.737352 L28.285908,101.993122 C27.1162831,100.824459 27.1162831,99.050775 28.285908,97.8821118 L98.0875359,28.1378823 C100.999864,25.6271836 105.751642,20.541824 112.729652,19.3524487 C117.915585,18.4685261 123.585219,20.4140239 129.738554,25.1889424 C125.624663,21.0784292 118.571995,14.0340304 108.58055,4.05574592 C103.862049,-0.537986846 96.2692618,-0.500797906 91.5880863,4.17652823 Z" id="Shape" fill="url(#linearGradient-2)"></path>
-                        </g>
-                        <path d="M153.685633,135.854579 C157.894115,140.0596 164.717412,140.0596 168.925894,135.854579 L195.959977,108.842726 C200.659183,104.147384 200.659183,96.5636133 195.960527,91.8688194 L168.690777,64.7181159 C164.472332,60.5180858 157.646868,60.5241425 153.435895,64.7316526 C149.227413,68.936674 149.227413,75.7543607 153.435895,79.9593821 L171.854035,98.3623765 C173.02366,99.5310396 173.02366,101.304724 171.854035,102.473387 L153.685633,120.626849 C149.47715,124.83187 149.47715,131.649557 153.685633,135.854579 Z" id="Shape" fill="url(#linearGradient-3)"></path>
-                    </g>
-                    <ellipse id="Combined-Shape" fill="url(#linearGradient-4)" cx="100.519339" cy="100.436681" rx="23.6001926" ry="23.580786"></ellipse>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file

ant-design-jeecg-vue/src/components/bpm/DynamicComponent.vue

-
-<template>
-  <component ref="compModel" :is="comp" :formData="formData" v-if="comp" @ok="callBackOk" @close="callBackClose"></component>
-</template>
-<script>
-  export default {
-    name: 'DynamicComponent',
-    data () {
-      return {
-        compName: this.path
-      }
-    },
-    computed: {
-      comp: function () {
-        return () => import(`@/views/${this.compName}.vue`)
-      }
-    },
-    props: ['path','formData'],
-    methods: {
-      add () {
-        this.$refs.compModel.add();
-      },
-      callBackClose () {
-        this.$emit('close');
-      },
-      handleOk () {
-        this.$refs.compModel.handleOk();
-      },
-      callBackOk(){
-        this.$emit('ok');
-        this.close();
-      },
-    }
-  }
-</script>
\ No newline at end of file

ant-design-jeecg-vue/src/components/bpm/FormCommonModal.vue

-<template>
-  <a-modal
-    :title="title"
-    :width="width"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @ok="handleOk"
-    @cancel="handleCancel"
-    destroyOnClose
-    cancelText="关闭">
-    <a-spin :spinning="confirmLoading">
-        <dynamic-component ref="dynamiclink" :path="path" :formData="formData" @ok="callBackOk" @close="callBackClose"></dynamic-component>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-
-  import DynamicComponent from "./DynamicComponent";
-
-  export default {
-    name: "FormCommonModal",
-    props: ['path'],
-    components: {
-      DynamicComponent
-    },
-    data () {
-      return {
-        title:"操作",
-        width:"80%",
-        visible: false,
-        confirmLoading: false,
-        formData:{},
-      }
-    },
-    created () {
-    },
-    methods: {
-      add () {
-        this.formData =[];
-        this.title = "新增";
-        this.visible = true;
-        this.$refs.dynamiclink.add();
-      },
-      edit (record) {
-        var  data = {
-          dataId:record.id,
-        }
-        this.formData = data;
-        this.visible = true;
-      },
-      callBackClose () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleOk () {
-        this.$refs.dynamiclink.handleOk();
-      },
-      callBackOk(){
-        this.$emit('ok');
-        this.callBackClose();
-      },
-      handleCancel () {
-        this.callBackClose()
-      },
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file

ant-design-jeecg-vue/src/components/bpm/ProcNodeInfoModel.vue

-<template>
-  <a-modal
-    :title="title"
-    :width="280"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    :bodyStyle ="bodyStyle"
-    :mask = "false"
-    destroyOnClose
-    :footer="null"
-    @cancel="handleCancel"
-    cancelText="关闭">
-
-    <a-spin :spinning="confirmLoading">
-      <div style="height: 300px;overflow: hidden;overflow-y: auto;overflow-x: auto;">
-        <template v-for="(item, key, index) in nodeInfos">
-          <table class="gridtable">
-            <tbody>
-            <tr>
-              <th width="90">任务名称</th>
-              <td width="150">{{ item.taskName}}</td>
-            </tr>
-            <tr>
-              <th width="90">执行人</th>
-              <td width="150">{{ item.taskAssigneeId}}</td>
-            </tr>
-            <tr>
-              <th width="90">开始时间</th>
-              <td width="150">{{ item.taskBeginTime }}</td>
-            </tr>
-            <tr>
-              <th width="90">结束时间</th>
-              <td width="150">{{ item.taskEndTime }}</td>
-            </tr>
-            <tr>
-              <th width="90">耗时</th>
-              <td width="150">{{ item.durationStr }}</td>
-            </tr>
-            <tr>
-              <th width="90">意见</th>
-              <td width="150">{{ item.remarks }}</td>
-            </tr>
-            </tbody>
-          </table>
-        </template>
-      </div>
-    </a-spin>
-  </a-modal>
-</template>
-
-<script>
-  import { httpAction } from '@/api/manage'
-  import pick from 'lodash.pick'
-
-  export default {
-    name: "ProcNodeInfoModel",
-    data () {
-      return {
-        title:"任务审批详情",
-        visible: false,
-        bodyStyle:{
-          padding: "0",
-        },
-        confirmLoading: false,
-        validatorRules:{
-        },
-        nodeInfos:[],
-      }
-    },
-    created () {
-    },
-    methods: {
-      showInfo(record,taskId) {
-        this.nodeInfos = [];
-        for (var item of record) {
-          if(item.taskId == taskId){
-            this.nodeInfos.push(item);
-          }
-        }
-        this.visible = true;
-      },
-      close() {
-        this.nodeInfos = [];
-        this.visible = false;
-      },
-      handleCancel () {
-        this.nodeInfos = [];
-        this.visible = false;
-      },
-
-    }
-  }
-</script>
-
-<style scoped>
-  table.gridtable {
-    margin: 0 auto;
-    margin-top: 10px;
-    font-family: verdana,arial,sans-serif;
-    font-size:12px;
-    color:#333333;
-    border-width: 1px;
-    border-color: #ddd;
-    border-collapse: collapse;
-  }
-  table.gridtable th {
-    border-width: 1px;
-    padding: 8px;
-    border-style: solid;
-    border-color: #ddd;
-    background-color: #eee;
-  }
-  table.gridtable td {
-    border-width: 1px;
-    padding: 8px;
-    border-style: solid;
-    border-color: #ddd;
-    background-color: #ffffff;
-  }
-</style>
\ No newline at end of file

ant-design-jeecg-vue/src/components/bpm/ProcessInstPicModal.vue

-<template>
-  <a-modal
-    :title="title"
-    :width="900"
-    :visible="visible"
-    :confirmLoading="confirmLoading"
-    @cancel="handleCancel"
-    :bodyStyle="bodyStyle"
-    style="top: 50px;"
-    destroyOnClose
-    :footer="null"
-    cancelText="关闭">
-    
-    <a-spin :spinning="confirmLoading">
-      <img :src="picUrl" alt="流程图" usemap="#planetmap"/>
-      <map name="planetmap">
-        <template v-for="(item, key, index) in nodePositionInfo.positionList">
-          <area shape="rect" :coords="item.coords" title="Venus" @mouseover="showNodeInfo(nodePositionInfo.hisTasks,item.id)">
-        </template>
-      </map>
-    </a-spin>
-    <proc-node-info-model ref="nodeInfoModel"></proc-node-info-model>
-  </a-modal>
-</template>
-
-<script>
-  import { getAction } from '@/api/manage'
-  import qs from 'qs';
-  import ProcNodeInfoModel from "./ProcNodeInfoModel.vue";
-
-  export default {
-    components: {ProcNodeInfoModel},
-    name: "ProcessInstPicModal",
-    data () {
-      return {
-        title:"操作",
-        visible: false,
-        nodePositionInfo:{},
-        model: {},
-        labelCol: {
-          xs: { span: 24 },
-          sm: { span: 5 },
-        },
-        wrapperCol: {
-          xs: { span: 24 },
-          sm: { span: 16 },
-        },
-        bodyStyle:{
-          "overflow-y":"auto",
-          "overflow-x":"auto",
-          height:(window.innerHeight-280)+"px",
-        },
-        confirmLoading: false,
-        picUrl:"",
-        url: {
-          getProcessInfo: "/process/extActFlowData/getProcessInfo",
-          getNodePositionInfo:"/act/task/getNodePositionInfo",
-        },
-      }
-    },
-    created () {
-    },
-    methods: {
-      preview(flowCode,dataId){
-        this.visible = true;
-        var params = {
-          flowCode:flowCode,
-          dataId:dataId
-        };//查询条件
-        this.confirmLoading = true;
-        getAction(this.url.getProcessInfo,params).then((res)=>{
-          if(res.success){
-            var processInstanceId = res.result.processInstanceId;
-            this.picUrl =  this.getResourceURL(processInstanceId);
-            this.getNodePositionInfoData(processInstanceId);
-            console.log("---流程图----",this.picUrl)
-          }else{
-            this.$message.warning(res.message);
-          }
-        }).catch(e => {
-          console.error(e)
-        }).then(() => {
-          this.confirmLoading = false;
-        })
-
-
-      },
-      close () {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleCancel () {
-        this.close()
-      },
-      // 获取静态资源访问地址
-      getResourceURL(processInstanceId) {
-        var params = qs.stringify({
-          //'token': Cookies.get('token'),
-          '_t': Date.parse(new Date())/1000,
-          'processInstanceId': processInstanceId
-        })
-        return `${window._CONFIG['domianURL']}/act/process/processPic?${params}`
-      },
-      // 获取静态资源访问地址
-      getResourceURL(processInstanceId) {
-        var params = qs.stringify({
-          //'token': Cookies.get('token'),
-          '_t': Date.parse(new Date())/1000,
-          'processInstanceId': processInstanceId
-        })
-        return `${window._CONFIG['domianURL']}/act/process/processPic?${params}`
-      },
-
-      // 查询坐标信息数据
-      getNodePositionInfoData(processInstanceId) {
-        var params = {processInstanceId:processInstanceId};//查询条件
-        getAction(this.url.getNodePositionInfo,params).then(res => {
-          if (res.success) {
-            this.nodePositionInfo = res.result
-          }
-        }).catch(e => {
-          console.error(e)
-        }).then(() => {
-        })
-      },
-      showNodeInfo(data,taskId){
-        this.$refs.nodeInfoModel.close();
-        this.$refs.nodeInfoModel.showInfo(data,taskId);
-      },
-    }
-  }
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file

ant-design-jeecg-vue/src/components/jeecgbiz/JSearchUserByDep.vue

-<template>
-
-  <a-modal
-    :width="modalWidth"
-    :visible="visible"
-    :title="title"
-    @ok="handleSubmit"
-    @cancel="close"
-    cancelText="关闭"
-    style="margin-top: -70px"
-    wrapClassName="ant-modal-cust-warp"
-  >
-    <a-row :gutter="10" style="background-color: #ececec; padding: 10px; margin: -10px">
-      <a-col :md="6" :sm="24">
-        <a-card :bordered="false">
-          <!--组织机构-->
-          <a-directory-tree
-            selectable
-            :selectedKeys="selectedKeys"
-            :checkStrictly="true"
-            @select="this.onSelect"
-            :dropdownStyle="{maxHeight:'200px',overflow:'auto'}"
-            :treeData="departTree"
-          />
-        </a-card>
-      </a-col>
-      <a-col :md="18" :sm="24">
-        <a-card :bordered="false">
-          用户账号:
-          <a-input-search
-            :style="{width:'150px',marginBottom:'15px'}"
-            placeholder="请输入用户账号"
-            v-model="queryParam.username"
-            @search="onSearch"
-          ></a-input-search>
-          <a-button @click="searchReset(1)" style="margin-left: 20px" icon="redo">重置</a-button>
-          <!--用户列表-->
-          <a-table
-            ref="table"
-            :scroll="scrollTrigger"
-            size="middle"
-            rowKey="id"
-            :columns="columns"
-            :dataSource="dataSource"
-            :pagination="ipagination"
-            :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-            @change="handleTableChange">
-          </a-table>
-        </a-card>
-      </a-col>
-    </a-row>
-  </a-modal>
-
-</template>
-
-<script>
-  import { filterObj } from '@/utils/util'
-  import { queryDepartTreeList, getUserList, queryUserByDepId, queryUserRoleMap } from '@/api/api'
-
-  export default {
-    name: 'JSearchUserByDep',
-    components: {},
-    data() {
-      return {
-        queryParam: {
-          username:"",
-        },
-        columns: [
-          {
-            title: '用户账号',
-            align: 'center',
-            dataIndex: 'username'
-          },
-          {
-            title: '真实姓名',
-            align: 'center',
-            dataIndex: 'realname'
-          },
-          {
-            title: '角色名称',
-            align: 'center',
-            dataIndex: 'roleName'
-          },
-          {
-            title: '性别',
-            align: 'center',
-            dataIndex: 'sex',
-            customRender: function(text) {
-              if (text === 1) {
-                return '男'
-              } else if (text === 2) {
-                return '女'
-              } else {
-                return text
-              }
-            }
-          },
-          {
-            title: '手机号码',
-            align: 'center',
-            dataIndex: 'phone'
-          },
-          {
-            title: '邮箱',
-            align: 'center',
-            dataIndex: 'email'
-          }
-        ],
-        scrollTrigger: {},
-        dataSource: [],
-        selectedKeys: [],
-        userNameArr: [],
-        departName: '',
-        userRolesMap: {},
-        title: '',
-        ipagination: {
-          current: 1,
-          pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + '-' + range[1] + ' 共' + total + '条'
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        },
-        isorter: {
-          column: 'createTime',
-          order: 'desc'
-        },
-        selectedRowKeys: [],
-        selectedRows: [],
-        modalWidth: 1250,
-        departTree: [],
-        visible: false,
-        form: this.$form.createForm(this)
-      }
-    },
-    created() {
-      // 该方法触发屏幕自适应
-      this.resetScreenSize();
-      this.queryUserRoleMap();
-    },
-    methods: {
-      loadData(arg) {
-        if (arg === 1) {
-          this.ipagination.current = 1;
-        }
-        let params = this.getQueryParams();//查询条件
-        getUserList(params).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result.records;
-            this.assignRoleName(this.dataSource);
-            this.ipagination.total = res.result.total;
-          }
-        })
-      },
-      queryUserRoleMap(){
-        queryUserRoleMap().then((res) => {
-          if (res.success) {
-            this.userRolesMap = res.result;
-            this.loadData();
-          }
-        })
-      },
-      // 触发屏幕自适应
-      resetScreenSize() {
-        let screenWidth = document.body.clientWidth;
-        if (screenWidth < 500) {
-          this.scrollTrigger = { x: 800 };
-        } else {
-          this.scrollTrigger = {};
-        }
-      },
-      showModal() {
-        this.visible = true;
-        this.assignRoleName(this.dataSource);
-        this.queryDepartTree();
-        this.form.resetFields();
-      },
-      getQueryParams() {
-        let param = Object.assign({}, this.queryParam, this.isorter);
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        return filterObj(param);
-      },
-      getQueryField() {
-        let str = 'id,';
-        for (let a = 0; a < this.columns.length; a++) {
-          str += ',' + this.columns[a].dataIndex;
-        }
-        return str;
-      },
-      searchReset(num) {
-        let that = this;
-        if(num !== 0){
-          that.queryParam = {};
-          that.loadData(1);
-        }
-        that.selectedRowKeys = [];
-        that.userNameArr = [];
-        that.selectedKeys = [];
-      },
-      close() {
-        this.searchReset(0);
-        this.visible = false;
-      },
-      handleTableChange(pagination, filters, sorter) {
-        //TODO 筛选
-        if (Object.keys(sorter).length > 0) {
-          this.isorter.column = sorter.field;
-          this.isorter.order = 'ascend' === sorter.order ? 'asc' : 'desc';
-        }
-        this.ipagination = pagination;
-        this.loadData();
-      },
-      handleSubmit() {
-        let that = this;
-        for (let i = 0, len = this.selectedRowKeys.length; i < len; i++) {
-          this.getUserNames(this.selectedRowKeys[i]);
-        }
-        that.$emit('ok', that.userNameArr.join(','));
-        that.close();
-      },
-      // 遍历匹配,获取用户真实姓名
-      getUserNames(rowId) {
-        let dataSource = this.dataSource;
-        for (let i = 0, len = dataSource.length; i < len; i++) {
-          if (rowId === dataSource[i].id) {
-            this.userNameArr.push(dataSource[i].realname);
-          }
-        }
-      },
-      // 点击树节点,筛选出对应的用户
-      onSelect(selectedKeys) {
-        if (selectedKeys[0] != null) {
-          this.queryUserByDepId(selectedKeys); // 调用方法根据选选择的id查询用户信息
-          if (this.selectedKeys[0] !== selectedKeys[0]) {
-            this.selectedKeys = [selectedKeys[0]];
-          }
-        }
-      },
-      onSelectChange(selectedRowKeys, selectionRows) {
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectionRows;
-      },
-      onSearch() {
-        this.loadData(1);
-      },
-      // 根据选择的id来查询用户信息
-      queryUserByDepId(selectedKeys) {
-        queryUserByDepId({ id: selectedKeys.toString() }).then((res) => {
-          if (res.success) {
-            this.dataSource = res.result;
-            this.ipagination.total = res.result.length;
-            this.assignRoleName(this.dataSource);
-          }
-        })
-      },
-      // 传入用户id,找到匹配的角色名称
-      queryUserRole(userId) {
-        let map = this.userRolesMap;
-        let roleName = [];
-        for (var key in map) {
-          if (userId === key) {
-            roleName.push(map[key]);
-          }
-        }
-        return roleName.join(',');
-      },
-      queryDepartTree() {
-        queryDepartTreeList().then((res) => {
-          if (res.success) {
-            this.departTree = res.result;
-          }
-        })
-      },
-      // 为角色名称赋值
-      assignRoleName(data) {
-        let userId = '';
-        let role = '';
-        for (let i = 0, length = data.length; i < length; i++) {
-          userId = this.dataSource[i].id;
-          role = this.queryUserRole(userId);
-          this.dataSource[i].roleName = role;
-        }
-      },
-      modalFormOk() {
-        this.loadData();
-      }
-    }
-  }
-</script>
-
-<style scoped>
-  .ant-table-tbody .ant-table-row td {
-    padding-top: 10px;
-    padding-bottom: 10px;
-  }
-
-  #components-layout-demo-custom-trigger .trigger {
-    font-size: 18px;
-    line-height: 64px;
-    padding: 0 24px;
-    cursor: pointer;
-    transition: color .3s;
-  }
-</style>
\ No newline at end of file

ant-design-jeecg-vue/src/components/jeecgbiz/JSelectMultipleUser.vue

-<template>
-  <div>
-    <a-modal
-      centered
-      :title="title"
-      :width="1000"
-      :visible="visible"
-      @ok="handleOk"
-      @cancel="handleCancel"
-      cancelText="关闭">
-      <a-row :gutter="18">
-        <a-col :span="16">
-          <a-card title="选择人员" :bordered="true">
-            <!-- 查询区域 -->
-            <div class="table-page-search-wrapper">
-              <a-form layout="inline">
-                <a-row :gutter="24">
-
-                  <a-col :span="10">
-                    <a-form-item label="姓名">
-                      <a-input placeholder="请输入姓名" v-model="queryParam.name"></a-input>
-                    </a-form-item>
-                  </a-col>
-                  <a-col :span="8" >
-                    <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-                      <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-                      <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-                    </span>
-                  </a-col>
-
-                </a-row>
-              </a-form>
-            </div>
-            <!-- table区域-begin -->
-            <div>
-              <a-table
-                size="small"
-                bordered
-                rowKey="id"
-                :columns="columns1"
-                :dataSource="dataSource1"
-                :pagination="ipagination"
-                :loading="loading"
-                :scroll="{ y: 240 }"
-                :rowSelection="{selectedRowKeys: selectedRowKeys,onSelectAll:onSelectAll,onSelect:onSelect,onChange: onSelectChange}"
-                @change="handleTableChange">
-
-              </a-table>
-            </div>
-            <!-- table区域-end -->
-          </a-card>
-        </a-col>
-        <a-col :span="8">
-          <a-card title="用户选择" :bordered="true">
-            <!-- table区域-begin -->
-            <div>
-              <a-table
-                size="small"
-                bordered
-                rowKey="id"
-                :columns="columns2"
-                :dataSource="dataSource2"
-                :loading="loading"
-                :scroll="{ y: 240 }"
-              >
-                <span slot="action" slot-scope="text, record">
-                  <a-button type="primary" size="small" @click="handleDelete(record)" icon="delete">删除</a-button>
-                </span>
-              </a-table>
-            </div>
-            <!-- table区域-end -->
-          </a-card>
-        </a-col>
-      </a-row>
-    </a-modal>
-  </div>
-</template>
-
-<script>
- import { filterObj } from '@/utils/util'
- import { getAction } from '@/api/manage'
-
-  export default {
-    name: "SelectDemoModal",
-    data () {
-      return {
-        title: "用户列表",
-        names: [],
-        visible: false,
-        placement: 'right',
-        description: '人员管理页面',
-        // 查询条件
-        queryParam: {},
-        // 表头
-        columns1: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:50,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title: '姓名',
-            align:"center",
-            width:113,
-            dataIndex: 'name'
-          },
-          {
-            title: '年龄',
-            align:"center",
-            width:100,
-            dataIndex: 'age'
-          },
-          {
-            title: '出生日期',
-            align:"center",
-            width:100,
-            dataIndex: 'birthday'
-          }
-        ],
-        columns2: [
-
-          {
-            title: '用户账号',
-            align:"center",
-            width:100,
-            dataIndex: 'name'
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            width:100,
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        //数据集
-        dataSource1:[],
-        dataSource2:[],
-        // 分页参数
-        ipagination:{
-          current: 1,
-          pageSize: 10,
-          pageSizeOptions: ['10', '20', '30'],
-          showTotal: (total, range) => {
-            return range[0] + "-" + range[1] + " 共" + total + "条"
-          },
-          showQuickJumper: true,
-          showSizeChanger: true,
-          total: 0
-        },
-        isorter:{
-          column: 'createTime',
-          order: 'desc',
-        },
-        loading:false,
-        selectedRowKeys: [],
-        selectedRows: [],
-        url: {
-          list: "/test/jeecgDemo/list",
-        },
-
-      }
-    },
-    created() {
-      this.loadData();
-    },
-    methods: {
-      searchQuery(){
-        this.loadData(1);
-      },
-      searchReset(){
-        this.queryParam={};
-        this.loadData(1);
-      },
-      handleCancel() {
-        this.visible = false;
-      },
-      handleOk() {
-          this.$emit("selectFinished",this.dataSource2);
-          this.visible = false;
-      },
-      add() {
-        this.visible = true;
-      },
-      loadData (arg){
-        //加载数据 若传入参数1则加载第一页的内容
-        if(arg===1){
-          this.ipagination.current = 1;
-        }
-        var params = this.getQueryParams();//查询条件
-        getAction(this.url.list,params).then((res)=>{
-          if(res.success){
-            this.dataSource1 = res.result.records;
-            this.ipagination.total = res.result.total;
-          }
-        })
-      },
-      getQueryParams(){
-        var param = Object.assign({}, this.queryParam,this.isorter);
-        param.field = this.getQueryField();
-        param.pageNo = this.ipagination.current;
-        param.pageSize = this.ipagination.pageSize;
-        return filterObj(param);
-      },
-      getQueryField(){
-        //TODO 字段权限控制
-      },
-      onSelectAll (selected, selectedRows, changeRows) {
-        if(selected===true){
-          for(var a = 0;a<changeRows.length;a++){
-            this.dataSource2.push(changeRows[a]);
-          }
-        }else{
-          for(var b = 0;b<changeRows.length;b++){
-            this.dataSource2.splice(this.dataSource2.indexOf(changeRows[b]),1);
-          }
-        }
-       // console.log(selected, selectedRows, changeRows);
-      },
-      onSelect (record,selected) {
-        if(selected===true){
-          this.dataSource2.push(record);
-        }else{
-          var index = this.dataSource2.indexOf(record);
-          //console.log();
-          if(index >=0 ){
-            this.dataSource2.splice(this.dataSource2.indexOf(record),1);
-          }
-
-        }
-      },
-      onSelectChange (selectedRowKeys,selectedRows) {
-        this.selectedRowKeys = selectedRowKeys;
-        this.selectionRows = selectedRows;
-      },
-      onClearSelected(){
-        this.selectedRowKeys = [];
-        this.selectionRows = [];
-      },
-      handleDelete: function(record){
-        this.dataSource2.splice(this.dataSource2.indexOf(record),1);
-      },
-      handleTableChange(pagination, filters, sorter){
-        //分页、排序、筛选变化时触发
-        console.log(sorter);
-        //TODO 筛选
-        if (Object.keys(sorter).length>0){
-          this.isorter.column = sorter.field;
-          this.isorter.order = "ascend"==sorter.order?"asc":"desc"
-        }
-        this.ipagination = pagination;
-        this.loadData();
-      }
-    }
-  }
-</script>
-<style lang="less" scoped>
-  .ant-card-body .table-operator{
-    margin-bottom: 18px;
-  }
-  .ant-table-tbody .ant-table-row td{
-    padding-top:15px;
-    padding-bottom:15px;
-  }
-  .anty-row-operator button{margin: 0 5px}
-  .ant-btn-danger{background-color: #ffffff}
-
-  .ant-modal-cust-warp{height: 100%}
-  .ant-modal-cust-warp .ant-modal-body{height:calc(100% - 110px) !important;overflow-y: auto}
-  .ant-modal-cust-warp .ant-modal-content{height:90% !important;overflow-y: hidden}
-</style>
\ No newline at end of file

ant-design-jeecg-vue/src/components/jeecgbiz/JSelectUser.vue

-<template>
-  <div>
-    <a-modal
-      :title="title"
-      :width="800"
-      :visible="visible"
-      :confirmLoading="confirmLoading"
-      @ok="handleSubmit"
-      @cancel="handleCancel">
-      <div>
-        <a-form-item label="用户名：" :label-col="{ span: 5 }" :wrapper-col="{ span: 12 }">
-          <a-input-search placeholder="点击右侧按钮选择用户" disabled @search="onSearch" v-model="userNames">
-            <a-button slot="enterButton" icon="search">选择</a-button>
-          </a-input-search>
-        </a-form-item>
-      </div>
-    </a-modal>
-
-    <!-- 用户查询列表 -->
-    <select-user-list-modal ref="selectUserListModal" @ok="getUserCallBack"></select-user-list-modal>
-  </div>
-</template>
-
-<script>
-  import {getUserList} from '@/api/api'
-  import SelectUserListModal from './modal/SelectUserListModal'
-
-  export default {
-    name: "SelectUserModal",
-    components: {
-      SelectUserListModal,
-    },
-    props: ['taskId'],
-    data() {
-      return {
-        title: "操作",
-        visible: false,
-        selectUserListVisible: false,
-        model: {},
-        confirmLoading: false,
-        userNames: '',
-        userKeys: '',
-      }
-    },
-    created() {
-    },
-    methods: {
-      open() {
-        this.userNames = ''
-        this.userKeys = ''
-        this.visible = true;
-      },
-      close() {
-        this.$emit('close');
-        this.visible = false;
-      },
-      handleCancel() {
-        this.close()
-      },
-      onSearch() {
-        this.$refs.selectUserListModal.open();
-      },
-      getUserCallBack(selectionRows) {
-        console.log(selectionRows)
-        let names = ''
-        let keys = ''
-        for (let row of selectionRows) {
-          names = row.realname + "," + names
-          keys = row.username + "," + keys
-        }
-        this.userNames = names
-        this.userKeys = keys
-
-        console.log('--userkeys--' + this.userKeys)
-      },
-      handleSubmit() {
-        console.log("taskId: "+ this.taskId)
-        this.$emit('ok', this.userKeys,this.taskId);
-        this.close()
-      },
-    }
-  }
-</script>
-
-<style>
-
-</style>

ant-design-jeecg-vue/src/views/jeecg/JoaDemoList.vue

-<template>
-  <a-card :bordered="false">
-
-    <!-- 查询区域 -->
-    <div class="table-page-search-wrapper">
-      <a-form layout="inline">
-        <a-row :gutter="24">
-        
-          <a-col :md="6" :sm="8" class="1">
-            <a-form-item label="请假人">
-              <a-input placeholder="请输入请假人" v-model="queryParam.name"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8" class="1">
-            <a-form-item label="请假天数">
-              <a-input placeholder="请输入请假天数" v-model="queryParam.days"></a-input>
-            </a-form-item>
-          </a-col>
-        <template v-if="toggleSearchStatus">
-        <a-col :md="6" :sm="8">
-            <a-form-item label="开始时间">
-              <a-input placeholder="请输入开始时间" v-model="queryParam.beginDate"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="请假结束时间">
-              <a-input placeholder="请输入请假结束时间" v-model="queryParam.endDate"></a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :md="6" :sm="8">
-            <a-form-item label="请假原因">
-              <a-input placeholder="请输入请假原因" v-model="queryParam.reason"></a-input>
-            </a-form-item>
-          </a-col>
-        </template>
-          <a-col :md="6" :sm="8" >
-            <span style="float: left;overflow: hidden;" class="table-page-search-submitButtons">
-              <a-button type="primary" @click="searchQuery" icon="search">查询</a-button>
-              <a-button type="primary" @click="searchReset" icon="reload" style="margin-left: 8px">重置</a-button>
-              <a @click="handleToggleSearch" style="margin-left: 8px">
-                {{ toggleSearchStatus ? '收起' : '展开' }}
-                <a-icon :type="toggleSearchStatus ? 'up' : 'down'"/>
-              </a>
-            </span>
-          </a-col>
-
-        </a-row>
-      </a-form>
-    </div>
-
-    <!-- 操作按钮区域 -->
-    <div class="table-operator">
-      <a-button @click="handleAdd" type="primary" icon="plus">新增</a-button>
-      <a-button type="primary" icon="download" @click="handleExportXls">导出</a-button>
-      <a-upload name="file" :showUploadList="false" :multiple="false" :action="importExcelUrl" @change="handleImportExcel">
-        <a-button type="primary" icon="import">导入</a-button>
-      </a-upload>
-      <a-dropdown v-if="selectedRowKeys.length > 0">
-        <a-menu slot="overlay">
-          <a-menu-item key="1" @click="batchDel"><a-icon type="delete"/>删除</a-menu-item>
-        </a-menu>
-        <a-button style="margin-left: 8px"> 批量操作 <a-icon type="down" /></a-button>
-      </a-dropdown>
-    </div>
-
-    <!-- table区域-begin -->
-    <div>
-      <div class="ant-alert ant-alert-info" style="margin-bottom: 16px;">
-        <i class="anticon anticon-info-circle ant-alert-icon"></i> 已选择 <a style="font-weight: 600">{{ selectedRowKeys.length }}</a>项
-        <a style="margin-left: 24px" @click="onClearSelected">清空</a>
-      </div>
-
-      <a-table
-        ref="table"
-        size="middle"
-        bordered
-        rowKey="id"
-        :columns="columns"
-        :dataSource="dataSource"
-        :pagination="ipagination"
-        :loading="loading"
-        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
-        @change="handleTableChange">
-
-         <span slot="action" slot-scope="text, record">
-          <template v-if="record.bpmStatus === '1'">
-            <a @click="handleEdit(record)">编辑</a>
-            <a-divider type="vertical"/>
-            <a @click="startProcess(record)">提交流程</a>
-            <a-divider type="vertical"/>
-          </template>
-          <a-dropdown>
-            <a class="ant-dropdown-link">更多 <a-icon type="down" /></a>
-            <a-menu slot="overlay">
-              <a-menu-item v-if="record.bpmStatus === '1'">
-                <a-popconfirm title="确定删除吗?" @confirm="() => handleDelete(record.id)">
-                  <a>删除</a>
-                </a-popconfirm>
-              </a-menu-item>
-              <a-menu-item v-else @click="handlePreviewPic(record)">审批进度</a-menu-item>
-            </a-menu>
-          </a-dropdown>
-        </span>
-
-      </a-table>
-    </div>
-    <!-- table区域-end -->
-
-    <!-- 表单区域 -->
-    <form-common-modal ref="modalForm" :path="path" @ok="modalFormOk"></form-common-modal>
-    <!-- 审批流程 -->
-    <process-inst-pic-modal ref="processInstPicModal"></process-inst-pic-modal>
-
-  </a-card>
-</template>
-
-<script>
-  import { postAction } from '@/api/manage'
-  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
-  import JDate from '@/components/jeecg/JDate.vue'
-  import FormCommonModal from "@/components/bpm/FormCommonModal";
-  import ProcessInstPicModal from "@/components/bpm/ProcessInstPicModal";
-
-  export default {
-    name: "JoaDemoList",
-    mixins:[JeecgListMixin],
-    components: {
-      FormCommonModal,
-      ProcessInstPicModal,
-      JDate
-    },
-    data () {
-      return {
-        description: '流程测试管理页面',
-        // 表头
-        columns: [
-          {
-            title: '#',
-            dataIndex: '',
-            key:'rowIndex',
-            width:60,
-            align:"center",
-            customRender:function (t,r,index) {
-              return parseInt(index)+1;
-            }
-          },
-          {
-            title: '请假人',
-            align:"center",
-            dataIndex: 'name'
-          },
-          {
-            title: '请假天数',
-            align:"center",
-            dataIndex: 'days'
-          },
-          {
-            title: '开始时间',
-            align:"center",
-            dataIndex: 'beginDate'
-          },
-          {
-            title: '结束时间',
-            align:"center",
-            dataIndex: 'endDate'
-          },
-          {
-            title: '请假原因',
-            align:"center",
-            dataIndex: 'reason'
-          },
-          {
-            title: '流程状态',
-            align:"center",
-            dataIndex: 'bpmStatus',
-            customRender:function (text) {
-              if(text=='1'){
-                return "待提交";
-              }else if(text=='2'){
-                return "处理中";
-              }else if(text=='3'){
-                return "已完成";
-              }else if(text=='4'){
-                return "已作废";
-              }else{
-                return text;
-              }
-            }
-          },
-          {
-            title: '操作',
-            dataIndex: 'action',
-            align:"center",
-            scopedSlots: { customRender: 'action' },
-          }
-        ],
-        flowCode:"dev_joa_demo_001",
-        path:"jeecg/modules/JoaDemoForm",
-		    url: {
-          list: "/test/joaDemo/list",
-          delete: "/test/joaDemo/delete",
-          deleteBatch: "/test/joaDemo/deleteBatch",
-          exportXlsUrl: "test/joaDemo/exportXls",
-          importExcelUrl: "test/joaDemo/importExcel",
-          startProcess: "/process/extActProcess/startMutilProcess",
-       },
-    }
-  },
-  computed: {
-    importExcelUrl: function(){
-      return `${window._CONFIG['domianURL']}/${this.url.importExcelUrl}`;
-    }
-  },
-    methods: {
-      startProcess: function(record){
-        var that = this;
-        this.$confirm({
-          title:"提示",
-          content:"确认提交流程吗?",
-          onOk: function(){
-            var param = {
-              flowCode:that.flowCode,
-              id:record.id,
-              formUrl:that.path,
-              formUrlMobile:that.path
-            }
-            postAction(that.url.startProcess,param).then((res)=>{
-              if(res.success){
-                that.$message.success(res.message);
-                that.loadData();
-                that.onClearSelected();
-              }else{
-                that.$message.warning(res.message);
-              }
-            });
-          }
-        });
-      },
-      handlePreviewPic: function(record){
-        var flowCode = this.flowCode;
-        var dataId = record.id;
-        this.$refs.processInstPicModal.preview(flowCode,dataId);
-        this.$refs.processInstPicModal.title="流程图";
-      },
-    }
-  }
-</script>
-<style scoped>
-  @import '~@assets/less/common.less'
-</style>
\ No newline at end of file

ant-design-jeecg-vue/README.md → ant-design-vue-jeecg/README.md

 Ant Design Jeecg Vue
 ====
 
-当前最新版本： 2.0.1（发布日期：20190603）
+当前最新版本： 2.0.2（发布日期：20190708）
 
 Overview
 ----

ant-design-jeecg-vue/package.json → ant-design-vue-jeecg/package.json

 {
   "name": "vue-antd-jeecg",
-  "version": "2.0.1",
+   "version": "2.0.2",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve --open",
@@ -10,9 +10,9 @@
     "test:e2e": "vue-cli-service test:e2e"
   },
   "dependencies": {
-    "@antv/data-set": "^0.10.1",
+    "@antv/data-set": "^0.10.2",
     "@tinymce/tinymce-vue": "^2.0.0",
-    "ant-design-vue": "^1.3.1",
+    "ant-design-vue": "^1.3.9",
     "apexcharts": "^3.6.5",
     "axios": "^0.18.0",
     "clipboard": "^2.0.4",
@@ -26,7 +26,7 @@
     "nprogress": "^0.2.0",
     "tinymce": "^5.0.2",
     "viser-vue": "^2.4.4",
-    "vue": "^2.5.22",
+    "vue": "^2.6.10",
     "vue-apexcharts": "^1.3.2",
     "vue-class-component": "^6.0.0",
     "vue-cropper": "^0.4.8",
@@ -34,7 +34,7 @@
     "vue-loader": "^15.7.0",
     "vue-ls": "^3.2.0",
     "vue-photo-preview": "^1.1.3",
-    "vue-print-nb-jeecg": "^1.0.7",
+    "vue-print-nb-jeecg": "^1.0.8",
     "vue-property-decorator": "^7.3.0",
     "vue-router": "^3.0.1",
     "vue-splitpane": "^1.0.4",
@@ -49,13 +49,13 @@
     "@vue/cli-service": "^3.3.0",
     "@vue/eslint-config-standard": "^4.0.0",
     "babel-eslint": "^10.0.1",
-    "eslint": "^5.12.0",
+    "eslint": "^5.16.0",
     "eslint-plugin-vue": "^5.1.0",
-    "less": "^3.8.1",
+    "less": "^3.9.0",
     "less-loader": "^4.1.0",
     "node-sass": "^4.11.0",
     "sass-loader": "^7.0.1",
-    "vue-template-compiler": "^2.5.22"
+    "vue-template-compiler": "^2.6.10"
   },
   "eslintConfig": {
     "root": true,

ant-design-jeecg-vue/public/index.html → ant-design-vue-jeecg/public/index.html

@@ -218,6 +218,26 @@
       color: #FFF;
       opacity: 0.5;
     }
+    /* 滚动条优化 start */
+    ::-webkit-scrollbar{
+      width:8px;
+      height:8px;
+    }
+    ::-webkit-scrollbar-track{
+      background: #f6f6f6;
+      border-radius:2px;
+    }
+    ::-webkit-scrollbar-thumb{
+      background: #cdcdcd;
+      border-radius:2px;
+    }
+    ::-webkit-scrollbar-thumb:hover{
+      background: #747474;
+    }
+    ::-webkit-scrollbar-corner {
+      background: #f6f6f6;
+    }
+    /* 滚动条优化 end */
   </style>
   <!-- 全局配置 -->
   <script>
@@ -240,6 +260,16 @@
     </div>
   </div>
 </div>
+
+<!-- update_begin author:sunjianlei date:20190524 for: 去指定页面的加载动画 -->
+<script>
+  // 去指定页面的加载动画
+  if (location.href.indexOf('online/desform/pureview') !== -1) {
+    document.getElementById('loader-wrapper').style.display = 'none'
+  }
+</script>
+<!-- update_end author:sunjianlei date:20190524 for: 去指定页面的加载动画 -->
+
 </body>
 
 </html>
\ No newline at end of file

ant-design-jeecg-vue/src/api/api.js → ant-design-vue-jeecg/src/api/api.js

@@ -22,8 +22,8 @@ const getUserList = (params)=>getAction("/sys/user/list",params);
 // const deleteUser = (params)=>deleteAction("/sys/user/delete",params);
 // const deleteUserList = (params)=>deleteAction("/sys/user/deleteBatch",params);
 const frozenBatch = (params)=>putAction("/sys/user/frozenBatch",params);
-//验证用户账号是否唯一
-const checkUsername = (params)=>getAction("/sys/user/checkOnlyUser",params);
+//验证用户是否存在
+const checkOnlyUser = (params)=>getAction("/sys/user/checkOnlyUser",params);
 //改变密码
 const changPassword = (params)=>putAction("/sys/user/changPassword",params);
 
@@ -76,6 +76,7 @@ const doReleaseData = (params)=>getAction("/sys/annountCement/doReleaseData",par
 const doReovkeData = (params)=>getAction("/sys/annountCement/doReovkeData",params);
 //获取系统访问量
 const getLoginfo = (params)=>getAction("/sys/loginfo",params);
+const getVisitInfo = (params)=>getAction("/sys/visitInfo",params);
 //数据日志访问
 // const getDataLogList = (params)=>getAction("/sys/dataLog/list",params);
 
@@ -99,7 +100,7 @@ export {
   getUserList,
   queryall,
   frozenBatch,
-  checkUsername,
+  checkOnlyUser,
   changPassword,
   getPermissionList,
   addPermission,
@@ -127,6 +128,7 @@ export {
   doReleaseData,
   doReovkeData,
   getLoginfo,
+  getVisitInfo,
   queryUserByDepId,
   queryUserRoleMap,
   duplicateCheck,

ant-design-jeecg-vue/src/api/login.js → ant-design-vue-jeecg/src/api/login.js

@@ -20,6 +20,14 @@ export function login(parameter) {
   })
 }
 
+export function phoneLogin(parameter) {
+  return axios({
+    url: '/sys/phoneLogin',
+    method: 'post',
+    data: parameter
+  })
+}
+
 export function getSmsCaptcha(parameter) {
   return axios({
     url: api.SendSms,

ant-design-vue-jeecg/src/assets/logo.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="293px" height="293px" viewBox="0 0 293 293" enable-background="new 0 0 293 293" xml:space="preserve">  <image id="image0" width="293" height="293" x="0" y="0"
+    href="data:image/png;base64,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
+OjAwP26CAAAAAABJRU5ErkJggg==" />
+</svg>

ant-design-jeecg-vue/src/components/dict/JMultiSelectTag.vue → ant-design-vue-jeecg/src/components/dict/JMultiSelectTag.vue

@@ -29,7 +29,6 @@
     props: {
       dictCode: String,
       placeholder: String,
-      triggerChange: Boolean,
       disabled: Boolean,
       value: String,
       type: String,
@@ -52,6 +51,9 @@
       this.initDictData();
     },
     watch:{
+      options: function(val){
+        this.setCurrentDictOptions(val);
+      },
       value (val) {
         if(!val){
           this.arrayValue = []
@@ -75,11 +77,7 @@
 
       },
       onChange (selectedValue) {
-        if(this.triggerChange){
-          this.$emit('change', selectedValue.join(","));
-        }else{
-          this.$emit('input', selectedValue.join(","));
-        }
+        this.$emit('change', selectedValue.join(","));
       },
       setCurrentDictOptions(dictOptions){
         this.dictOptions = dictOptions
@@ -87,6 +85,10 @@
       getCurrentDictOptions(){
         return this.dictOptions
       }
+    },
+    model: {
+      prop: 'value',
+      event: 'change'
     }
   }
 </script>

ant-design-jeecg-vue/src/components/dict/JSearchSelectTag.vue → ant-design-vue-jeecg/src/components/dict/JSearchSelectTag.vue

@@ -40,10 +40,9 @@
   export default {
     name: 'JSearchSelectTag',
     props:{
-      triggerChange: Boolean,
       disabled: Boolean,
       value: String,
-      dictCode: String,
+      dict: String,
       dictOptions: Array,
       async: Boolean,
       placeholder:{
@@ -76,6 +75,11 @@
             this.initSelectValue()
           }
         }
+      },
+      "dict":{
+        handler(){
+          this.initDictData()
+        }
       }
     },
     methods:{
@@ -83,7 +87,7 @@
         if(this.async){
           if(!this.selectedAsyncValue || !this.selectedAsyncValue.key || this.selectedAsyncValue.key!=this.value){
             console.log("这才请求后台")
-            getAction(`/sys/dict/loadDictItem/${this.dictCode}`,{key:this.value}).then(res=>{
+            getAction(`/sys/dict/loadDictItem/${this.dict}`,{key:this.value}).then(res=>{
               if(res.success){
                 let obj = {
                   key:this.value,
@@ -104,7 +108,7 @@
         this.options = []
         this.loading=true
         // 字典code格式：table,text,code
-        getAction(`/sys/dict/loadDict/${this.dictCode}`,{keyword:value}).then(res=>{
+        getAction(`/sys/dict/loadDict/${this.dict}`,{keyword:value}).then(res=>{
           this.loading=false
           if(res.success){
             if(currentLoad!=this.lastLoad){
@@ -126,7 +130,7 @@
             this.options = [...this.dictOptions]
           }else{
             //根据字典Code, 初始化字典数组
-            ajaxGetDictItems(this.dictCode, null).then((res) => {
+            ajaxGetDictItems(this.dict, null).then((res) => {
               if (res.success) {
                 this.options = res.result;
               }
@@ -148,11 +152,7 @@
         this.callback()
       },
       callback(){
-        if(this.triggerChange){
-          this.$emit('change', this.selectedValue);
-        }else{
-          this.$emit('input', this.selectedValue);
-        }
+        this.$emit('change', this.selectedValue);
       },
       setCurrentDictOptions(dictOptions){
         this.options = dictOptions
@@ -161,6 +161,10 @@
         return this.options
       }
 
+    },
+    model: {
+      prop: 'value',
+      event: 'change'
     }
   }
 </script>

ant-design-jeecg-vue/src/components/dict/README.md → ant-design-vue-jeecg/src/components/dict/README.md

@@ -53,4 +53,129 @@ v-decorator用法：
        //字典值替换通用方法
        return filterDictText(this.sexDictOptions, text);
      }
-```
+```
\ No newline at end of file
+
+
+# JMultiSelectTag 多选组件
+下拉/checkbox
+
+## 参数配置
+| 参数           | 类型   | 必填 |说明|
+|--------------|---------|----|---------|
+| placeholder      |string   | | placeholder |
+| disabled      |Boolean   | | 是否禁用 |
+| type      |string   | | 多选类型 select/checkbox 默认是select |
+| dictCode      |string   | | 数据字典编码或者表名,显示字段名,存储字段名拼接而成的字符串,如果提供了options参数 则此参数可不填|
+| options      |Array   | | 多选项,如果dictCode参数未提供,可以设置此参数加载多选项 |
+
+使用示例
+----
+```vue
+<template>
+  <a-form>
+    <a-form-item label="下拉多选" style="width: 300px">
+      <j-multi-select-tag
+        v-model="selectValue"
+        :options="dictOptions"
+        placeholder="请做出你的选择">
+      </j-multi-select-tag>
+      {{ selectValue }}
+    </a-form-item>
+
+    <a-form-item label="checkbox">
+      <j-multi-select-tag
+        v-model="checkboxValue"
+        :options="dictOptions"
+        type="checkbox">
+      </j-multi-select-tag>
+      {{ checkboxValue }}
+    </a-form-item>
+  </a-form >
+</template>
+
+<script>
+  import JMultiSelectTag from '@/components/dict/JMultiSelectTag'
+  export default {
+    components: {JMultiSelectTag},
+    data() {
+      return {
+        selectValue:"",
+        checkboxValue:"",
+        dictOptions:[{
+          label:"选项一",
+          value:"1"
+        },{
+          label:"选项二",
+          value:"2"
+        },{
+          label:"选项三",
+          value:"3"
+        }]
+      }
+    }
+  }
+</script>
+```
+
+# JSearchSelectTag 字典表的搜索组件
+下拉搜索组件,支持异步加载,异步加载用于大数据量的字典表
+
+## 参数配置
+| 参数           | 类型   | 必填 |说明|
+|--------------|---------|----|---------|
+| placeholder      |string   | | placeholder |
+| disabled      |Boolean   | | 是否禁用 |
+| dict      |string   | | 表名,显示字段名,存储字段名拼接而成的字符串,如果提供了dictOptions参数 则此参数可不填|
+| dictOptions      |Array   | | 多选项,如果dict参数未提供,可以设置此参数加载多选项 |
+| async      |Boolean   | | 是否支持异步加载,设置成true,则通过输入的内容加载远程数据,否则在本地过滤数据,默认false|
+
+使用示例
+----
+```vue
+<template>
+  <a-form>
+    <a-form-item label="下拉搜索" style="width: 300px">
+      <j-search-select-tag
+        placeholder="请做出你的选择"
+        v-model="selectValue"
+        :dictOptions="dictOptions">
+      </j-search-select-tag>
+      {{ selectValue }}
+    </a-form-item>
+
+    <a-form-item label="异步加载" style="width: 300px">
+      <j-search-select-tag
+        placeholder="请做出你的选择"
+        v-model="asyncSelectValue"
+        dict="sys_depart,depart_name,id"
+        :async="true">
+      </j-search-select-tag>
+      {{ asyncSelectValue }}
+    </a-form-item>
+  </a-form >
+</template>
+
+<script>
+  import JSearchSelectTag from '@/components/dict/JSearchSelectTag'
+  export default {
+    components: {JSearchSelectTag},
+    data() {
+      return {
+        selectValue:"",
+        asyncSelectValue:"",
+        dictOptions:[{
+          text:"选项一",
+          value:"1"
+        },{
+          text:"选项二",
+          value:"2"
+        },{
+          text:"选项三",
+          value:"3"
+        }]
+      }
+    }
+  }
+</script>
+```
+

ant-design-jeecg-vue/src/components/jeecg/JCheckbox.vue → ant-design-vue-jeecg/src/components/jeecg/JCheckbox.vue

@@ -10,20 +10,10 @@
         type: String,
         required: false
       },
-      readOnly:{
-        type: Boolean,
-        required: false,
-        default: false
-      },
       /*label value*/
       options:{
         type: Array,
         required: true
-      },
-      triggerChange:{
-        type: Boolean,
-        required: false,
-        default: false
       }
     },
     data(){
@@ -42,12 +32,12 @@
     },
     methods:{
       onChange (checkedValues) {
-        if(this.triggerChange){
-          this.$emit('change', checkedValues.join(","));
-        }else{
-          this.$emit('input', checkedValues.join(","));
-        }
+        this.$emit('change', checkedValues.join(","));
       },
+    },
+    model: {
+      prop: 'value',
+      event: 'change'
     }
   }
 </script>

ant-design-jeecg-vue/src/components/jeecg/JDate.vue → ant-design-vue-jeecg/src/components/jeecg/JDate.vue

 <template>
   <a-date-picker
-    :disabled="readOnly"
+    :disabled="disabled || readOnly"
     :placeholder="placeholder"
     @change="handleDateChange"
     :value="momVal"
@@ -28,6 +28,7 @@
         default: 'YYYY-MM-DD',
         required: false
       },
+      //此属性可以被废弃了
       triggerChange:{
         type: Boolean,
         required: false,
@@ -38,6 +39,11 @@
         required: false,
         default: false
       },
+      disabled:{
+        type: Boolean,
+        required: false,
+        default: false
+      },
       showTime:{
         type: Boolean,
         required: false,
@@ -67,13 +73,13 @@
     methods: {
       moment,
       handleDateChange(mom,dateStr){
-        if(this.triggerChange){
-          this.$emit('change', dateStr);
-        }else{
-          this.$emit('input', dateStr);
-        }
+        this.$emit('change', dateStr);
       }
+    },
+    //2.2新增 在组件内定义 指定父组件调用时候的传值属性和事件类型 这个牛逼
+    model: {
+      prop: 'value',
+      event: 'change'
     }
   }
-  //note: do not set the prop value one default property
 </script>

ant-design-jeecg-vue/src/components/jeecg/JEditableTable.vue → ant-design-vue-jeecg/src/components/jeecg/JEditableTable.vue

 <!-- JEditableTable -->
-<!-- @version 1.4 -->
+<!-- @version 1.4.1 -->
 <!-- @author sjlei -->
 <template>
   <a-spin :spinning="loading">
@@ -40,6 +40,7 @@
           <!-- 右侧动态生成td -->
           <template v-for="col in columns">
             <div
+              v-show="col.type !== formTypes.hidden"
               class="td"
               :key="col.key"
               :style="buildTdStyle(col)">
@@ -93,6 +94,7 @@
               <div
                 class="td"
                 v-for="col in columns"
+                v-show="col.type !== formTypes.hidden"
                 :key="col.key"
                 :style="buildTdStyle(col)">
 
@@ -132,7 +134,6 @@
                   </template>
                   <!-- select -->
                   <template v-else-if="col.type === formTypes.select">
-                    <!-- select 真身 -->
                     <a-tooltip
                       :key="i"
                       :id="id"
@@ -154,7 +155,10 @@
                           :options="col.options"
                           :getPopupContainer="getParentContainer"
                           :placeholder="replaceProps(col, col.placeholder)"
-                          @change="(v)=>handleChangeSelectCommon(v,id,row,col)">
+                          @change="(v)=>handleChangeSelectCommon(v,id,row,col)"
+                          @search="(v)=>handleSearchSelect(v,id,row,col)"
+                          @blur="(v)=>handleBlurSearch(v,id,row,col)"
+                        >
 
                           <!--<template v-for="(opt,optKey) in col.options">-->
                           <!--<a-select-option :value="opt.value" :key="optKey">{{ opt.title }}</a-select-option>-->
@@ -247,7 +251,7 @@
 
                   <div v-else-if="col.type === formTypes.slot" :key="i">
                     <slot
-                      :name="col.slotName || col.key"
+                      :name="(col.slot || col.slotName) || col.key"
                       :text="inputValues[rowIndex][col.key]"
                       :column="col"
                       :rowId="removeCaseId(row.id)"
@@ -294,7 +298,8 @@
       // 数据源
       dataSource: {
         type: Array,
-        required: true
+        required: true,
+        default: () => []
       },
       // 是否显示操作按钮
       actionButton: {
@@ -327,6 +332,11 @@
         default() {
           return {}
         }
+      },
+      // 是否禁用全部组件
+      disabled: {
+        type: Boolean,
+        default: false
       }
     },
     data() {
@@ -421,22 +431,24 @@
       realTrWidth() {
         let calcWidth = 'calc('
         this.columns.forEach((column, i) => {
-          let { width } = column
-          if (typeof width === 'number') {
-            calcWidth += width + 'px'
-          } else if (typeof width === 'string') {
-            calcWidth += width
-          } else {
-            calcWidth += '120px'
-          }
+          let { type, width } = column
+          // 隐藏字段不参与计算
+          if (type !== FormTypes.hidden) {
+            if (typeof width === 'number') {
+              calcWidth += width + 'px'
+            } else if (typeof width === 'string') {
+              calcWidth += width
+            } else {
+              calcWidth += '120px'
+            }
 
-          if (i < this.columns.length - 1) {
-            calcWidth += ' + '
+            if (i < this.columns.length - 1) {
+              calcWidth += ' + '
+            }
           }
-
         })
         calcWidth += ')'
-        console.log('calcWidth: ', calcWidth)
+        // console.log('calcWidth: ', calcWidth)
         return calcWidth
       }
     },
@@ -451,7 +463,12 @@
         let jdateValues = {}
         // 禁用行的id
         let disabledRowIds = (this.disabledRowIds || [])
-        newValue.forEach(data => {
+        newValue.forEach((data, newValueIndex) => {
+          // 判断源数据是否带有id
+          if (data.id == null || data.id === '') {
+            data.id = this.removeCaseId(this.generateId() + newValueIndex)
+          }
+
           let value = { id: this.caseId + data.id }
           let row = { id: value.id }
           let disabled = false
@@ -475,19 +492,7 @@
               } else {
                 selectValues[inputId] = undefined
               }
-              // 兼容 旧版本 options
-              if (column.options instanceof Array) {
-                column.options = column.options.map(item => {
-                  if (item) {
-                    return {
-                      text: item.text || item.title,
-                      title: item.text || item.title,
-                      value: item.value
-                    }
-                  }
-                  return {}
-                })
-              }
+
             } else if (column.type === FormTypes.date || column.type === FormTypes.datetime) {
               jdateValues[inputId] = sourceValue
 
@@ -533,6 +538,28 @@
         })
 
       },
+      columns: {
+        immediate: true,
+        handler(columns) {
+          columns.forEach(column => {
+            if (column.type === FormTypes.select) {
+              // 兼容 旧版本 options
+              if (column.options instanceof Array) {
+                column.options = column.options.map(item => {
+                  if (item) {
+                    return {
+                      text: item.text || item.title,
+                      title: item.text || item.title,
+                      value: item.value
+                    }
+                  }
+                  return {}
+                })
+              }
+            }
+          })
+        }
+      },
       // 当selectRowIds改变时触发事件
       selectedRowIds(newValue) {
         this.$emit('selectRowChange', cloneObject(newValue))
@@ -651,14 +678,14 @@
           // record中是否有该列的值
           let recordHasValue = record[key] != null
           if (column.type === FormTypes.input) {
-            value[key] = recordHasValue ? record[key] : column.defaultValue
+            value[key] = recordHasValue ? record[key] : (column.defaultValue || (column.defaultValue === 0 ? 0 : ''))
 
           } else if (column.type === FormTypes.inputNumber) {
             // 判断是否是排序字段，如果是就赋最大值
             if (column.isOrder === true) {
               value[key] = this.getInputNumberMaxValue(column) + 1
             } else {
-              value[key] = recordHasValue ? record[key] : column.defaultValue
+              value[key] = recordHasValue ? record[key] : (column.defaultValue || (column.defaultValue === 0 ? 0 : ''))
             }
 
           } else if (column.type === FormTypes.checkbox) {
@@ -1026,29 +1053,26 @@
       },
       /** 通过规则验证值是否正确 */
       validateValue(rules, value) {
-        if (!(rules instanceof Array)) {
-          return [true, ''] // 没有验证规则，或验证规则格式不正确，默认通过
-        }
-
-        let passed = true
-        let message = ''
-        for (let rule of rules) {
-          let isNull = (value == null || value === '')
-          // 非空验证
-          if (rule.required === true) {
-            if (isNull) {
+        let passed = true, message = ''
+        // 判断有没有验证规则或验证规则格式正不正确，若条件不符合则默认通过
+        if (rules instanceof Array) {
+          for (let rule of rules) {
+            // 当前值是否为空
+            let isNull = (value == null || value === '')
+            // 验证规则：非空
+            if (rule.required === true && isNull) {
               passed = false
+            } else // 使用 else-if 是为了防止一个 rule 中出现两个规则
+            // 验证规则：正则表达式
+            if (!!rule.pattern && !isNull) {
+              passed = new RegExp(rule.pattern).test(value)
+            }
+            // 如果没有通过验证，则跳出循环。如果通过了验证，则继续验证下一条规则
+            if (!passed) {
               message = rule.message
               break
             }
-          } else // 使用 else-if 是为了防止一个 rule 中出现两个规则
-          // 正则表达式验证
-          if (rule.pattern && !isNull) {
-            passed = new RegExp(rule.pattern).test(value)
-            message = rule.message
-            break
           }
-
         }
         return [passed, message]
       },
@@ -1136,7 +1160,46 @@
       handleClickClearSelect() {
         this.selectedRowIds = []
       },
+      /** select 搜索时的事件，用于动态添加options */
+      handleSearchSelect(value, id, row, col) {
+        if (col.allowInput === true) {
+          // 是否找到了对应的项，找不到则添加这一项
+          let flag = false
+          for (let option of col.options) {
+            if (option.value.toLocaleString() === value.toLocaleString()) {
+              flag = true
+              break
+            }
+          }
+          // !!value ：不添加空值
+          if (!flag && !!value) {
+            // searchAdd 是否是通过搜索添加的
+            col.options.push({ title: value, value: value, searchAdd: true })
+          }
+
+        }
+      },
+      // blur 失去焦点
+      handleBlurSearch(value, id, row, col) {
+        if (col.allowInput === true) {
+          // 删除无用的因搜索（用户输入）而创建的项
+          if (typeof value === 'string') {
+            let indexs = []
+            col.options.forEach((option, index) => {
+              if (option.value.toLocaleString() === value.toLocaleString()) {
+                delete option.searchAdd
+              } else if (option.searchAdd === true) {
+                indexs.push(index)
+              }
+            })
+            // 翻转删除数组中的项
+            for (let index of indexs.reverse()) {
+              col.options.splice(index, 1)
+            }
+          }
 
+        }
+      },
 
       /* --- common function begin --- */
 
@@ -1251,7 +1314,8 @@
 
       /** 将caseId去除 */
       removeCaseId(id) {
-        return id.split(this.caseId)[1]
+        let remove = id.split(this.caseId)[1]
+        return remove ? remove : id
       },
 
       handleClickDelFile(id) {
@@ -1329,10 +1393,21 @@
             }
           }
         }
+        // 判断select是否允许输入
+        if (col.type === FormTypes.select && col.allowInput === true) {
+          props['showSearch'] = true
+        }
+
         // 判断是否为禁用的行
         if (props['disabled'] !== true) {
           props['disabled'] = ((this.disabledRowIds || []).indexOf(row.id) !== -1)
         }
+
+        // 判断是否禁用全部组件
+        if (this.disabled === true) {
+          props['disabled'] = true
+        }
+
         return props
       },
       /** upload 辅助方法：获取 headers */

ant-design-jeecg-vue/src/components/jeecg/JEditor.vue → ant-design-vue-jeecg/src/components/jeecg/JEditor.vue

@@ -21,6 +21,7 @@
   import 'tinymce/plugins/wordcount'
   import 'tinymce/plugins/colorpicker'
   import 'tinymce/plugins/textcolor'
+  import 'tinymce/plugins/fullscreen'
   export default {
     components: {
       Editor
@@ -41,11 +42,11 @@
       },
       plugins: {
         type: [String, Array],
-        default: 'lists image media table textcolor wordcount contextmenu'
+        default: 'lists image media table textcolor wordcount contextmenu fullscreen'
       },
       toolbar: {
         type: [String, Array],
-        default: 'undo redo |  formatselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | lists image media table | removeformat'
+        default: 'undo redo |  formatselect | bold italic | alignleft aligncenter alignright alignjustify | bullist numlist outdent indent | lists image media table | removeformat | fullscreen'
       }
     },
     data() {

ant-design-vue-jeecg/src/components/jeecg/JFormContainer.vue

+<template>
+  <div v-if="disabled" class="jeecg-form-container-disabled">
+    <fieldset disabled>
+      <slot></slot>
+    </fieldset>
+  </div>
+  <div v-else>
+    <slot></slot>
+  </div>
+</template>
+
+<script>
+  /**
+   * 使用方法
+   * 在form下直接写这个组件就行了，
+   *<a-form layout="inline" :form="form" >
+   *     <j-form-container :disabled="true">
+   *         <!-- 表单内容省略..... -->
+   *     </j-form-container>
+   *</a-form>
+   */
+  export default {
+    name: 'JFormContainer',
+    props:{
+      disabled:{
+        type:Boolean,
+        default:false,
+        required:false
+      }
+    },
+    mounted(){
+      console.log("我是表单禁用专用组件,但是我并不支持表单中iframe的内容禁用")
+    }
+  }
+</script>
+<style>
+  .jeecg-form-container-disabled{
+    cursor: not-allowed;
+  }
+  .jeecg-form-container-disabled fieldset[disabled] {
+    -ms-pointer-events: none;
+    pointer-events: none;
+  }
+  .jeecg-form-container-disabled .ant-select{
+    -ms-pointer-events: none;
+    pointer-events: none;
+  }
+</style>
\ No newline at end of file

ant-design-jeecg-vue/src/components/jeecg/JSelectMultiple.vue → ant-design-vue-jeecg/src/components/jeecg/JSelectMultiple.vue

@@ -60,6 +60,7 @@
           this.$emit('input', selectedValue.join(","));
         }
       },
-    }
+    },
+
   }
 </script>

ant-design-vue-jeecg/src/components/jeecg/JTreeDict.vue

+<template>
+  <a-tree-select
+    allowClear
+    labelInValue
+    style="width: 100%"
+    :disabled="disabled"
+    :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+    :placeholder="placeholder"
+    :loadData="asyncLoadTreeData"
+    :value="treeValue"
+    :treeData="treeData"
+    @change="onChange"
+    @search="onSearch">
+  </a-tree-select>
+</template>
+
+<script>
+  import { getAction } from '@/api/manage'
+
+  export default {
+    name: 'JTreeDict',
+    data(){
+      return {
+        treeData:[],
+        treeValue:"",
+        url_root:"/sys/category/loadTreeRoot",
+        url_children:"/sys/category/loadTreeChildren",
+        url_view:'/sys/category/loadOne',
+      }
+    },
+    props:{
+      value:{
+        type: String,
+        required: false
+      },
+      placeholder:{
+        type: String,
+        default: '请选择',
+        required: false
+      },
+      parentCode:{
+        type: String,
+        default: '',
+        required: false
+      },
+      field:{
+        type: String,
+        default: 'id',
+        required: false
+      },
+      root:{
+        type:Object,
+        required:false,
+        default:()=>{
+          return {
+            pid:'0'
+          }
+        }
+      },
+      async:{
+        type:Boolean,
+        default:false,
+        required:false
+      },
+      disabled:{
+        type:Boolean,
+        default:false,
+        required:false
+      }
+    },
+    watch:{
+      root:{
+        handler(val){
+          console.log("root-change",val)
+        },
+        deep:true
+      },
+      parentCode:{
+        handler(){
+          this.loadRoot()
+        }
+      },
+      value:{
+        handler(){
+          this.loadViewInfo()
+        }
+      }
+    },
+    created(){
+      this.loadRoot()
+      this.loadViewInfo()
+    },
+    model: {
+      prop: 'value',
+      event: 'change'
+    },
+    methods:{
+      loadViewInfo(){
+        if(!this.value || this.value=="0"){
+          this.treeValue = ""
+        }else{
+          let param = {
+            field:this.field,
+            val:this.value
+          }
+          getAction(this.url_view,param).then(res=>{
+            if(res.success){
+              this.treeValue = {
+                value:this.value,
+                label:res.result.name
+              }
+            }
+          })
+        }
+      },
+      loadRoot(){
+        let param = {
+          async:this.async,
+          pcode:this.parentCode
+        }
+        getAction(this.url_root,param).then(res=>{
+          if(res.success){
+            this.handleTreeNodeValue(res.result)
+            console.log("aaaa",res.result)
+            this.treeData = [...res.result]
+          }else{
+            this.$message.error(res.message)
+          }
+        })
+      },
+      asyncLoadTreeData (treeNode) {
+        return new Promise((resolve) => {
+          if(!this.async){
+            resolve()
+            return
+          }
+          if (treeNode.$vnode.children) {
+            resolve()
+            return
+          }
+          let pid = treeNode.$vnode.key
+          let param = {
+            pid:pid
+          }
+          getAction(this.url_children,param).then(res=>{
+            if(res.success){
+              this.handleTreeNodeValue(res.result)
+              this.addChildren(pid,res.result,this.treeData)
+              this.treeData = [...this.treeData]
+            }
+            resolve()
+          })
+        })
+      },
+      addChildren(pid,children,treeArray){
+        if(treeArray && treeArray.length>0){
+          for(let item of treeArray){
+            if(item.key == pid){
+              if(!children || children.length==0){
+                item.leaf = true
+              }else{
+                item.children = children
+              }
+              break
+            }else{
+              this.addChildren(pid,children,item.children)
+            }
+          }
+        }
+      },
+      handleTreeNodeValue(result){
+        let storeField = this.field=='code'?'code':'key'
+        for(let i of result){
+          i.value = i[storeField]
+          i.isLeaf = (!i.leaf)?false:true
+          if(i.children && i.children.length>0){
+            this.handleTreeNodeValue(i.children)
+          }
+        }
+      },
+      onChange(value){
+        console.log(value)
+        this.$emit('change', value.value);
+        this.treeValue = value
+      },
+      onSearch(value){
+        console.log(value)
+      },
+      getCurrTreeData(){
+        return this.treeData
+      }
+    }
+
+  }
+</script>
\ No newline at end of file

ant-design-vue-jeecg/src/components/jeecg/JTreeSelect.vue

+<template>
+  <a-tree-select
+    allowClear
+    labelInValue
+    style="width: 100%"
+    :disabled="disabled"
+    :dropdownStyle="{ maxHeight: '400px', overflow: 'auto' }"
+    :placeholder="placeholder"
+    :loadData="asyncLoadTreeData"
+    :value="treeValue"
+    :treeData="treeData"
+    @change="onChange"
+    @search="onSearch">
+  </a-tree-select>
+</template>
+<script>
+
+  /*
+  * 异步树加载组件 通过传入表名 显示字段 存储字段 加载一个树控件
+  * <j-tree-select dict="aa_tree_test,aad,id" pid-field="pid" ></j-tree-select>
+  * */
+  import { getAction } from '@/api/manage'
+
+  export default {
+    name: 'JTreeSelect',
+    props: {
+      value:{
+        type: String,
+        required: false
+      },
+      placeholder:{
+        type: String,
+        default: '请选择',
+        required: false
+      },
+      dict:{
+        type: String,
+        default: '',
+        required: false
+      },
+      pidField:{
+        type: String,
+        default: 'pid',
+        required: false
+      },
+      pidValue:{
+        type: String,
+        default: '0',
+        required: false
+      },
+      disabled:{
+        type:Boolean,
+        default:false,
+        required:false
+      },
+      hasChildField:{
+        type: String,
+        default: '',
+        required: false
+      }
+    },
+    data () {
+      return {
+        treeValue:"",
+        treeData:[],
+        url:"/sys/dict/loadTreeData",
+        view:'/sys/dict/loadDictItem/',
+        tableName:"",
+        text:"",
+        code:"",
+
+      }
+    },
+    watch: {
+      value () {
+        this.loadItemByCode()
+      },
+      dict(){
+        this.initDictInfo()
+        this.loadRoot();
+      }
+    },
+    created(){
+      this.initDictInfo()
+      this.loadRoot()
+      this.loadItemByCode()
+    },
+    methods: {
+      loadItemByCode(){
+        if(!this.value || this.value=="0"){
+          this.treeValue = ""
+        }else{
+          getAction(`${this.view}${this.dict}`,{key:this.value}).then(res=>{
+            if(res.success){
+              this.treeValue = {
+                key:this.value,
+                value:this.value,
+                label:res.result
+              }
+            }
+          })
+        }
+      },
+      initDictInfo(){
+        let arr = this.dict.split(",")
+        this.tableName = arr[0]
+        this.text = arr[1]
+        this.code = arr[2]
+      },
+      asyncLoadTreeData (treeNode) {
+        return new Promise((resolve) => {
+          if (treeNode.$vnode.children) {
+            resolve()
+            return
+          }
+          let pid = treeNode.$vnode.key
+          let param = {
+            pid:pid,
+            tableName:this.tableName,
+            text:this.text,
+            code:this.code,
+            pidField:this.pidField,
+            hasChildField:this.hasChildField
+          }
+          getAction(this.url,param).then(res=>{
+            if(res.success){
+              for(let i of res.result){
+                i.value = i.key
+                if(i.leaf==false){
+                  i.isLeaf=false
+                }else if(i.leaf==true){
+                  i.isLeaf=true
+                }
+              }
+              this.addChildren(pid,res.result,this.treeData)
+              this.treeData = [...this.treeData]
+            }
+            resolve()
+          })
+        })
+      },
+      addChildren(pid,children,treeArray){
+        if(treeArray && treeArray.length>0){
+          for(let item of treeArray){
+            if(item.key == pid){
+              if(!children || children.length==0){
+                item.isLeaf=true
+              }else{
+                item.children = children
+              }
+              break
+            }else{
+              this.addChildren(pid,children,item.children)
+            }
+          }
+        }
+      },
+      loadRoot(){
+        let param = {
+          pid:this.pidValue,
+          tableName:this.tableName,
+          text:this.text,
+          code:this.code,
+          pidField:this.pidField,
+          hasChildField:this.hasChildField
+        }
+        getAction(this.url,param).then(res=>{
+          if(res.success && res.result){
+            for(let i of res.result){
+              i.value = i.key
+              if(i.leaf==false){
+                i.isLeaf=false
+              }else if(i.leaf==true){
+                i.isLeaf=true
+              }
+            }
+            this.treeData = [...res.result]
+          }else{
+            console.log("数根节点查询结果-else",res)
+          }
+        })
+      },
+      onChange(value){
+        if(!value){
+          this.$emit('change', '');
+          this.treeValue = ''
+        }else{
+          this.$emit('change', value.value);
+          this.treeValue = value
+        }
+
+      },
+      onSearch(value){
+        console.log(value)
+      },
+      getCurrTreeData(){
+        return this.treeData
+      }
+    },
+    //2.2新增 在组件内定义 指定父组件调用时候的传值属性和事件类型 这个牛逼
+    model: {
+      prop: 'value',
+      event: 'change'
+    }
+  }
+</script>

ant-design-jeecg-vue/src/components/jeecg/JTreeTable.vue → ant-design-vue-jeecg/src/components/jeecg/JTreeTable.vue

@@ -4,7 +4,13 @@
     :columns="columns"
     :dataSource="dataSource"
     v-bind="tableProps"
-    @expand="handleExpand"/>
+    @expand="handleExpand">
+
+    <template v-for="(slotItem) of slots" :slot="slotItem" slot-scope="text, record, index">
+      <slot :name="slotItem" v-bind="{text,record,index}"></slot>
+    </template>
+
+  </a-table>
 </template>
 
 <script>
@@ -17,6 +23,21 @@
         type: String,
         default: 'id'
       },
+      // 根据什么查询，如果传递 id 就根据 id 查询
+      queryKey: {
+        type: String,
+        default: 'parentId'
+      },
+      queryParams: {
+        type: Object,
+        default: () => {
+        }
+      },
+      // 查询顶级时的值，如果顶级为0，则传0
+      topValue: {
+        type: String,
+        default: null
+      },
       columns: {
         type: Array,
         required: true
@@ -47,6 +68,23 @@
         } else {
           return this.url
         }
+      },
+      slots() {
+        let slots = []
+        for (let column of this.columns) {
+          if (column.scopedSlots && column.scopedSlots.customRender) {
+            slots.push(column.scopedSlots.customRender)
+          }
+        }
+        return slots
+      }
+    },
+    watch: {
+      queryParams: {
+        deep: true,
+        handler() {
+          this.loadData()
+        }
       }
     },
     created() {
@@ -55,8 +93,10 @@
     methods: {
 
       /** 加载数据*/
-      loadData(id = '0', first = true, url = this.url) {
-        return getAction(url, { id }).then(res => {
+      loadData(id = this.topValue, first = true, url = this.url) {
+        let params = Object.assign({}, this.queryParams || {})
+        params[this.queryKey] = id
+        return getAction(url, params).then(res => {
           let dataSource = res.result.map(item => {
             // 判断是否标记了带有子级
             if (item.hasChildren === true) {
@@ -81,7 +121,11 @@
           if (record.children[0].isLoading === true) {
             this.loadData(record.id, false, this.getChildrenUrl).then(dataSource => {
               // 处理好的数据可直接赋值给children
-              record.children = dataSource
+              if (dataSource.length === 0) {
+                record.children = null
+              } else {
+                record.children = dataSource
+              }
             })
           }
         }