Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(module:select & module:table): fix table style error & select error #2987

Merged
merged 1 commit into from
Feb 28, 2019
Merged

fix(module:select & module:table): fix table style error & select error #2987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions components/core/style/index.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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;
Expand Down Expand Up @@ -205,6 +215,7 @@ textarea.cdk-textarea-autosize-measuring {
animation: none;
transition: none;
}

& > * {
transition: none;
}
Expand All @@ -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;
Expand All @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions components/dropdown/nz-dropdown.directive.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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]'
Expand All @@ -11,7 +11,7 @@ export class NzDropDownDirective {
fromEvent(this.el, 'mouseenter').pipe(mapTo(true)),
fromEvent(this.el, 'mouseleave').pipe(mapTo(false))
);
$click: Observable<boolean> = fromEvent(this.el, 'click').pipe(mapTo(true));
$click: Observable<boolean> = fromEvent(this.el, 'click').pipe(tap(e => e.stopPropagation()), mapTo(true));

setDisabled(disabled: boolean): void {
if (disabled) {
Expand Down
10 changes: 4 additions & 6 deletions components/select/nz-select-top-control.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,14 @@
<!--single mode-->
<ng-container *ngIf="nzSelectService.isSingleMode">
<!--selected label-->
<div
*ngIf="nzSelectService.listOfSelectedValue.length"
<div *ngIf="nzSelectService.listOfCachedSelectedOption.length && nzSelectService.listOfSelectedValue.length"
class="ant-select-selection-selected-value"
[attr.title]="nzSelectService.listOfCachedSelectedOption[0].nzLabel"
[attr.title]="nzSelectService.listOfCachedSelectedOption[0]?.nzLabel"
[ngStyle]="selectedValueStyle">
{{ nzSelectService.listOfCachedSelectedOption[0].nzLabel }}
{{ nzSelectService.listOfCachedSelectedOption[0]?.nzLabel }}
</div>
<!--show search-->
<div
*ngIf="nzShowSearch"
<div *ngIf="nzShowSearch"
class="ant-select-search ant-select-search--inline">
<div class="ant-select-search__field__wrap">
<ng-template [ngTemplateOutlet]="inputTemplate"></ng-template>
Expand Down
118 changes: 0 additions & 118 deletions rollup.config.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion scripts/site/_site/doc/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<meta name="theme-color" content="#ffffff">
<title>NG-ZORRO - Ant Design Of Angular</title>
<base href="/">
<script src="https://cdnjs.cloudflare.com/ajax/libs/hammer.js/2.0.8/hammer.js"></script>
<!-- Hotjar Tracking Code for ng.ant.design -->
<script>
(function(h,o,t,j,a,r){
Expand Down