ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 09:35:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Notebook Views grid fixes (#17170)

Browse Source
This commit is contained in:
Daniel Grajeda
2021-09-28 15:52:00 -06:00
committed by GitHub
parent 508630411d
commit 08acd6aadc
4 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sql/workbench/contrib/notebook/browser/notebookViews/notebookViewsCard.component.ts
View File

@@ -49,10 +49,6 @@ export class NotebookViewsCardComponent extends AngularDisposable implements OnI
}
ngOnInit() {
this.initActionBar();
}
ngAfterViewInit() {
this.initialize();
}

2
src/sql/workbench/contrib/notebook/browser/notebookViews/notebookViewsGrid.component.html
View File

@@ -15,6 +15,6 @@
{{emptyText}}
</div>
<div *ngIf="!loaded" style="display: block; position: absolute; height: 100%; width: 100%; z-index: 9999; background: #fff;">
<div *ngIf="!loaded" style="display: block; position: absolute; height: 100%; width: 100%; z-index: 1; background: #fff;">
<loading-spinner [loading]="!loaded" [loadingMessage]="loadingMessage"></loading-spinner>
</div>

24
src/sql/workbench/contrib/notebook/browser/notebookViews/notebookViewsGrid.component.ts
View File

@@ -40,7 +40,7 @@ export class NotebookViewsGridComponent extends AngularDisposable implements OnI
protected _activeCell: ICellModel;
protected _options: INotebookViewsGridOptions = {
cellHeight: 60
cellHeight: 30
};;
constructor(
@@ -89,9 +89,6 @@ export class NotebookViewsGridComponent extends AngularDisposable implements OnI
this._grid = undefined;
}
}
if (this.activeView && this.activeView.guid !== this._gridView?.guid) {
this.activeView.initialize();
}
if (this.model?.activeCell?.id !== this._activeCell?.id) {
this._activeCell = this.model.activeCell;
@@ -102,7 +99,6 @@ export class NotebookViewsGridComponent extends AngularDisposable implements OnI
ngAfterViewChecked() {
// If activeView has changed, rebuild the grid
if (this.activeView && this.activeView.guid !== this._gridView?.guid) {
this._gridView = this.activeView;
if (!this._grid) {
this.createGrid();
@@ -119,6 +115,7 @@ export class NotebookViewsGridComponent extends AngularDisposable implements OnI
private destroyGrid() {
if (this._grid) {
this._loaded = false;
this._gridEnabled = false;
this._grid.destroy(false);
}
@@ -126,6 +123,7 @@ export class NotebookViewsGridComponent extends AngularDisposable implements OnI
private createGrid() {
const isNew = this.activeView.isNew;
this._gridView = this.activeView;
if (this._grid) {
this.destroyGrid();
@@ -140,14 +138,14 @@ export class NotebookViewsGridComponent extends AngularDisposable implements OnI
alwaysShowResizeHandle: false,
styleInHead: true,
margin: 2,
cellHeight: this._options.cellHeight,
staticGrid: false,
});
this._gridEnabled = true;
if (isNew) {
this.updateGrid();
}
this.updateGrid();
}
/**
@@ -161,11 +159,13 @@ export class NotebookViewsGridComponent extends AngularDisposable implements OnI
this._grid.batchUpdate();
this.activeView.cells.forEach(cell => {
const el = this._grid.getGridItems().find(x => x.getAttribute('data-cell-id') === cell.cellGuid);
const cellData = this.activeView.getCellMetadata(cell);
this._grid.update(el, { x: cellData.x, y: cellData.y, w: cellData.width, h: cellData.height });
if (el) {
const cellData = this.activeView.getCellMetadata(cell);
this._grid.update(el, { x: cellData.x, y: cellData.y, w: cellData.width, h: cellData.height });
if (cellData?.hidden) {
this._grid.removeWidget(el, false); // Do not trigger event for batch update
if (cellData?.hidden) {
this._grid.removeWidget(el, false); // Do not trigger event for batch update
}
}
});
this._grid.commit();

6
src/sql/workbench/services/notebook/browser/notebookViews/autodash.ts
View File

@@ -69,13 +69,13 @@ class CellDisplayGroup extends DisplayGroup<ICellModel> {
//For graphs
if (this.hasGraph(cell)) {
visInfo.width = 6;
visInfo.height = 4;
visInfo.height = 12;
}
//For tables
else if (this.hasTable(cell)) {
visInfo.height = Math.min(meta?.height, 3);
visInfo.height = Math.min(meta?.height, 6);
} else {
visInfo.height = Math.min(meta?.height, 3);
visInfo.height = Math.min(meta?.height, 6);
}
visInfo.display = true;