timi/gaoYuJournal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove PreviewImageMetadata.isImage/isVideo

Browse Source
This commit is contained in:
Timi
2026-01-04 19:09:28 +08:00
parent 2c6478c729
commit e31a3432a0
9 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
miniprogram/components/journal-detail-popup/index.ts
View File

@ -50,8 +50,9 @@ Component({
const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

3
miniprogram/components/travel-location-popup/index.ts
View File

@ -46,8 +46,9 @@ Component({
const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

3
miniprogram/pages/main/journal-editor/index.ts
View File

@ -159,8 +159,9 @@ Page({
const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

3
miniprogram/pages/main/journal/index.ts
View File

@ -166,8 +166,9 @@ Page({
const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

6
miniprogram/pages/main/moment/index.ts
View File

@ -137,9 +137,10 @@ Page({
const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata; const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${item.mongoId}`; const thumbURL = `${config.url}/attachment/read/${item.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isImage = metadata.sourceMimeType?.startsWith("image/");
return { return {
id: item.id, id: item.id,
type: metadata.isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO, type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
thumbURL, thumbURL,
sourceURL, sourceURL,
checked: false checked: false
@ -262,9 +263,10 @@ Page({
const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata; const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${item.mongoId}`; const thumbURL = `${config.url}/attachment/read/${item.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isImage = item.mimeType?.startsWith("image/");
return { return {
id: item.id, id: item.id,
type: metadata.isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO, type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
thumbURL, thumbURL,
sourceURL, sourceURL,
checked: false checked: false

3
miniprogram/pages/main/portfolio/index.ts
View File

@ -95,8 +95,9 @@ Page({
const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

3
miniprogram/pages/main/travel-location-detail/index.ts
View File

@ -98,8 +98,9 @@ Page({
const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
mediaItems.push({ mediaItems.push({
type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

3
miniprogram/pages/main/travel-location-editor/index.ts
View File

@ -164,8 +164,9 @@ Page({
const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata; const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`; const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`; const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isVideo = metadata.sourceMimeType?.startsWith("video/");
return { return {
type: metadata.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE, type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
thumbURL, thumbURL,
sourceURL, sourceURL,
size: thumbItem.size || 0, size: thumbItem.size || 0,

7
miniprogram/types/Attachment.ts
View File

@ -57,9 +57,6 @@ export type PreviewImageMetadata = {
/** 原文件访问 mongoId */ /** 原文件访问 mongoId */
sourceMongoId: string; sourceMongoId: string;
/** true 为图片 */ /** 原文件 MimeType */
isImage: boolean; sourceMimeType: string;
/** true 为视频 */
isVideo: boolean;
} & ImageMetadata; } & ImageMetadata;