diff --git a/src/stores/ConversationStore.js b/src/stores/ConversationStore.js index 912a178..8381d85 100644 --- a/src/stores/ConversationStore.js +++ b/src/stores/ConversationStore.js @@ -149,7 +149,7 @@ const websocketSlice = (set, get) => ({ }, 500); }, handleMessage: (data) => { - olog('handleMessage------------------'); + olog('handleMessage------------------', data); // console.log(data); const { updateMessageItem, sentOrReceivedNewMessage, addGlobalNotify } = get(); const { errcode, errmsg, result } = data; diff --git a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx index 6cb74f6..29f7178 100644 --- a/src/views/Conversations/Online/Input/EmailEditorPopup.jsx +++ b/src/views/Conversations/Online/Input/EmailEditorPopup.jsx @@ -18,6 +18,10 @@ import { useEmailDetail } from '@/hooks/useEmail'; import useSnippetStore from '@/stores/SnippetStore' import { useOrderStore } from '@/stores/OrderStore' +// 禁止上传的附件类型 +// .application, .exe, .app +const disallowedAttachmentTypes = ['.ps1','.msi','application/x-msdownload', 'application/x-ms-dos-executable', 'application/x-ms-wmd', 'application/x-ms-wmz', 'application/x-ms-xbap', 'application/x-msaccess', ]; + const getAbstract = (longtext) => { const lines = longtext.split('\n'); const firstLine = lines[0]; @@ -244,7 +248,7 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers setFileList(newFileList); }; const normFile = (e) => { - console.log('Upload event:', e); + // console.log('Upload event:', e); if (Array.isArray(e)) { return e; } @@ -256,8 +260,16 @@ const EmailEditorPopup = ({ open, setOpen, fromEmail, fromUser, toEmail, convers multiple: true, fileList, beforeUpload: (file) => { + // console.log('beforeUpload', file); + const lastDotIndex = file.name.lastIndexOf('.'); + const extension = file.name.slice(lastDotIndex).toLocaleLowerCase(); + if (disallowedAttachmentTypes.includes(file.type) || disallowedAttachmentTypes.includes(extension)) { + message.warning('不支持的文件格式: '+ extension) + return false; + } + setFileList(prev => [...prev, file]); - return false; + return false; // 阻止默认上传, 附件不上传阿里云 }, onRemove: (file) => { const index = fileList.indexOf(file); diff --git a/src/views/Conversations/Online/Input/MediaUpload.jsx b/src/views/Conversations/Online/Input/MediaUpload.jsx index b75c2dc..ddc1c91 100644 --- a/src/views/Conversations/Online/Input/MediaUpload.jsx +++ b/src/views/Conversations/Online/Input/MediaUpload.jsx @@ -54,7 +54,6 @@ const ImageUpload = ({ disabled, invokeUploadFileMessage, invokeSendUploadMessag const uploadProps = { name: 'file', action: `${API_HOST}/WAFileUpload`, - // action: 'https://run.mocky.io/v3/435e224c-44fb-4773-9faf-380c5e6a2188', // test: headers: { 'X-Requested-With': null },