diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index bc8f725c0..a5a48bc96 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -606,11 +606,7 @@ export default { pageType: 'app', pageTitle: ' ', url: 'web.js', - params: { - url, - browser: true, - showProgress: true, - }, + params: {url}, }) } // 会议事件 diff --git a/resources/assets/js/pages/manage/application.vue b/resources/assets/js/pages/manage/application.vue index 64f9a6e21..201129ea6 100644 --- a/resources/assets/js/pages/manage/application.vue +++ b/resources/assets/js/pages/manage/application.vue @@ -713,9 +713,7 @@ export default { pageTitle: ' ', url: 'web.js', params: { - url: text, - browser: true, - showProgress: true, + url: text }, }); } diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index b120f9b10..194cf02e3 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -3808,7 +3808,6 @@ export default { url: 'web.js', params: { titleFixed: true, - allowAccess: true, url: $A.urlReplaceHash(path) }, }) diff --git a/resources/assets/js/pages/manage/components/FileHistory.vue b/resources/assets/js/pages/manage/components/FileHistory.vue index 6b031b293..6a1022655 100644 --- a/resources/assets/js/pages/manage/components/FileHistory.vue +++ b/resources/assets/js/pages/manage/components/FileHistory.vue @@ -201,7 +201,6 @@ export default { url: 'web.js', params: { titleFixed: true, - allowAccess: true, url: $A.urlReplaceHash(path) }, }) diff --git a/resources/assets/js/pages/manage/components/ProjectLog.vue b/resources/assets/js/pages/manage/components/ProjectLog.vue index 834678a35..377637109 100644 --- a/resources/assets/js/pages/manage/components/ProjectLog.vue +++ b/resources/assets/js/pages/manage/components/ProjectLog.vue @@ -235,7 +235,6 @@ export default { pageTitle: this.$L(title), url: 'web.js', params: { - allowAccess: true, url: $A.urlReplaceHash(path) }, }) diff --git a/resources/assets/js/pages/manage/components/TaskContentHistory.vue b/resources/assets/js/pages/manage/components/TaskContentHistory.vue index 0a61a3d7b..3c9a90c0d 100644 --- a/resources/assets/js/pages/manage/components/TaskContentHistory.vue +++ b/resources/assets/js/pages/manage/components/TaskContentHistory.vue @@ -188,7 +188,6 @@ export default { url: 'web.js', params: { titleFixed: true, - allowAccess: true, url: $A.urlReplaceHash(path) }, }) diff --git a/resources/assets/js/pages/manage/components/TaskDetail.vue b/resources/assets/js/pages/manage/components/TaskDetail.vue index b18ec9a0a..a51c20f3f 100755 --- a/resources/assets/js/pages/manage/components/TaskDetail.vue +++ b/resources/assets/js/pages/manage/components/TaskDetail.vue @@ -1927,7 +1927,6 @@ export default { url: 'web.js', params: { titleFixed: true, - allowAccess: true, url: $A.urlReplaceHash(path) }, }); diff --git a/resources/assets/js/pages/manage/file.vue b/resources/assets/js/pages/manage/file.vue index b98b2454f..496b32b19 100644 --- a/resources/assets/js/pages/manage/file.vue +++ b/resources/assets/js/pages/manage/file.vue @@ -1145,7 +1145,6 @@ export default { url: 'web.js', params: { titleFixed: true, - allowAccess: true, url: $A.urlReplaceHash(path) }, }); diff --git a/resources/assets/js/pages/manage/setting/index.vue b/resources/assets/js/pages/manage/setting/index.vue index 49547e83d..581e2f71e 100644 --- a/resources/assets/js/pages/manage/setting/index.vue +++ b/resources/assets/js/pages/manage/setting/index.vue @@ -188,11 +188,7 @@ export default { pageType: 'app', pageTitle: ' ', url: 'web.js', - params: { - url, - browser: true, - showProgress: true, - }, + params: {url}, }); } else { window.open(url) diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 09720a4ca..7794fb473 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -1194,6 +1194,21 @@ export default { */ userUrl({state}, url) { return new Promise(resolve => { + // 如果是访问:服务器域名 且 当前是本地文件,则将服务器域名替换成本地路径 + if ($A.getDomain(url) == $A.getDomain($A.mainUrl()) && window.location.protocol == "file:") { + try { + const remoteURL = new URL(url) + if (/^\/(single|meeting)\//.test(remoteURL.pathname)) { + // 判断将服务器域名替换成本地路径 + const localURL = new URL(window.location) + localURL.hash = remoteURL.pathname + remoteURL.search + return resolve(localURL.toString()) + } + } catch (e) { + // 解析失败则不做任何处理 + } + } + // 基本参数 const params = { language: languageName, @@ -1235,7 +1250,6 @@ export default { url: 'web.js', params: { titleFixed: true, - allowAccess: true, hiddenDone: true, url }, @@ -1259,6 +1273,16 @@ export default { */ async openAppChildPage({dispatch}, objects) { objects.params.url = await dispatch("userUrl", objects.params.url) + + if (typeof objects.params.allowAccess === "undefined") { + // 如果是本地文件,则允许跨域 + objects.params.allowAccess = $A.getProtocol(objects.params.url) == "file:" + } + if (typeof objects.params.showProgress === "undefined") { + // 如果不是本地文件,则显示进度条 + objects.params.showProgress = $A.getProtocol(objects.params.url) != "file:" + } + $A.eeuiAppOpenPage(objects) }, diff --git a/resources/mobile b/resources/mobile index c40f8b16e..ca3803c8f 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit c40f8b16e992581c280760a082c1f6f56653c380 +Subproject commit ca3803c8f27b96a955585a042102621249e08392