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

Use max column width when auto-sizing columns (#4394)

Browse Source
This commit is contained in:
Matt Irvine
2019-03-12 14:03:37 -07:00
committed by GitHub
parent 53a94cc7bb
commit e783aeab66
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ export interface IAutoColumnSizeOptions extends Slick.PluginOptions {
} }
const defaultOptions: IAutoColumnSizeOptions = { const defaultOptions: IAutoColumnSizeOptions = {
maxWidth: 200, maxWidth: 212,
autoSizeOnRender: false autoSizeOnRender: false
}; };
@@ -146,7 +146,7 @@ export class AutoColumnSize<T> implements Slick.Plugin<T> {
let template = this.getMaxTextTemplate(texts, columnDef, colIndex, data, rowEl); let template = this.getMaxTextTemplate(texts, columnDef, colIndex, data, rowEl);
let width = this.getTemplateWidth(rowEl, template); let width = this.getTemplateWidth(rowEl, template);
this.deleteRow(rowEl); this.deleteRow(rowEl);
return width; return width > this._options.maxWidth ? this._options.maxWidth : width;
} }
private getTemplateWidth(rowEl: JQuery, template: JQuery | HTMLElement): number { private getTemplateWidth(rowEl: JQuery, template: JQuery | HTMLElement): number {

2
src/sql/parts/grid/views/editData/editData.component.ts
View File

@@ -380,7 +380,7 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
}; };
})) }))
}; };
self.plugins.push([rowNumberColumn, new AutoColumnSize(), new AdditionalKeyBindings()]); self.plugins.push([rowNumberColumn, new AutoColumnSize({ maxWidth: this.configurationService.getValue<number>('resultsGrid.maxColumnWidth') }), new AdditionalKeyBindings()]);
self.dataSet = dataSet; self.dataSet = dataSet;
// Create a dataSet to render without rows to reduce DOM size // Create a dataSet to render without rows to reduce DOM size

2
src/sql/parts/query/editor/gridPanel.ts
View File

@@ -503,7 +503,7 @@ class GridTable<T> extends Disposable implements IView {
this.table = this._register(new Table(tableContainer, { dataProvider: this.dataProvider, columns: this.columns }, tableOptions)); this.table = this._register(new Table(tableContainer, { dataProvider: this.dataProvider, columns: this.columns }, tableOptions));
this.table.setSelectionModel(this.selectionModel); this.table.setSelectionModel(this.selectionModel);
this.table.registerPlugin(new MouseWheelSupport()); this.table.registerPlugin(new MouseWheelSupport());
this.table.registerPlugin(new AutoColumnSize({ autoSizeOnRender: !this.state.columnSizes && this.configurationService.getValue('resultsGrid.autoSizeColumns') })); this.table.registerPlugin(new AutoColumnSize({ autoSizeOnRender: !this.state.columnSizes && this.configurationService.getValue('resultsGrid.autoSizeColumns'), maxWidth: this.configurationService.getValue<number>('resultsGrid.maxColumnWidth') }));
this.table.registerPlugin(copyHandler); this.table.registerPlugin(copyHandler);
this.table.registerPlugin(this.rowNumberColumn); this.table.registerPlugin(this.rowNumberColumn);
this.table.registerPlugin(new AdditionalKeyBindings()); this.table.registerPlugin(new AdditionalKeyBindings());

5
src/sql/parts/query/editor/resultsGridContribution.ts
View File

@@ -66,6 +66,11 @@ const resultsGridConfiguration: IConfigurationNode = {
type: 'boolean', type: 'boolean',
default: true, default: true,
description: nls.localize('autoSizeColumns', "Auto size the columns width on inital results. Could have performance problems with large number of columns or large cells") description: nls.localize('autoSizeColumns', "Auto size the columns width on inital results. Could have performance problems with large number of columns or large cells")
},
'resultsGrid.maxColumnWidth': {
type: 'number',
default: 212,
description: nls.localize('maxColumnWidth', "The maximum width in pixels for auto-sized columns")
} }
} }
}; };