From 2d9609f04b42f1f2ceaaefd9be1d65e49d5f04fc Mon Sep 17 00:00:00 2001 From: toesbieya <1647775459@126.com> Date: Tue, 29 Sep 2020 08:19:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=A0=8F=E3=80=81=E5=A4=9A?= =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E3=80=81=E9=A1=B5=E5=A4=B4=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E7=BC=A9=E5=B0=8F=E5=A4=9A=E9=A1=B5?= =?UTF-8?q?=E7=AD=BE=E9=BC=A0=E6=A0=87=E6=BB=9A=E8=BD=AE=E7=9A=84=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=BB=9A=E5=8A=A8=E8=B7=9D=E7=A6=BB=20=E4=BD=BF?= =?UTF-8?q?=E7=94=A8window=E7=9A=84=E6=96=B9=E6=B3=95=E4=BB=A5window.?= =?UTF-8?q?=E5=BC=80=E5=A4=B4=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../component/Menu/Submenu.vue | 12 ++++++------ vue/src/asset/style/element-ui.scss | 4 ++-- vue/src/asset/style/index.scss | 8 +++++--- vue/src/asset/style/variables.scss | 11 +++++++---- vue/src/component/abstract/Dialog/index.vue | 3 ++- vue/src/directive/ripple/index.js | 6 +++--- .../Header/component/TagsView/ScrollPanel.vue | 4 ++-- .../Header/component/TagsView/index.vue | 9 ++++++--- .../Header/component/TagsView/style.scss | 7 ++++--- .../component/Page/component/PageHeader.vue | 16 ++++++++++------ vue/src/layout/store/tagsView.js | 2 +- .../plugin/canvasAnimation/godrays/original.js | 2 +- .../canvasAnimation/particleNetwork/index.js | 4 ++-- vue/src/plugin/webgl/fluid/index.js | 2 +- vue/src/store/module/resource.js | 3 --- vue/src/util/index.js | 4 ++-- .../purchase/inbound/component/OrderSelector.vue | 1 - .../order/component/SupplierSelector.vue | 1 - .../sell/order/component/CustomerSelector.vue | 1 - .../view/sell/order/component/StockSelector.vue | 1 - .../sell/outbound/component/OrderSelector.vue | 1 - .../sell/outbound/component/StockSelector.vue | 1 - 22 files changed, 54 insertions(+), 49 deletions(-) diff --git a/vue/element-ui-personal/component/Menu/Submenu.vue b/vue/element-ui-personal/component/Menu/Submenu.vue index a02e950..a2d8a0d 100644 --- a/vue/element-ui-personal/component/Menu/Submenu.vue +++ b/vue/element-ui-personal/component/Menu/Submenu.vue @@ -129,8 +129,8 @@ export default { this.dispatch('ElSubmenu', 'mouse-enter-child') - clearTimeout(this.timeout) - this.timeout = setTimeout(() => this.rootMenu.openMenu(this.index, this.indexPath), showTimeout) + window.clearTimeout(this.timeout) + this.timeout = window.setTimeout(() => this.rootMenu.openMenu(this.index, this.indexPath), showTimeout) this.appendToBody && this.$parent.$el.dispatchEvent(new MouseEvent('mouseenter')) }, @@ -143,8 +143,8 @@ export default { this.dispatch('ElSubmenu', 'mouse-leave-child') - clearTimeout(this.timeout) - this.timeout = setTimeout(() => !this.mouseInChild && this.rootMenu.closeMenu(this.index), this.hideTimeout) + window.clearTimeout(this.timeout) + this.timeout = window.setTimeout(() => !this.mouseInChild && this.rootMenu.closeMenu(this.index), this.hideTimeout) if (this.appendToBody && deepDispatch) { if (this.$parent.$options.name === 'ElSubmenu') { @@ -170,11 +170,11 @@ export default { this.$on('toggle-collapse', this.handleCollapseToggle) this.$on('mouse-enter-child', () => { this.mouseInChild = true - clearTimeout(this.timeout) + window.clearTimeout(this.timeout) }) this.$on('mouse-leave-child', () => { this.mouseInChild = false - clearTimeout(this.timeout) + window.clearTimeout(this.timeout) }) }, diff --git a/vue/src/asset/style/element-ui.scss b/vue/src/asset/style/element-ui.scss index 77a167a..d7a7d70 100644 --- a/vue/src/asset/style/element-ui.scss +++ b/vue/src/asset/style/element-ui.scss @@ -77,8 +77,8 @@ } .el-scrollbar__wrap { - //53 for dialog header,53 for dialog footer,100 for up+down - max-height: calc(100vh - 53px - 53px - 100px); + //53 for dialog header,53 for dialog footer + max-height: calc(100vh - 53px - 53px - #{$nav-height * 2}); } } diff --git a/vue/src/asset/style/index.scss b/vue/src/asset/style/index.scss index 21c9a5c..88cf8b1 100644 --- a/vue/src/asset/style/index.scss +++ b/vue/src/asset/style/index.scss @@ -80,6 +80,8 @@ a:hover { } /*----------路由页面的最大高度开始----------*/ +$page-header-offsetHeight: $page-header-line-height + #{$page-view-margin * 2}; + .max-view-height { height: calc(100vh - #{$page-view-margin * 2}); } @@ -93,7 +95,7 @@ a:hover { } .has-page-header .max-view-height { - height: calc(100vh - #{$page-view-margin * 2} - #{$page-header-height}); + height: calc(100vh - #{$page-view-margin * 2} - #{$page-header-offsetHeight}); } .has-nav.has-tags-view .max-view-height { @@ -101,11 +103,11 @@ a:hover { } .has-nav .has-page-header .max-view-height { - height: calc(100vh - #{$page-view-margin * 2} - #{$nav-height} - #{$page-header-height}); + height: calc(100vh - #{$page-view-margin * 2} - #{$nav-height} - #{$page-header-offsetHeight}); } .has-nav.has-tags-view .has-page-header .max-view-height { - height: calc(100vh - #{$page-view-margin * 2} - #{$nav-height} - #{$tags-view-height} - #{$page-header-height}); + height: calc(100vh - #{$page-view-margin * 2} - #{$nav-height} - #{$tags-view-height} - #{$page-header-offsetHeight}); } /*----------路由页面的最大高度结束----------*/ diff --git a/vue/src/asset/style/variables.scss b/vue/src/asset/style/variables.scss index e4103f0..3fa3f46 100644 --- a/vue/src/asset/style/variables.scss +++ b/vue/src/asset/style/variables.scss @@ -69,12 +69,14 @@ $head-menu-item-hover-color: $--color-primary; //侧边栏宽度 $aside-width: 208px; //头部导航栏高度 -$nav-height: 50px; +$nav-height: 48px; //头部多页签栏高度 -$tags-view-height: 40px; +$tags-view-height: 32px; -//页头高度 -$page-header-height: 51px; +//页头行高 +$page-header-line-height: 26px; +//页头的上下padding +$page-header-padding: 12px; //路由页面的margin $page-view-margin: 24px; @@ -86,4 +88,5 @@ $page-view-margin: 24px; success: $--color-success; danger: $--color-danger; warning: $--color-warning; + navHeight: $nav-height; } diff --git a/vue/src/component/abstract/Dialog/index.vue b/vue/src/component/abstract/Dialog/index.vue index e33ffc0..d9ff800 100644 --- a/vue/src/component/abstract/Dialog/index.vue +++ b/vue/src/component/abstract/Dialog/index.vue @@ -1,4 +1,5 @@