@webtypen/webframez-core 0.2.58 → 0.2.60

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.
Files changed (3) hide show
  1. package/dist/Datatable/Datatable.js +34 -2
  2. package/package.json +1 -1
  3. package/src/Datatable/Datatable.ts +24 -2
package/dist/Datatable/Datatable.js CHANGED
@@ -295,7 +295,31 @@ class Datatable {
295
295
  }
296
296
  }
297
297
  else {
298
- if (options && options.regex) {
298
+ if (valueClean.toString().trim() === "==null") {
299
+ value = null;
300
+ }
301
+ else if (valueClean.toString().trim() === "!=null") {
302
+ value = { $ne: null };
303
+ }
304
+ else if (valueClean.toString().startWith("!=")) {
305
+ value = { $ne: valueClean.replace("!=", "") };
306
+ }
307
+ else if (valueClean.toString().startWith("==")) {
308
+ value = valueClean.replace("==", "");
309
+ }
310
+ else if (valueClean.toString().startWith(">=")) {
311
+ value = { $gte: valueClean.replace(">=", "") };
312
+ }
313
+ else if (valueClean.toString().startWith(">")) {
314
+ value = { $gt: valueClean.replace(">", "") };
315
+ }
316
+ else if (valueClean.toString().startWith("<=")) {
317
+ value = { $lte: valueClean.replace("<=", "") };
318
+ }
319
+ else if (valueClean.toString().startWith("<")) {
320
+ value = { $lt: valueClean.replace("<", "") };
321
+ }
322
+ else if (options && options.regex) {
299
323
  value = new RegExp(valueClean, "i");
300
324
  }
301
325
  else {
@@ -360,6 +384,9 @@ class Datatable {
360
384
  if (valueClean.startsWith("==null")) {
361
385
  out[mappingKey] = null;
362
386
  }
387
+ else if (valueClean.startsWith("!=null")) {
388
+ out[mappingKey] = null;
389
+ }
363
390
  else if (valueClean.startsWith("<=")) {
364
391
  const val = valueClean.replace("<=", "").trim();
365
392
  out[mappingKey] = {
@@ -412,7 +439,12 @@ class Datatable {
412
439
  value = { $ne: null };
413
440
  break;
414
441
  case "==":
415
- value = this.formatFilterEntryVal(entry, filterEl, { regex: filterEl && filterEl.regex ? true : false });
442
+ if (!filterEl) {
443
+ value = this.formatFilterEntryVal(entry, filterEl, { regex: true });
444
+ }
445
+ else {
446
+ value = this.formatFilterEntryVal(entry, filterEl, { regex: filterEl && filterEl.regex ? true : false });
447
+ }
416
448
  break;
417
449
  case "!=":
418
450
  const temp = this.formatFilterEntryVal(entry, filterEl);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webtypen/webframez-core",
3
- "version": "0.2.58",
3
+ "version": "0.2.60",
4
4
  "description": "The core package of the typescript based webframez (web-framework) by webtypen.de",
5
5
  "homepage": "https://webtypen.de/",
6
6
  "license": "MIT",
package/src/Datatable/Datatable.ts CHANGED
@@ -300,7 +300,23 @@ export class Datatable {
300
300
  value = false;
301
301
  }
302
302
  } else {
303
- if (options && options.regex) {
303
+ if (valueClean.toString().trim() === "==null") {
304
+ value = null;
305
+ } else if (valueClean.toString().trim() === "!=null") {
306
+ value = { $ne: null };
307
+ } else if (valueClean.toString().startWith("!=")) {
308
+ value = { $ne: valueClean.replace("!=", "") };
309
+ } else if (valueClean.toString().startWith("==")) {
310
+ value = valueClean.replace("==", "");
311
+ } else if (valueClean.toString().startWith(">=")) {
312
+ value = { $gte: valueClean.replace(">=", "") };
313
+ } else if (valueClean.toString().startWith(">")) {
314
+ value = { $gt: valueClean.replace(">", "") };
315
+ } else if (valueClean.toString().startWith("<=")) {
316
+ value = { $lte: valueClean.replace("<=", "") };
317
+ } else if (valueClean.toString().startWith("<")) {
318
+ value = { $lt: valueClean.replace("<", "") };
319
+ } else if (options && options.regex) {
304
320
  value = new RegExp(valueClean, "i");
305
321
  } else {
306
322
  value = valueClean;
@@ -375,6 +391,8 @@ export class Datatable {
375
391
 
376
392
  if (valueClean.startsWith("==null")) {
377
393
  out[mappingKey] = null;
394
+ } else if (valueClean.startsWith("!=null")) {
395
+ out[mappingKey] = null;
378
396
  } else if (valueClean.startsWith("<=")) {
379
397
  const val = valueClean.replace("<=", "").trim();
380
398
 
@@ -429,7 +447,11 @@ export class Datatable {
429
447
  value = { $ne: null };
430
448
  break;
431
449
  case "==":
432
- value = this.formatFilterEntryVal(entry, filterEl, { regex: filterEl && filterEl.regex ? true : false });
450
+ if (!filterEl) {
451
+ value = this.formatFilterEntryVal(entry, filterEl, { regex: true });
452
+ } else {
453
+ value = this.formatFilterEntryVal(entry, filterEl, { regex: filterEl && filterEl.regex ? true : false });
454
+ }
433
455
  break;
434
456
  case "!=":
435
457
  const temp = this.formatFilterEntryVal(entry, filterEl);