fix: refs #8078 enhance row selection logic in VnTable component
gitea/salix-front/pipeline/pr-master This commit looks good
Details
gitea/salix-front/pipeline/pr-master This commit looks good
Details
This commit is contained in:
parent
c07fd2d2a5
commit
cb220ce268
|
@ -295,8 +295,14 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
|
||||||
if (evt?.shiftKey && added) {
|
if (evt?.shiftKey && added) {
|
||||||
const rowIndex = selectedRows[0].$index;
|
const rowIndex = selectedRows[0].$index;
|
||||||
const selectedIndexes = new Set(selected.value.map((row) => row.$index));
|
const selectedIndexes = new Set(selected.value.map((row) => row.$index));
|
||||||
for (const row of rows) {
|
const minIndex = selectedIndexes.size
|
||||||
if (row.$index == rowIndex) break;
|
? Math.min(...selectedIndexes, rowIndex)
|
||||||
|
: 0;
|
||||||
|
const maxIndex = Math.max(...selectedIndexes, rowIndex);
|
||||||
|
|
||||||
|
for (let i = minIndex; i <= maxIndex; i++) {
|
||||||
|
const row = rows[i];
|
||||||
|
if (row.$index == rowIndex) continue;
|
||||||
if (!selectedIndexes.has(row.$index)) {
|
if (!selectedIndexes.has(row.$index)) {
|
||||||
selected.value.push(row);
|
selected.value.push(row);
|
||||||
selectedIndexes.add(row.$index);
|
selectedIndexes.add(row.$index);
|
||||||
|
|
|
@ -27,30 +27,58 @@ describe('VnTable', () => {
|
||||||
beforeEach(() => (vm.selected = []));
|
beforeEach(() => (vm.selected = []));
|
||||||
|
|
||||||
describe('handleSelection()', () => {
|
describe('handleSelection()', () => {
|
||||||
const rows = [{ $index: 0 }, { $index: 1 }, { $index: 2 }];
|
const rows = [
|
||||||
const selectedRows = [{ $index: 1 }];
|
{ $index: 0 },
|
||||||
it('should add rows to selected when shift key is pressed and rows are added except last one', () => {
|
{ $index: 1 },
|
||||||
|
{ $index: 2 },
|
||||||
|
{ $index: 3 },
|
||||||
|
{ $index: 4 },
|
||||||
|
];
|
||||||
|
|
||||||
|
it('should add rows to selected when shift key is pressed and rows are added in ascending order', () => {
|
||||||
|
const selectedRows = [{ $index: 1 }];
|
||||||
vm.handleSelection(
|
vm.handleSelection(
|
||||||
{ evt: { shiftKey: true }, added: true, rows: selectedRows },
|
{ evt: { shiftKey: true }, added: true, rows: selectedRows },
|
||||||
rows
|
rows,
|
||||||
);
|
);
|
||||||
expect(vm.selected).toEqual([{ $index: 0 }]);
|
expect(vm.selected).toEqual([{ $index: 0 }]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should add rows to selected when shift key is pressed and rows are added in descending order', () => {
|
||||||
|
const selectedRows = [{ $index: 3 }];
|
||||||
|
vm.handleSelection(
|
||||||
|
{ evt: { shiftKey: true }, added: true, rows: selectedRows },
|
||||||
|
rows,
|
||||||
|
);
|
||||||
|
expect(vm.selected).toEqual([{ $index: 0 }, { $index: 1 }, { $index: 2 }]);
|
||||||
|
});
|
||||||
|
|
||||||
it('should not add rows to selected when shift key is not pressed', () => {
|
it('should not add rows to selected when shift key is not pressed', () => {
|
||||||
|
const selectedRows = [{ $index: 1 }];
|
||||||
vm.handleSelection(
|
vm.handleSelection(
|
||||||
{ evt: { shiftKey: false }, added: true, rows: selectedRows },
|
{ evt: { shiftKey: false }, added: true, rows: selectedRows },
|
||||||
rows
|
rows,
|
||||||
);
|
);
|
||||||
expect(vm.selected).toEqual([]);
|
expect(vm.selected).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
it('should not add rows to selected when rows are not added', () => {
|
it('should not add rows to selected when rows are not added', () => {
|
||||||
|
const selectedRows = [{ $index: 1 }];
|
||||||
vm.handleSelection(
|
vm.handleSelection(
|
||||||
{ evt: { shiftKey: true }, added: false, rows: selectedRows },
|
{ evt: { shiftKey: true }, added: false, rows: selectedRows },
|
||||||
rows
|
rows,
|
||||||
);
|
);
|
||||||
expect(vm.selected).toEqual([]);
|
expect(vm.selected).toEqual([]);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
it('should add all rows between the smallest and largest selected indexes', () => {
|
||||||
|
vm.selected = [{ $index: 1 }, { $index: 3 }];
|
||||||
|
const selectedRows = [{ $index: 4 }];
|
||||||
|
vm.handleSelection(
|
||||||
|
{ evt: { shiftKey: true }, added: true, rows: selectedRows },
|
||||||
|
rows,
|
||||||
|
);
|
||||||
|
expect(vm.selected).toEqual([{ $index: 1 }, { $index: 3 }, { $index: 2 }]);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue