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

reverting a change in declarative table (#2246)

Browse Source
This commit is contained in:
Leila Lali
2018-08-17 14:50:41 -07:00
committed by GitHub
parent d10e08e63e
commit 1b6328b451
3 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/sql/parts/modelComponents/declarativeTable.component.ts
View File

@@ -32,18 +32,15 @@ export enum DeclarativeDataType {
@Component({ @Component({
selector: 'modelview-declarativeTable', selector: 'modelview-declarativeTable',
template: ` template: `
<table role=grid aria-labelledby="ID_REF" #container *ngIf="columns" class="declarative-table"> <table role=grid aria-labelledby="ID_REF" #container *ngIf="columns" class="declarative-table" [style.height]="getHeight()">
<thead> <thead>
<tr style="display:block;">
<ng-container *ngFor="let column of columns;let h = index"> <ng-container *ngFor="let column of columns;let h = index">
<td class="declarative-table-header" tabindex="-1" [style.width]="getColumnWidth(h)" role="button" aria-sort="none">{{column.displayName}}</td> <th class="declarative-table-header" tabindex="-1" role="button" aria-sort="none">{{column.displayName}}</th>
</ng-container> </ng-container>
</tr>
</thead> </thead>
<ng-container *ngIf="data"> <ng-container *ngIf="data">
<tbody style="display: block; width:100%; overflow-y: scroll" [style.height]="getHeight()">
<ng-container *ngFor="let row of data;let r = index"> <ng-container *ngFor="let row of data;let r = index">
<tr class="declarative-table-row"> <tr class="declarative-table-row" >
<ng-container *ngFor="let cellData of row;let c = index"> <ng-container *ngFor="let cellData of row;let c = index">
<td class="declarative-table-cell" tabindex="-1" role="button" [style.width]="getColumnWidth(c)"> <td class="declarative-table-cell" tabindex="-1" role="button" [style.width]="getColumnWidth(c)">
<checkbox *ngIf="isCheckBox(c)" label="" (onChange)="onCheckBoxChanged($event,r,c)" [enabled]="isControlEnabled(c)" [checked]="isChecked(r,c)"></checkbox> <checkbox *ngIf="isCheckBox(c)" label="" (onChange)="onCheckBoxChanged($event,r,c)" [enabled]="isControlEnabled(c)" [checked]="isChecked(r,c)"></checkbox>
@@ -54,9 +51,7 @@ export enum DeclarativeDataType {
</td> </td>
</ng-container> </ng-container>
</tr> </tr>
</ng-container> </ng-container>
</tbody>
</ng-container> </ng-container>
</table> </table>
` `

2
src/sql/sqlops.proposed.d.ts vendored
View File

@@ -715,7 +715,7 @@ declare module 'sqlops' {
* Register model view content for the dialog. * Register model view content for the dialog.
* Doesn't do anything if model view is already registered * Doesn't do anything if model view is already registered
*/ */
registerContent(handler: (view: ModelView) => void): void; registerContent(handler: (view: ModelView) => Thenable<void>): void;
/** /**
* Returns the model view content if registered. Returns undefined if model review is not registered * Returns the model view content if registered. Returns undefined if model review is not registered

2
src/sql/workbench/api/node/extHostModelViewDialog.ts
View File

@@ -36,7 +36,7 @@ class ModelViewPanelImpl implements sqlops.window.modelviewdialog.ModelViewPanel
this._onValidityChanged(valid => this._valid = valid); this._onValidityChanged(valid => this._valid = valid);
} }
public registerContent(handler: (view: sqlops.ModelView) => void): void { public registerContent(handler: (view: sqlops.ModelView) => Thenable<void>): void {
if (!this._modelViewId) { if (!this._modelViewId) {
let viewId = this._viewType + this._handle; let viewId = this._viewType + this._handle;
this.setModelViewId(viewId); this.setModelViewId(viewId);