From 16efba90cf559d24819a94869ff4d151ecfa40d9 Mon Sep 17 00:00:00 2001 From: Lu Chaohai Date: Wed, 10 Apr 2019 08:13:42 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E5=AF=BC=E8=87=B4=E7=9A=84?= =?UTF-8?q?=E9=A1=B6=E9=83=A8=E8=8F=9C=E5=8D=95=E6=BB=9A=E5=8A=A8=E8=BD=B4?= =?UTF-8?q?=E5=BC=82=E5=B8=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 2b4afbe19591d83920da0a594c628c419d9fda25 [formerly 2b4afbe19591d83920da0a594c628c419d9fda25 [formerly 2b4afbe19591d83920da0a594c628c419d9fda25 [formerly 2b4afbe19591d83920da0a594c628c419d9fda25 [formerly a4f4fe6a4efa08a93ec74345bb4630fece1b0560 [formerly 7a54ed8bc65c87132d18f1e3ff3fd7b2c94212dc]]]]] Former-commit-id: 86a7bdfe0575038ae12d52f26fd0bfa334b0b704 Former-commit-id: 1d908e75d462b1f490d85abe2a5eb6c07ef23aee Former-commit-id: cc70ea58925cd8339b3fcf6c2236ddba4eecd6a5 [formerly 8583b31523987529d8aee76070e0955ead44ca02] Former-commit-id: 95c8f7f88157d3ec99e36688f5315c5c4d274cc4 Former-commit-id: c6ef3f63dddd62d6725cd31ee3cbd0a8428e6a3b Former-commit-id: 4d5008e488776faa64ceb843042973c6fcdb5061 Former-commit-id: 193fad7fdeb14fa41370b62ca9cc8f68c044ba1a Former-commit-id: 70bb99b49d3b0d335dd74f13aa71c781193dd260 --- src/layout/header-aside/components/menu-header/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layout/header-aside/components/menu-header/index.vue b/src/layout/header-aside/components/menu-header/index.vue index e3e5df18..fe307770 100644 --- a/src/layout/header-aside/components/menu-header/index.vue +++ b/src/layout/header-aside/components/menu-header/index.vue @@ -109,7 +109,7 @@ export default { mounted () { // 初始化判断 // 默认判断父元素和子元素的大小,以确定初始情况是否显示滚动 - this.checkScroll() + window.addEventListener('load', this.checkScroll) // 全局窗口变化监听,判断父元素和子元素的大小,从而控制isScroll的开关 this.throttledCheckScroll = throttle(this.checkScroll, 300) window.addEventListener('resize', this.throttledCheckScroll) From f6d665e2762ac72ba2581d4be637b16e6ca279ca Mon Sep 17 00:00:00 2001 From: Lu Chaohai Date: Wed, 10 Apr 2019 08:46:46 +0800 Subject: [PATCH 2/2] =?UTF-8?q?menu-scroll=E7=9A=84load=E9=97=AD=E7=8E=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Former-commit-id: 3b77e62fab4ebcc6240c5583921109cb440ac040 [formerly 3b77e62fab4ebcc6240c5583921109cb440ac040 [formerly 3b77e62fab4ebcc6240c5583921109cb440ac040 [formerly 3b77e62fab4ebcc6240c5583921109cb440ac040 [formerly b23640838d125a94b88f1f1251a58ab7ee8192b4 [formerly 95206821db3f98a24808708e18b6f3229f5c5081]]]]] Former-commit-id: b418bd5953c02fc5a128edaea6814a82f759a0b4 Former-commit-id: f653dd9ca82a56576dd70ac5c41f84766c77c8aa Former-commit-id: 4b9dd2a4dabc9c475eaa0aaff2d6a803a869ac18 [formerly 11ee19bc2f6791a9a2f755123e021c39ae238498] Former-commit-id: 2d897b6562f9cc25db215868600c9e0750abc995 Former-commit-id: 064842b388029046538160bec1e4da87c29d97af Former-commit-id: 877956cf441d92621e67a9827296afb15e0aa887 Former-commit-id: 4c4d5278eafde4bbf84eae6f5991f17de3228856 Former-commit-id: 73e53f2f1768b12320346573f277b0f9fc4521c7 --- src/layout/header-aside/components/menu-header/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/layout/header-aside/components/menu-header/index.vue b/src/layout/header-aside/components/menu-header/index.vue index fe307770..62df2621 100644 --- a/src/layout/header-aside/components/menu-header/index.vue +++ b/src/layout/header-aside/components/menu-header/index.vue @@ -117,6 +117,7 @@ export default { beforeDestroy () { // 取消监听 window.removeEventListener('resize', this.throttledCheckScroll) + window.removeEventListener('load', this.checkScroll) } }