JeecgBoot 2.4.6版本发布

ant-design-vue-jeecg/src/views/system/QuartzJobList.vue

@@ -214,7 +214,12 @@
           this.isorter.order = "ascend" == sorter.order ? "asc" : "desc"
         }
         //这种筛选方式只支持单选
-        this.filters.status = filters.status[0];
+        
+        // update-begin-author:liusq date:20210624 for:前台定时任务无法翻页  #2666
+        if(filters && Object.keys(filters).length>0 && filters.status){
+          this.filters.status = filters.status[0];
+        }
+        // update-end-author:liusq date:20210624 for:前台定时任务无法翻页  #2666
         this.ipagination = pagination;
         this.loadData();
       },

ant-design-vue-jeecg/src/views/system/SysDataSourceList.vue

@@ -122,11 +122,6 @@
             align: 'center',
             customRender: (t, r, index) => index + 1
           },
-          {
-            title: '数据源编码',
-            align: 'center',
-            dataIndex: 'code'
-          },
           {
             title: '数据源名称',
             align: 'center',
@@ -149,11 +144,6 @@
             dataIndex: 'dbUrl',
             customRender: (t) => ellipsis(t)
           },
-          {
-            title: '数据库名称',
-            align: 'center',
-            dataIndex: 'dbName'
-          },
           {
             title: '用户名',
             align: 'center',

ant-design-vue-jeecg/src/views/system/SysUserOnlineList.vue

@@ -70,7 +70,7 @@
   import {getFileAccessHttpUrl} from '@/api/manage';
 
   export default {
-    name: "SysOnlineList",
+    name: "SysUserOnlineList",
     mixins:[JeecgListMixin, mixinDevice],
     components: {},
     data () {

ant-design-vue-jeecg/src/views/system/UserList.vue

@@ -291,7 +291,7 @@
         superQueryFieldList: [
           { type: 'input', value: 'username', text: '用户账号', },
           { type: 'input', value: 'realname', text: '用户姓名', },
-          { type: 'select', value: 'sex', text: '性别', dictCode: 'sex' },
+          { type: 'select', value: 'sex', dbType: 'int', text: '性别', dictCode: 'sex' },
         ],
         url: {
           syncUser: "/act/process/extActProcess/doSyncUser",

ant-design-vue-jeecg/src/views/system/modules/SysCategoryModal.vue

@@ -22,11 +22,11 @@
            :disabled="disabled">
           </j-tree-select>
         </a-form-model-item>
-          
+
         <a-form-model-item label="分类名称" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="name">
           <a-input v-model="model.name" placeholder="请输入分类名称"></a-input>
         </a-form-model-item>
-          
+
       </a-form-model>
     </a-spin>
   </a-modal>
@@ -36,10 +36,10 @@
 
   import { httpAction,getAction } from '@/api/manage'
   import JTreeSelect from '@/components/jeecg/JTreeSelect'
-  
+
   export default {
     name: "SysCategoryModal",
-    components: { 
+    components: {
       JTreeSelect
     },
     data () {
@@ -70,7 +70,7 @@
         expandedRowKeys:[],
         pidField:"pid",
         subExpandedKeys:[]
-     
+
       }
     },
     created () {
@@ -111,7 +111,8 @@
             httpAction(httpurl,this.model,method).then((res)=>{
               if(res.success){
                 that.$message.success(res.message);
-                that.submitSuccess(this.model)
+                // close的时候清空了表单的值 导致model为空 修改值在列表页没有变 此处需要复制一下model
+                that.submitSuccess({...this.model})
               }else{
                 that.$message.warning(res.message);
               }
@@ -122,7 +123,7 @@
           }else{
             return false;
           }
-         
+
         })
       },
       handleCancel () {

ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue

@@ -41,12 +41,12 @@
           label="数据源地址">
           <a-input placeholder="请输入数据源地址" v-decorator="['dbUrl', validatorRules.dbUrl]"/>
         </a-form-item>
-        <a-form-item
+       <!-- <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="数据库名称">
           <a-input placeholder="请输入数据库名称" v-decorator="['dbName', validatorRules.dbName]"/>
-        </a-form-item>
+        </a-form-item>-->
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
@@ -124,7 +124,7 @@
           dbUrl: { rules: [{ required: true, message: '请输入数据源地址!' }] },
           dbName: { rules: [{ required: true, message: '请输入数据库名称!' }] },
           dbUsername: { rules: [{ required: true, message: '请输入用户名!' }] },
-          dbPassword: { rules: [{ required: true, message: '请输入密码!' }] }
+          dbPassword: { rules: [{ required: false, message: '请输入密码!' }] }
         },
         url: {
           add: '/sys/dataSource/add',
@@ -142,7 +142,25 @@
           // marialDB 数据库
           '5': { dbDriver: 'org.mariadb.jdbc.Driver' },
           // postgresql 数据库
-          '6': { dbDriver: 'org.postgresql.Driver' }
+          '6': { dbDriver: 'org.postgresql.Driver' },
+          // 达梦 数据库
+          '7': { dbDriver: 'dm.jdbc.driver.DmDriver' },
+          // 人大金仓 数据库
+          '8': { dbDriver: 'com.kingbase8.Driver' },
+          // 神通 数据库
+          '9': { dbDriver: 'com.oscar.Driver' },
+          // SQLite 数据库
+          '10': { dbDriver: 'org.sqlite.JDBC' },
+          // DB2 数据库
+          '11': { dbDriver: 'com.ibm.db2.jcc.DB2Driver' },
+          // Hsqldb 数据库
+          '12': { dbDriver: 'org.hsqldb.jdbc.JDBCDriver' },
+          // Derby 数据库
+          '13': { dbDriver: 'org.apache.derby.jdbc.ClientDriver' },
+          // H2 数据库
+          '14': { dbDriver: 'org.h2.Driver' },
+          // 其他数据库
+          '15': { dbDriver: '' }
         },
         dbUrlMap: {
           // MySQL 数据库
@@ -153,10 +171,28 @@
           '2': { dbUrl: 'jdbc:oracle:thin:@127.0.0.1:1521:ORCL' },
           // SQLServer 数据库
           '3': { dbUrl: 'jdbc:sqlserver://127.0.0.1:1433;SelectMethod=cursor;DatabaseName=jeecgboot' },
-          // SQLServer 数据库
+          // Mariadb 数据库
           '5': { dbUrl: 'jdbc:mariadb://127.0.0.1:3306/jeecg-boot?characterEncoding=UTF-8&useSSL=false' },
-          // SQLServer 数据库
-          '6': { dbUrl: 'jdbc:postgresql://127.0.0.1:5432/jeecg-boot' }
+          // Postgresql 数据库
+          '6': { dbUrl: 'jdbc:postgresql://127.0.0.1:5432/jeecg-boot' },
+          // 达梦 数据库
+          '7': { dbUrl: 'jdbc:dm://127.0.0.1:5236/?jeecg-boot&zeroDateTimeBehavior=convertToNull&useUnicode=true&characterEncoding=utf-8' },
+          // 人大金仓 数据库
+          '8': { dbUrl: 'jdbc:kingbase8://127.0.0.1:54321/jeecg-boot' },
+          // 神通 数据库
+          '9': { dbUrl: 'jdbc:oscar://192.168.1.125:2003/jeecg-boot' },
+          // SQLite 数据库
+          '10': { dbUrl: 'jdbc:sqlite://opt/test.db' },
+          // DB2 数据库
+          '11': { dbUrl: 'jdbc:db2://127.0.0.1:50000/jeecg-boot' },
+          // Hsqldb 数据库
+          '12': { dbUrl: 'jdbc:hsqldb:hsql://127.0.0.1/jeecg-boot' },
+          // Derby 数据库
+          '13': { dbUrl: 'jdbc:derby://127.0.0.1:1527/jeecg-boot' },
+          // H2 数据库
+          '14': { dbUrl: 'jdbc:h2:tcp://127.0.0.1:8082/jeecg-boot' },
+          // 其他数据库
+          '15': { dbUrl: '' }
         }
       }
     },

ant-design-vue-jeecg/src/views/system/modules/UserModal.vue

@@ -59,7 +59,7 @@
 
         <!--部门分配-->
         <a-form-model-item label="部门分配" :labelCol="labelCol" :wrapperCol="wrapperCol" v-show="!departDisabled">
-          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true"></j-select-depart>
+          <j-select-depart v-model="model.selecteddeparts" :multi="true" @back="backDepartInfo" :backDepart="true" :treeOpera="true">></j-select-depart>
         </a-form-model-item>
 
         <!--租户分配-->