diff --git a/electron/package.json b/electron/package.json index 2b471e4ea..a35e7ece9 100755 --- a/electron/package.json +++ b/electron/package.json @@ -32,7 +32,7 @@ "@electron-forge/maker-squirrel": "^7.2.0", "@electron-forge/maker-zip": "^7.2.0", "dotenv": "^16.3.1", - "electron": "^28.1.0", + "electron": "^28.1.1", "electron-builder": "^24.9.1", "electron-notarize": "^1.2.2", "form-data": "^4.0.0", diff --git a/resources/assets/js/pages/manage/components/DialogWrapper.vue b/resources/assets/js/pages/manage/components/DialogWrapper.vue index 14c53c366..1f2bac9ae 100644 --- a/resources/assets/js/pages/manage/components/DialogWrapper.vue +++ b/resources/assets/js/pages/manage/components/DialogWrapper.vue @@ -140,7 +140,7 @@
- +

@@ -318,7 +318,7 @@ {{ $L(operateItem.todo ? '取消待办' : '设待办') }}

  • - + {{ $L(dialogData.top_msg_id == operateItem.id ? '取消置顶' : '置顶') }}
  • @@ -956,20 +956,24 @@ export default { }); }, + isDefaultSize() { + return this.windowScrollY === 0 && !this.androidKeyboardVisible + }, + quickShow() { - return this.quickMsgs.length > 0 && this.windowScrollY === 0 && this.quoteId === 0 + return this.quickMsgs.length > 0 && this.isDefaultSize && this.quoteId === 0 }, todoShow() { - return this.todoList.length > 0 && this.windowScrollY === 0 && this.quoteId === 0 + return this.todoList.length > 0 && this.isDefaultSize && this.quoteId === 0 }, tagShow() { - return this.msgTags.length > 1 && this.windowScrollY === 0 && !this.searchShow + return this.msgTags.length > 1 && this.isDefaultSize && !this.searchShow }, topShow() { - return this.topMsg && this.windowScrollY === 0 && !this.searchShow && this.msgType === '' + return this.topMsg && this.isDefaultSize && !this.searchShow && this.msgType === '' }, wrapperClass() { @@ -1358,6 +1362,7 @@ export default { windowHeight() { this.androidKeyboardVisible = $A.isAndroid() && $A.eeuiAppKeyboardStatus() + requestAnimationFrame(this.$refs.input.updateTools) }, dialogDrag(val) { diff --git a/resources/assets/sass/pages/components/dialog-wrapper.scss b/resources/assets/sass/pages/components/dialog-wrapper.scss index eb8d74a2c..3fbad98ea 100644 --- a/resources/assets/sass/pages/components/dialog-wrapper.scss +++ b/resources/assets/sass/pages/components/dialog-wrapper.scss @@ -521,7 +521,8 @@ .dialog-position { position: relative; z-index: 2; - height: 0; + height: 1px; // 不加高度iOS动画无效果 + margin-bottom: -1px; width: 100%; display: flex; align-items: center; @@ -2434,11 +2435,11 @@ body.window-portrait { @keyframes position-in-animation { from { + transform: translate3d(100%, 0, 0); opacity: 0; - transform: translateX(100%); } to { + transform: translate3d(0%, 0, 0); opacity: 1; - transform: translateX(0); } } diff --git a/resources/mobile b/resources/mobile index 53efe745c..c24690c75 160000 --- a/resources/mobile +++ b/resources/mobile @@ -1 +1 @@ -Subproject commit 53efe745c063f9bce1cfa9f3a3055a83ca6153c4 +Subproject commit c24690c754533852f7ef596c14718bec6edbfcb3