Merge branch 'secondStage' into thirdStage

# Conflicts:
#	src/views/enterpriseStandardLibrary/publicize/EnterpriseStandardPublicize.vue
This commit is contained in:
赵霄
2024-01-04 10:01:25 +08:00
8 changed files with 73 additions and 30 deletions
+2 -2
View File
@@ -100,6 +100,7 @@ import { Base64 } from 'js-base64'
import FlowChartModal from './FlowChartModal.vue'
import UploadFile from './UploadFile'
import { filterObj } from '../utils/util'
import { kkFilePreview } from '../utils/kkFilePreview'
// 支持预览的文件后缀
const CAN_PREVIEW_FILE_SUFFIX = ['jpg', 'jpeg', 'png', 'pdf', 'doc', 'docx', 'xls', 'xlsx', 'ppt', 'pptx']
@@ -319,8 +320,7 @@ export default {
}
// word用KKfile预览
if (canPreview && (fileSuffix === 'doc' || fileSuffix === 'docx')) {
const url = `${window._CONFIG.onlinePreviewDomainURL}?url=${encodeURIComponent(Base64.encode(fileFullUrl))}`
window.open(url)
kkFilePreview(fileFullUrl)
return
}
// 如果都不能预览就下载