From 6bfae2652f63d1929cd0987655752214b84d2ec2 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 01 十二月 2021 08:53:11 +0800
Subject: [PATCH] 若依 3.8.0
---
ruoyi-ui/src/plugins/download.js | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/ruoyi-ui/src/plugins/download.js b/ruoyi-ui/src/plugins/download.js
index 2aa8122..103e106 100644
--- a/ruoyi-ui/src/plugins/download.js
+++ b/ruoyi-ui/src/plugins/download.js
@@ -1,7 +1,8 @@
-import { saveAs } from 'file-saver'
import axios from 'axios'
-import { getToken } from '@/utils/auth'
import { Message } from 'element-ui'
+import { saveAs } from 'file-saver'
+import { getToken } from '@/utils/auth'
+import { blobValidate } from "@/utils/ruoyi";
const baseURL = process.env.VUE_APP_BASE_API
@@ -14,7 +15,7 @@
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(async (res) => {
- const isLogin = await this.blobValidate(res.data);
+ const isLogin = await blobValidate(res.data);
if (isLogin) {
const blob = new Blob([res.data])
this.saveAs(blob, decodeURI(res.headers['download-filename']))
@@ -31,7 +32,7 @@
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(async (res) => {
- const isLogin = await this.blobValidate(res.data);
+ const isLogin = await blobValidate(res.data);
if (isLogin) {
const blob = new Blob([res.data])
this.saveAs(blob, decodeURI(res.headers['download-filename']))
@@ -48,7 +49,7 @@
responseType: 'blob',
headers: { 'Authorization': 'Bearer ' + getToken() }
}).then(async (res) => {
- const isLogin = await this.blobValidate(res.data);
+ const isLogin = await blobValidate(res.data);
if (isLogin) {
const blob = new Blob([res.data], { type: 'application/zip' })
this.saveAs(blob, name)
@@ -59,15 +60,6 @@
},
saveAs(text, name, opts) {
saveAs(text, name, opts);
- },
- async blobValidate(data) {
- try {
- const text = await data.text();
- JSON.parse(text);
- return false;
- } catch (error) {
- return true;
- }
- },
+ }
}
--
Gitblit v1.9.2