From 353164e39393474de6d40e6fb26ac5b270446a8a Mon Sep 17 00:00:00 2001 From: vthinkxie Date: Thu, 28 Feb 2019 12:36:45 +0800 Subject: [PATCH] fix(module:select & module:table): fix table style error & select error (#2987) close #2983 --- components/core/style/index.less | 15 +++ components/dropdown/nz-dropdown.directive.ts | 4 +- .../nz-select-top-control.component.html | 10 +- rollup.config.js | 118 ------------------ scripts/site/_site/doc/index.html | 1 - 5 files changed, 21 insertions(+), 127 deletions(-) delete mode 100644 rollup.config.js diff --git a/components/core/style/index.less b/components/core/style/index.less index f668e895ac6..d23c0af7948 100644 --- a/components/core/style/index.less +++ b/components/core/style/index.less @@ -110,6 +110,12 @@ background: @component-background; } +.ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-header > table > .ant-table-thead > tr > th ,.ant-table-small > .ant-table-content > .ant-table-scroll > .ant-table-body > table > .ant-table-thead > tr > th { + &.ant-table-th-left-sticky, &.ant-table-th-right-sticky { + background: @component-background; + } +} + .ant-table-tbody { & > tr { &:hover { @@ -126,6 +132,10 @@ } } +.ant-table-thead > tr > th .ant-table-column-sorters > nz-dropdown { + position: static !important; +} + .ant-table-scroll-position-middle { .box-shadow-right; .box-shadow-left; @@ -205,6 +215,7 @@ textarea.cdk-textarea-autosize-measuring { animation: none; transition: none; } + & > * { transition: none; } @@ -214,6 +225,7 @@ textarea.cdk-textarea-autosize-measuring { .ant-modal-mask, .ant-modal { animation: none; transition: none; + &.zoom-enter, &.zoom-leave, &.zoom-enter-active, &.zoom-leave-active { animation: none; @@ -224,11 +236,14 @@ textarea.cdk-textarea-autosize-measuring { // menu &.ant-menu { transition: none; + .ant-menu-item, .ant-menu-submenu-title { transition: none; } + .ant-menu-item .anticon, .ant-menu-submenu-title .anticon { transition: none; + & + span { transition: none; } diff --git a/components/dropdown/nz-dropdown.directive.ts b/components/dropdown/nz-dropdown.directive.ts index 1029edfc334..c5782dfc8e3 100644 --- a/components/dropdown/nz-dropdown.directive.ts +++ b/components/dropdown/nz-dropdown.directive.ts @@ -1,6 +1,6 @@ import { Directive, ElementRef, Renderer2 } from '@angular/core'; import { fromEvent, merge, Observable } from 'rxjs'; -import { mapTo } from 'rxjs/operators'; +import { mapTo, tap } from 'rxjs/operators'; @Directive({ selector: '[nz-dropdown]' @@ -11,7 +11,7 @@ export class NzDropDownDirective { fromEvent(this.el, 'mouseenter').pipe(mapTo(true)), fromEvent(this.el, 'mouseleave').pipe(mapTo(false)) ); - $click: Observable = fromEvent(this.el, 'click').pipe(mapTo(true)); + $click: Observable = fromEvent(this.el, 'click').pipe(tap(e => e.stopPropagation()), mapTo(true)); setDisabled(disabled: boolean): void { if (disabled) { diff --git a/components/select/nz-select-top-control.component.html b/components/select/nz-select-top-control.component.html index 0d110c10f00..29df8ab3f87 100644 --- a/components/select/nz-select-top-control.component.html +++ b/components/select/nz-select-top-control.component.html @@ -17,16 +17,14 @@ -
- {{ nzSelectService.listOfCachedSelectedOption[0].nzLabel }} + {{ nzSelectService.listOfCachedSelectedOption[0]?.nzLabel }}
-
diff --git a/rollup.config.js b/rollup.config.js deleted file mode 100644 index c173d900da0..00000000000 --- a/rollup.config.js +++ /dev/null @@ -1,118 +0,0 @@ -import resolve from 'rollup-plugin-node-resolve'; -import replace from 'rollup-plugin-replace'; -import uglify from 'rollup-plugin-uglify'; -import sourcemaps from 'rollup-plugin-sourcemaps'; - -const target = process.env.ROLLUP_TARGET || 'esm'; - -let globals = { - '@angular/animations' : 'ng.animations', - '@angular/core' : 'ng.core', - '@angular/common' : 'ng.common', - '@angular/forms' : 'ng.forms', - '@angular/common/http' : 'ng.common.http', - '@angular/router' : 'ng.router', - '@angular/platform-browser' : 'ng.platformBrowser', - '@angular/platform-server' : 'ng.platformServer', - '@angular/platform-browser-dynamic' : 'ng.platformBrowserDynamic', - '@angular/platform-browser/animations': 'ng.platformBrowser.animations', - '@angular/core/testing' : 'ng.core.testing', - '@angular/common/testing' : 'ng.common.testing', - '@angular/common/http/testing' : 'ng.common.http.testing', - - '@angular/cdk' : 'ng.cdk', - '@angular/cdk/keycodes' : 'ng.cdk.keycodes', - '@angular/cdk/a11y' : 'ng.cdk.a11y', - '@angular/cdk/accordion' : 'ng.cdk.accordion', - '@angular/cdk/bidi' : 'ng.cdk.bidi', - '@angular/cdk/coercion' : 'ng.cdk.coercion', - '@angular/cdk/collections': 'ng.cdk.collections', - '@angular/cdk/layout' : 'ng.cdk.layout', - '@angular/cdk/observers' : 'ng.cdk.observers', - '@angular/cdk/overlay' : 'ng.cdk.overlay', - '@angular/cdk/platform' : 'ng.cdk.platform', - '@angular/cdk/portal' : 'ng.cdk.portal', - '@angular/cdk/scrolling' : 'ng.cdk.scrolling', - '@angular/cdk/stepper' : 'ng.cdk.stepper', - '@angular/cdk/table' : 'ng.cdk.table', - - 'date-fns/add_days' : 'date-fns/add_days/index', - 'date-fns/difference_in_calendar_days' : 'date-fns/difference_in_calendar_days/index', - 'date-fns/difference_in_calendar_months': 'date-fns/difference_in_calendar_months/index', - 'date-fns/difference_in_calendar_weeks' : 'date-fns/difference_in_calendar_weeks/index', - 'date-fns/end_of_month' : 'date-fns/end_of_month/index', - 'date-fns/is_same_day' : 'date-fns/is_same_day/index', - 'date-fns/is_same_month' : 'date-fns/is_same_month/index', - 'date-fns/is_same_year' : 'date-fns/is_same_year/index', - 'date-fns/is_this_month' : 'date-fns/is_this_month/index', - 'date-fns/is_this_year' : 'date-fns/is_this_year/index', - 'date-fns/set_month' : 'date-fns/set_month/index', - 'date-fns/set_year' : 'date-fns/set_year/index', - 'date-fns/start_of_month' : 'date-fns/start_of_month/index', - 'date-fns/start_of_week' : 'date-fns/start_of_week/index', - 'date-fns/start_of_year' : 'date-fns/start_of_year/index', - 'date-fns/parse' : 'date-fns/parse/index', - 'date-fns/add_months' : 'date-fns/add_months/index', - 'date-fns/add_years' : 'date-fns/add_years/index', - 'date-fns/set_day' : 'date-fns/set_day/index', - - 'rxjs' : 'Rx', - 'rxjs/operators': 'Rx.Observable.prototype', -}; - -const listOfDateFns = [ - 'addDays', - 'differenceInCalendarDays', - 'differenceInCalendarMonths', - 'differenceInCalendarWeeks', - 'endOfMonth', - 'isSameDay', - 'isSameMonth', - 'isSameYear', - 'isThisMonth', - 'isThisYear', - 'setMonth', - 'setYear', - 'startOfMonth', - 'startOfWeek', - 'startOfYear', - 'parse', - 'addMonths', - 'addYears', - 'setDay' -]; -const listOfReplace = listOfDateFns.map(name => { - const map = {}; - // map[`import * as ${name} `] = `var ${name}=_${name};\nimport * as _${name} `; - map[`import * as ${name}`] = `import ${name}`; - return replace(map) -}); - -let plugins = [ - sourcemaps(), - ...listOfReplace, - // replace({ "import * as setMonth ": "import " }), - resolve(), -]; - -switch (target) { - case 'esm': - Object.assign(globals, { - 'tslib': 'tslib', - }); - break; - case 'mumd': - plugins.push(uglify()); - break; -} - -export default { - plugins, - external : Object.keys(globals), - output : { - exports : 'named', - name : 'ngZorro.antd', - globals, - sourcemap: true, - } -} diff --git a/scripts/site/_site/doc/index.html b/scripts/site/_site/doc/index.html index ab0a6752658..9da96cd6fce 100644 --- a/scripts/site/_site/doc/index.html +++ b/scripts/site/_site/doc/index.html @@ -15,7 +15,6 @@ NG-ZORRO - Ant Design Of Angular -