From 83925832be4093fa2b70838c8f722cb68ce52619 Mon Sep 17 00:00:00 2001 From: kangfenmao Date: Fri, 20 Sep 2024 11:38:30 +0800 Subject: [PATCH] fix: attachment open handler --- .../src/pages/home/Messages/MessageAttachments.tsx | 9 ++++++--- src/renderer/src/services/file.ts | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/renderer/src/pages/home/Messages/MessageAttachments.tsx b/src/renderer/src/pages/home/Messages/MessageAttachments.tsx index fe98065d..0900f36f 100644 --- a/src/renderer/src/pages/home/Messages/MessageAttachments.tsx +++ b/src/renderer/src/pages/home/Messages/MessageAttachments.tsx @@ -1,5 +1,5 @@ +import FileManager from '@renderer/services/file' import { FileTypes, Message } from '@renderer/types' -import { getFileDirectory } from '@renderer/utils' import { Image as AntdImage, Upload } from 'antd' import { FC } from 'react' import styled from 'styled-components' @@ -9,6 +9,10 @@ interface Props { } const MessageAttachments: FC = ({ message }) => { + if (!message.files) { + return null + } + if (message?.files && message.files[0]?.type === FileTypes.IMAGE) { return ( @@ -22,10 +26,9 @@ const MessageAttachments: FC = ({ message }) => { item.url && window.open(getFileDirectory(item.url))} fileList={message.files?.map((file) => ({ uid: file.id, - url: 'file://' + file.path, + url: 'file://' + FileManager.getSafePath(file), status: 'done', name: file.origin_name }))} diff --git a/src/renderer/src/services/file.ts b/src/renderer/src/services/file.ts index f2cd155e..cb4eb610 100644 --- a/src/renderer/src/services/file.ts +++ b/src/renderer/src/services/file.ts @@ -55,7 +55,7 @@ class FileManager { } static isDangerFile(file: FileType) { - return ['.sh', '.bat', '.cmd', '.ps1'].includes(file.ext) + return ['.sh', '.bat', '.cmd', '.ps1', '.vbs', 'reg'].includes(file.ext) } static getSafePath(file: FileType) {