ninegrid2 6.197.0 → 6.199.0

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 (5) hide show
  1. package/dist/bundle.cjs.js +17 -5
  2. package/dist/bundle.esm.js +17 -5
  3. package/dist/etc/ngFiltering.js +17 -5
  4. package/package.json +1 -1
  5. package/src/etc/ngFiltering.js +17 -5
package/dist/bundle.cjs.js CHANGED
@@ -18224,6 +18224,7 @@ class ngFilterButton extends HTMLElement
18224
18224
  panel.close();
18225
18225
  }
18226
18226
  else {
18227
+ /**
18227
18228
  var cell = e.target.closest("th,td");
18228
18229
 
18229
18230
  var l = $(e.target).offset().left - $(this.#owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
@@ -18236,7 +18237,7 @@ class ngFilterButton extends HTMLElement
18236
18237
 
18237
18238
  //$(panel).offset({left: l, top: t});
18238
18239
  $(panel).css({left: l, top: t});
18239
-
18240
+ */
18240
18241
  panel.open(this);
18241
18242
  }
18242
18243
  };
@@ -18459,6 +18460,17 @@ class ngFilterPanel extends HTMLElement
18459
18460
  open = (filterButton) => {
18460
18461
 
18461
18462
  const owner = this.shadow.closest("nine-grid");
18463
+
18464
+ var cell = filterButton.closest("th,td");
18465
+
18466
+ var l = $(filterButton).offset().left - $(owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
18467
+ if (l < 0) l = 0;
18468
+ if (l + $(panel).width() > $(owner).width()) l = $(owner).width() - $(panel).width() - 5;
18469
+
18470
+ var t = $(cell).offset().top + $(cell).height()- $(owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
18471
+
18472
+ //$(panel).offset({left: l, top: t});
18473
+ $(this).css({left: l, top: t});
18462
18474
 
18463
18475
 
18464
18476
  //console.log(this, owner, filterButton.filterOptions, colnms);
@@ -18487,11 +18499,11 @@ class ngFilterPanel extends HTMLElement
18487
18499
 
18488
18500
  let data = owner.data.getValidDataNF();
18489
18501
 
18490
- console.log(data);
18502
+ //console.log(data);
18491
18503
 
18492
18504
  owner.body.querySelectorAll("ng-filter-button").forEach(el => {
18493
18505
  //console.log(el);
18494
- if (el.closest('th,td').dataset.col != col && el.filterOptions.length > 0) {
18506
+ if (el.closest('th,td').dataset.col != col && el.filterOptions) {
18495
18507
 
18496
18508
  //console.log("================", el.filterOptions);
18497
18509
 
@@ -18500,14 +18512,14 @@ class ngFilterPanel extends HTMLElement
18500
18512
 
18501
18513
  //console.log(idx);
18502
18514
 
18503
- if (idx >= 0) {
18515
+ if (idx >= 0 && filterOption.data.length > 0) {
18504
18516
  data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
18505
18517
  }
18506
18518
  });
18507
18519
  }
18508
18520
  });
18509
18521
 
18510
- console.log(data);
18522
+ //console.log(data);
18511
18523
 
18512
18524
  /**
18513
18525
  $("ng-filter-button", owner.body).each((index,el) => {
package/dist/bundle.esm.js CHANGED
@@ -18222,6 +18222,7 @@ class ngFilterButton extends HTMLElement
18222
18222
  panel.close();
18223
18223
  }
18224
18224
  else {
18225
+ /**
18225
18226
  var cell = e.target.closest("th,td");
18226
18227
 
18227
18228
  var l = $(e.target).offset().left - $(this.#owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
@@ -18234,7 +18235,7 @@ class ngFilterButton extends HTMLElement
18234
18235
 
18235
18236
  //$(panel).offset({left: l, top: t});
18236
18237
  $(panel).css({left: l, top: t});
18237
-
18238
+ */
18238
18239
  panel.open(this);
18239
18240
  }
18240
18241
  };
@@ -18457,6 +18458,17 @@ class ngFilterPanel extends HTMLElement
18457
18458
  open = (filterButton) => {
18458
18459
 
18459
18460
  const owner = this.shadow.closest("nine-grid");
18461
+
18462
+ var cell = filterButton.closest("th,td");
18463
+
18464
+ var l = $(filterButton).offset().left - $(owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
18465
+ if (l < 0) l = 0;
18466
+ if (l + $(panel).width() > $(owner).width()) l = $(owner).width() - $(panel).width() - 5;
18467
+
18468
+ var t = $(cell).offset().top + $(cell).height()- $(owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
18469
+
18470
+ //$(panel).offset({left: l, top: t});
18471
+ $(this).css({left: l, top: t});
18460
18472
 
18461
18473
 
18462
18474
  //console.log(this, owner, filterButton.filterOptions, colnms);
@@ -18485,11 +18497,11 @@ class ngFilterPanel extends HTMLElement
18485
18497
 
18486
18498
  let data = owner.data.getValidDataNF();
18487
18499
 
18488
- console.log(data);
18500
+ //console.log(data);
18489
18501
 
18490
18502
  owner.body.querySelectorAll("ng-filter-button").forEach(el => {
18491
18503
  //console.log(el);
18492
- if (el.closest('th,td').dataset.col != col && el.filterOptions.length > 0) {
18504
+ if (el.closest('th,td').dataset.col != col && el.filterOptions) {
18493
18505
 
18494
18506
  //console.log("================", el.filterOptions);
18495
18507
 
@@ -18498,14 +18510,14 @@ class ngFilterPanel extends HTMLElement
18498
18510
 
18499
18511
  //console.log(idx);
18500
18512
 
18501
- if (idx >= 0) {
18513
+ if (idx >= 0 && filterOption.data.length > 0) {
18502
18514
  data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
18503
18515
  }
18504
18516
  });
18505
18517
  }
18506
18518
  });
18507
18519
 
18508
- console.log(data);
18520
+ //console.log(data);
18509
18521
 
18510
18522
  /**
18511
18523
  $("ng-filter-button", owner.body).each((index,el) => {
package/dist/etc/ngFiltering.js CHANGED
@@ -292,6 +292,7 @@ class ngFilterButton extends HTMLElement
292
292
  panel.close();
293
293
  }
294
294
  else {
295
+ /**
295
296
  var cell = e.target.closest("th,td");
296
297
 
297
298
  var l = $(e.target).offset().left - $(this.#owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
@@ -304,7 +305,7 @@ class ngFilterButton extends HTMLElement
304
305
 
305
306
  //$(panel).offset({left: l, top: t});
306
307
  $(panel).css({left: l, top: t});
307
-
308
+ */
308
309
  panel.open(this);
309
310
  }
310
311
  };
@@ -529,6 +530,17 @@ class ngFilterPanel extends HTMLElement
529
530
  open = (filterButton) => {
530
531
 
531
532
  const owner = this.shadow.closest("nine-grid");
533
+
534
+ var cell = filterButton.closest("th,td");
535
+
536
+ var l = $(filterButton).offset().left - $(owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
537
+ if (l < 0) l = 0;
538
+ if (l + $(panel).width() > $(owner).width()) l = $(owner).width() - $(panel).width() - 5;
539
+
540
+ var t = $(cell).offset().top + $(cell).height()- $(owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
541
+
542
+ //$(panel).offset({left: l, top: t});
543
+ $(this).css({left: l, top: t});
532
544
 
533
545
 
534
546
  //console.log(this, owner, filterButton.filterOptions, colnms);
@@ -557,11 +569,11 @@ class ngFilterPanel extends HTMLElement
557
569
 
558
570
  let data = owner.data.getValidDataNF();
559
571
 
560
- console.log(data);
572
+ //console.log(data);
561
573
 
562
574
  owner.body.querySelectorAll("ng-filter-button").forEach(el => {
563
575
  //console.log(el);
564
- if (el.closest('th,td').dataset.col != col && el.filterOptions.length > 0) {
576
+ if (el.closest('th,td').dataset.col != col && el.filterOptions) {
565
577
 
566
578
  //console.log("================", el.filterOptions);
567
579
 
@@ -570,14 +582,14 @@ class ngFilterPanel extends HTMLElement
570
582
 
571
583
  //console.log(idx);
572
584
 
573
- if (idx >= 0) {
585
+ if (idx >= 0 && filterOption.data.length > 0) {
574
586
  data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
575
587
  }
576
588
  });
577
589
  }
578
590
  });
579
591
 
580
- console.log(data);
592
+ //console.log(data);
581
593
 
582
594
  /**
583
595
  $("ng-filter-button", owner.body).each((index,el) => {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ninegrid2",
3
3
  "type": "module",
4
- "version": "6.197.0",
4
+ "version": "6.199.0",
5
5
  "main": "dist/index.js",
6
6
  "exports": {
7
7
  "import": "./dist/index.js",
package/src/etc/ngFiltering.js CHANGED
@@ -292,6 +292,7 @@ class ngFilterButton extends HTMLElement
292
292
  panel.close();
293
293
  }
294
294
  else {
295
+ /**
295
296
  var cell = e.target.closest("th,td");
296
297
 
297
298
  var l = $(e.target).offset().left - $(this.#owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
@@ -304,7 +305,7 @@ class ngFilterButton extends HTMLElement
304
305
 
305
306
  //$(panel).offset({left: l, top: t});
306
307
  $(panel).css({left: l, top: t});
307
-
308
+ */
308
309
  panel.open(this);
309
310
  }
310
311
  };
@@ -529,6 +530,17 @@ class ngFilterPanel extends HTMLElement
529
530
  open = (filterButton) => {
530
531
 
531
532
  const owner = this.shadow.closest("nine-grid");
533
+
534
+ var cell = filterButton.closest("th,td");
535
+
536
+ var l = $(filterButton).offset().left - $(owner).offset().left;// - $(panel).width() + $(e.target).width() + 1;
537
+ if (l < 0) l = 0;
538
+ if (l + $(panel).width() > $(owner).width()) l = $(owner).width() - $(panel).width() - 5;
539
+
540
+ var t = $(cell).offset().top + $(cell).height()- $(owner).offset().top;//$(e.target).offset().top + $(e.target).height() + 2;
541
+
542
+ //$(panel).offset({left: l, top: t});
543
+ $(this).css({left: l, top: t});
532
544
 
533
545
 
534
546
  //console.log(this, owner, filterButton.filterOptions, colnms);
@@ -557,11 +569,11 @@ class ngFilterPanel extends HTMLElement
557
569
 
558
570
  let data = owner.data.getValidDataNF();
559
571
 
560
- console.log(data);
572
+ //console.log(data);
561
573
 
562
574
  owner.body.querySelectorAll("ng-filter-button").forEach(el => {
563
575
  //console.log(el);
564
- if (el.closest('th,td').dataset.col != col && el.filterOptions.length > 0) {
576
+ if (el.closest('th,td').dataset.col != col && el.filterOptions) {
565
577
 
566
578
  //console.log("================", el.filterOptions);
567
579
 
@@ -570,14 +582,14 @@ class ngFilterPanel extends HTMLElement
570
582
 
571
583
  //console.log(idx);
572
584
 
573
- if (idx >= 0) {
585
+ if (idx >= 0 && filterOption.data.length > 0) {
574
586
  data = data.filter(m => { return filterOption.data.nineBinarySearch(m.v[idx] || '') >= 0; });
575
587
  }
576
588
  });
577
589
  }
578
590
  });
579
591
 
580
- console.log(data);
592
+ //console.log(data);
581
593
 
582
594
  /**
583
595
  $("ng-filter-button", owner.body).each((index,el) => {