Merge pull request #192 from shariquerik/minor-fix-4
fix: store all data and data in separately
This commit is contained in:
commit
cca14e09eb
@ -30,16 +30,15 @@ export default function filterRows(rows, filters, data) {
|
|||||||
return filteredRowIndices;
|
return filteredRowIndices;
|
||||||
};
|
};
|
||||||
|
|
||||||
function getFilterMethod(rows, data, filter) {
|
function getFilterMethod(rows, allData, filter) {
|
||||||
const getFormattedValue = cell => {
|
const getFormattedValue = cell => {
|
||||||
let formatter = CellManager.getCustomCellFormatter(cell);
|
let formatter = CellManager.getCustomCellFormatter(cell);
|
||||||
if (data && data.data && data.data.length) {
|
let rowData = rows[cell.rowIndex];
|
||||||
data = data.data[cell.rowIndex];
|
if (allData && allData.data && allData.data.length) {
|
||||||
} else {
|
rowData = allData.data[cell.rowIndex];
|
||||||
data = rows[cell.rowIndex];
|
|
||||||
}
|
}
|
||||||
if (formatter && cell.content) {
|
if (formatter && cell.content) {
|
||||||
cell.html = formatter(cell.content, rows[cell.rowIndex], cell.column, data, filter);
|
cell.html = formatter(cell.content, rows[cell.rowIndex], cell.column, rowData, filter);
|
||||||
return stripHTML(cell.html);
|
return stripHTML(cell.html);
|
||||||
}
|
}
|
||||||
return cell.content || '';
|
return cell.content || '';
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user