Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
S
sts网站
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
liyang
sts网站
Commits
2a235917
Commit
2a235917
authored
Dec 10, 2021
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化下载解析blob异常提示
parent
44ce6774
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
4 deletions
+14
-4
download.js
ruoyi-ui/src/plugins/download.js
+10
-3
request.js
ruoyi-ui/src/utils/request.js
+4
-1
No files found.
ruoyi-ui/src/plugins/download.js
View file @
2a235917
...
@@ -2,6 +2,7 @@ import axios from 'axios'
...
@@ -2,6 +2,7 @@ import axios from 'axios'
import
{
Message
}
from
'element-ui'
import
{
Message
}
from
'element-ui'
import
{
saveAs
}
from
'file-saver'
import
{
saveAs
}
from
'file-saver'
import
{
getToken
}
from
'@/utils/auth'
import
{
getToken
}
from
'@/utils/auth'
import
errorCode
from
'@/utils/errorCode'
import
{
blobValidate
}
from
"@/utils/ruoyi"
;
import
{
blobValidate
}
from
"@/utils/ruoyi"
;
const
baseURL
=
process
.
env
.
VUE_APP_BASE_API
const
baseURL
=
process
.
env
.
VUE_APP_BASE_API
...
@@ -20,7 +21,7 @@ export default {
...
@@ -20,7 +21,7 @@ export default {
const
blob
=
new
Blob
([
res
.
data
])
const
blob
=
new
Blob
([
res
.
data
])
this
.
saveAs
(
blob
,
decodeURI
(
res
.
headers
[
'download-filename'
]))
this
.
saveAs
(
blob
,
decodeURI
(
res
.
headers
[
'download-filename'
]))
}
else
{
}
else
{
Message
.
error
(
'无效的会话,或者会话已过期,请重新登录。'
);
this
.
printErrMsg
(
res
.
data
);
}
}
})
})
},
},
...
@@ -37,7 +38,7 @@ export default {
...
@@ -37,7 +38,7 @@ export default {
const
blob
=
new
Blob
([
res
.
data
])
const
blob
=
new
Blob
([
res
.
data
])
this
.
saveAs
(
blob
,
decodeURI
(
res
.
headers
[
'download-filename'
]))
this
.
saveAs
(
blob
,
decodeURI
(
res
.
headers
[
'download-filename'
]))
}
else
{
}
else
{
Message
.
error
(
'无效的会话,或者会话已过期,请重新登录。'
);
this
.
printErrMsg
(
res
.
data
);
}
}
})
})
},
},
...
@@ -54,12 +55,18 @@ export default {
...
@@ -54,12 +55,18 @@ export default {
const
blob
=
new
Blob
([
res
.
data
],
{
type
:
'application/zip'
})
const
blob
=
new
Blob
([
res
.
data
],
{
type
:
'application/zip'
})
this
.
saveAs
(
blob
,
name
)
this
.
saveAs
(
blob
,
name
)
}
else
{
}
else
{
Message
.
error
(
'无效的会话,或者会话已过期,请重新登录。'
);
this
.
printErrMsg
(
res
.
data
);
}
}
})
})
},
},
saveAs
(
text
,
name
,
opts
)
{
saveAs
(
text
,
name
,
opts
)
{
saveAs
(
text
,
name
,
opts
);
saveAs
(
text
,
name
,
opts
);
},
async
printErrMsg
(
data
)
{
const
resText
=
await
data
.
text
();
const
rspObj
=
JSON
.
parse
(
resText
);
const
errMsg
=
errorCode
[
rspObj
.
code
]
||
rspObj
.
msg
||
errorCode
[
'default'
]
Message
.
error
(
errMsg
);
}
}
}
}
ruoyi-ui/src/utils/request.js
View file @
2a235917
...
@@ -108,7 +108,10 @@ export function download(url, params, filename) {
...
@@ -108,7 +108,10 @@ export function download(url, params, filename) {
const
blob
=
new
Blob
([
data
])
const
blob
=
new
Blob
([
data
])
saveAs
(
blob
,
filename
)
saveAs
(
blob
,
filename
)
}
else
{
}
else
{
Message
.
error
(
'无效的会话,或者会话已过期,请重新登录。'
);
const
resText
=
await
data
.
text
();
const
rspObj
=
JSON
.
parse
(
resText
);
const
errMsg
=
errorCode
[
rspObj
.
code
]
||
rspObj
.
msg
||
errorCode
[
'default'
]
Message
.
error
(
errMsg
);
}
}
downloadLoadingInstance
.
close
();
downloadLoadingInstance
.
close
();
}).
catch
((
r
)
=>
{
}).
catch
((
r
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment