cloud-web-corejs 1.0.294 → 1.0.295
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/src/index.js +4 -2
- package/src/router/index.js +7 -0
- package/src/utils/request.js +10 -5
- package/src/utils/runtimeRecovery.js +105 -0
package/package.json
CHANGED
package/src/index.js
CHANGED
|
@@ -13,6 +13,7 @@ import router, { resetRouter } from "@base/router";
|
|
|
13
13
|
import settings from "@/settings";
|
|
14
14
|
import { setToken as setAuthToken } from "@base/utils/auth";
|
|
15
15
|
import { loadViewComponentAsync } from "@base/utils/resolveViewComponent";
|
|
16
|
+
import { installRuntimeRecovery } from "@base/utils/runtimeRecovery";
|
|
16
17
|
|
|
17
18
|
import "@/icons"; // icon
|
|
18
19
|
import "@base/permission"; // permission control
|
|
@@ -269,10 +270,11 @@ if (process.env.NODE_ENV === "production") {
|
|
|
269
270
|
mockXHR() */
|
|
270
271
|
}
|
|
271
272
|
|
|
272
|
-
Vue.use(Element, {
|
|
273
|
+
Vue.use(Element, {
|
|
273
274
|
size: Cookies.get("size") || "medium", // set element-ui default size
|
|
274
275
|
// locale: enLang // 如果使用中文,无需设置,请删除
|
|
275
|
-
});
|
|
276
|
+
});
|
|
277
|
+
installRuntimeRecovery();
|
|
276
278
|
|
|
277
279
|
// register global utility filters
|
|
278
280
|
Object.keys(filters).forEach((key) => {
|
package/src/router/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import Vue from "vue";
|
|
2
2
|
import Router from "vue-router";
|
|
3
|
+
import { promptRefreshForUpdate } from "@base/utils/runtimeRecovery";
|
|
3
4
|
|
|
4
5
|
Vue.use(Router);
|
|
5
6
|
|
|
@@ -19,6 +20,12 @@ const createRouter = () =>
|
|
|
19
20
|
|
|
20
21
|
const router = createRouter();
|
|
21
22
|
|
|
23
|
+
router.onError((error) => {
|
|
24
|
+
const msg = (error && error.message) || "";
|
|
25
|
+
if (!/Loading (CSS )?chunk .* failed|ChunkLoadError/i.test(msg)) return;
|
|
26
|
+
promptRefreshForUpdate(error);
|
|
27
|
+
});
|
|
28
|
+
|
|
22
29
|
export function resetRouter() {
|
|
23
30
|
const newRouter = createRouter();
|
|
24
31
|
router.matcher = newRouter.matcher; // reset router
|
package/src/utils/request.js
CHANGED
|
@@ -8,7 +8,8 @@ import ErroreBox from "../components/errorMsg/index.js";
|
|
|
8
8
|
import PopupManager from "element-ui/src/utils/popup/popup-manager.js";
|
|
9
9
|
import settingConfig from "@/settings.js";
|
|
10
10
|
import { encode } from "js-base64";
|
|
11
|
-
import { encrypt } from "@base/utils/aes";
|
|
11
|
+
import { encrypt } from "@base/utils/aes";
|
|
12
|
+
import { handleRequestNetworkError } from "@base/utils/runtimeRecovery";
|
|
12
13
|
|
|
13
14
|
let configUtil = {
|
|
14
15
|
baseUrl: process.env.VUE_APP_BASE_API,
|
|
@@ -397,10 +398,14 @@ service.interceptors.response.use(
|
|
|
397
398
|
// 那个 else 分支无条件弹 ErroreBox —— 而 ErroreBox 是弹窗不是 toast,取消 N 个
|
|
398
399
|
// 在途请求就会连弹 N 个错误框。config.errorMsg 那条逃生口在 if (config) 里面,
|
|
399
400
|
// Cancel 走不到,所以只能在这里拦。调用方按需自行 catch。
|
|
400
|
-
if (axios.isCancel(error)) {
|
|
401
|
-
return Promise.reject(error);
|
|
402
|
-
}
|
|
403
|
-
let config = error.config;
|
|
401
|
+
if (axios.isCancel(error)) {
|
|
402
|
+
return Promise.reject(error);
|
|
403
|
+
}
|
|
404
|
+
let config = error.config;
|
|
405
|
+
if (handleRequestNetworkError()) {
|
|
406
|
+
if (config && config.modalStrictly !== true) removeModel(config);
|
|
407
|
+
return Promise.reject(error);
|
|
408
|
+
}
|
|
404
409
|
if (
|
|
405
410
|
error.response &&
|
|
406
411
|
error.response.data &&
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { Message, MessageBox } from "element-ui";
|
|
2
|
+
import { isChunkLoadError } from "@base/utils/chunkLoadError";
|
|
3
|
+
|
|
4
|
+
let installed = false;
|
|
5
|
+
let offlineMessage = null;
|
|
6
|
+
let refreshPromptVisible = false;
|
|
7
|
+
let assetFailedWhileOffline = false;
|
|
8
|
+
|
|
9
|
+
function isOffline() {
|
|
10
|
+
return typeof navigator !== "undefined" && navigator.onLine === false;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
function getAssetUrl(target) {
|
|
14
|
+
if (!target || !target.tagName) return "";
|
|
15
|
+
const tagName = target.tagName.toUpperCase();
|
|
16
|
+
if (tagName !== "SCRIPT" && tagName !== "LINK") return "";
|
|
17
|
+
return target.src || target.href || "";
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export function showOfflineMessage() {
|
|
21
|
+
if (offlineMessage) return;
|
|
22
|
+
offlineMessage = Message({
|
|
23
|
+
message: "网络连接已断开,请检查网络;恢复后可继续操作",
|
|
24
|
+
type: "warning",
|
|
25
|
+
duration: 0,
|
|
26
|
+
showClose: true,
|
|
27
|
+
onClose: () => {
|
|
28
|
+
offlineMessage = null;
|
|
29
|
+
},
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
|
|
33
|
+
function closeOfflineMessage(showRecovered) {
|
|
34
|
+
if (offlineMessage) {
|
|
35
|
+
offlineMessage.close();
|
|
36
|
+
offlineMessage = null;
|
|
37
|
+
}
|
|
38
|
+
if (showRecovered) Message.success("网络连接已恢复");
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
export function promptRefreshForUpdate(error) {
|
|
42
|
+
if (isOffline()) {
|
|
43
|
+
showOfflineMessage();
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
if (refreshPromptVisible) return;
|
|
47
|
+
refreshPromptVisible = true;
|
|
48
|
+
console.error("[runtime-recovery] 页面静态资源加载失败:", error);
|
|
49
|
+
MessageBox.confirm(
|
|
50
|
+
"检测到页面资源已失效,可能系统已发布新版本。刷新页面后即可继续使用。",
|
|
51
|
+
"系统更新提示",
|
|
52
|
+
{
|
|
53
|
+
confirmButtonText: "立即刷新",
|
|
54
|
+
cancelButtonText: "稍后处理",
|
|
55
|
+
closeOnClickModal: false,
|
|
56
|
+
type: "warning",
|
|
57
|
+
}
|
|
58
|
+
)
|
|
59
|
+
.then(() => window.location.reload())
|
|
60
|
+
.catch(() => {})
|
|
61
|
+
.then(() => {
|
|
62
|
+
refreshPromptVisible = false;
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
export function handleRequestNetworkError() {
|
|
67
|
+
if (!isOffline()) return false;
|
|
68
|
+
showOfflineMessage();
|
|
69
|
+
return true;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
export function installRuntimeRecovery() {
|
|
73
|
+
if (installed || typeof window === "undefined") return;
|
|
74
|
+
installed = true;
|
|
75
|
+
|
|
76
|
+
window.addEventListener("offline", showOfflineMessage);
|
|
77
|
+
window.addEventListener("online", () => {
|
|
78
|
+
const shouldRefresh = assetFailedWhileOffline;
|
|
79
|
+
assetFailedWhileOffline = false;
|
|
80
|
+
closeOfflineMessage(!shouldRefresh);
|
|
81
|
+
if (shouldRefresh) promptRefreshForUpdate(new Error("断网期间页面资源加载失败"));
|
|
82
|
+
});
|
|
83
|
+
window.addEventListener(
|
|
84
|
+
"error",
|
|
85
|
+
(event) => {
|
|
86
|
+
const assetUrl = getAssetUrl(event.target);
|
|
87
|
+
if (!assetUrl || !/\/static\/(js|css)\//i.test(assetUrl)) return;
|
|
88
|
+
if (isOffline()) {
|
|
89
|
+
assetFailedWhileOffline = true;
|
|
90
|
+
showOfflineMessage();
|
|
91
|
+
}
|
|
92
|
+
else promptRefreshForUpdate(event.error || new Error(`静态资源加载失败: ${assetUrl}`));
|
|
93
|
+
},
|
|
94
|
+
true
|
|
95
|
+
);
|
|
96
|
+
window.addEventListener("unhandledrejection", (event) => {
|
|
97
|
+
if (isOffline()) {
|
|
98
|
+
showOfflineMessage();
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
if (isChunkLoadError(event.reason)) promptRefreshForUpdate(event.reason);
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
if (isOffline()) showOfflineMessage();
|
|
105
|
+
}
|