@megha-ui/react 1.2.404 → 1.2.406
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.
- package/dist/components/grid/index.js +173 -166
- package/package.json +1 -1
|
@@ -136,173 +136,178 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
136
136
|
})
|
|
137
137
|
: true);
|
|
138
138
|
console.log(searchQueries, "searchQueries");
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
: "";
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
case "contains":
|
|
159
|
-
return value.toLowerCase().includes(query.toLowerCase());
|
|
160
|
-
case "doesNotContain":
|
|
161
|
-
return !value.toLowerCase().includes(query.toLowerCase());
|
|
162
|
-
case "equals":
|
|
163
|
-
return queryData.includes(value.toLowerCase());
|
|
164
|
-
case "gt":
|
|
165
|
-
if (!isNaN(parseFloat(query))) {
|
|
166
|
-
return parseFloat(value) > parseFloat(query);
|
|
167
|
-
}
|
|
168
|
-
return true;
|
|
169
|
-
case "gte":
|
|
170
|
-
if (!isNaN(parseFloat(query))) {
|
|
171
|
-
return parseFloat(value) >= parseFloat(query);
|
|
172
|
-
}
|
|
173
|
-
return true;
|
|
174
|
-
case "lt":
|
|
175
|
-
if (!isNaN(parseFloat(query))) {
|
|
176
|
-
return parseFloat(value) < parseFloat(query);
|
|
177
|
-
}
|
|
178
|
-
return true;
|
|
179
|
-
case "lte":
|
|
180
|
-
if (!isNaN(parseFloat(query))) {
|
|
181
|
-
return parseFloat(value) <= parseFloat(query);
|
|
182
|
-
}
|
|
183
|
-
return true;
|
|
184
|
-
case "after":
|
|
185
|
-
if (!isNaN(new Date(query).getTime())) {
|
|
186
|
-
return new Date(value).getTime() > new Date(query).getTime();
|
|
187
|
-
}
|
|
188
|
-
return true;
|
|
189
|
-
case "before":
|
|
190
|
-
if (!isNaN(new Date(query).getTime())) {
|
|
191
|
-
return new Date(value).getTime() < new Date(query).getTime();
|
|
192
|
-
}
|
|
193
|
-
return true;
|
|
194
|
-
case "between":
|
|
195
|
-
let [start, end] = column.dataType === "date"
|
|
196
|
-
? query.split("to")
|
|
197
|
-
: query.split("-");
|
|
198
|
-
if (column.dataType === "date" && start && end) {
|
|
199
|
-
start = new Date(start).getTime();
|
|
200
|
-
end = new Date(end).getTime();
|
|
201
|
-
return (start < new Date(value).getTime() &&
|
|
202
|
-
new Date(value).getTime() < end);
|
|
203
|
-
}
|
|
204
|
-
else if (start && end) {
|
|
205
|
-
return (parseFloat(start.trim()) < parseFloat(value) &&
|
|
206
|
-
parseFloat(value) < parseFloat(end.trim()));
|
|
207
|
-
}
|
|
208
|
-
return true;
|
|
209
|
-
case "doesNotEqual":
|
|
210
|
-
return !queryData.includes(value.toLowerCase());
|
|
211
|
-
case "startsWith":
|
|
212
|
-
return value.toLowerCase().startsWith(query.toLowerCase());
|
|
213
|
-
case "endsWith":
|
|
214
|
-
return value.toLowerCase().endsWith(query.toLowerCase());
|
|
215
|
-
case "blank":
|
|
216
|
-
return value === "";
|
|
217
|
-
case "notBlank":
|
|
218
|
-
return value !== "";
|
|
219
|
-
default:
|
|
220
|
-
return true;
|
|
221
|
-
}
|
|
222
|
-
})
|
|
223
|
-
: filterColumns.filter(item => searchQueries[item.key]).some((column) => {
|
|
224
|
-
var _a, _b, _c, _d;
|
|
225
|
-
const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
|
|
226
|
-
const queryData = query.toLowerCase().split(",");
|
|
227
|
-
const value = item[column.key] && item[column.key].value
|
|
228
|
-
? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
|
|
229
|
-
: "";
|
|
230
|
-
console.log("Coming here2");
|
|
231
|
-
if (query.includes("*") || query.includes("?")) {
|
|
232
|
-
const regex = createRegexFromWildcard(query);
|
|
233
|
-
return regex.test(value);
|
|
234
|
-
}
|
|
235
|
-
console.log(column, "column");
|
|
236
|
-
if (query === "") {
|
|
237
|
-
return true;
|
|
238
|
-
}
|
|
239
|
-
console.log((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type, "type");
|
|
240
|
-
switch ((_d = searchQueries[column.key]) === null || _d === void 0 ? void 0 : _d.type) {
|
|
241
|
-
case "contains":
|
|
242
|
-
return value.toLowerCase().includes(query.toLowerCase());
|
|
243
|
-
case "doesNotContain":
|
|
244
|
-
return !value.toLowerCase().includes(query.toLowerCase());
|
|
245
|
-
case "equals":
|
|
246
|
-
return !queryData.includes(value.toLowerCase());
|
|
247
|
-
case "gt":
|
|
248
|
-
if (!isNaN(parseFloat(query))) {
|
|
249
|
-
return parseFloat(value) > parseFloat(query);
|
|
250
|
-
}
|
|
251
|
-
return true;
|
|
252
|
-
case "gte":
|
|
253
|
-
if (!isNaN(parseFloat(query))) {
|
|
254
|
-
return parseFloat(value) >= parseFloat(query);
|
|
255
|
-
}
|
|
256
|
-
return true;
|
|
257
|
-
case "lt":
|
|
258
|
-
if (!isNaN(parseFloat(query))) {
|
|
259
|
-
return parseFloat(value) < parseFloat(query);
|
|
260
|
-
}
|
|
261
|
-
return true;
|
|
262
|
-
case "lte":
|
|
263
|
-
if (!isNaN(parseFloat(query))) {
|
|
264
|
-
return parseFloat(value) <= parseFloat(query);
|
|
265
|
-
}
|
|
266
|
-
return true;
|
|
267
|
-
case "after":
|
|
268
|
-
if (!isNaN(new Date(query).getTime())) {
|
|
269
|
-
return new Date(value).getTime() > new Date(query).getTime();
|
|
270
|
-
}
|
|
271
|
-
return true;
|
|
272
|
-
case "before":
|
|
273
|
-
if (!isNaN(new Date(query).getTime())) {
|
|
274
|
-
return new Date(value).getTime() < new Date(query).getTime();
|
|
275
|
-
}
|
|
276
|
-
return true;
|
|
277
|
-
case "between":
|
|
278
|
-
let [start, end] = column.dataType === "date"
|
|
279
|
-
? query.split("to")
|
|
280
|
-
: query.split("-");
|
|
281
|
-
if (column.dataType === "date" && start && end) {
|
|
282
|
-
start = new Date(start).getTime();
|
|
283
|
-
end = new Date(end).getTime();
|
|
284
|
-
return (start < new Date(value).getTime() &&
|
|
285
|
-
new Date(value).getTime() < end);
|
|
286
|
-
}
|
|
287
|
-
else if (start && end) {
|
|
288
|
-
return (parseFloat(start.trim()) < parseFloat(value) &&
|
|
289
|
-
parseFloat(value) < parseFloat(end.trim()));
|
|
290
|
-
}
|
|
139
|
+
const _searchAvailableColumns = filterColumns.filter((column) => {
|
|
140
|
+
return searchQueries[column.key] && searchQueries[column.key].text !== "";
|
|
141
|
+
});
|
|
142
|
+
if (_searchAvailableColumns.length > 0) {
|
|
143
|
+
console.log(_searchAvailableColumns, "_searchAvailableColumns");
|
|
144
|
+
_filteredData = _filteredData.filter((item) => searchOp === "and"
|
|
145
|
+
? _searchAvailableColumns.every((column) => {
|
|
146
|
+
var _a, _b, _c, _d;
|
|
147
|
+
const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
|
|
148
|
+
const queryData = query.toLowerCase().split(",");
|
|
149
|
+
const value = item[column.key] && item[column.key].value
|
|
150
|
+
? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
|
|
151
|
+
: "";
|
|
152
|
+
console.log("Coming here");
|
|
153
|
+
if (query.includes("*") || query.includes("?")) {
|
|
154
|
+
const regex = createRegexFromWildcard(query);
|
|
155
|
+
return regex.test(value);
|
|
156
|
+
}
|
|
157
|
+
if (query === "") {
|
|
291
158
|
return true;
|
|
292
|
-
|
|
293
|
-
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
159
|
+
}
|
|
160
|
+
console.log((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type, "type");
|
|
161
|
+
switch ((_d = searchQueries[column.key]) === null || _d === void 0 ? void 0 : _d.type) {
|
|
162
|
+
case "contains":
|
|
163
|
+
return value.toLowerCase().includes(query.toLowerCase());
|
|
164
|
+
case "doesNotContain":
|
|
165
|
+
return !value.toLowerCase().includes(query.toLowerCase());
|
|
166
|
+
case "equals":
|
|
167
|
+
return queryData.includes(value.toLowerCase());
|
|
168
|
+
case "gt":
|
|
169
|
+
if (!isNaN(parseFloat(query))) {
|
|
170
|
+
return parseFloat(value) > parseFloat(query);
|
|
171
|
+
}
|
|
172
|
+
return true;
|
|
173
|
+
case "gte":
|
|
174
|
+
if (!isNaN(parseFloat(query))) {
|
|
175
|
+
return parseFloat(value) >= parseFloat(query);
|
|
176
|
+
}
|
|
177
|
+
return true;
|
|
178
|
+
case "lt":
|
|
179
|
+
if (!isNaN(parseFloat(query))) {
|
|
180
|
+
return parseFloat(value) < parseFloat(query);
|
|
181
|
+
}
|
|
182
|
+
return true;
|
|
183
|
+
case "lte":
|
|
184
|
+
if (!isNaN(parseFloat(query))) {
|
|
185
|
+
return parseFloat(value) <= parseFloat(query);
|
|
186
|
+
}
|
|
187
|
+
return true;
|
|
188
|
+
case "after":
|
|
189
|
+
if (!isNaN(new Date(query).getTime())) {
|
|
190
|
+
return (new Date(value).getTime() > new Date(query).getTime());
|
|
191
|
+
}
|
|
192
|
+
return true;
|
|
193
|
+
case "before":
|
|
194
|
+
if (!isNaN(new Date(query).getTime())) {
|
|
195
|
+
return (new Date(value).getTime() < new Date(query).getTime());
|
|
196
|
+
}
|
|
197
|
+
return true;
|
|
198
|
+
case "between":
|
|
199
|
+
let [start, end] = column.dataType === "date"
|
|
200
|
+
? query.split("to")
|
|
201
|
+
: query.split("-");
|
|
202
|
+
if (column.dataType === "date" && start && end) {
|
|
203
|
+
start = new Date(start).getTime();
|
|
204
|
+
end = new Date(end).getTime();
|
|
205
|
+
return (start < new Date(value).getTime() &&
|
|
206
|
+
new Date(value).getTime() < end);
|
|
207
|
+
}
|
|
208
|
+
else if (start && end) {
|
|
209
|
+
return (parseFloat(start.trim()) < parseFloat(value) &&
|
|
210
|
+
parseFloat(value) < parseFloat(end.trim()));
|
|
211
|
+
}
|
|
212
|
+
return true;
|
|
213
|
+
case "doesNotEqual":
|
|
214
|
+
return !queryData.includes(value.toLowerCase());
|
|
215
|
+
case "startsWith":
|
|
216
|
+
return value.toLowerCase().startsWith(query.toLowerCase());
|
|
217
|
+
case "endsWith":
|
|
218
|
+
return value.toLowerCase().endsWith(query.toLowerCase());
|
|
219
|
+
case "blank":
|
|
220
|
+
return value === "";
|
|
221
|
+
case "notBlank":
|
|
222
|
+
return value !== "";
|
|
223
|
+
default:
|
|
224
|
+
return true;
|
|
225
|
+
}
|
|
226
|
+
})
|
|
227
|
+
: _searchAvailableColumns.some((column) => {
|
|
228
|
+
var _a, _b, _c, _d;
|
|
229
|
+
const query = ((_a = searchQueries[column.key]) === null || _a === void 0 ? void 0 : _a.text) || "";
|
|
230
|
+
const queryData = query.toLowerCase().split(",");
|
|
231
|
+
const value = item[column.key] && item[column.key].value
|
|
232
|
+
? (_b = item[column.key].value) === null || _b === void 0 ? void 0 : _b.toString()
|
|
233
|
+
: "";
|
|
234
|
+
console.log("Coming here2");
|
|
235
|
+
if (query.includes("*") || query.includes("?")) {
|
|
236
|
+
const regex = createRegexFromWildcard(query);
|
|
237
|
+
return regex.test(value);
|
|
238
|
+
}
|
|
239
|
+
console.log(column, "column");
|
|
240
|
+
if (query === "") {
|
|
303
241
|
return true;
|
|
304
|
-
|
|
305
|
-
|
|
242
|
+
}
|
|
243
|
+
console.log((_c = searchQueries[column.key]) === null || _c === void 0 ? void 0 : _c.type, "type");
|
|
244
|
+
switch ((_d = searchQueries[column.key]) === null || _d === void 0 ? void 0 : _d.type) {
|
|
245
|
+
case "contains":
|
|
246
|
+
return value.toLowerCase().includes(query.toLowerCase());
|
|
247
|
+
case "doesNotContain":
|
|
248
|
+
return !value.toLowerCase().includes(query.toLowerCase());
|
|
249
|
+
case "equals":
|
|
250
|
+
return !queryData.includes(value.toLowerCase());
|
|
251
|
+
case "gt":
|
|
252
|
+
if (!isNaN(parseFloat(query))) {
|
|
253
|
+
return parseFloat(value) > parseFloat(query);
|
|
254
|
+
}
|
|
255
|
+
return true;
|
|
256
|
+
case "gte":
|
|
257
|
+
if (!isNaN(parseFloat(query))) {
|
|
258
|
+
return parseFloat(value) >= parseFloat(query);
|
|
259
|
+
}
|
|
260
|
+
return true;
|
|
261
|
+
case "lt":
|
|
262
|
+
if (!isNaN(parseFloat(query))) {
|
|
263
|
+
return parseFloat(value) < parseFloat(query);
|
|
264
|
+
}
|
|
265
|
+
return true;
|
|
266
|
+
case "lte":
|
|
267
|
+
if (!isNaN(parseFloat(query))) {
|
|
268
|
+
return parseFloat(value) <= parseFloat(query);
|
|
269
|
+
}
|
|
270
|
+
return true;
|
|
271
|
+
case "after":
|
|
272
|
+
if (!isNaN(new Date(query).getTime())) {
|
|
273
|
+
return (new Date(value).getTime() > new Date(query).getTime());
|
|
274
|
+
}
|
|
275
|
+
return true;
|
|
276
|
+
case "before":
|
|
277
|
+
if (!isNaN(new Date(query).getTime())) {
|
|
278
|
+
return (new Date(value).getTime() < new Date(query).getTime());
|
|
279
|
+
}
|
|
280
|
+
return true;
|
|
281
|
+
case "between":
|
|
282
|
+
let [start, end] = column.dataType === "date"
|
|
283
|
+
? query.split("to")
|
|
284
|
+
: query.split("-");
|
|
285
|
+
if (column.dataType === "date" && start && end) {
|
|
286
|
+
start = new Date(start).getTime();
|
|
287
|
+
end = new Date(end).getTime();
|
|
288
|
+
return (start < new Date(value).getTime() &&
|
|
289
|
+
new Date(value).getTime() < end);
|
|
290
|
+
}
|
|
291
|
+
else if (start && end) {
|
|
292
|
+
return (parseFloat(start.trim()) < parseFloat(value) &&
|
|
293
|
+
parseFloat(value) < parseFloat(end.trim()));
|
|
294
|
+
}
|
|
295
|
+
return true;
|
|
296
|
+
case "doesNotEqual":
|
|
297
|
+
return !queryData.includes(value.toLowerCase());
|
|
298
|
+
case "startsWith":
|
|
299
|
+
return value.toLowerCase().startsWith(query.toLowerCase());
|
|
300
|
+
case "endsWith":
|
|
301
|
+
return value.toLowerCase().endsWith(query.toLowerCase());
|
|
302
|
+
case "blank":
|
|
303
|
+
return value === "";
|
|
304
|
+
case "notBlank":
|
|
305
|
+
return value !== "";
|
|
306
|
+
default:
|
|
307
|
+
return true;
|
|
308
|
+
}
|
|
309
|
+
}));
|
|
310
|
+
}
|
|
306
311
|
_filteredData = _filteredData.filter((item) => {
|
|
307
312
|
const query = (globalInputSearch || "").toLowerCase().split(",");
|
|
308
313
|
const rowValues = [];
|
|
@@ -320,7 +325,9 @@ const Grid = ({ columns, wrapperClass, updateGridColumns, data, height, sortable
|
|
|
320
325
|
return query.some((term) => rowValues.some((value) => value.includes(term)));
|
|
321
326
|
}
|
|
322
327
|
});
|
|
323
|
-
_filteredData = _filteredData.filter((item) => filterColumns
|
|
328
|
+
_filteredData = _filteredData.filter((item) => filterColumns
|
|
329
|
+
.filter((item) => searchQueries[item.key])
|
|
330
|
+
.some((column) => {
|
|
324
331
|
var _a;
|
|
325
332
|
const query = inputValue || "";
|
|
326
333
|
const value = item[column.key] && item[column.key].value
|
package/package.json
CHANGED