From 5d2d82e9356b11538590a8ead49c4b5081704c12 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 25 Apr 2024 15:06:56 +0800 Subject: [PATCH 1/3] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=EF=BC=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=EF=BC=8C=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=98=AFonlyOffice=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E7=9A=84=E8=AF=9D=E9=A2=84=E8=A7=88onlyOffic?= =?UTF-8?q?e=E7=94=9F=E6=88=90=E7=9A=84pdf=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/UploadFile.vue | 6 ++++++ src/views/dashboard/search/AdvancedSearch.vue | 13 ++++++++++++- src/views/dashboard/search/GeneralSearch.vue | 13 ++++++++++++- .../standard/EnterpriseStandardList.vue | 13 ++++++++++++- .../standard/detail/EnterpriseStandardDetail.vue | 6 ++++++ 5 files changed, 48 insertions(+), 3 deletions(-) diff --git a/src/components/UploadFile.vue b/src/components/UploadFile.vue index 17c87c36..16862748 100644 --- a/src/components/UploadFile.vue +++ b/src/components/UploadFile.vue @@ -299,6 +299,12 @@ export default { if (!file || !file.url) { return } + if (file.pdf_id) { + // 说明是onlyOffice生成的 + const url = previewPdf(file.pdf_id) + window.open(url) + return + } // 截取文件后缀名 const fileSuffix = (file.name ? file.name.split('.')[file.name.split('.').length - 1] : '').toLowerCase() const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix === tt) diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 980308d9..82636d8e 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -394,6 +394,14 @@ export default { } console.log('seletedFile', file) + // 是onlyOffice生成的，预览关联的pdf文件 + if (file.pdf_id) { + // 说明是onlyOffice生成的 + const url = previewPdf(file.pdf_id) + window.open(url) + return + } + // 预览选择的文件 const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` console.log(fileFullUrl) @@ -410,7 +418,10 @@ export default { */ async selectNewestFile (fileList) { if (!fileList || fileList.length === 0) return null - if (fileList.length === 1) return fileList[0] + if (fileList.length === 1) { + const res = await getFileInfo(fileList[0]) + return { ...fileList[0], ...res.result } + } const newFileList = [] // 获取时间信息 for (const file of fileList) { diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue index 6b2a34ec..9c6f65c3 100644 --- a/src/views/dashboard/search/GeneralSearch.vue +++ b/src/views/dashboard/search/GeneralSearch.vue @@ -618,6 +618,14 @@ export default { } console.log('seletedFile', file) + // 是onlyOffice生成的，预览关联的pdf文件 + if (file.pdf_id) { + // 说明是onlyOffice生成的 + const url = previewPdf(file.pdf_id) + window.open(url) + return + } + // 预览选择的文件 const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` console.log(fileFullUrl) @@ -634,7 +642,10 @@ export default { */ async selectNewestFile (fileList) { if (!fileList || fileList.length === 0) return null - if (fileList.length === 1) return fileList[0] + if (fileList.length === 1) { + const res = await getFileInfo(fileList[0]) + return { ...fileList[0], ...res.result } + } const newFileList = [] // 获取时间信息 for (const file of fileList) { diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue index 330de42c..60f41bdd 100644 --- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue +++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue @@ -828,6 +828,14 @@ export default { } console.log('seletedFile', file) + // 是onlyOffice生成的，预览关联的pdf文件 + if (file.pdf_id) { + // 说明是onlyOffice生成的 + const url = previewPdf(file.pdf_id) + window.open(url) + return + } + // 预览选择的文件 const fileFullUrl = `${window._CONFIG.domianWebSocketURL}/sys/common/view/${file.id}?at=${Vue.ls.get(ACCESS_TOKEN)}&fullfilename=${file.name}` console.log(fileFullUrl) @@ -844,7 +852,10 @@ export default { */ async selectNewestFile (fileList) { if (!fileList || fileList.length === 0) return null - if (fileList.length === 1) return fileList[0] + if (fileList.length === 1) { + const res = await getFileInfo(fileList[0]) + return { ...fileList[0], ...res.result } + } const newFileList = [] // 获取时间信息 for (const file of fileList) { diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue index b4009aa3..22d666d7 100644 --- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue +++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue @@ -287,6 +287,12 @@ export default { if (!file || !file.url) { return } + if (file.pdf_id) { + // 说明是onlyOffice生成的 + const url = previewPdf(file.pdf_id) + window.open(url) + return + } // 截取文件后缀名 const fileSuffix = file.fileName ? file.fileName.split('.')[file.fileName.split('.').length - 1] : '' const canPreview = CAN_PREVIEW_FILE_SUFFIX.some(tt => fileSuffix.toLowerCase() === tt) From b137630902eee30fb95f5c9721bddd5198377868 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 25 Apr 2024 16:16:54 +0800 Subject: [PATCH 2/3] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=EF=BC=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=EF=BC=8C=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=98=AFonlyOffice=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E7=9A=84=E8=AF=9D=E9=A2=84=E8=A7=88onlyOffic?= =?UTF-8?q?e=E7=94=9F=E6=88=90=E7=9A=84pdf=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/UploadFile.vue | 4 ++-- src/views/dashboard/search/AdvancedSearch.vue | 4 ++-- src/views/dashboard/search/GeneralSearch.vue | 4 ++-- .../standard/EnterpriseStandardList.vue | 4 ++-- .../standard/detail/EnterpriseStandardDetail.vue | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/components/UploadFile.vue b/src/components/UploadFile.vue index 16862748..a0953fe5 100644 --- a/src/components/UploadFile.vue +++ b/src/components/UploadFile.vue @@ -299,9 +299,9 @@ export default { if (!file || !file.url) { return } - if (file.pdf_id) { + if (file.pdfId) { // 说明是onlyOffice生成的 - const url = previewPdf(file.pdf_id) + const url = previewPdf(file.pdfId) window.open(url) return } diff --git a/src/views/dashboard/search/AdvancedSearch.vue b/src/views/dashboard/search/AdvancedSearch.vue index 82636d8e..3fa85ef8 100644 --- a/src/views/dashboard/search/AdvancedSearch.vue +++ b/src/views/dashboard/search/AdvancedSearch.vue @@ -395,9 +395,9 @@ export default { console.log('seletedFile', file) // 是onlyOffice生成的，预览关联的pdf文件 - if (file.pdf_id) { + if (file.pdfId) { // 说明是onlyOffice生成的 - const url = previewPdf(file.pdf_id) + const url = previewPdf(file.pdfId) window.open(url) return } diff --git a/src/views/dashboard/search/GeneralSearch.vue b/src/views/dashboard/search/GeneralSearch.vue index 9c6f65c3..b26b91c6 100644 --- a/src/views/dashboard/search/GeneralSearch.vue +++ b/src/views/dashboard/search/GeneralSearch.vue @@ -619,9 +619,9 @@ export default { console.log('seletedFile', file) // 是onlyOffice生成的，预览关联的pdf文件 - if (file.pdf_id) { + if (file.pdfId) { // 说明是onlyOffice生成的 - const url = previewPdf(file.pdf_id) + const url = previewPdf(file.pdfId) window.open(url) return } diff --git a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue index 60f41bdd..a34a5d02 100644 --- a/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue +++ b/src/views/enterpriseStandardLibrary/standard/EnterpriseStandardList.vue @@ -829,9 +829,9 @@ export default { console.log('seletedFile', file) // 是onlyOffice生成的，预览关联的pdf文件 - if (file.pdf_id) { + if (file.pdfId) { // 说明是onlyOffice生成的 - const url = previewPdf(file.pdf_id) + const url = previewPdf(file.pdfId) window.open(url) return } diff --git a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue index 22d666d7..fd403106 100644 --- a/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue +++ b/src/views/enterpriseStandardLibrary/standard/detail/EnterpriseStandardDetail.vue @@ -287,9 +287,9 @@ export default { if (!file || !file.url) { return } - if (file.pdf_id) { + if (file.pdfId) { // 说明是onlyOffice生成的 - const url = previewPdf(file.pdf_id) + const url = previewPdf(file.pdfId) window.open(url) return } From f33abf1036593f32b3caafae4c241399f99b3806 Mon Sep 17 00:00:00 2001 From: lideqin <694785430@qq.com> Date: Thu, 25 Apr 2024 16:29:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?[update]=20=E4=BC=81=E6=A0=87=EF=BC=8C?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E4=B8=AD=E5=BF=83=EF=BC=8C=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E6=98=AFonlyOffice=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=EF=BC=8C=E6=98=AF=E7=9A=84=E8=AF=9D=E9=A2=84=E8=A7=88onlyOffic?= =?UTF-8?q?e=E7=94=9F=E6=88=90=E7=9A=84pdf=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/UploadFile.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/UploadFile.vue b/src/components/UploadFile.vue index a0953fe5..f317ffda 100644 --- a/src/components/UploadFile.vue +++ b/src/components/UploadFile.vue @@ -205,6 +205,7 @@ export default { name: fileInfo.fileName, status: 'done', url: fileInfo.url, + pdfId: fileInfo.pdfId, // response用于下载和预览 response: { success: true, @@ -299,6 +300,7 @@ export default { if (!file || !file.url) { return } + console.log(file) if (file.pdfId) { // 说明是onlyOffice生成的 const url = previewPdf(file.pdfId)