summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author陈劲松 <[email protected]>2023-07-05 03:32:42 +0000
committer陈劲松 <[email protected]>2023-07-05 03:32:42 +0000
commit5ee7631d2551ea69615202e0ae9e563929eb8fb6 (patch)
tree2b2d1fb27d6447e57f15ddf8102bc2c9d89fda6f
parentb178941f0119a7268ca4acc825adc28411b818b3 (diff)
parent28c0b3aebf16a85e5aa593ea9e09d20c2a6b2076 (diff)
Merge branch 'cherry-pick-53b40851' into 'dev-23.02'23.02-rc2dev-23.02
CN-1156 fix: 修复s3=0时无法下载和预览的问题 See merge request cyber-narrator/cn-ui!32
-rw-r--r--src/mixins/data-list.js20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/mixins/data-list.js b/src/mixins/data-list.js
index 543e1d5d..7c1c3555 100644
--- a/src/mixins/data-list.js
+++ b/src/mixins/data-list.js
@@ -222,8 +222,14 @@ export default {
if (this.$refs.dataTable.loadingTableId === u.id) { // 列表单个下载
return
}
- if (u.state !== 1 || u.upload !== 1) {
- return
+ if (localStorage.getItem(storageKey.s3Enable) == 1) {
+ if (u.state !== 1 || u.upload !== 1) {
+ return
+ }
+ } else {
+ if (u.state !== 1) {
+ return
+ }
}
let fileName = ''
let url = ''
@@ -284,8 +290,14 @@ export default {
if (this.$refs.dataTable.loadingPreviewId === u.id) { // 列表单个下载
return
}
- if (u.state !== 1 || u.upload !== 1) {
- return
+ if (localStorage.getItem(storageKey.s3Enable) == 1) {
+ if (u.state !== 1 || u.upload !== 1) {
+ return
+ }
+ } else {
+ if (u.state !== 1) {
+ return
+ }
}
const params = {
id: u.id