预览word

jero-web/package-lock.json

@@ -9519,10 +9519,15 @@
       "integrity": "sha1-FC0RHzpuPa6PSpr9d9RYVbWpzOM=",
       "dev": true
     },
-    "js-base64": {
+    "jquery": {
       "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.6.0.tgz",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz",
-      "integrity": "sha512-wVdUBYQeY2gY73RIlPrysvpYx+2vheGo8Y1SNQv/BzHToWpAZzJU7Z6uheKMAe+GLSBig5/Ps2nxg/8tRB73xg=="
+      "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw=="
+    },
+    "js-base64": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-3.7.2.tgz",
+      "integrity": "sha512-NnRs6dsyqUXejqk/yv2aiXlAvOs56sLkX6nUdeaNezI5LFFLlsZjOThmwnrcwh5ZZRwZlCMnVAY3CvhIhoVEKQ=="
     },
     "js-cookie": {
       "version": "2.2.1",
@@ -11271,7 +11276,8 @@
     "picomatch": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
-      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg=="
+      "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
+      "optional": true
     },
     "pify": {
       "version": "2.3.0",
@@ -14310,7 +14316,8 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz",
       "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "rx-lite-aggregates": {
       "version": "4.0.8",

jero-web/package.json

@@ -23,7 +23,7 @@
     "echarts": "^5.0.2",
     "enquire.js": "^2.1.6",
     "jquery": "^3.6.0",
-    "js-base64": "^3.6.0",
+    "js-base64": "^3.7.2",
     "js-cookie": "^2.2.0",
     "jsencrypt": "^3.0.0-rc.1",
     "lodash.get": "^4.4.2",

jero-web/src/components/uploadFile/file.vue

@@ -27,6 +27,7 @@
   import Vue from 'vue'
   import { ACCESS_TOKEN } from '@/store/mutation-types'
   import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
+  import { Base64 } from 'js-base64'
 
   export default {
     name: 'file',
@@ -182,10 +183,10 @@
         if (fileSuffix === '.pdf') {
           window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id))
         } else if (fileSuffix === '.docx') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '?id=' + fileQuery.id)
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else if (fileSuffix === '.xlsx' || fileSuffix === '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '?id=' + fileQuery.id)
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id })

jero-web/src/views/documentManage/library/docDetail/index.vue

@@ -169,6 +169,7 @@
 </template>
 <script>
   import { getAction, postAction, downFile, downloadFile } from '@/api/manage'
+  import { Base64 } from 'js-base64';
 
   export default {
     name: 'docIndex',
@@ -240,13 +241,15 @@
         let index1 = fileName.lastIndexOf('.')
         let index2 = fileName.length
         let fileSuffix = fileName.substring(index1, index2)
+        debugger
         if (fileSuffix == '.pdf') {
           window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id))
         } else if (fileSuffix == '.docx') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '?id=' + fileQuery.id)
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '?id=' + fileQuery.id)
+          console.log(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id })

jero-web/src/views/documentTools/searchCenter/components/DocumentLibrary.vue

@@ -168,6 +168,7 @@
   import { getAction, postAction, downloadFile } from '@/api/manage'
   import libraryPush from '@/components/libraryPush/index'
   import moment from 'moment'
+  import { Base64 } from 'js-base64'
 
   export default {
     name: 'DocumentLibrary',
@@ -288,7 +289,7 @@
         loading: false,
         selectModel: '',
         fileList: [],
-        downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/download',
+        downLoadFileUrl: window._CONFIG['domianURL'] + '/sys/common/download'
       }
     },
     watch: {
@@ -469,10 +470,10 @@
         if (fileSuffix == '.pdf') {
           window.open('/pdf/web/viewer.html?file=' + encodeURIComponent('/jero-boot/sys/common/pdf/viewFile?id=' + fileQuery.id))
         } else if (fileSuffix == '.docx') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '?id=' + fileQuery.id)
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else if (fileSuffix == '.xlsx' || fileSuffix == '.xls') {
-          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + encodeURIComponent(this.downLoadFileUrl + '?id=' + fileQuery.id)
+          let url = window._CONFIG['onlinePreviewDomainURL'] + '?url=' + Base64.encode(this.downLoadFileUrl + '/' + fileQuery.id + fileSuffix)
           window.open(url, '_blank')
         } else {
           downloadFile('/sys/common/download', fileQuery.fileName, { id: fileQuery.id })