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

revert row edit and dirty row fix (#2845)

Browse Source 
* revert row edit and dirty row fix

* undo the dirtyRow change
This commit is contained in:
Alan Ren
2018-10-12 16:39:08 -07:00
committed by GitHub
parent 620f4a8bfb
commit a1341ba503
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,9 +192,9 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
this.onBeforeAppendCell = (row: number, column: number): string => { this.onBeforeAppendCell = (row: number, column: number): string => {
let cellClass = undefined; let cellClass = undefined;
if (this.isRowDirty(row) && column === 0) { if (this.isRowDirty(row) && column === 0) {
cellClass = ' dirtyCell ';
} else if (this.isCellDirty(row, column)) {
cellClass = ' dirtyRowHeader '; cellClass = ' dirtyRowHeader ';
} else if (this.isCellDirty(row, column)) {
cellClass = ' dirtyCell ';
} }
return cellClass; return cellClass;
@@ -279,8 +279,8 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
let cellSelectTasks: Promise<void> = this.submitCurrentCellChange( let cellSelectTasks: Promise<void> = this.submitCurrentCellChange(
(result: EditUpdateCellResult) => { (result: EditUpdateCellResult) => {
// Cell update was successful, update the flags // Cell update was successful, update the flags
self.setCellDirtyState(row, self.currentCell.column, result.cell.isDirty); self.setCellDirtyState(self.currentCell.row, self.currentCell.column, result.cell.isDirty);
self.setRowDirtyState(row, result.isRowDirty); self.setRowDirtyState(self.currentCell.row, result.isRowDirty);
return Promise.resolve(); return Promise.resolve();
}, },
(error) => { (error) => {
@@ -474,10 +474,11 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
// //
this.currentEditCellValue = undefined; this.currentEditCellValue = undefined;
this.dirtyCells = []; this.dirtyCells = [];
let row = this.currentCell.row;
this.resetCurrentCell(); this.resetCurrentCell();
if (this.currentCell.row !== undefined) { if (row !== undefined) {
this.dataSet.dataRows.resetWindowsAroundIndex(this.currentCell.row); this.dataSet.dataRows.resetWindowsAroundIndex(row);
} }
} }
} }
@@ -540,6 +541,9 @@ export class EditDataComponent extends GridParentComponent implements OnInit, On
} }
} else { } else {
$(grid.getCellNode(row, column)).removeClass('dirtyCell'); $(grid.getCellNode(row, column)).removeClass('dirtyCell');
if (this.dirtyCells.indexOf(column) !== -1) {
this.dirtyCells.splice(this.dirtyCells.indexOf(column), 1);
}
} }
} }