JeecgBoot 2.4.6版本发布

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: '重新登录',

ant-design-vue-jeecg/src/mixins/OnlineCommonUtil.js

@@ -1,14 +1,16 @@
 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(){
-    this.mixin_pca = new Area()
+    this.mixin_pca = new Area(this.$Jpcaa)
   },
   methods:{
     simpleDateFormat(millisecond, format){