diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index 06f069381..5b4bd55a9 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -243,7 +243,7 @@ export default { || /meet\.google\.com/i.test(url)) { return true; } - if ($A.getDomain(url) == $A.getDomain($A.apiUrl('../'))) { + if ($A.getDomain(url) == $A.getDomain($A.mainUrl())) { try { if (/^\/uploads\//i.test(new URL(url).pathname)) { return true; diff --git a/resources/assets/js/components/Drawio.vue b/resources/assets/js/components/Drawio.vue index 400f372a5..edeb1225d 100644 --- a/resources/assets/js/components/Drawio.vue +++ b/resources/assets/js/components/Drawio.vue @@ -81,7 +81,7 @@ export default { if (this.$Electron) { this.url = $A.originUrl(`drawio/webapp/index.html${query}`); } else { - this.url = $A.apiUrl(`../drawio/webapp/${query}`); + this.url = $A.mainUrl(`drawio/webapp/${query}`); } }, mounted() { diff --git a/resources/assets/js/components/ImgUpload.vue b/resources/assets/js/components/ImgUpload.vue index e9d292b72..ef8ed66fc 100755 --- a/resources/assets/js/components/ImgUpload.vue +++ b/resources/assets/js/components/ImgUpload.vue @@ -366,7 +366,7 @@ browseStyle(thumb) { if (!/https*:\/\//.test(thumb) && !/^\//.test(thumb)) { - thumb = $A.apiUrl(`../${thumb}`); + thumb = $A.mainUrl(thumb); } return { 'background-image': `url("${thumb}")` diff --git a/resources/assets/js/components/ImgView.vue b/resources/assets/js/components/ImgView.vue index 3f6a30ba7..c332ff5ee 100755 --- a/resources/assets/js/components/ImgView.vue +++ b/resources/assets/js/components/ImgView.vue @@ -24,7 +24,7 @@ export default { src.substring(0, 1) === "/") { return src; } - return $A.apiUrl(`../${src}`) + return $A.mainUrl(src) } } } diff --git a/resources/assets/js/components/Minder.vue b/resources/assets/js/components/Minder.vue index c030af73f..115486c35 100644 --- a/resources/assets/js/components/Minder.vue +++ b/resources/assets/js/components/Minder.vue @@ -307,7 +307,7 @@ }, computed: { url() { - return $A.apiUrl(`../minder/index.html?type=manual&readonly=${this.readOnly ? 'yes' : 'no'}`) + return $A.mainUrl(`minder/index.html?type=manual&readonly=${this.readOnly ? 'yes' : 'no'}`) } }, watch: { diff --git a/resources/assets/js/components/OnlyOffice.vue b/resources/assets/js/components/OnlyOffice.vue index 82c1f2a14..8f41aa67d 100644 --- a/resources/assets/js/components/OnlyOffice.vue +++ b/resources/assets/js/components/OnlyOffice.vue @@ -156,7 +156,7 @@ export default { } this.loading = true; this.loadError = false; - $A.loadScript($A.apiUrl("../office/web-apps/apps/api/documents/api.js")).then(_ => { + $A.loadScript($A.mainUrl("office/web-apps/apps/api/documents/api.js")).then(_ => { if (!this.documentKey) { this.handleClose(); return diff --git a/resources/assets/js/components/RightBottom.vue b/resources/assets/js/components/RightBottom.vue index 61e3011d9..371d7cef5 100644 --- a/resources/assets/js/components/RightBottom.vue +++ b/resources/assets/js/components/RightBottom.vue @@ -154,7 +154,7 @@ export default { if (this.compareVersion(this.apiVersion, '0.19.0') === -1) { $A.modalWarning({ title: '温馨提示', - message: `服务器(${$A.getDomain($A.apiUrl('../'))})接口版本过低,部分功能可能无法正常使用。`, + message: `服务器(${$A.getDomain($A.mainUrl())})接口版本过低,部分功能可能无法正常使用。`, }); } if (this.$Electron) { diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js index 1c59a902f..c63b58f0b 100755 --- a/resources/assets/js/functions/web.js +++ b/resources/assets/js/functions/web.js @@ -42,6 +42,25 @@ import {MarkdownPreview} from "../store/markdown"; return str }, + /** + * 主页地址 + * @param str + * @returns {string} + */ + mainUrl(str = null) { + if (!str) { + str = "" + } + if (str.substring(0, 2) === "//" || + str.substring(0, 7) === "http://" || + str.substring(0, 8) === "https://" || + str.substring(0, 6) === "ftp://" || + str.substring(0, 1) === "/") { + return str; + } + return $A.apiUrl(`../${str}`) + }, + /** * 服务地址 * @param str @@ -73,7 +92,7 @@ import {MarkdownPreview} from "../store/markdown"; * @returns {*} */ onlinePreviewUrl(name, key) { - return $A.apiUrl(`../online/preview/${name}?key=${key}&version=${window.systemInfo.version}&__=${new Date().getTime()}`) + return $A.mainUrl(`online/preview/${name}?key=${key}&version=${window.systemInfo.version}&__=${new Date().getTime()}`) }, /** @@ -759,7 +778,7 @@ import {MarkdownPreview} from "../store/markdown"; text = text.trim().replace(/(\n\x20*){3,}/g, "\n\n"); text = text.replace(/ /g, ' ') text = text.replace(/
<\/p>/g, '
{{$L('抄送')}}
{{$L('系统')}}
{{$L('自动抄送')}}
@@ -134,7 +134,7 @@
{{$L('结束')}} {{$L('系统')}} {{ datas.is_finished ? $L('已结束') : $L('未结束') }}