From 7fbd3bc760cb7f2acfdaffbed5da6331cccf0dad Mon Sep 17 00:00:00 2001 From: kuaifan Date: Wed, 20 Nov 2024 09:04:19 +0800 Subject: [PATCH 1/3] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=B7=B1?= =?UTF-8?q?=E8=89=B2=E4=B8=BB=E9=A2=98=E4=B8=8B=E8=B0=83=E6=95=B4=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=E7=AA=97=E5=8F=A3=E6=98=BE=E7=A4=BA=E7=99=BD?= =?UTF-8?q?=E8=BE=B9=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/js/functions/web.js | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/assets/js/functions/web.js b/resources/assets/js/functions/web.js index 5330a5e29..eccbe4579 100755 --- a/resources/assets/js/functions/web.js +++ b/resources/assets/js/functions/web.js @@ -1000,6 +1000,7 @@ import {convertLocalResourcePath} from "../components/Replace/utils"; @media screen { html { ${this.utils.defaultFilter()} + background-color: #0D0D0D; will-change: transform; } From d34bff28c5457b03a1bb8c12e92ae17eeb54fa36 Mon Sep 17 00:00:00 2001 From: weifashi <> Date: Thu, 21 Nov 2024 23:56:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?perf:=20=20=E4=BC=98=E5=8C=96=E8=A1=A8?= =?UTF-8?q?=E6=83=85=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/components/ChatInput/emoji.vue | 48 ++++++------ .../sass/pages/components/chat-input.scss | 75 +++++++++++-------- 2 files changed, 67 insertions(+), 56 deletions(-) diff --git a/resources/assets/js/pages/manage/components/ChatInput/emoji.vue b/resources/assets/js/pages/manage/components/ChatInput/emoji.vue index 1188f4794..9eb92dd61 100644 --- a/resources/assets/js/pages/manage/components/ChatInput/emoji.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/emoji.vue @@ -23,19 +23,21 @@ - +
+ + + +
@@ -115,19 +117,16 @@ export default { } return []; }, - chatEmojiMenuStyle() { - return { - paddingLeft: this.showEmojiMenuScrollLeftBtn ? '34px' : 0, - paddingRight: this.showEmojiMenuScrollRightBtn ? '34px' : 0, - } - }, showEmojiMenuScrollLeftBtn(){ return this.emojiMenuScrollLeft > 34 }, showEmojiMenuScrollRightBtn(){ const container = this.$refs['chatEmojiMenuRef']; - const liWidth = container?.querySelector('li')?.offsetWidth || 48; - return this.emojiMenuScrollLeft < this.emoticonData.length * liWidth - (this.$store.state.windowPortrait ? 34 : 0) + if (container) { + const liWidth = container?.querySelector('li')?.offsetWidth || 48; + return this.emojiMenuScrollLeft < (container.scrollWidth - container.clientWidth - liWidth); + } + return this.emojiMenuScrollLeft <= 100; } }, methods: { @@ -226,8 +225,11 @@ export default { onMonitorWheel() { const container = this.$refs['chatEmojiMenuRef']; container?.addEventListener("wheel", (event) =>{ - event.preventDefault(); - container.scrollLeft = container.scrollLeft + event.deltaY; + const isTouchpad = Math.abs(event.deltaY) < 10 && event.deltaMode === 0; + if (!isTouchpad) { + event.preventDefault(); + container.scrollLeft = container.scrollLeft + event.deltaY; + } }); }, diff --git a/resources/assets/sass/pages/components/chat-input.scss b/resources/assets/sass/pages/components/chat-input.scss index 2a4e10239..dae330d00 100755 --- a/resources/assets/sass/pages/components/chat-input.scss +++ b/resources/assets/sass/pages/components/chat-input.scss @@ -562,55 +562,64 @@ } } } - .chat-emoji-menu { - width: 376px; - height: 40px; - line-height: 40px; - background-color: #f2f4f7; - display: flex; - align-items: center; - overflow: auto; - &::-webkit-scrollbar { - display: none; - } + .chat-emoji-menu-wrap { + position: relative; - > li { - list-style: none; - cursor: pointer; + .chat-emoji-menu { + width: 376px; + height: 40px; + line-height: 40px; + background-color: #f2f4f7; display: flex; align-items: center; - height: 100%; + overflow: auto; - &.active { - background-color: #fff; + &::-webkit-scrollbar { + display: none; } - > span { - padding: 0 13px; - font-size: 22px; - } + > li { + list-style: none; + cursor: pointer; + display: flex; + align-items: center; + height: 100%; - > i { - width: 48px; - font-size: 18px; - text-align: center; - } + &.active { + background-color: #fff; + } - > img { - width: 24px; - height: 24px; - padding: 0 12px; - box-sizing: content-box; + > span { + padding: 0 13px; + font-size: 22px; + } + + > i { + width: 48px; + font-size: 18px; + text-align: center; + } + + > img { + width: 24px; + height: 24px; + padding: 0 12px; + box-sizing: content-box; + } } } .left-btn,.right-btn{ - position: absolute !important; - height: 40px; + position: absolute; + height: 100%; background: #f2f4f7 !important; width: 34px; z-index: 3; + text-align: center; + display: flex; + align-items: center; + justify-content: center; } .left-btn{ From 3f5c85b434d334f3a60fa5cabd3c933c4fafa28d Mon Sep 17 00:00:00 2001 From: weifs <605403358@qq.com> Date: Fri, 22 Nov 2024 09:08:30 +0800 Subject: [PATCH 3/3] =?UTF-8?q?perf:=20=20=E4=BC=98=E5=8C=96=E8=A1=A8?= =?UTF-8?q?=E6=83=85=E6=BB=9A=E5=8A=A8=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/js/pages/manage/components/ChatInput/emoji.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/js/pages/manage/components/ChatInput/emoji.vue b/resources/assets/js/pages/manage/components/ChatInput/emoji.vue index 9eb92dd61..3a054ec49 100644 --- a/resources/assets/js/pages/manage/components/ChatInput/emoji.vue +++ b/resources/assets/js/pages/manage/components/ChatInput/emoji.vue @@ -24,7 +24,7 @@
- + - +