@megha-ui/react 1.2.403 → 1.2.404
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -138,7 +138,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
138
138
|
console.log(searchQueries, "searchQueries");
|
|
139
139
|
console.log(filterColumns, "filterColumns");
|
|
140
140
|
_filteredData = _filteredData.filter((item) => searchOp === "and"
|
|
141
|
-
? filterColumns.every((column) => {
|
|
141
|
+
? filterColumns.filter(item => searchQueries[item.key]).every((column) => {
|
|
142
142
|
var _a, _b, _c, _d;
|
|
143
143
|
const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
|
|
144
144
|
const queryData = query.toLowerCase().split(",");
|
|
@@ -220,7 +220,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
220
220
|
return true;
|
|
221
221
|
}
|
|
222
222
|
})
|
|
223
|
-
: filterColumns.some((column) => {
|
|
223
|
+
: filterColumns.filter(item => searchQueries[item.key]).some((column) => {
|
|
224
224
|
var _a, _b, _c, _d;
|
|
225
225
|
const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
|
|
226
226
|
const queryData = query.toLowerCase().split(",");
|
|
@@ -232,6 +232,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
232
232
|
const regex = createRegexFromWildcard(query);
|
|
233
233
|
return regex.test(value);
|
|
234
234
|
}
|
|
235
|
+
console.log(column, "column");
|
|
235
236
|
if (query === "") {
|
|
236
237
|
return true;
|
|
237
238
|
}
|
|
@@ -319,7 +320,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
319
320
|
return query.some((term) => rowValues.some((value) => value.includes(term)));
|
|
320
321
|
}
|
|
321
322
|
});
|
|
322
|
-
_filteredData = _filteredData.filter((item) => filterColumns.some((column) => {
|
|
323
|
+
_filteredData = _filteredData.filter((item) => filterColumns.filter(item => searchQueries[item.key]).some((column) => {
|
|
323
324
|
var _a;
|
|
324
325
|
const query = inputValue || "";
|
|
325
326
|
const value = item[column.key] && item[column.key].value
|
package/package.json
CHANGED