From ab47f0162588eb0db6355012734f337583953333 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Fri, 14 Mar 2025 11:43:53 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=85=A8=E5=B1=80?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/App.vue | 5 + .../assets/js/components/AuthException.vue | 69 +++++++++++ resources/assets/js/components/GuidePage.vue | 2 +- .../assets/js/components/NetworkException.vue | 6 +- resources/assets/js/functions/web.js | 28 ++--- resources/assets/js/pages/login.vue | 6 +- resources/assets/js/pages/manage.vue | 2 +- .../assets/js/pages/manage/approve/index.vue | 2 +- resources/assets/js/store/actions.js | 115 ++++++++++-------- resources/assets/js/store/state.js | 3 +- .../public/images/{ => other}/guide.png | Bin 11 files changed, 160 insertions(+), 78 deletions(-) create mode 100644 resources/assets/js/components/AuthException.vue rename resources/assets/statics/public/images/{ => other}/guide.png (100%) diff --git a/resources/assets/js/App.vue b/resources/assets/js/App.vue index 6fd607900..d5d8678ac 100755 --- a/resources/assets/js/App.vue +++ b/resources/assets/js/App.vue @@ -22,6 +22,9 @@ + + + @@ -43,6 +46,7 @@ import FloatSpinner from "./components/FloatSpinner"; import RightBottom from "./components/RightBottom"; import PreviewImageState from "./components/PreviewImage/state"; +import AuthException from "./components/AuthException"; import NetworkException from "./components/NetworkException"; import GuidePage from "./components/GuidePage"; import TaskOperation from "./pages/manage/components/TaskOperation"; @@ -56,6 +60,7 @@ export default { mixins: [ctrlPressed], components: { + AuthException, MeetingManager, DropdownMenu, TaskOperation, diff --git a/resources/assets/js/components/AuthException.vue b/resources/assets/js/components/AuthException.vue new file mode 100644 index 000000000..3c6828a61 --- /dev/null +++ b/resources/assets/js/components/AuthException.vue @@ -0,0 +1,69 @@ + + + diff --git a/resources/assets/js/components/GuidePage.vue b/resources/assets/js/components/GuidePage.vue index 8683d0242..480226fcd 100644 --- a/resources/assets/js/components/GuidePage.vue +++ b/resources/assets/js/components/GuidePage.vue @@ -19,7 +19,7 @@ export default { }, mounted() { - this.src = $.apiUrl('../images/guide.png'); + this.src = $.apiUrl('../images/other/guide.png'); }, watch: { diff --git a/resources/assets/js/components/NetworkException.vue b/resources/assets/js/components/NetworkException.vue index 11482f85a..550975ab6 100644 --- a/resources/assets/js/components/NetworkException.vue +++ b/resources/assets/js/components/NetworkException.vue @@ -8,14 +8,14 @@ v-model="show" :width="416" :closable="false" - :footer-hide="true" - class-name="common-network-exception-modal"> + :mask-closable="false" + :footer-hide="true">
{{$L('温馨提示')}}
-
{{$L('网络连接失败，请检查网络设置。')}}
+
{{ajaxNetworkException}}
diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js index 016de3e44..1da6f67d8 100755 --- a/resources/assets/js/functions/web.js +++ b/resources/assets/js/functions/web.js @@ -848,16 +848,13 @@ import {convertLocalResourcePath} from "../components/Replace/utils"; if (config === false) { return; } + if ($A.isJson(config) && config.content === false) { + return; + } if (millisecond > 0) { setTimeout(() => { $A.modalWarning(config) }, millisecond); return; } - if (typeof config === "string" && config === "Network exception") { - return; - } - if ($A.isJson(config) && config.content === "Network exception") { - return; - } $A.Modal.warning($A.modalConfig(config)); }, @@ -865,16 +862,13 @@ import {convertLocalResourcePath} from "../components/Replace/utils"; if (config === false) { return; } + if ($A.isJson(config) && config.content === false) { + return; + } if (millisecond > 0) { setTimeout(() => { $A.modalError(config) }, millisecond); return; } - if (typeof config === "string" && config === "Network exception") { - return; - } - if ($A.isJson(config) && config.content === "Network exception") { - return; - } $A.Modal.error($A.modalConfig(config)); }, @@ -891,14 +885,14 @@ import {convertLocalResourcePath} from "../components/Replace/utils"; }, messageWarning(msg) { - if (typeof msg === "string" && msg === "Network exception") { + if (msg === false) { return; } $A.Message.warning($A.L(msg)); }, messageError(msg) { - if (typeof msg === "string" && msg === "Network exception") { + if (msg === false) { return; } $A.Message.error($A.L(msg)); @@ -921,10 +915,16 @@ import {convertLocalResourcePath} from "../components/Replace/utils"; }, noticeWarning(config) { + if (config === false) { + return; + } $A.Notice.warning($A.noticeConfig(config)); }, noticeError(config) { + if (config === false) { + return; + } if (typeof config === "string") { config = { desc: config, diff --git a/resources/assets/js/pages/login.vue b/resources/assets/js/pages/login.vue index ca8d61b91..ef06f5c47 100644 --- a/resources/assets/js/pages/login.vue +++ b/resources/assets/js/pages/login.vue @@ -229,11 +229,6 @@ export default { // this.getDemoAccount(); this.getNeedStartHome(); - // - if (this.$Electron) { - this.$Electron.sendMessage('webTabDestroyAll') - this.$Electron.sendMessage('childWindowDestroyAll') - } }, deactivated() { @@ -444,6 +439,7 @@ export default { this.$store.dispatch("call", { url: `${url}system/setting`, checkNetwork: false, + networkFailureRetry: false }).then(async ({data}) => { if (typeof data.server_version === "undefined" && typeof data.all_group_mute === "undefined") { reject(`服务器（${$A.getDomain(value)}）版本过低`) diff --git a/resources/assets/js/pages/manage.vue b/resources/assets/js/pages/manage.vue index 23bca3581..268fe2073 100644 --- a/resources/assets/js/pages/manage.vue +++ b/resources/assets/js/pages/manage.vue @@ -1083,7 +1083,7 @@ export default { data: { userid: [userid] }, - skipAuthError: true + checkAuth: false }); tempUser = data.find(item => item.userid == userid); } catch (_) {} diff --git a/resources/assets/js/pages/manage/approve/index.vue b/resources/assets/js/pages/manage/approve/index.vue index c0e613903..89c8ed2ed 100644 --- a/resources/assets/js/pages/manage/approve/index.vue +++ b/resources/assets/js/pages/manage/approve/index.vue @@ -625,7 +625,7 @@ export default { data: { userid: [this.userInfo.userid] }, - skipAuthError: true + checkAuth: false }).then(({data}) => { this.addData.department_id = data[0]?.department[0] || 0; this.getProcdefList().then(_ => { diff --git a/resources/assets/js/store/actions.js b/resources/assets/js/store/actions.js index 68186029b..9a8765bf5 100644 --- a/resources/assets/js/store/actions.js +++ b/resources/assets/js/store/actions.js @@ -210,13 +210,14 @@ export default { reject({ret: -1, data: {}, msg: "No server address"}) return } + // 加密传输 const encrypt = [] if (params.encrypt === true) { - // 有数据才加密 if (params.data) { - // PGP加密 + // 有数据才加密 if (state.apiKeyData.type === 'pgp') { + // PGP加密 encrypt.push(`encrypt_type=${state.apiKeyData.type};encrypt_id=${state.apiKeyData.id}`) params.method = "post" // 加密传输时强制使用post params.data = {encrypted: await dispatch("pgpEncryptApi", params.data)} @@ -227,51 +228,54 @@ export default { if (encrypt.length > 0) { params.header.encrypt = encrypt.join(";") } + // 数据转换 if (params.method === "post") { params.data = JSON.stringify(params.data) } - // Spinner + + // 等待效果（Spinner） if (params.spinner === true || (typeof params.spinner === "number" && params.spinner > 0)) { const {before, complete} = params params.before = () => { dispatch("showSpinner", typeof params.spinner === "number" ? params.spinner : 0) typeof before === "function" && before() } - // params.complete = () => { dispatch("hiddenSpinner") typeof complete === "function" && complete() } } - // 请求回调 + + // 请求成功 params.success = async (result, status, xhr) => { - state.ajaxNetworkException = false + state.ajaxNetworkException = null + + // 数据校验 if (!$A.isJson(result)) { console.log(result, status, xhr) reject({ret: -1, data: {}, msg: $A.L('返回参数错误')}) return } + + // 数据解密 if (params.encrypt === true && result.encrypted) { result = await dispatch("pgpDecryptApi", result.encrypted) } const {ret, data, msg} = result + + // 身份判断（身份丢失） if (ret === -1) { state.userId = 0 - if (params.skipAuthError !== true) { - //身份丢失 - $A.modalError({ - content: msg, - onOk: () => { - dispatch("logout") - } - }) - reject(result) + if (params.checkAuth !== false) { + state.ajaxAuthException = msg || $A.L('请登录后继续...') + reject(Object.assign(result, {msg: false})) return } } + + // 身份判断（需要昵称） if (ret === -2 && params.checkNick !== false) { - // 需要昵称 dispatch("userEditInput", 'nickname').then(() => { dispatch("call", cloneParams).then(resolve).catch(reject) }).catch(err => { @@ -279,8 +283,9 @@ export default { }) return } + + // 身份判断（需要联系电话） if (ret === -3 && params.checkTel !== false) { - // 需要联系电话 dispatch("userEditInput", 'tel').then(() => { dispatch("call", cloneParams).then(resolve).catch(reject) }).catch(err => { @@ -288,48 +293,54 @@ export default { }) return } + + // 返回数据 if (ret === 1) { resolve({data, msg, xhr}) - } else { - reject({ret, data, msg: msg || $A.L('未知错误')}) - // - if (ret === -4001) { - dispatch("forgetProject", data.project_id) - } else if (ret === -4002) { - if (data.force === 1) { - state.taskArchiveView = 0 - } - dispatch("forgetTask", data.task_id) - } else if (ret === -4003) { - dispatch("forgetDialog", data.dialog_id) - } else if (ret === -4004) { - dispatch("getTaskForParent", data.task_id).catch(() => {}) - } - } - } - params.error = (xhr, status) => { - const networkException = window.navigator.onLine === false || (status === 0 && xhr.readyState === 4) - if (networkException - && cloneParams.method !== "post" - && cloneParams.__networkFailureRetry !== true) { - // 网络异常，重试一次 - setTimeout(_ => { - cloneParams.__networkFailureRetry = true - dispatch("call", cloneParams).then(resolve).catch(reject) - }, 1000) return } - if (params.checkNetwork !== false) { - state.ajaxNetworkException = networkException + + // 错误处理 + reject({ret, data, msg: msg || $A.L('未知错误')}) + if (ret === -4001) { + dispatch("forgetProject", data.project_id) + } else if (ret === -4002) { + data.force === 1 && (state.taskArchiveView = 0) + dispatch("forgetTask", data.task_id) + } else if (ret === -4003) { + dispatch("forgetDialog", data.dialog_id) + } else if (ret === -4004) { + dispatch("getTaskForParent", data.task_id).catch(() => {}) } - if (networkException) { - reject({ret: -1001, data: {}, msg: $A.L('网络异常，请重试。')}) - } else { - reject({ret: -1, data: {}, msg: $A.L('请求失败，请重试。')}) + } + + // 请求失败 + params.error = async (xhr, status) => { + const reason = {ret: -1, data: {}, msg: $A.L('请求失败，请重试。')} + const isNetworkException = window.navigator.onLine === false || (status === 0 && xhr.readyState === 4) + + // 网络异常 + if (isNetworkException) { + // 重试一次 + if (cloneParams.method !== "post" && cloneParams.networkFailureRetry !== false) { + await new Promise(resolve => setTimeout(resolve, 1000)); + dispatch("call", Object.assign(cloneParams, {networkFailureRetry: false})).then(resolve).catch(reject) + return + } + // 异常提示 + reason.ret = -1001 + reason.msg = params.checkNetwork !== false ? false : $A.L('网络异常，请重试。') + if (params.checkNetwork !== false) { + state.ajaxNetworkException = $A.L("网络连接失败，请检查网络设置。") + } } + + // 异常处理 + reject(reason) console.error(xhr, status); } - // + + // 发起请求 $A.ajaxc(params) }) }, @@ -770,7 +781,7 @@ export default { data: { userid: [...new Set(array.map(({userid}) => userid))] }, - skipAuthError: true + checkAuth: false }).then(result => { time = $A.dayjs().unix(); array.forEach(value => { diff --git a/resources/assets/js/store/state.js b/resources/assets/js/store/state.js index 4efbb5752..9bc68d927 100644 --- a/resources/assets/js/store/state.js +++ b/resources/assets/js/store/state.js @@ -95,7 +95,8 @@ export default { cacheKeyboard: {}, // Ajax - ajaxNetworkException: false, + ajaxAuthException: null, + ajaxNetworkException: null, // Websocket ws: null, diff --git a/resources/assets/statics/public/images/guide.png b/resources/assets/statics/public/images/other/guide.png similarity index 100% rename from resources/assets/statics/public/images/guide.png rename to resources/assets/statics/public/images/other/guide.png