@megha-ui/react 1.2.403 → 1.2.405
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.
|
@@ -136,9 +136,12 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
136
136
|
})
|
|
137
137
|
: true);
|
|
138
138
|
console.log(searchQueries, "searchQueries");
|
|
139
|
-
|
|
139
|
+
const _searchAvailableColumns = filterColumns.filter((column) => {
|
|
140
|
+
return searchQueries[column.key] && searchQueries[column.key].text !== "";
|
|
141
|
+
});
|
|
142
|
+
console.log(_searchAvailableColumns, "_searchAvailableColumns");
|
|
140
143
|
_filteredData = _filteredData.filter((item) => searchOp === "and"
|
|
141
|
-
?
|
|
144
|
+
? _searchAvailableColumns.every((column) => {
|
|
142
145
|
var _a, _b, _c, _d;
|
|
143
146
|
const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
|
|
144
147
|
const queryData = query.toLowerCase().split(",");
|
|
@@ -220,7 +223,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
220
223
|
return true;
|
|
221
224
|
}
|
|
222
225
|
})
|
|
223
|
-
:
|
|
226
|
+
: _searchAvailableColumns.some((column) => {
|
|
224
227
|
var _a, _b, _c, _d;
|
|
225
228
|
const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
|
|
226
229
|
const queryData = query.toLowerCase().split(",");
|
|
@@ -232,6 +235,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
232
235
|
const regex = createRegexFromWildcard(query);
|
|
233
236
|
return regex.test(value);
|
|
234
237
|
}
|
|
238
|
+
console.log(column, "column");
|
|
235
239
|
if (query === "") {
|
|
236
240
|
return true;
|
|
237
241
|
}
|
|
@@ -319,7 +323,7 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
319
323
|
return query.some((term) => rowValues.some((value) => value.includes(term)));
|
|
320
324
|
}
|
|
321
325
|
});
|
|
322
|
-
_filteredData = _filteredData.filter((item) => filterColumns.some((column) => {
|
|
326
|
+
_filteredData = _filteredData.filter((item) => filterColumns.filter(item => searchQueries[item.key]).some((column) => {
|
|
323
327
|
var _a;
|
|
324
328
|
const query = inputValue || "";
|
|
325
329
|
const value = item[column.key] && item[column.key].value
|
package/package.json
CHANGED