test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-02 03:58:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: picker selectedChange事件中缺少shift连续多选的数据 (#7831)

Browse Source 
Co-authored-by: wanglinfang <wanglinfang@baidu.com>
This commit is contained in:
wanglinfang2014 2023-08-16 14:58:45 +08:00 committed by GitHub
parent 7aba99acd5
commit 0fb7d65a86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
packages/amis-core/src/store/table.ts
View File

@ -1380,14 +1380,14 @@ export const TableStore = iRendererStore
}
}
// 按住 shift 的时候点击选项
function toggleShift(row: IRow, checked: boolean) {
function getToggleShiftRows(row: IRow) {
// 如果是同一个或非 multiple 模式下就和不用 shift 一样
if (!lastCheckedRow || row === lastCheckedRow || !self.multiple) {
toggle(row, checked);
return;
return [row];
}
const toggleRows = [];
const maxLength = self.maxKeepItemSelectionLength;
const checkableRows = self.checkableRows;
const lastCheckedRowIndex = checkableRows.findIndex(
@ -1395,31 +1395,44 @@ export const TableStore = iRendererStore
);
const rowIndex = checkableRows.findIndex(rowItem => row === rowItem);
const minIndex =
lastCheckedRowIndex > rowIndex ? rowIndex : lastCheckedRowIndex;
lastCheckedRowIndex > rowIndex ? rowIndex : lastCheckedRowIndex + 1;
const maxIndex =
lastCheckedRowIndex > rowIndex ? lastCheckedRowIndex : rowIndex;
lastCheckedRowIndex > rowIndex ? lastCheckedRowIndex : rowIndex + 1;
const rows = checkableRows.slice(minIndex, maxIndex);
rows.push(row); // 将当前行也加入进行判断
for (const rowItem of rows) {
const idx = self.selectedRows.indexOf(rowItem);
if (idx === -1 && checked) {
// 如果上一个是选中状态，则将之间的所有 check 都变成可选
if (lastCheckedRow.checked) {
if (maxLength) {
if (self.selectedRows.length < maxLength) {
self.selectedRows.push(rowItem);
}
} else {
self.selectedRows.push(rowItem);
if (
!(
lastCheckedRow.checked &&
maxLength &&
self.selectedRows.length + toggleRows.length >= maxLength
)
) {
toggleRows.push(rowItem);
}
}
} else if (!checked) {
if (!lastCheckedRow.checked) {
return toggleRows;
}
// 按住 shift 的时候点击选项
function toggleShift(row: IRow, checked: boolean) {
const toggleRows = getToggleShiftRows(row);
if (toggleRows?.length === 1) {
toggle(row, checked);
return;
}
toggleRows.forEach(row => {
const idx = self.selectedRows.indexOf(row);
if (idx === -1 && checked) {
self.selectedRows.push(row);
} else if (~idx && !checked) {
self.selectedRows.splice(idx, 1);
}
}
}
});
lastCheckedRow = row;
}
@ -1633,6 +1646,7 @@ export const TableStore = iRendererStore
getSelectedRows,
toggle,
toggleShift,
getToggleShiftRows,
toggleExpandAll,
toggleExpanded,
collapseAllAtDepth,

29
packages/amis/src/renderers/Table/index.tsx
View File

@ -878,16 +878,33 @@ export default class Table extends React.Component<TableProps, object> {
return;
}
let rows = [item];
if (shift) {
rows = store.getToggleShiftRows(item);
}
const selectedItems = value
? [...store.selectedRows.map(row => row.data), item.data]
? [
...store.selectedRows.map((row: IRow) => row.data),
...rows.map((row: IRow) => row.data)
]
: store.selectedRows
.filter(row => row.id !== item.id)
.map(row => row.data);
.filter(
(row: IRow) =>
rows.findIndex((rowItem: IRow) => rowItem === row) === -1
)
.map((row: IRow) => row.data);
const unSelectedItems = value
? store.unSelectedRows
.filter(row => row.id !== item.id)
.map(row => row.data)
: [...store.unSelectedRows.map(row => row.data), item.data];
.filter(
(row: IRow) =>
rows.findIndex((rowItem: IRow) => rowItem === row) === -1
)
.map((row: IRow) => row.data)
: [
...store.unSelectedRows.map((row: IRow) => row.data),
...rows.map((row: IRow) => row.data)
];
const rendererEvent = await dispatchEvent(
'selectedChange',