ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-17 02:51:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

redraw table header (#14963) (#14988)

Browse Source
This commit is contained in:
Alan Ren
2021-04-05 19:49:07 -07:00
committed by GitHub
parent b421b19b73
commit 3eb705e77b
2 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -37,7 +37,7 @@ export class HeaderFilter<T extends Slick.SlickData> {
private columnDef!: FilterableColumn<T>; private columnDef!: FilterableColumn<T>;
private buttonStyles?: IButtonStyles; private buttonStyles?: IButtonStyles;
private disposableStore = new DisposableStore(); private disposableStore = new DisposableStore();
public enabled: boolean = true; private _enabled: boolean = true;
constructor() { constructor() {
} }
@@ -435,4 +435,18 @@ export class HeaderFilter<T extends Slick.SlickData> {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
} }
public get enabled(): boolean {
return this._enabled;
}
public set enabled(value: boolean) {
if (this._enabled !== value) {
this._enabled = value;
// force the table header to redraw.
this.grid.getColumns().forEach((column) => {
this.grid.updateColumnHeader(column.id);
});
}
}
} }

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

@@ -430,6 +430,7 @@ export abstract class GridTableBase<T> extends Disposable implements IView {
this.renderGridDataRowsRange(startIndex, count); this.renderGridDataRowsRange(startIndex, count);
}); });
this.dataProvider.dataRows = collection; this.dataProvider.dataRows = collection;
this.setFilterState();
this.table.updateRowCount(); this.table.updateRowCount();
await this.setupState(); await this.setupState();
} }
@@ -525,7 +526,7 @@ export abstract class GridTableBase<T> extends Disposable implements IView {
}; };
this.table.rerenderGrid(); this.table.rerenderGrid();
})); }));
if (this.configurationService.getValue<boolean>('workbench')['enablePreviewFeatures']) { if (this.enableFilteringFeature) {
this.filterPlugin = new HeaderFilter(); this.filterPlugin = new HeaderFilter();
attachButtonStyler(this.filterPlugin, this.themeService); attachButtonStyler(this.filterPlugin, this.themeService);
this.table.registerPlugin(this.filterPlugin); this.table.registerPlugin(this.filterPlugin);
@@ -686,15 +687,25 @@ export abstract class GridTableBase<T> extends Disposable implements IView {
public updateResult(resultSet: ResultSetSummary) { public updateResult(resultSet: ResultSetSummary) {
this._resultSet = resultSet; this._resultSet = resultSet;
if (this.table && this.visible) { if (this.table && this.visible) {
if (this.configurationService.getValue<boolean>('workbench')['enablePreviewFeatures'] && this.options.inMemoryDataProcessing && this.options.inMemoryDataCountThreshold < resultSet.rowCount) {
this.filterPlugin.enabled = false;
}
this.dataProvider.length = resultSet.rowCount; this.dataProvider.length = resultSet.rowCount;
this.setFilterState();
this.table.updateRowCount(); this.table.updateRowCount();
} }
this._onDidChange.fire(undefined); this._onDidChange.fire(undefined);
} }
private get enableFilteringFeature(): boolean {
return this.configurationService.getValue<boolean>('workbench')['enablePreviewFeatures'];
}
private setFilterState(): void {
if (this.enableFilteringFeature) {
const rowCount = this.table.getData().getLength();
this.filterPlugin.enabled = this.options.inMemoryDataProcessing
&& (this.options.inMemoryDataCountThreshold === undefined || this.options.inMemoryDataCountThreshold >= rowCount);
}
}
private generateContext(cell?: Slick.Cell): IGridActionContext { private generateContext(cell?: Slick.Cell): IGridActionContext {
const selection = this.selectionModel.getSelectedRanges(); const selection = this.selectionModel.getSelectedRanges();
return <IGridActionContext>{ return <IGridActionContext>{