dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-28 03:46:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Jan Prochazka
2020-10-31 11:20:34 +01:00
parent 44059f1215
commit 9bed46fe01
1 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
packages/web/src/datagrid/DataGridCore.js
View File

@@ -465,7 +465,7 @@ export default function DataGridCore(props) {
cells = _.flatten( cells = _.flatten(
cells.map((cell) => { cells.map((cell) => {
if (cell[0] == 'header') { if (cell[0] == 'header') {
return _.range(0, allRowCount).map((row) => [row, cell[1]]); return _.range(0, grider.rowCount).map((row) => [row, cell[1]]);
} }
return [cell]; return [cell];
}) })
@@ -539,25 +539,8 @@ export default function DataGridCore(props) {
return _.uniq((selectedCells || []).map((x) => x[1])).filter((x) => _.isNumber(x)); return _.uniq((selectedCells || []).map((x) => x[1])).filter((x) => _.isNumber(x));
} }
function getSelectedRegularCells() {
if (selectedCells.find((x) => x[0] == 'header' && x[1] == 'header')) {
const row = _.range(0, realColumnUniqueNames.length);
return _.range(0, grider.rowCount).map((rowIndex) => row.map((colIndex) => [rowIndex, colIndex]));
}
const res = [];
for (const cell of selectedCells) {
if (isRegularCell(cell)) res.push(cell);
else if (cell[0] == 'header' && _.isNumber(cell[1])) {
res.push(..._.range(0, grider.rowCount).map((rowIndex) => [rowIndex, cell[1]]));
} else if (cell[1] == 'header' && _.isNumber(cell[0])) {
res.push(..._.range(0, realColumnUniqueNames.length).map((colIndex) => [cell[0], colIndex]));
}
}
return res;
}
function getSelectedMacroCells() { function getSelectedMacroCells() {
const regular = getSelectedRegularCells(); const regular = cellsToRegularCells(selectedCells);
// @ts-ignore // @ts-ignore
return regular.map((cell) => ({ return regular.map((cell) => ({
row: cell[0], row: cell[0],