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

edit data issue with column index handling (#2595)

Browse Source
This commit is contained in:
Alan Ren
2018-09-14 21:19:56 -07:00
committed by Karl Burtram
parent d156c0be3d
commit dede5c5ef5
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,7 +166,7 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
this.onCellEditEnd = (event: Slick.OnCellChangeEventArgs<any>): void => { this.onCellEditEnd = (event: Slick.OnCellChangeEventArgs<any>): void => {
// Store the value that was set // Store the value that was set
self.currentEditCellValue = event.item[event.cell - 1]; self.currentEditCellValue = event.item[event.cell];
}; };
this.overrideCellFn = (rowNumber, columnId, value?, data?): string => { this.overrideCellFn = (rowNumber, columnId, value?, data?): string => {
@@ -270,18 +270,18 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
return self.dataService.updateCell(sessionRowId, self.currentCell.column - 1, self.currentEditCellValue) return self.dataService.updateCell(sessionRowId, self.currentCell.column - 1, self.currentEditCellValue)
.then( .then(
result => { result => {
// Cell update was successful, update the flags // Cell update was successful, update the flags
self.currentEditCellValue = null; self.currentEditCellValue = null;
self.setCellDirtyState(row, self.currentCell.column, result.cell.isDirty); self.setCellDirtyState(row, self.currentCell.column, result.cell.isDirty);
self.setRowDirtyState(row, result.isRowDirty); self.setRowDirtyState(row, result.isRowDirty);
return Promise.resolve(); return Promise.resolve();
}, },
error => { error => {
// Cell update failed, jump back to the last cell we were on // Cell update failed, jump back to the last cell we were on
self.focusCell(self.currentCell.row, self.currentCell.column, true); self.focusCell(self.currentCell.row, self.currentCell.column, true);
return Promise.reject(null); return Promise.reject(null);
} }
); );
}); });
} }
@@ -377,10 +377,11 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
index => { return {}; } index => { return {}; }
), ),
columnDefinitions: [rowNumberColumn.getColumnDefinition()].concat(resultSet.columnInfo.map((c, i) => { columnDefinitions: [rowNumberColumn.getColumnDefinition()].concat(resultSet.columnInfo.map((c, i) => {
let columnIndex = (i + 1).toString();
return { return {
id: i.toString(), id: columnIndex,
name: escape(c.columnName), name: escape(c.columnName),
field: i.toString(), field: columnIndex,
formatter: Services.textFormatter, formatter: Services.textFormatter,
isEditable: c.isUpdatable isEditable: c.isUpdatable
}; };