From e31a3432a0ad6916cd183d74298ae608e3bac184 Mon Sep 17 00:00:00 2001 From: Timi Date: Sun, 4 Jan 2026 19:09:28 +0800 Subject: [PATCH] remove PreviewImageMetadata.isImage/isVideo --- miniprogram/components/journal-detail-popup/index.ts | 3 ++- miniprogram/components/travel-location-popup/index.ts | 3 ++- miniprogram/pages/main/journal-editor/index.ts | 3 ++- miniprogram/pages/main/journal/index.ts | 3 ++- miniprogram/pages/main/moment/index.ts | 6 ++++-- miniprogram/pages/main/portfolio/index.ts | 3 ++- miniprogram/pages/main/travel-location-detail/index.ts | 3 ++- miniprogram/pages/main/travel-location-editor/index.ts | 3 ++- miniprogram/types/Attachment.ts | 7 ++----- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/miniprogram/components/journal-detail-popup/index.ts b/miniprogram/components/journal-detail-popup/index.ts index 00c72db..d5fd1a0 100644 --- a/miniprogram/components/journal-detail-popup/index.ts +++ b/miniprogram/components/journal-detail-popup/index.ts @@ -50,8 +50,9 @@ Component({ const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; + const isVideo = metadata.sourceMimeType?.startsWith("video/"); return { - type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, + type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, thumbURL, sourceURL, size: thumbItem.size || 0, diff --git a/miniprogram/components/travel-location-popup/index.ts b/miniprogram/components/travel-location-popup/index.ts index 1debc41..b48bf2e 100644 --- a/miniprogram/components/travel-location-popup/index.ts +++ b/miniprogram/components/travel-location-popup/index.ts @@ -46,8 +46,9 @@ Component({ const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; + const isVideo = metadata.sourceMimeType?.startsWith("video/"); return { - type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, + type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, thumbURL, sourceURL, size: thumbItem.size || 0, diff --git a/miniprogram/pages/main/journal-editor/index.ts b/miniprogram/pages/main/journal-editor/index.ts index 770e79c..9123ebc 100644 --- a/miniprogram/pages/main/journal-editor/index.ts +++ b/miniprogram/pages/main/journal-editor/index.ts @@ -159,8 +159,9 @@ Page({ const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; + const isVideo = metadata.sourceMimeType?.startsWith("video/"); return { - type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, + type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, thumbURL, sourceURL, size: thumbItem.size || 0, diff --git a/miniprogram/pages/main/journal/index.ts b/miniprogram/pages/main/journal/index.ts index 514e1e3..74f591b 100644 --- a/miniprogram/pages/main/journal/index.ts +++ b/miniprogram/pages/main/journal/index.ts @@ -166,8 +166,9 @@ Page({ const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; + const isVideo = metadata.sourceMimeType?.startsWith("video/"); return { - type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, + type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, thumbURL, sourceURL, size: thumbItem.size || 0, diff --git a/miniprogram/pages/main/moment/index.ts b/miniprogram/pages/main/moment/index.ts index 35bafb4..3c83a91 100644 --- a/miniprogram/pages/main/moment/index.ts +++ b/miniprogram/pages/main/moment/index.ts @@ -137,9 +137,10 @@ Page({ const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata; const thumbURL = `${config.url}/attachment/read/${item.mongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; + const isImage = metadata.sourceMimeType?.startsWith("image/"); return { id: item.id, - type: metadata.isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO, + type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO, thumbURL, sourceURL, checked: false @@ -262,9 +263,10 @@ Page({ const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata; const thumbURL = `${config.url}/attachment/read/${item.mongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; + const isImage = item.mimeType?.startsWith("image/"); return { id: item.id, - type: metadata.isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO, + type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO, thumbURL, sourceURL, checked: false diff --git a/miniprogram/pages/main/portfolio/index.ts b/miniprogram/pages/main/portfolio/index.ts index 4315aef..23fe4d3 100644 --- a/miniprogram/pages/main/portfolio/index.ts +++ b/miniprogram/pages/main/portfolio/index.ts @@ -95,8 +95,9 @@ Page({ const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; + const isVideo = metadata.sourceMimeType?.startsWith("video/"); return { - type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, + type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, thumbURL, sourceURL, size: thumbItem.size || 0, diff --git a/miniprogram/pages/main/travel-location-detail/index.ts b/miniprogram/pages/main/travel-location-detail/index.ts index 043cc19..2759033 100644 --- a/miniprogram/pages/main/travel-location-detail/index.ts +++ b/miniprogram/pages/main/travel-location-detail/index.ts @@ -98,8 +98,9 @@ Page({ const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; + const isVideo = metadata.sourceMimeType?.startsWith("video/"); mediaItems.push({ - type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, + type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, thumbURL, sourceURL, size: thumbItem.size || 0, diff --git a/miniprogram/pages/main/travel-location-editor/index.ts b/miniprogram/pages/main/travel-location-editor/index.ts index e743f65..ceb354c 100644 --- a/miniprogram/pages/main/travel-location-editor/index.ts +++ b/miniprogram/pages/main/travel-location-editor/index.ts @@ -164,8 +164,9 @@ Page({ const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; + const isVideo = metadata.sourceMimeType?.startsWith("video/"); return { - type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, + type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, thumbURL, sourceURL, size: thumbItem.size || 0, diff --git a/miniprogram/types/Attachment.ts b/miniprogram/types/Attachment.ts index 6e86d5a..3aef64c 100644 --- a/miniprogram/types/Attachment.ts +++ b/miniprogram/types/Attachment.ts @@ -57,9 +57,6 @@ export type PreviewImageMetadata = { /** 原文件访问 mongoId */ sourceMongoId: string; - /** true 为图片 */ - isImage: boolean; - - /** true 为视频 */ - isVideo: boolean; + /** 原文件 MimeType */ + sourceMimeType: string; } & ImageMetadata;