@sd-angular/core 1.3.99 → 1.3.101
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/bundles/sd-angular-core-grid-material.umd.js +218 -249
- package/bundles/sd-angular-core-grid-material.umd.js.map +1 -1
- package/bundles/sd-angular-core-grid-material.umd.min.js +2 -2
- package/bundles/sd-angular-core-grid-material.umd.min.js.map +1 -1
- package/esm2015/grid-material/src/lib/components/grid-filter/grid-filter.component.js +13 -53
- package/esm2015/grid-material/src/lib/components/popup-filter/popup-filter.component.js +14 -31
- package/esm2015/grid-material/src/lib/grid-material.component.js +21 -20
- package/esm2015/grid-material/src/lib/services/grid-filter/grid-filter.model.js +1 -1
- package/esm2015/grid-material/src/lib/services/grid-filter/grid-filter.service.js +123 -121
- package/fesm2015/sd-angular-core-grid-material.js +187 -239
- package/fesm2015/sd-angular-core-grid-material.js.map +1 -1
- package/grid-material/sd-angular-core-grid-material.metadata.json +1 -1
- package/grid-material/src/lib/components/grid-filter/grid-filter.component.d.ts +0 -1
- package/grid-material/src/lib/services/grid-filter/grid-filter.model.d.ts +17 -10
- package/grid-material/src/lib/services/grid-filter/grid-filter.service.d.ts +1 -3
- package/package.json +1 -1
- package/{sd-angular-core-1.3.99.tgz → sd-angular-core-1.3.101.tgz} +0 -0
|
@@ -451,22 +451,16 @@
|
|
|
451
451
|
_this.cdRef.markForCheck();
|
|
452
452
|
};
|
|
453
453
|
this.onApply = function () {
|
|
454
|
-
__classPrivateFieldGet(_this, _filterRegister).set({
|
|
454
|
+
__classPrivateFieldGet(_this, _filterRegister).configuration.set({
|
|
455
455
|
inlineColumn: _this.inlineColumn,
|
|
456
|
-
columnFilter: _this.columnFilter,
|
|
457
456
|
inlineExternal: _this.inlineExternal,
|
|
458
|
-
externalFilter: _this.externalFilter,
|
|
459
457
|
inlineFilterDef: _this.inlineFilterDef,
|
|
458
|
+
});
|
|
459
|
+
__classPrivateFieldGet(_this, _filterRegister).value.set({
|
|
460
|
+
columnFilter: _this.columnFilter,
|
|
461
|
+
externalFilter: _this.externalFilter,
|
|
460
462
|
filterDef: _this.filterDef
|
|
461
463
|
});
|
|
462
|
-
// this.changeFilter.emit({
|
|
463
|
-
// inlineColumn: this.inlineColumn || {},
|
|
464
|
-
// columnFilter: this.columnFilter || {},
|
|
465
|
-
// inlineExternal: this.inlineExternal || {},
|
|
466
|
-
// externalFilter: this.externalFilter || {},
|
|
467
|
-
// inlineFilterDef: this.inlineFilterDef || {},
|
|
468
|
-
// filterDef: this.filterDef || {}
|
|
469
|
-
// });
|
|
470
464
|
_this.modal.close();
|
|
471
465
|
_this.cdRef.markForCheck();
|
|
472
466
|
};
|
|
@@ -481,27 +475,16 @@
|
|
|
481
475
|
;
|
|
482
476
|
SdPopupFilter.prototype.ngAfterViewInit = function () {
|
|
483
477
|
var _this = this;
|
|
484
|
-
|
|
485
|
-
// if (this.filter?.disabled) {
|
|
486
|
-
// this.filterChange.next(true);
|
|
487
|
-
// return;
|
|
488
|
-
// }
|
|
489
|
-
// this.externalFilters = this.filter?.externalFilters || [];
|
|
490
|
-
// const configuration = this.gridFilterService.get(this.filter?.key);
|
|
491
|
-
// this.inlineColumn = configuration.inlineColumn;
|
|
492
|
-
// this.inlineExternal = configuration.inlineExternal;
|
|
493
|
-
// this.inlineFilterDef = configuration.inlineFilterDef;
|
|
494
|
-
// this.#loadDefault();
|
|
495
|
-
// this.filterChange.next(true);
|
|
496
|
-
// this.ref.markForCheck();
|
|
497
|
-
// }));
|
|
498
|
-
__classPrivateFieldGet(this, _subscription).add(__classPrivateFieldGet(this, _filterRegister).observer.subscribe(function (configuration) {
|
|
478
|
+
__classPrivateFieldGet(this, _subscription).add(__classPrivateFieldGet(this, _filterRegister).configuration.observer.subscribe(function (configuration) {
|
|
499
479
|
_this.inlineColumn = JSON.parse(JSON.stringify(configuration.inlineColumn));
|
|
500
|
-
_this.columnFilter = JSON.parse(JSON.stringify(configuration.columnFilter));
|
|
501
480
|
_this.inlineExternal = JSON.parse(JSON.stringify(configuration.inlineExternal));
|
|
502
|
-
_this.externalFilter = JSON.parse(JSON.stringify(configuration.externalFilter));
|
|
503
481
|
_this.inlineFilterDef = JSON.parse(JSON.stringify(configuration.inlineFilterDef));
|
|
504
|
-
_this.
|
|
482
|
+
_this.cdRef.markForCheck();
|
|
483
|
+
}));
|
|
484
|
+
__classPrivateFieldGet(this, _subscription).add(__classPrivateFieldGet(this, _filterRegister).value.observer.subscribe(function (filterValue) {
|
|
485
|
+
_this.columnFilter = JSON.parse(JSON.stringify(filterValue.columnFilter));
|
|
486
|
+
_this.externalFilter = JSON.parse(JSON.stringify(filterValue.externalFilter));
|
|
487
|
+
_this.filterDef = JSON.parse(JSON.stringify(filterValue.filterDef));
|
|
505
488
|
_this.cdRef.markForCheck();
|
|
506
489
|
}));
|
|
507
490
|
};
|
|
@@ -509,7 +492,7 @@
|
|
|
509
492
|
__classPrivateFieldGet(this, _subscription).unsubscribe();
|
|
510
493
|
};
|
|
511
494
|
SdPopupFilter.prototype.onClear = function () {
|
|
512
|
-
__classPrivateFieldGet(this, _filterRegister).remove();
|
|
495
|
+
__classPrivateFieldGet(this, _filterRegister).value.remove();
|
|
513
496
|
this.modal.close();
|
|
514
497
|
this.cdRef.markForCheck();
|
|
515
498
|
};
|
|
@@ -553,20 +536,15 @@
|
|
|
553
536
|
this.inlineExternal = {};
|
|
554
537
|
_subscription$1.set(this, new rxjs.Subscription());
|
|
555
538
|
this.onFilter = function (item) {
|
|
556
|
-
_this.filterRegister.set({
|
|
539
|
+
_this.filterRegister.value.set({
|
|
557
540
|
columnFilter: _this.columnFilter,
|
|
558
541
|
externalFilter: _this.externalFilter,
|
|
559
542
|
filterDef: _this.filterDef
|
|
560
543
|
});
|
|
561
|
-
// this.filterChange.next(true);
|
|
562
544
|
};
|
|
563
545
|
this.open = function () {
|
|
564
546
|
_this.popupFilter.open();
|
|
565
547
|
};
|
|
566
|
-
this.onReset = function () {
|
|
567
|
-
_this.filterRegister.remove();
|
|
568
|
-
_this.ref.markForCheck();
|
|
569
|
-
};
|
|
570
548
|
this.isMobileOrTablet = !this.deviceService.isDesktop();
|
|
571
549
|
this.ref.markForCheck();
|
|
572
550
|
}
|
|
@@ -595,53 +573,19 @@
|
|
|
595
573
|
;
|
|
596
574
|
SdGridFilter.prototype.ngAfterViewInit = function () {
|
|
597
575
|
var _this = this;
|
|
598
|
-
|
|
599
|
-
|
|
600
|
-
|
|
601
|
-
|
|
602
|
-
|
|
603
|
-
|
|
604
|
-
|
|
605
|
-
|
|
606
|
-
|
|
607
|
-
|
|
608
|
-
|
|
609
|
-
// this.filterChange.next(true);
|
|
610
|
-
// this.ref.markForCheck();
|
|
611
|
-
// }));
|
|
612
|
-
__classPrivateFieldGet(this, _subscription$1).add(this.filterRegisterChange.pipe(operators.startWith(this.filterRegister)).subscribe(function () {
|
|
613
|
-
__classPrivateFieldGet(_this, _subscription$1).add(_this.filterRegister.observer.subscribe(function (configuration) {
|
|
614
|
-
_this.inlineColumn = configuration.inlineColumn;
|
|
615
|
-
_this.columnFilter = configuration.columnFilter;
|
|
616
|
-
_this.inlineExternal = configuration.inlineExternal;
|
|
617
|
-
_this.externalFilter = configuration.externalFilter;
|
|
618
|
-
_this.inlineFilterDef = configuration.inlineFilterDef;
|
|
619
|
-
_this.filterDef = configuration.filterDef;
|
|
620
|
-
_this.ref.markForCheck();
|
|
621
|
-
}));
|
|
576
|
+
__classPrivateFieldGet(this, _subscription$1).add(this.filterRegister.configuration.observer.subscribe(function (configuration) {
|
|
577
|
+
_this.inlineColumn = configuration.inlineColumn;
|
|
578
|
+
_this.inlineExternal = configuration.inlineExternal;
|
|
579
|
+
_this.inlineFilterDef = configuration.inlineFilterDef;
|
|
580
|
+
_this.ref.markForCheck();
|
|
581
|
+
}));
|
|
582
|
+
__classPrivateFieldGet(this, _subscription$1).add(this.filterRegister.value.observer.subscribe(function (value) {
|
|
583
|
+
_this.columnFilter = value.columnFilter;
|
|
584
|
+
_this.externalFilter = value.externalFilter;
|
|
585
|
+
_this.filterDef = value.filterDef;
|
|
586
|
+
_this.ref.markForCheck();
|
|
622
587
|
}));
|
|
623
588
|
};
|
|
624
|
-
// #loadDefault = () => {
|
|
625
|
-
// for (const column of this.columns) {
|
|
626
|
-
// this.inlineColumn[column.field] = this.inlineColumn[column.field] ?? column?.filter?.defaultShowing;
|
|
627
|
-
// this.columnFilter[column.field] = this.columnFilter[column.field] ?? column?.filter?.default;
|
|
628
|
-
// }
|
|
629
|
-
// for (const externalFilter of this.externalFilters) {
|
|
630
|
-
// this.inlineExternal[externalFilter.field] = this.inlineExternal[externalFilter.field] ?? externalFilter?.defaultShowing;
|
|
631
|
-
// if (externalFilter.type === 'daterange') {
|
|
632
|
-
// this.externalFilter[externalFilter.field] = {
|
|
633
|
-
// from: this.externalFilter[externalFilter.field]?.from ?? externalFilter.default?.from ?? undefined,
|
|
634
|
-
// to: this.externalFilter[externalFilter.field]?.to ?? externalFilter.default?.to ?? undefined
|
|
635
|
-
// };
|
|
636
|
-
// } else {
|
|
637
|
-
// this.externalFilter[externalFilter.field] = this.externalFilter[externalFilter.field] ?? externalFilter.default;
|
|
638
|
-
// }
|
|
639
|
-
// }
|
|
640
|
-
// for (const filterDef of this.filterDefs) {
|
|
641
|
-
// this.inlineFilterDef[filterDef.sdMaterialFilterDef] =
|
|
642
|
-
// this.inlineFilterDef[filterDef.sdMaterialFilterDef] ?? filterDef?.defaultShowing;
|
|
643
|
-
// }
|
|
644
|
-
// }
|
|
645
589
|
SdGridFilter.prototype.ngOnDestroy = function () {
|
|
646
590
|
__classPrivateFieldGet(this, _subscription$1).unsubscribe();
|
|
647
591
|
};
|
|
@@ -1690,193 +1634,217 @@
|
|
|
1690
1634
|
{ type: core.NgZone }
|
|
1691
1635
|
]; };
|
|
1692
1636
|
|
|
1693
|
-
var
|
|
1637
|
+
var _filterConfiguration, _filterValue, _cache$2, _loadDefaultConfiguration, _loadDefaultValue;
|
|
1694
1638
|
var SdGridFilterService = /** @class */ (function () {
|
|
1695
1639
|
function SdGridFilterService(settingService) {
|
|
1696
1640
|
var _this = this;
|
|
1697
1641
|
this.settingService = settingService;
|
|
1698
|
-
|
|
1642
|
+
_filterConfiguration.set(this, 'GRID-FILTER-CONFIGURATION');
|
|
1643
|
+
_filterValue.set(this, 'GRID-FILTER-VALUE');
|
|
1644
|
+
_cache$2.set(this, {});
|
|
1699
1645
|
this.register = function (key, args) {
|
|
1700
1646
|
var cacheSession = false;
|
|
1701
1647
|
if (!key) {
|
|
1702
|
-
|
|
1648
|
+
var columns = args.columns, externalFilters = args.externalFilters;
|
|
1649
|
+
key = hash__default['default']({
|
|
1650
|
+
columns: columns,
|
|
1651
|
+
externalFilters: externalFilters
|
|
1652
|
+
});
|
|
1703
1653
|
cacheSession = true; // Nếu không có key thì chỉ lưu theo session
|
|
1704
1654
|
}
|
|
1705
|
-
|
|
1706
|
-
|
|
1707
|
-
|
|
1708
|
-
|
|
1709
|
-
|
|
1710
|
-
|
|
1711
|
-
|
|
1712
|
-
|
|
1713
|
-
|
|
1714
|
-
|
|
1715
|
-
|
|
1716
|
-
|
|
1717
|
-
|
|
1718
|
-
|
|
1719
|
-
|
|
1720
|
-
|
|
1721
|
-
|
|
1722
|
-
|
|
1723
|
-
|
|
1724
|
-
|
|
1725
|
-
|
|
1726
|
-
|
|
1727
|
-
|
|
1728
|
-
|
|
1729
|
-
|
|
1730
|
-
|
|
1731
|
-
|
|
1732
|
-
|
|
1733
|
-
|
|
1734
|
-
|
|
1735
|
-
|
|
1736
|
-
|
|
1737
|
-
|
|
1738
|
-
|
|
1739
|
-
|
|
1740
|
-
|
|
1741
|
-
|
|
1742
|
-
|
|
1743
|
-
|
|
1744
|
-
|
|
1745
|
-
|
|
1746
|
-
|
|
1747
|
-
|
|
1748
|
-
|
|
1749
|
-
|
|
1750
|
-
|
|
1751
|
-
|
|
1752
|
-
|
|
1753
|
-
|
|
1754
|
-
|
|
1755
|
-
|
|
1655
|
+
if (!__classPrivateFieldGet(_this, _cache$2)[key]) {
|
|
1656
|
+
var filterConfiguration_1 = _this.settingService.create({
|
|
1657
|
+
prefix: __classPrivateFieldGet(_this, _filterConfiguration),
|
|
1658
|
+
key: key
|
|
1659
|
+
}, {
|
|
1660
|
+
default: __classPrivateFieldGet(_this, _loadDefaultConfiguration).call(_this, args),
|
|
1661
|
+
type: cacheSession ? 'session' : undefined
|
|
1662
|
+
});
|
|
1663
|
+
var filterValue_1 = _this.settingService.create({
|
|
1664
|
+
prefix: __classPrivateFieldGet(_this, _filterValue),
|
|
1665
|
+
key: key
|
|
1666
|
+
}, {
|
|
1667
|
+
default: __classPrivateFieldGet(_this, _loadDefaultValue).call(_this, args),
|
|
1668
|
+
type: cacheSession ? 'session' : undefined
|
|
1669
|
+
});
|
|
1670
|
+
__classPrivateFieldGet(_this, _cache$2)[key] = {
|
|
1671
|
+
configuration: {
|
|
1672
|
+
get: function () {
|
|
1673
|
+
var configuration = filterConfiguration_1.get();
|
|
1674
|
+
return {
|
|
1675
|
+
// Filter column
|
|
1676
|
+
inlineColumn: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {},
|
|
1677
|
+
// Filter external
|
|
1678
|
+
inlineExternal: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) || {},
|
|
1679
|
+
// Filter def
|
|
1680
|
+
inlineFilterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {},
|
|
1681
|
+
};
|
|
1682
|
+
},
|
|
1683
|
+
set: function (configuration) {
|
|
1684
|
+
var keys = Object.keys(configuration || {});
|
|
1685
|
+
var current = filterConfiguration_1.get();
|
|
1686
|
+
var inlineColumn = current.inlineColumn, inlineExternal = current.inlineExternal, inlineFilterDef = current.inlineFilterDef;
|
|
1687
|
+
var updatedConfiguration = {
|
|
1688
|
+
// Filter column
|
|
1689
|
+
inlineColumn: keys.includes('inlineColumn') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {}) : inlineColumn,
|
|
1690
|
+
// Filter external
|
|
1691
|
+
inlineExternal: keys.includes('inlineExternal') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineExternal) || {}) : inlineExternal,
|
|
1692
|
+
// Filter def
|
|
1693
|
+
inlineFilterDef: keys.includes('inlineFilterDef') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {}) : inlineFilterDef,
|
|
1694
|
+
};
|
|
1695
|
+
filterConfiguration_1.set(updatedConfiguration);
|
|
1696
|
+
return updatedConfiguration;
|
|
1697
|
+
},
|
|
1698
|
+
remove: function () {
|
|
1699
|
+
filterConfiguration_1.remove();
|
|
1700
|
+
},
|
|
1701
|
+
observer: filterConfiguration_1.observer
|
|
1702
|
+
},
|
|
1703
|
+
value: {
|
|
1704
|
+
get: function () {
|
|
1705
|
+
var configuration = filterValue_1.get();
|
|
1706
|
+
return {
|
|
1707
|
+
// Filter column
|
|
1708
|
+
columnFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {},
|
|
1709
|
+
// Filter external
|
|
1710
|
+
externalFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {},
|
|
1711
|
+
// Filter def
|
|
1712
|
+
filterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}
|
|
1713
|
+
};
|
|
1714
|
+
},
|
|
1715
|
+
set: function (configuration) {
|
|
1716
|
+
var keys = Object.keys(configuration || {});
|
|
1717
|
+
var current = filterValue_1.get();
|
|
1718
|
+
var columnFilter = current.columnFilter, externalFilter = current.externalFilter, filterDef = current.filterDef;
|
|
1719
|
+
var updatedConfiguration = {
|
|
1720
|
+
// Filter column
|
|
1721
|
+
columnFilter: keys.includes('columnFilter') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.columnFilter) || {}) : columnFilter,
|
|
1722
|
+
// Filter external
|
|
1723
|
+
externalFilter: keys.includes('externalFilter') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.externalFilter) || {}) : externalFilter,
|
|
1724
|
+
// Filter def
|
|
1725
|
+
filterDef: keys.includes('filterDef') ? ((configuration === null || configuration === void 0 ? void 0 : configuration.filterDef) || {}) : filterDef,
|
|
1726
|
+
};
|
|
1727
|
+
filterValue_1.set(updatedConfiguration);
|
|
1728
|
+
return updatedConfiguration;
|
|
1729
|
+
},
|
|
1730
|
+
remove: function () {
|
|
1731
|
+
filterValue_1.remove();
|
|
1732
|
+
},
|
|
1733
|
+
observer: filterValue_1.observer
|
|
1734
|
+
}
|
|
1735
|
+
};
|
|
1736
|
+
}
|
|
1737
|
+
return __classPrivateFieldGet(_this, _cache$2)[key];
|
|
1756
1738
|
};
|
|
1757
|
-
|
|
1758
|
-
var e_1,
|
|
1759
|
-
var _a, _b, _c, _d
|
|
1739
|
+
_loadDefaultConfiguration.set(this, function (args) {
|
|
1740
|
+
var e_1, _m, e_2, _o, e_3, _p;
|
|
1741
|
+
var _a, _b, _c, _d;
|
|
1760
1742
|
var columns = args.columns, externalFilters = args.externalFilters, filterDefs = args.filterDefs;
|
|
1761
1743
|
var inlineColumn = {};
|
|
1762
|
-
var columnFilter = {};
|
|
1763
1744
|
var inlineExternal = {};
|
|
1764
|
-
var externalFilter = {};
|
|
1765
1745
|
var inlineFilterDef = {};
|
|
1766
|
-
var filterDef = {};
|
|
1767
1746
|
try {
|
|
1768
1747
|
// Filter column
|
|
1769
|
-
for (var
|
|
1770
|
-
var item =
|
|
1748
|
+
for (var _q = __values((columns || [])), _r = _q.next(); !_r.done; _r = _q.next()) {
|
|
1749
|
+
var item = _r.value;
|
|
1771
1750
|
inlineColumn[item.field] = (_a = inlineColumn[item.field]) !== null && _a !== void 0 ? _a : (_b = item === null || item === void 0 ? void 0 : item.filter) === null || _b === void 0 ? void 0 : _b.defaultShowing;
|
|
1772
|
-
columnFilter[item.field] = (_c = columnFilter[item.field]) !== null && _c !== void 0 ? _c : (_d = item === null || item === void 0 ? void 0 : item.filter) === null || _d === void 0 ? void 0 : _d.default;
|
|
1773
1751
|
}
|
|
1774
1752
|
}
|
|
1775
1753
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
1776
1754
|
finally {
|
|
1777
1755
|
try {
|
|
1778
|
-
if (
|
|
1756
|
+
if (_r && !_r.done && (_m = _q.return)) _m.call(_q);
|
|
1779
1757
|
}
|
|
1780
1758
|
finally { if (e_1) throw e_1.error; }
|
|
1781
1759
|
}
|
|
1782
1760
|
try {
|
|
1783
1761
|
// Filter external
|
|
1784
|
-
for (var
|
|
1785
|
-
var item =
|
|
1786
|
-
inlineExternal[item.field] = (
|
|
1787
|
-
if (item.type === 'daterange') {
|
|
1788
|
-
externalFilter[item.field] = {
|
|
1789
|
-
from: (_j = (_g = (_f = externalFilter[item.field]) === null || _f === void 0 ? void 0 : _f.from) !== null && _g !== void 0 ? _g : (_h = item.default) === null || _h === void 0 ? void 0 : _h.from) !== null && _j !== void 0 ? _j : undefined,
|
|
1790
|
-
to: (_o = (_l = (_k = externalFilter[item.field]) === null || _k === void 0 ? void 0 : _k.to) !== null && _l !== void 0 ? _l : (_m = item.default) === null || _m === void 0 ? void 0 : _m.to) !== null && _o !== void 0 ? _o : undefined
|
|
1791
|
-
};
|
|
1792
|
-
}
|
|
1793
|
-
else {
|
|
1794
|
-
externalFilter[item.field] = (_p = externalFilter[item.field]) !== null && _p !== void 0 ? _p : item.default;
|
|
1795
|
-
}
|
|
1762
|
+
for (var _s = __values((externalFilters || [])), _t = _s.next(); !_t.done; _t = _s.next()) {
|
|
1763
|
+
var item = _t.value;
|
|
1764
|
+
inlineExternal[item.field] = (_c = inlineExternal[item.field]) !== null && _c !== void 0 ? _c : item === null || item === void 0 ? void 0 : item.defaultShowing;
|
|
1796
1765
|
}
|
|
1797
1766
|
}
|
|
1798
1767
|
catch (e_2_1) { e_2 = { error: e_2_1 }; }
|
|
1799
1768
|
finally {
|
|
1800
1769
|
try {
|
|
1801
|
-
if (
|
|
1770
|
+
if (_t && !_t.done && (_o = _s.return)) _o.call(_s);
|
|
1802
1771
|
}
|
|
1803
1772
|
finally { if (e_2) throw e_2.error; }
|
|
1804
1773
|
}
|
|
1805
1774
|
try {
|
|
1806
1775
|
// Filter def
|
|
1807
|
-
for (var
|
|
1808
|
-
var item =
|
|
1809
|
-
inlineFilterDef[item.sdMaterialFilterDef] = (
|
|
1776
|
+
for (var _u = __values((filterDefs || [])), _v = _u.next(); !_v.done; _v = _u.next()) {
|
|
1777
|
+
var item = _v.value;
|
|
1778
|
+
inlineFilterDef[item.sdMaterialFilterDef] = (_d = inlineFilterDef[item.sdMaterialFilterDef]) !== null && _d !== void 0 ? _d : item === null || item === void 0 ? void 0 : item.defaultShowing;
|
|
1810
1779
|
}
|
|
1811
1780
|
}
|
|
1812
1781
|
catch (e_3_1) { e_3 = { error: e_3_1 }; }
|
|
1813
1782
|
finally {
|
|
1814
1783
|
try {
|
|
1815
|
-
if (
|
|
1784
|
+
if (_v && !_v.done && (_p = _u.return)) _p.call(_u);
|
|
1816
1785
|
}
|
|
1817
1786
|
finally { if (e_3) throw e_3.error; }
|
|
1818
1787
|
}
|
|
1819
1788
|
return {
|
|
1820
|
-
quickFilters: [],
|
|
1821
|
-
selectedQuickFilter: null,
|
|
1822
1789
|
inlineColumn: inlineColumn,
|
|
1823
|
-
columnFilter: columnFilter,
|
|
1824
1790
|
inlineExternal: inlineExternal,
|
|
1825
|
-
externalFilter: externalFilter,
|
|
1826
1791
|
inlineFilterDef: inlineFilterDef,
|
|
1827
|
-
filterDef: filterDef,
|
|
1828
1792
|
};
|
|
1829
1793
|
});
|
|
1830
|
-
this
|
|
1831
|
-
var
|
|
1832
|
-
|
|
1833
|
-
|
|
1834
|
-
|
|
1835
|
-
|
|
1836
|
-
|
|
1837
|
-
|
|
1838
|
-
|
|
1839
|
-
|
|
1794
|
+
_loadDefaultValue.set(this, function (args) {
|
|
1795
|
+
var e_4, _m, e_5, _o;
|
|
1796
|
+
var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
|
|
1797
|
+
var columns = args.columns, externalFilters = args.externalFilters, filterDefs = args.filterDefs;
|
|
1798
|
+
var columnFilter = {};
|
|
1799
|
+
var externalFilter = {};
|
|
1800
|
+
var filterDef = {};
|
|
1801
|
+
try {
|
|
1802
|
+
// Filter column
|
|
1803
|
+
for (var _p = __values((columns || [])), _q = _p.next(); !_q.done; _q = _p.next()) {
|
|
1804
|
+
var item = _q.value;
|
|
1805
|
+
columnFilter[item.field] = (_a = columnFilter[item.field]) !== null && _a !== void 0 ? _a : (_b = item === null || item === void 0 ? void 0 : item.filter) === null || _b === void 0 ? void 0 : _b.default;
|
|
1806
|
+
}
|
|
1807
|
+
}
|
|
1808
|
+
catch (e_4_1) { e_4 = { error: e_4_1 }; }
|
|
1809
|
+
finally {
|
|
1810
|
+
try {
|
|
1811
|
+
if (_q && !_q.done && (_m = _p.return)) _m.call(_p);
|
|
1812
|
+
}
|
|
1813
|
+
finally { if (e_4) throw e_4.error; }
|
|
1814
|
+
}
|
|
1815
|
+
try {
|
|
1816
|
+
// Filter external
|
|
1817
|
+
for (var _r = __values((externalFilters || [])), _s = _r.next(); !_s.done; _s = _r.next()) {
|
|
1818
|
+
var item = _s.value;
|
|
1819
|
+
if (item.type === 'daterange') {
|
|
1820
|
+
externalFilter[item.field] = {
|
|
1821
|
+
from: (_f = (_d = (_c = externalFilter[item.field]) === null || _c === void 0 ? void 0 : _c.from) !== null && _d !== void 0 ? _d : (_e = item.default) === null || _e === void 0 ? void 0 : _e.from) !== null && _f !== void 0 ? _f : undefined,
|
|
1822
|
+
to: (_k = (_h = (_g = externalFilter[item.field]) === null || _g === void 0 ? void 0 : _g.to) !== null && _h !== void 0 ? _h : (_j = item.default) === null || _j === void 0 ? void 0 : _j.to) !== null && _k !== void 0 ? _k : undefined
|
|
1823
|
+
};
|
|
1824
|
+
}
|
|
1825
|
+
else {
|
|
1826
|
+
externalFilter[item.field] = (_l = externalFilter[item.field]) !== null && _l !== void 0 ? _l : item.default;
|
|
1827
|
+
}
|
|
1828
|
+
}
|
|
1829
|
+
}
|
|
1830
|
+
catch (e_5_1) { e_5 = { error: e_5_1 }; }
|
|
1831
|
+
finally {
|
|
1832
|
+
try {
|
|
1833
|
+
if (_s && !_s.done && (_o = _r.return)) _o.call(_r);
|
|
1834
|
+
}
|
|
1835
|
+
finally { if (e_5) throw e_5.error; }
|
|
1840
1836
|
}
|
|
1841
|
-
|
|
1842
|
-
prefix: __classPrivateFieldGet(_this, _prefix$1),
|
|
1843
|
-
key: key
|
|
1844
|
-
}).get;
|
|
1845
|
-
var configuration = get();
|
|
1837
|
+
// Filter def
|
|
1846
1838
|
return {
|
|
1847
|
-
|
|
1848
|
-
|
|
1849
|
-
|
|
1850
|
-
inlineColumn: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineColumn) || {},
|
|
1851
|
-
inlineFilterDef: (configuration === null || configuration === void 0 ? void 0 : configuration.inlineFilterDef) || {},
|
|
1852
|
-
};
|
|
1853
|
-
};
|
|
1854
|
-
this.set = function (key, configuration) {
|
|
1855
|
-
configuration = {
|
|
1856
|
-
selectedQuickFilter: (configuration === null || configuration === void 0 ? void 0 : configuration.selectedQuickFilter) || null,
|
|
1857
|
-
quickFilters: (configuration === null || configuration === void 0 ? void 0 : configuration.quickFilters) || [],
|
|
1858
|
-
inlineExternal: configuration.inlineExternal || {},
|
|
1859
|
-
inlineColumn: configuration.inlineColumn || {},
|
|
1860
|
-
inlineFilterDef: configuration.inlineFilterDef || {}
|
|
1839
|
+
columnFilter: columnFilter,
|
|
1840
|
+
externalFilter: externalFilter,
|
|
1841
|
+
filterDef: filterDef,
|
|
1861
1842
|
};
|
|
1862
|
-
|
|
1863
|
-
return configuration;
|
|
1864
|
-
}
|
|
1865
|
-
var set = _this.settingService.create({
|
|
1866
|
-
prefix: __classPrivateFieldGet(_this, _prefix$1),
|
|
1867
|
-
key: key
|
|
1868
|
-
}).set;
|
|
1869
|
-
key = hash__default['default']({
|
|
1870
|
-
prefix: __classPrivateFieldGet(_this, _prefix$1),
|
|
1871
|
-
key: key
|
|
1872
|
-
});
|
|
1873
|
-
set(configuration);
|
|
1874
|
-
return configuration;
|
|
1875
|
-
};
|
|
1843
|
+
});
|
|
1876
1844
|
}
|
|
1877
1845
|
return SdGridFilterService;
|
|
1878
1846
|
}());
|
|
1879
|
-
|
|
1847
|
+
_filterConfiguration = new WeakMap(), _filterValue = new WeakMap(), _cache$2 = new WeakMap(), _loadDefaultConfiguration = new WeakMap(), _loadDefaultValue = new WeakMap();
|
|
1880
1848
|
SdGridFilterService.decorators = [
|
|
1881
1849
|
{ type: core.Injectable }
|
|
1882
1850
|
];
|
|
@@ -1989,7 +1957,7 @@
|
|
|
1989
1957
|
});
|
|
1990
1958
|
_filterExportInfo.set(this, function (pageNumber, pageSize) {
|
|
1991
1959
|
var _a, _b;
|
|
1992
|
-
var _3 = _this.filterRegister.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
|
|
1960
|
+
var _3 = _this.filterRegister.value.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
|
|
1993
1961
|
return {
|
|
1994
1962
|
rawColumnFilter: columnFilter || {},
|
|
1995
1963
|
rawExternalFilter: externalFilter || {},
|
|
@@ -2015,18 +1983,23 @@
|
|
|
2015
1983
|
_loadFilterRegister.set(this, function () {
|
|
2016
1984
|
var _a, _b, _c, _d, _e;
|
|
2017
1985
|
// Init filter
|
|
2018
|
-
|
|
2019
|
-
|
|
2020
|
-
|
|
2021
|
-
|
|
2022
|
-
|
|
2023
|
-
|
|
2024
|
-
_this.columnFilter = configuration.columnFilter;
|
|
2025
|
-
__classPrivateFieldGet(_this, _paginator).pageIndex = 0;
|
|
2026
|
-
__classPrivateFieldGet(_this, _reload).next({
|
|
2027
|
-
force: false,
|
|
1986
|
+
if (_this.gridOption) {
|
|
1987
|
+
var hasRegister = !!_this.filterRegister;
|
|
1988
|
+
_this.filterRegister = _this.gridFilterService.register((_b = (_a = _this.gridOption) === null || _a === void 0 ? void 0 : _a.filter) === null || _b === void 0 ? void 0 : _b.key, {
|
|
1989
|
+
columns: (_c = _this.gridOption) === null || _c === void 0 ? void 0 : _c.columns,
|
|
1990
|
+
externalFilters: (_e = (_d = _this.gridOption) === null || _d === void 0 ? void 0 : _d.filter) === null || _e === void 0 ? void 0 : _e.externalFilters,
|
|
1991
|
+
filterDefs: _this.filterDefs
|
|
2028
1992
|
});
|
|
2029
|
-
|
|
1993
|
+
if (!hasRegister) {
|
|
1994
|
+
__classPrivateFieldGet(_this, _subscription$2).add(_this.filterRegister.value.observer.pipe(operators.debounceTime(500), operators.map(function (filterValue) {
|
|
1995
|
+
_this.columnFilter = filterValue.columnFilter;
|
|
1996
|
+
__classPrivateFieldGet(_this, _paginator).pageIndex = 0;
|
|
1997
|
+
__classPrivateFieldGet(_this, _reload).next({
|
|
1998
|
+
force: false,
|
|
1999
|
+
});
|
|
2000
|
+
})).subscribe());
|
|
2001
|
+
}
|
|
2002
|
+
}
|
|
2030
2003
|
});
|
|
2031
2004
|
_filterLocal.set(this, function (localItems, filterInfo) {
|
|
2032
2005
|
var columns = _this.gridOption.columns;
|
|
@@ -2157,7 +2130,7 @@
|
|
|
2157
2130
|
});
|
|
2158
2131
|
_getFilter.set(this, function () {
|
|
2159
2132
|
var _a, _b, _c, _d, _e, _f;
|
|
2160
|
-
var _3 = _this.filterRegister.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
|
|
2133
|
+
var _3 = _this.filterRegister.value.get(), columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
|
|
2161
2134
|
return {
|
|
2162
2135
|
rawColumnFilter: columnFilter || {},
|
|
2163
2136
|
rawExternalFilter: externalFilter || {},
|
|
@@ -2791,15 +2764,11 @@
|
|
|
2791
2764
|
_this.ref.detectChanges();
|
|
2792
2765
|
});
|
|
2793
2766
|
this.clearFilter = function () {
|
|
2794
|
-
_this.filterRegister.remove();
|
|
2795
|
-
// if (this.gridOption?.filter?.inlineColumn) {
|
|
2796
|
-
// this.columnFilter = {};
|
|
2797
|
-
// }
|
|
2798
|
-
// this.gridFilter?.onClearFilter();
|
|
2767
|
+
_this.filterRegister.value.remove();
|
|
2799
2768
|
};
|
|
2800
2769
|
this.setFilter = function (args) {
|
|
2801
2770
|
var _3 = args || {}, columnFilter = _3.columnFilter, externalFilter = _3.externalFilter, filterDef = _3.filterDef;
|
|
2802
|
-
_this.filterRegister.set({
|
|
2771
|
+
_this.filterRegister.value.set({
|
|
2803
2772
|
columnFilter: columnFilter,
|
|
2804
2773
|
externalFilter: externalFilter,
|
|
2805
2774
|
filterDef: filterDef
|
|
@@ -3755,7 +3724,7 @@
|
|
|
3755
3724
|
{ type: SdGridConfigurationService }
|
|
3756
3725
|
]; };
|
|
3757
3726
|
|
|
3758
|
-
var _cache$
|
|
3727
|
+
var _cache$3;
|
|
3759
3728
|
var SdPopupGridConfiguration = /** @class */ (function () {
|
|
3760
3729
|
function SdPopupGridConfiguration(ref, notifyService, translateService, gridConfigurationService) {
|
|
3761
3730
|
var _this = this;
|
|
@@ -3764,7 +3733,7 @@
|
|
|
3764
3733
|
this.translateService = translateService;
|
|
3765
3734
|
this.gridConfigurationService = gridConfigurationService;
|
|
3766
3735
|
this.changes = new core.EventEmitter();
|
|
3767
|
-
_cache$
|
|
3736
|
+
_cache$3.set(this, void 0);
|
|
3768
3737
|
this.isCreatingColumn = false;
|
|
3769
3738
|
this.selected = {};
|
|
3770
3739
|
this.disabledDrag = true;
|
|
@@ -3773,9 +3742,9 @@
|
|
|
3773
3742
|
return __generator(this, function (_c) {
|
|
3774
3743
|
switch (_c.label) {
|
|
3775
3744
|
case 0:
|
|
3776
|
-
__classPrivateFieldSet(this, _cache$
|
|
3745
|
+
__classPrivateFieldSet(this, _cache$3, this.gridConfigurationService.init(this.key, this.gridOption));
|
|
3777
3746
|
_b = this;
|
|
3778
|
-
return [4 /*yield*/, __classPrivateFieldGet(this, _cache$
|
|
3747
|
+
return [4 /*yield*/, __classPrivateFieldGet(this, _cache$3).get()];
|
|
3779
3748
|
case 1:
|
|
3780
3749
|
_b.configuration = _c.sent();
|
|
3781
3750
|
this.modal.open();
|
|
@@ -3784,7 +3753,7 @@
|
|
|
3784
3753
|
});
|
|
3785
3754
|
}); };
|
|
3786
3755
|
this.onSave = function () {
|
|
3787
|
-
__classPrivateFieldGet(_this, _cache$
|
|
3756
|
+
__classPrivateFieldGet(_this, _cache$3).set(_this.configuration);
|
|
3788
3757
|
_this.modal.close();
|
|
3789
3758
|
_this.ref.detectChanges();
|
|
3790
3759
|
};
|
|
@@ -3794,7 +3763,7 @@
|
|
|
3794
3763
|
return __generator(this, function (_b) {
|
|
3795
3764
|
translate = this.translateService.translate;
|
|
3796
3765
|
this.notifyService.confirm(translate('Reset grid configuration to default')).then(function () {
|
|
3797
|
-
__classPrivateFieldGet(_this, _cache$
|
|
3766
|
+
__classPrivateFieldGet(_this, _cache$3).remove();
|
|
3798
3767
|
_this.modal.close();
|
|
3799
3768
|
_this.ref.detectChanges();
|
|
3800
3769
|
});
|
|
@@ -3826,7 +3795,7 @@
|
|
|
3826
3795
|
generatedColumns: this.configuration.columns.filter(function (e) { var _a; return _this.selected[(_a = e.origin) === null || _a === void 0 ? void 0 : _a.field]; }).map(function (e) { var _a; return (_a = e.origin) === null || _a === void 0 ? void 0 : _a.field; })
|
|
3827
3796
|
};
|
|
3828
3797
|
this.configuration.columns.push(generatedColumn);
|
|
3829
|
-
this.configuration = __classPrivateFieldGet(this, _cache$
|
|
3798
|
+
this.configuration = __classPrivateFieldGet(this, _cache$3).set(this.configuration);
|
|
3830
3799
|
this.isCreatingColumn = false;
|
|
3831
3800
|
return [2 /*return*/];
|
|
3832
3801
|
});
|
|
@@ -3849,7 +3818,7 @@
|
|
|
3849
3818
|
};
|
|
3850
3819
|
return SdPopupGridConfiguration;
|
|
3851
3820
|
}());
|
|
3852
|
-
_cache$
|
|
3821
|
+
_cache$3 = new WeakMap();
|
|
3853
3822
|
SdPopupGridConfiguration.decorators = [
|
|
3854
3823
|
{ type: core.Component, args: [{
|
|
3855
3824
|
selector: 'sd-popup-grid-configuration',
|
|
@@ -4137,12 +4106,12 @@
|
|
|
4137
4106
|
},] }
|
|
4138
4107
|
];
|
|
4139
4108
|
|
|
4140
|
-
var _cache$
|
|
4109
|
+
var _cache$4;
|
|
4141
4110
|
var SdGeneratedColumnService = /** @class */ (function () {
|
|
4142
4111
|
function SdGeneratedColumnService(settingService) {
|
|
4143
4112
|
var _this = this;
|
|
4144
4113
|
this.settingService = settingService;
|
|
4145
|
-
_cache$
|
|
4114
|
+
_cache$4.set(this, {});
|
|
4146
4115
|
this.load = function (configuration) {
|
|
4147
4116
|
if (!(configuration === null || configuration === void 0 ? void 0 : configuration.key)) {
|
|
4148
4117
|
return null;
|
|
@@ -4151,22 +4120,22 @@
|
|
|
4151
4120
|
prefix: '260f5e94-5865-4425-8ced-b9c083c390dd',
|
|
4152
4121
|
key: configuration.key
|
|
4153
4122
|
});
|
|
4154
|
-
if (!__classPrivateFieldGet(_this, _cache$
|
|
4123
|
+
if (!__classPrivateFieldGet(_this, _cache$4)[key]) {
|
|
4155
4124
|
if ((configuration === null || configuration === void 0 ? void 0 : configuration.storage) === 'server') {
|
|
4156
|
-
__classPrivateFieldGet(_this, _cache$
|
|
4125
|
+
__classPrivateFieldGet(_this, _cache$4)[key] = _this.settingService.createServer(key, {
|
|
4157
4126
|
args: configuration === null || configuration === void 0 ? void 0 : configuration.args,
|
|
4158
4127
|
default: []
|
|
4159
4128
|
});
|
|
4160
4129
|
}
|
|
4161
4130
|
else {
|
|
4162
|
-
__classPrivateFieldGet(_this, _cache$
|
|
4131
|
+
__classPrivateFieldGet(_this, _cache$4)[key] = _this.settingService.create(key, {
|
|
4163
4132
|
type: configuration === null || configuration === void 0 ? void 0 : configuration.storage,
|
|
4164
4133
|
args: configuration === null || configuration === void 0 ? void 0 : configuration.args,
|
|
4165
4134
|
default: []
|
|
4166
4135
|
});
|
|
4167
4136
|
}
|
|
4168
4137
|
}
|
|
4169
|
-
return __classPrivateFieldGet(_this, _cache$
|
|
4138
|
+
return __classPrivateFieldGet(_this, _cache$4)[key];
|
|
4170
4139
|
};
|
|
4171
4140
|
this.loadSystem = function (configuration) {
|
|
4172
4141
|
var _a, _b;
|
|
@@ -4180,27 +4149,27 @@
|
|
|
4180
4149
|
prefix: '8b8050ca-1f44-4860-bad3-20e646c0d68f',
|
|
4181
4150
|
key: configuration.key
|
|
4182
4151
|
});
|
|
4183
|
-
if (!__classPrivateFieldGet(_this, _cache$
|
|
4152
|
+
if (!__classPrivateFieldGet(_this, _cache$4)[key]) {
|
|
4184
4153
|
if ((configuration === null || configuration === void 0 ? void 0 : configuration.storage) === 'server') {
|
|
4185
|
-
__classPrivateFieldGet(_this, _cache$
|
|
4154
|
+
__classPrivateFieldGet(_this, _cache$4)[key] = _this.settingService.createServer(key, {
|
|
4186
4155
|
args: (_a = configuration === null || configuration === void 0 ? void 0 : configuration.systemColumn) === null || _a === void 0 ? void 0 : _a.args,
|
|
4187
4156
|
default: []
|
|
4188
4157
|
});
|
|
4189
4158
|
}
|
|
4190
4159
|
else {
|
|
4191
|
-
__classPrivateFieldGet(_this, _cache$
|
|
4160
|
+
__classPrivateFieldGet(_this, _cache$4)[key] = _this.settingService.create(key, {
|
|
4192
4161
|
type: configuration === null || configuration === void 0 ? void 0 : configuration.storage,
|
|
4193
4162
|
args: (_b = configuration === null || configuration === void 0 ? void 0 : configuration.systemColumn) === null || _b === void 0 ? void 0 : _b.args,
|
|
4194
4163
|
default: []
|
|
4195
4164
|
});
|
|
4196
4165
|
}
|
|
4197
4166
|
}
|
|
4198
|
-
return __classPrivateFieldGet(_this, _cache$
|
|
4167
|
+
return __classPrivateFieldGet(_this, _cache$4)[key];
|
|
4199
4168
|
};
|
|
4200
4169
|
}
|
|
4201
4170
|
return SdGeneratedColumnService;
|
|
4202
4171
|
}());
|
|
4203
|
-
_cache$
|
|
4172
|
+
_cache$4 = new WeakMap();
|
|
4204
4173
|
SdGeneratedColumnService.decorators = [
|
|
4205
4174
|
{ type: core.Injectable }
|
|
4206
4175
|
];
|