From 040f1e8c8688002df89a89d82ea989b0f2acc89b Mon Sep 17 00:00:00 2001 From: kuaifan Date: Tue, 17 May 2022 13:44:07 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=8F=96=E6=B6=88To?= =?UTF-8?q?oltip=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.js | 2 ++ resources/assets/js/components/AutoTip.vue | 2 +- resources/assets/js/components/Loading.vue | 2 +- resources/assets/js/components/Minder/minder.vue | 12 ++++++------ resources/assets/js/components/RightBottom.vue | 6 +----- resources/assets/js/components/TableAction.vue | 2 +- resources/assets/js/components/UserAvatar.vue | 2 +- .../js/pages/manage/components/ChatInput/index.vue | 10 +++++----- .../js/pages/manage/components/DialogWrapper.vue | 10 +++++++--- .../js/pages/manage/components/FileContent.vue | 4 ++-- .../js/pages/manage/components/ProjectPanel.vue | 14 +++++++------- .../js/pages/manage/components/ProjectWorkflow.vue | 6 +----- .../js/pages/manage/components/ReportEdit.vue | 4 ++-- .../assets/js/pages/manage/components/TaskAdd.vue | 8 ++++---- .../js/pages/manage/components/TaskAddSimple.vue | 4 ++-- .../js/pages/manage/components/TaskDetail.vue | 2 +- .../assets/js/pages/manage/components/TaskRow.vue | 1 + resources/assets/js/pages/manage/dashboard.vue | 2 +- resources/assets/js/pages/manage/messenger.vue | 4 ++-- .../manage/setting/components/SystemSetting.vue | 2 +- .../setting/components/SystemTaskPriority.vue | 4 ++-- resources/assets/js/pages/manage/setting/index.vue | 8 ++++---- resources/assets/js/store/state.js | 3 --- 23 files changed, 55 insertions(+), 59 deletions(-) diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index 2f72c7935..03aa0815d 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -109,6 +109,7 @@ Vue.prototype.$Platform = "web"; Vue.prototype.$isMainElectron = false; Vue.prototype.$isSubElectron = false; Vue.prototype.$isEEUiApp = isEEUiApp; +Vue.prototype.$isDesktop = $A.isDesktop(); if (isElectron) { Vue.prototype.$Electron = electron; Vue.prototype.$Platform = /macintosh|mac os x/i.test(navigator.userAgent) ? "mac" : "win"; @@ -141,6 +142,7 @@ $A.Platform = app.$Platform; $A.isMainElectron = app.$isMainElectron; $A.isSubElectron = app.$isSubElectron; $A.isEEUiApp = app.$isEEUiApp; +$A.isDesktop = app.$isDesktop; $A.execMainDispatch = (action, data) => { if ($A.isSubElectron) { $A.Electron.sendMessage('sendForwardMain', { diff --git a/resources/assets/js/components/AutoTip.vue b/resources/assets/js/components/AutoTip.vue index c53cb3af0..7ce5de6fc 100644 --- a/resources/assets/js/components/AutoTip.vue +++ b/resources/assets/js/components/AutoTip.vue @@ -4,7 +4,7 @@ :placement="placement" :effect="tooltipTheme" :delay="delay" - :disabled="!showTooltip || disabled" + :disabled="!$isDesktop || !showTooltip || disabled" :max-width="tooltipMaxWidth" transfer> diff --git a/resources/assets/js/components/Loading.vue b/resources/assets/js/components/Loading.vue index 1fa82b6f3..69dad8d40 100644 --- a/resources/assets/js/components/Loading.vue +++ b/resources/assets/js/components/Loading.vue @@ -1,5 +1,5 @@