JeecgBoot 2.4 微服务正式版本发布，基于SpringBoot的低代码平台

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

@@ -48,18 +48,23 @@ export const JEditableTableMixin = {
 
     /** 当点击新增按钮时调用此方法 */
     add() {
-      if (typeof this.addBefore === 'function') this.addBefore()
-      // 默认新增空数据
-      let rowNum = this.addDefaultRowNum
-      if (typeof rowNum !== 'number') {
-        rowNum = 1
-        console.warn('由于你没有在 data 中定义 addDefaultRowNum 或 addDefaultRowNum 不是数字，所以默认添加一条空数据，如果不想默认添加空数据，请将定义 addDefaultRowNum 为 0')
-      }
-      this.eachAllTable((item) => {
-        item.add(rowNum)
+      //update-begin-author:lvdandan date:20201113 for:LOWCOD-1049 JEditaTable,子表默认添加一条数据，addDefaultRowNum设置无效 #1930
+      return new Promise((resolve) => {
+        resolve();
+      }).then(() => {
+        // 默认新增空数据
+        let rowNum = this.addDefaultRowNum
+        if (typeof rowNum !== 'number') {
+          rowNum = 1
+          console.warn('由于你没有在 data 中定义 addDefaultRowNum 或 addDefaultRowNum 不是数字，所以默认添加一条空数据，如果不想默认添加空数据，请将定义 addDefaultRowNum 为 0')
+        }
+        this.eachAllTable((item) => {
+          item.add(rowNum)
+        })
+        if (typeof this.addAfter === 'function') this.addAfter(this.model)
+        this.edit({})
       })
-      if (typeof this.addAfter === 'function') this.addAfter(this.model)
-      this.edit({})
+      //update-end-author:lvdandan date:20201113 for:LOWCOD-1049 JEditaTable,子表默认添加一条数据，addDefaultRowNum设置无效 #1930
     },
     /** 当点击了编辑（修改）按钮时调用此方法 */
     edit(record) {

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

@@ -7,6 +7,8 @@ import { filterObj } from '@/utils/util';
 import { deleteAction, getAction,downFile,getFileAccessHttpUrl } from '@/api/manage'
 import Vue from 'vue'
 import { ACCESS_TOKEN } from "@/store/mutation-types"
+import store from '@/store'
+import {Modal} from 'ant-design-vue'
 
 export const JeecgListMixin = {
   data(){
@@ -74,8 +76,13 @@ export const JeecgListMixin = {
       this.loading = true;
       getAction(this.url.list, params).then((res) => {
         if (res.success) {
-          this.dataSource = res.result.records;
-          this.ipagination.total = res.result.total;
+          //update-begin---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
+          this.dataSource = res.result.records||res.result;
+          if(res.result.total)
+          {
+            this.ipagination.total = res.result.total;
+          }
+          //update-end---author:zhangyafei    Date:20201118  for：适配不分页的数据列表------------
         }
         if(res.code===510){
           this.$message.warning(res.message)
@@ -233,7 +240,7 @@ export const JeecgListMixin = {
       if(!fileName || typeof fileName != "string"){
         fileName = "导出文件"
       }
-      let param = {...this.getQueryParams()};
+      let param = this.getQueryParams();
       if(this.selectedRowKeys && this.selectedRowKeys.length>0){
         param['selections'] = this.selectedRowKeys.join(",")
       }
@@ -286,7 +293,26 @@ export const JeecgListMixin = {
           this.$message.error(`${info.file.name} ${info.file.response.message}.`);
         }
       } else if (info.file.status === 'error') {
-        this.$message.error(`文件上传失败: ${info.file.msg} `);
+        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({
+              title: '登录已过期',
+              content: '很抱歉，登录已过期，请重新登录',
+              okText: '重新登录',
+              mask: false,
+              onOk: () => {
+                store.dispatch('Logout').then(() => {
+                  Vue.ls.remove(ACCESS_TOKEN)
+                  window.location.reload();
+                })
+              }
+            })
+          }
+        } else {
+          this.$message.error(`文件上传失败: ${info.file.msg} `);
+        }
       }
     },
     /* 图片预览 */

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

@@ -1,116 +0,0 @@
-import { filterMultiDictText } from '@/components/dict/JDictSelectUtil'
-
-export const HrefJump = {
-  data() {
-    return {
-      fieldHrefSlots: [],
-      hrefComponent: {
-        model: {
-          title: '',
-          width: '100%',
-          visible: false,
-          destroyOnClose: true,
-          style: {
-            top: 0,
-            left: 0,
-            height: '100%',
-            margin: 0,
-            padding: 0
-          },
-          bodyStyle: { padding: '8px', height: 'calc(100vh - 108px)', overflow: 'auto', overflowX: 'hidden' },
-          // 隐藏掉取消按钮
-          cancelButtonProps: { style: { display: 'none' } }
-        },
-        on: {
-          ok: () => this.hrefComponent.model.visible = false,
-          cancel: () => this.hrefComponent.model.visible = false
-        },
-        is: null,
-        params: {},
-      }
-    }
-  },
-  methods: {
-    // 处理接收href参数
-    handleAcceptHrefParams(){
-      this.acceptHrefParams={}
-      let hrefparam = this.$route.query;
-      if(hrefparam){
-        this.acceptHrefParams = {...hrefparam}
-      }
-    },
-    //支持链接href跳转
-    handleClickFieldHref(field, record) {
-      let href = field.href
-      let urlPattern = /(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&%\$#_]*)?/
-      let compPattern = /\.vue(\?.*)?$/
-      if (typeof href === 'string') {
-        href = href.trim().replace(/\${([^}]+)?}/g, (s1, s2) => record[s2])
-        if (urlPattern.test(href)) {
-          window.open(href, '_blank')
-        } else if (compPattern.test(href)) {
-          this.openHrefCompModal(href)
-        } else {
-          this.$router.push(href)
-        }
-      }
-    },
-    openHrefCompModal(href) {
-      // 解析 href 参数
-      let index = href.indexOf('?')
-      let path = href
-      if (index !== -1) {
-        path = href.substring(0, index)
-        let paramString = href.substring(index + 1, href.length)
-        let paramArray = paramString.split('&')
-        let params = {}
-        paramArray.forEach(paramObject => {
-          let paramItem = paramObject.split('=')
-          params[paramItem[0]] = paramItem[1]
-        })
-        this.hrefComponent.params = params
-      } else {
-        this.hrefComponent.params = {}
-      }
-      this.hrefComponent.model.visible = true
-      this.hrefComponent.model.title = '操作'
-      this.hrefComponent.is = () => import('@/views/' + (path.startsWith('/') ? path.slice(1) : path))
-    },
-    /** 处理列中的 href 跳转和 dict 字典，使两者可以兼容存在 */
-    handleColumnHrefAndDict(column = {}, fieldHrefSlotKeysMap = {}) {
-      let { customRender, hrefSlotName } = column
-      if (!hrefSlotName && (column.scopedSlots && column.scopedSlots.customRender)) {
-        //hrefSlotName = column.scopedSlots.customRender
-      }
-      // 如果 customRender 有值则代表使用了字典
-      // 如果 hrefSlotName 有值则代表使用了href跳转
-      // 两者可以兼容。兼容的具体思路为：先获取到字典替换的值，再添加href链接跳转
-      if (customRender || hrefSlotName) {
-        let dictCode = customRender
-        let replaceFlag = '_replace_text_'
-        column.customRender = (text, record) => {
-          let value = text
-          // 如果 dictCode 有值，就进行字典转换
-          if (dictCode) {
-            if (dictCode.startsWith(replaceFlag)) {
-              let textFieldName = dictCode.replace(replaceFlag, '')
-              value = record[textFieldName]
-            } else {
-              value = filterMultiDictText(this.dictOptions[dictCode], text)
-            }
-          }
-          // 如果 hrefSlotName 有值，就生成一个 a 标签，包裹住字典替换后（或原生）的值
-          if (hrefSlotName) {
-            let field = fieldHrefSlotKeysMap[hrefSlotName]
-            if (field) {
-              // 此处为 JSX 语法
-              return (<a onClick={() => this.handleClickFieldHref(field, record)}>{value}</a>)
-            }
-          }
-          return value
-        }
-      }
-    },
-
-  }
-}