diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
index b300717..1a50cb9 100644
--- a/src/components/ShowFile/ShowFile.vue
+++ b/src/components/ShowFile/ShowFile.vue
@@ -2426,7 +2426,7 @@ export default {
if (!file.exif && !file.video) {
return ''
}
- return "\r\n" + formatExif(file.exif) + formatVideo(file.video, '
')
+ return formatExif(file.exif, '
') + formatVideo(file.video, '
')
},
upload() {
// 打开文件选择框
diff --git a/src/components/preview/FileDetails.vue b/src/components/preview/FileDetails.vue
index 971f480..5dc6fb7 100644
--- a/src/components/preview/FileDetails.vue
+++ b/src/components/preview/FileDetails.vue
@@ -271,7 +271,7 @@ export default {
return formatSize(size)
},
formatExif(exifInfo) {
- return formatExif(exifInfo)
+ return formatExif(exifInfo, '\r\n')
},
formatVideo(videoInfo) {
return formatVideo(videoInfo, '\r\n')
diff --git a/src/utils/media.js b/src/utils/media.js
index e649f8d..6cec0a9 100644
--- a/src/utils/media.js
+++ b/src/utils/media.js
@@ -1,55 +1,56 @@
-export function formatExif(exifInfo) {
+export function formatExif(exifInfo, lineBreak) {
if (!exifInfo) {
return ''
}
+ lineBreak = lineBreak || '\r\n'
let exifStr = ''
if (exifInfo['dateTimeOriginal']) {
exifStr += `内容创作时间: ${exifInfo['dateTimeOriginal']}`
}
if (exifInfo['resolution']) {
- exifStr += `\r\n分辨率: ${exifInfo['resolution']}`
+ exifStr += `${lineBreak}分辨率: ${exifInfo['resolution']}`
}
if (exifInfo['make']) {
- exifStr += `\r\n设备制造商: ${exifInfo['make']}`
+ exifStr += `${lineBreak}设备制造商: ${exifInfo['make']}`
}
if (exifInfo['model']) {
- exifStr += `\r\n设备型号: ${exifInfo['model']}`
+ exifStr += `${lineBreak}设备型号: ${exifInfo['model']}`
}
if (exifInfo['aperture']) {
- exifStr += `\r\n光圈值: ${exifInfo['aperture']}`
+ exifStr += `${lineBreak}光圈值: ${exifInfo['aperture']}`
}
if (exifInfo['exposureTime']) {
- exifStr += `\r\n曝光时间: ${exifInfo['exposureTime']}`
+ exifStr += `${lineBreak}曝光时间: ${exifInfo['exposureTime']}`
}
if (exifInfo['focalLength']) {
- exifStr += `\r\n焦距: ${exifInfo['focalLength']} 毫米`
+ exifStr += `${lineBreak}焦距: ${exifInfo['focalLength']} 毫米`
}
if (exifInfo['isoEquivalent']) {
- exifStr += `\r\nISO感光度: ${exifInfo['isoEquivalent']}`
+ exifStr += `${lineBreak}ISO感光度: ${exifInfo['isoEquivalent']}`
}
if (exifInfo['flash']) {
- exifStr += `\r\n闪光灯: ${exifInfo['flash']}`
+ exifStr += `${lineBreak}闪光灯: ${exifInfo['flash']}`
}
if (exifInfo['fNumber']) {
- exifStr += `\r\n光圈数: ${exifInfo['fNumber']}`
+ exifStr += `${lineBreak}光圈数: ${exifInfo['fNumber']}`
}
if (exifInfo['exposureProgram']) {
- exifStr += `\r\n曝光程序: ${exifInfo['exposureProgram']}`
+ exifStr += `${lineBreak}曝光程序: ${exifInfo['exposureProgram']}`
}
if (exifInfo['meteringMode']) {
- exifStr += `\r\n测光模式: ${exifInfo['meteringMode']}`
+ exifStr += `${lineBreak}测光模式: ${exifInfo['meteringMode']}`
}
if (exifInfo['whiteBalanceMode']) {
- exifStr += `\r\n白平衡: ${exifInfo['whiteBalanceMode']}`
+ exifStr += `${lineBreak}白平衡: ${exifInfo['whiteBalanceMode']}`
}
if (exifInfo['software']) {
- exifStr += `内容创作者: ${exifInfo['software']}`
+ exifStr += `${lineBreak}内容创作者: ${exifInfo['software']}`
}
if (exifInfo['longitude']) {
- exifStr += `\r\n经度: ${exifInfo['longitude']}`
+ exifStr += `${lineBreak}经度: ${exifInfo['longitude']}`
}
if (exifInfo['latitude']) {
- exifStr += `\r\n纬度: ${exifInfo['latitude']}`
+ exifStr += `${lineBreak}纬度: ${exifInfo['latitude']}`
}
return exifStr
}
diff --git a/src/views/public/share/shareList.vue b/src/views/public/share/shareList.vue
index 032dfa2..79782d8 100644
--- a/src/views/public/share/shareList.vue
+++ b/src/views/public/share/shareList.vue
@@ -50,10 +50,12 @@