From f4e6fd060e2d8a6c5c154e0ed4b8d5a0fbc62bb1 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Mon, 3 Mar 2025 18:42:33 +0800 Subject: [PATCH] no message --- resources/assets/js/app.js | 21 +++++++++++++++++++ resources/assets/js/components/SearchBox.vue | 4 ++++ resources/assets/js/components/UserSelect.vue | 7 ++++--- 3 files changed, 29 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 564d69ec5..a3069f81a 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -269,12 +269,33 @@ const $init = async () => { } const $preload = async () => { + if ($A.isEEUiApp) { + const requireTime = new Date().getTime(); + while (typeof requireModuleJs !== "function") { + await new Promise(resolve => setTimeout(resolve, 200)); + if (new Date().getTime() - requireTime > 15 * 1000) { + break + } + } + if (typeof requireModuleJs !== "function") { + const errorTip = $A.L("加载失败,请重启软件") + const errorView = document.querySelector(".app-view-loading") + if (errorView) { + errorView.innerHTML = `${errorTip}` + } else { + alert(errorTip) + } + return + } + } + await store.dispatch("preload"); const hash = (window.location[routeMode === 'history' ? 'pathname' : 'hash']).replace(/^[#\/\s]/, ''); if (hash !== 'preload') { $init().catch(_ => {}) return } + window.__initializeApp = (route) => { if (/^https?:\/\//.test(route)) { if ($A.getDomain(route) !== $A.getDomain($A.mainUrl())) { diff --git a/resources/assets/js/components/SearchBox.vue b/resources/assets/js/components/SearchBox.vue index 892350d68..8283abed2 100755 --- a/resources/assets/js/components/SearchBox.vue +++ b/resources/assets/js/components/SearchBox.vue @@ -124,6 +124,10 @@ export default { }, 500) }, immediate: true + }, + + showModal(v) { + $A.eeuiAppSetScrollEnabled(!v) } }, diff --git a/resources/assets/js/components/UserSelect.vue b/resources/assets/js/components/UserSelect.vue index 3d3c60b7b..fbfe60063 100755 --- a/resources/assets/js/components/UserSelect.vue +++ b/resources/assets/js/components/UserSelect.vue @@ -323,14 +323,15 @@ export default { immediate: true }, - showModal(value) { - if (value) { + showModal(v) { + if (v) { this.searchBefore() this.upTitleWidth() } else { this.searchKey = "" } - this.$emit("on-show-change", value) + this.$emit("on-show-change", v) + $A.eeuiAppSetScrollEnabled(!v) }, searchKey() {