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

changed the format of rowspan and colspan to be string or number (#859)

Browse Source
This commit is contained in:
Leila Lali
2018-03-09 09:55:04 -08:00
committed by GitHub
parent 8b2ea4f0a0
commit 52544fa953
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/sql/parts/dashboard/containers/dashboardGridContainer.component.ts
View File

@@ -25,8 +25,8 @@ export interface GridCellConfig {
id?: string; id?: string;
row?: number; row?: number;
col?: number; col?: number;
colspan?: string; colspan?: string | number;
rowspan?: string; rowspan?: string | number;
} }
export interface GridWidgetConfig extends GridCellConfig, WidgetConfig { export interface GridWidgetConfig extends GridCellConfig, WidgetConfig {
@@ -136,7 +136,10 @@ export class DashboardGridContainer extends DashboardTab implements OnDestroy {
return rowCount * this.cellHeight + 'px'; return rowCount * this.cellHeight + 'px';
} }
private convertToNumber(value: string, maxNumber: number): number { private convertToNumber(value: string | number, maxNumber: number): number {
if (!value) {
return 1;
}
if (value === '*') { if (value === '*') {
return maxNumber; return maxNumber;
} }

4
src/sql/parts/dashboard/pages/dashboardPageContribution.ts
View File

@@ -83,7 +83,7 @@ export function generateDashboardGridLayoutSchema(type?: 'database' | 'server',
description: localize('dashboardpage.rowNumber', "The row of the component in the grid") description: localize('dashboardpage.rowNumber', "The row of the component in the grid")
}, },
rowspan: { rowspan: {
type: 'string', type: ['string', 'number'],
description: localize('dashboardpage.rowSpan', "The rowspan of the component in the grid. Default value is 1. Use '*' to set to number of rows in the grid.") description: localize('dashboardpage.rowSpan', "The rowspan of the component in the grid. Default value is 1. Use '*' to set to number of rows in the grid.")
}, },
col: { col: {
@@ -91,7 +91,7 @@ export function generateDashboardGridLayoutSchema(type?: 'database' | 'server',
description: localize('dashboardpage.colNumber', "The column of the component in the grid") description: localize('dashboardpage.colNumber', "The column of the component in the grid")
}, },
colspan: { colspan: {
type: 'string', type: ['string', 'number'],
description: localize('dashboardpage.colspan', "The colspan of the component in the grid. Default value is 1. Use '*' to set to number of columns in the grid.") description: localize('dashboardpage.colspan', "The colspan of the component in the grid. Default value is 1. Use '*' to set to number of columns in the grid.")
}, },
widget: { widget: {