From 06fbda53248c3e4dfdb09db2bc05a957f918bfd9 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期一, 07 十一月 2022 11:20:02 +0800
Subject: [PATCH] 修复sheet超出最大行数异常问题
---
ruoyi-ui/src/utils/request.js | 52 +++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 11 deletions(-)
diff --git a/ruoyi-ui/src/utils/request.js b/ruoyi-ui/src/utils/request.js
index 12e535a..80ee3c3 100644
--- a/ruoyi-ui/src/utils/request.js
+++ b/ruoyi-ui/src/utils/request.js
@@ -4,11 +4,12 @@
import { getToken } from '@/utils/auth'
import errorCode from '@/utils/errorCode'
import { tansParams, blobValidate } from "@/utils/ruoyi";
+import cache from '@/plugins/cache'
import { saveAs } from 'file-saver'
let downloadLoadingInstance;
// 是否显示重新登录
-let isReloginShow;
+export let isRelogin = { show: false };
axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
// 创建axios实例
@@ -23,6 +24,8 @@
service.interceptors.request.use(config => {
// 是否需要设置 token
const isToken = (config.headers || {}).isToken === false
+ // 是否需要防止数据重复提交
+ const isRepeatSubmit = (config.headers || {}).repeatSubmit === false
if (getToken() && !isToken) {
config.headers['Authorization'] = 'Bearer ' + getToken() // 让每个请求携带自定义token 请根据实际情况自行修改
}
@@ -32,6 +35,29 @@
url = url.slice(0, -1);
config.params = {};
config.url = url;
+ }
+ if (!isRepeatSubmit && (config.method === 'post' || config.method === 'put')) {
+ const requestObj = {
+ url: config.url,
+ data: typeof config.data === 'object' ? JSON.stringify(config.data) : config.data,
+ time: new Date().getTime()
+ }
+ const sessionObj = cache.session.getJSON('sessionObj')
+ if (sessionObj === undefined || sessionObj === null || sessionObj === '') {
+ cache.session.setJSON('sessionObj', requestObj)
+ } else {
+ const s_url = sessionObj.url; // 请求地址
+ const s_data = sessionObj.data; // 请求数据
+ const s_time = sessionObj.time; // 请求时间
+ const interval = 1000; // 间隔时间(ms)，小于此时间视为重复提交
+ if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
+ const message = '数据正在处理，请勿重复提交';
+ console.warn(`[${s_url}]: ` + message)
+ return Promise.reject(new Error(message))
+ } else {
+ cache.session.setJSON('sessionObj', requestObj)
+ }
+ }
}
return config
}, error => {
@@ -50,23 +76,20 @@
return res.data
}
if (code === 401) {
- if (!isReloginShow) {
- isReloginShow = true;
+ if (!isRelogin.show) {
+ isRelogin.show = true;
MessageBox.confirm('登录状态已过期，您可以继续留在该页面，或者重新登录', '系统提示', {
confirmButtonText: '重新登录',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
- isReloginShow = false;
+ isRelogin.show = false;
store.dispatch('LogOut').then(() => {
- // 如果是登录页面不需要重新加载
- if (window.location.hash.indexOf("#/login") != 0) {
- location.href = '/index';
- }
+ location.href = '/index';
})
}).catch(() => {
- isReloginShow = false;
+ isRelogin.show = false;
});
}
return Promise.reject('无效的会话，或者会话已过期，请重新登录。')
@@ -76,6 +99,12 @@
type: 'error'
})
return Promise.reject(new Error(msg))
+ } else if (code === 601) {
+ Message({
+ message: msg,
+ type: 'warning'
+ })
+ return Promise.reject('error')
} else if (code !== 200) {
Notification.error({
title: msg
@@ -107,12 +136,13 @@
)
// 通用下载方法
-export function download(url, params, filename) {
+export function download(url, params, filename, config) {
downloadLoadingInstance = Loading.service({ text: "正在下载数据，请稍候", spinner: "el-icon-loading", background: "rgba(0, 0, 0, 0.7)", })
return service.post(url, params, {
transformRequest: [(params) => { return tansParams(params) }],
headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
- responseType: 'blob'
+ responseType: 'blob',
+ ...config
}).then(async (data) => {
const isLogin = await blobValidate(data);
if (isLogin) {
--
Gitblit v1.9.2