From 2143641841d629bc7bec86471fa2254304f62ee0 Mon Sep 17 00:00:00 2001 From: garlic Date: Wed, 16 Jan 2019 10:41:45 +0900 Subject: [PATCH] #795 horizontal scroll in slick-header --- .../edit-rule-grid/scroll-loading-grid.component.ts | 6 ++++++ discovery-frontend/src/assets/css/polaris.v2.component.css | 1 + 2 files changed, 7 insertions(+) diff --git a/discovery-frontend/src/app/data-preparation/dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule-grid/scroll-loading-grid.component.ts b/discovery-frontend/src/app/data-preparation/dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule-grid/scroll-loading-grid.component.ts index fbb65d6f16..b62f51a7d9 100644 --- a/discovery-frontend/src/app/data-preparation/dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule-grid/scroll-loading-grid.component.ts +++ b/discovery-frontend/src/app/data-preparation/dataflow/dataflow-detail/component/edit-dataflow-rule/edit-rule-grid/scroll-loading-grid.component.ts @@ -219,6 +219,7 @@ export class ScrollLoadingGridComponent implements OnInit, AfterViewInit, OnDest } if(ieBrowser == false){ $('.slick-headerrow').css('overflow-x','auto'); + $('.slick-header').css('overflow-x','auto'); } // horizontal_scroll_in_histogram_area @@ -516,6 +517,11 @@ export class ScrollLoadingGridComponent implements OnInit, AfterViewInit, OnDest grid.registerPlugin(headerButtonsPlugin); } + grid.getContainerNode().querySelector('.slick-header').addEventListener('scroll', (event)=>{ + if(grid.getContainerNode().querySelector('.slick-viewport').scrollLeft != grid.getContainerNode().querySelector('.slick-header').scrollLeft) + grid.getContainerNode().querySelector('.slick-viewport').scrollLeft = grid.getContainerNode().querySelector('.slick-header').scrollLeft; + }); + return grid; } // function - _generateGrid diff --git a/discovery-frontend/src/assets/css/polaris.v2.component.css b/discovery-frontend/src/assets/css/polaris.v2.component.css index 25ebd7ef38..f513eb9086 100644 --- a/discovery-frontend/src/assets/css/polaris.v2.component.css +++ b/discovery-frontend/src/assets/css/polaris.v2.component.css @@ -488,6 +488,7 @@ ul.ddp-list-typebasic.ddp-view li.ddp-selected a .ddp-icon-plus {display:block;} .slick-header-menuicon.type-so:before {content:'So';} .slick-header-menuicon.type-mv:before {content:'Mv';} .slick-headerrow::-webkit-scrollbar {display: none;} +.slick-header::-webkit-scrollbar {display: none;} /************************************************************** 공통