diff --git a/env/.env.test b/env/.env.test index e7f905e..43930b6 100644 --- a/env/.env.test +++ b/env/.env.test @@ -8,4 +8,5 @@ VUE_APP_PREVIEW=false VITE_BASE_API=http://114.218.158.24:8503 VITE_SOCKET_API=ws://114.218.158.24:8504 VITE_EPR_BASEURL=http://114.218.158.24:9020 +VITE_PAGE_URL=http://172.16.100.93:9032 VUE_APP_WEBSITE_NAME="" \ No newline at end of file diff --git a/src/components/editor/Editor.vue b/src/components/editor/Editor.vue index fef3e47..5bc1b8e 100644 --- a/src/components/editor/Editor.vue +++ b/src/components/editor/Editor.vue @@ -363,22 +363,9 @@ async function onUploadFile(e: any) { console.log("文件类型"+file.type) if (file.type.indexOf('image/') === 0) { console.log("进入图片") - // 处理图片文件 - const quill = getQuill() - let index = getQuillSelectionIndex() - - // 删除编辑器中多余的换行符 - if (index == 1 && quill.getLength() == 1 && quill.getText(0, 1) == '\n') { - quill.deleteText(0, 1) - index = 0 - } - - // 上传图片并插入到编辑器中 - let src = await onUploadImage(file) - if (src) { - quill.insertEmbed(index, 'image', src) - quill.setSelection(index + 1) - } + // 处理图片文件 - 立即显示临时消息,然后上传 + let fn = emitCall('image_event', file, () => {}) + emit('editor-event', fn) return } @@ -437,8 +424,7 @@ function onClipboardMatcher(node: any, Delta) { function onSendMessage() { var delta = getQuill().getContents() let data = deltaToMessage(delta) // 转换Delta为消息格式 - - if (data.items.length === 0) { + if (data.items.length === 0||!data.items[0].content.trim()) { return // 没有内容不发送 } diff --git a/src/components/talk/message/FileMessage.vue b/src/components/talk/message/FileMessage.vue index 9653726..8129e4e 100644 --- a/src/components/talk/message/FileMessage.vue +++ b/src/components/talk/message/FileMessage.vue @@ -49,7 +49,7 @@ const PPT_EXTENSIONS = ['PPT', 'PPTX', 'PPS', 'PPSX'] // 获取文件类型信息 const fileInfo = computed(() => { - const extension = getFileExtension(props.extra.name) + const extension = getFileExtension(props.extra.path) if (EXCEL_EXTENSIONS.includes(extension)) { return fileTypes.EXCEL } @@ -63,8 +63,8 @@ const fileInfo = computed(() => { }) // 获取文件扩展名 -function getFileExtension(filename) { - const parts = filename.split('.') +function getFileExtension(filepath) { + const parts = filepath.split('.') return parts.length > 1 ? parts.pop().toUpperCase() : '' } @@ -88,7 +88,7 @@ const strokeDashoffset = computed(() => const handleClick = () => { if(!props.extra.is_uploading){ window.open( - `${window.location.origin}/office?url=${props.extra.path}`, + `${import.meta.env.VITE_PAGE_URL}/office?url=${props.extra.path}`, '_blank', 'width=1200,height=900,left=200,top=200,toolbar=no,menubar=no,scrollbars=yes,resizable=yes,location=no,status=no' ); diff --git a/src/components/talk/message/ImageMessage.vue b/src/components/talk/message/ImageMessage.vue index 389c220..588a3a8 100644 --- a/src/components/talk/message/ImageMessage.vue +++ b/src/components/talk/message/ImageMessage.vue @@ -1,9 +1,9 @@