ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix the menu not hide issue (#15138)

Browse Source
This commit is contained in:
Alan Ren
2021-04-14 16:18:45 -07:00
committed by GitHub
parent 3a1885491f
commit 4edbd6f3e7
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts
View File

@@ -60,7 +60,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
.subscribe(this.grid.onKeyDown, (e: DOMEvent) => this.handleKeyDown(e as KeyboardEvent)); .subscribe(this.grid.onKeyDown, (e: DOMEvent) => this.handleKeyDown(e as KeyboardEvent));
this.grid.setColumns(this.grid.getColumns()); this.grid.setColumns(this.grid.getColumns());
this.disposableStore.add(addDisposableListener(document.body, 'mousedown', e => this.handleBodyMouseDown(e))); this.disposableStore.add(addDisposableListener(document.body, 'mousedown', e => this.handleBodyMouseDown(e), true));
this.disposableStore.add(addDisposableListener(document.body, 'keydown', e => this.handleKeyDown(e))); this.disposableStore.add(addDisposableListener(document.body, 'keydown', e => this.handleKeyDown(e)));
} }
@@ -80,8 +80,6 @@ export class HeaderFilter<T extends Slick.SlickData> {
private handleBodyMouseDown(e: MouseEvent): void { private handleBodyMouseDown(e: MouseEvent): void {
if (this.$menu && this.$menu[0] !== e.target && !jQuery.contains(this.$menu[0], e.target as Element)) { if (this.$menu && this.$menu[0] !== e.target && !jQuery.contains(this.$menu[0], e.target as Element)) {
this.hideMenu(); this.hideMenu();
e.preventDefault();
e.stopPropagation();
} }
} }

2
src/sql/workbench/contrib/query/browser/gridPanel.ts
View File

@@ -528,7 +528,7 @@ export abstract class GridTableBase<T> extends Disposable implements IView {
})); }));
if (this.enableFilteringFeature) { if (this.enableFilteringFeature) {
this.filterPlugin = new HeaderFilter(this.contextViewService); this.filterPlugin = new HeaderFilter(this.contextViewService);
attachTableFilterStyler(this.filterPlugin, this.themeService); this._register(attachTableFilterStyler(this.filterPlugin, this.themeService));
this.table.registerPlugin(this.filterPlugin); this.table.registerPlugin(this.filterPlugin);
} }
if (this.styles) { if (this.styles) {