@sd-angular/core 1.0.1 → 1.0.2
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 +60 -54
- package/bundles/sd-angular-core-grid-material.umd.js.map +1 -1
- package/bundles/sd-angular-core-grid-material.umd.min.js +1 -1
- package/bundles/sd-angular-core-grid-material.umd.min.js.map +1 -1
- package/esm2015/grid-material/src/lib/grid-material.component.js +23 -22
- package/fesm2015/sd-angular-core-grid-material.js +22 -21
- package/fesm2015/sd-angular-core-grid-material.js.map +1 -1
- package/package.json +1 -1
- package/{sd-angular-core-1.0.1.tgz → sd-angular-core-1.0.2.tgz} +0 -0
|
@@ -1834,14 +1834,16 @@
|
|
|
1834
1834
|
});
|
|
1835
1835
|
_filterLocal.set(this, function (localItems, filterInfo) {
|
|
1836
1836
|
var columns = _this.gridOption.columns;
|
|
1837
|
+
var rawColumnFilter = filterInfo.rawColumnFilter, orderBy = filterInfo.orderBy, orderDirection = filterInfo.orderDirection, pageSize = filterInfo.pageSize, pageNumber = filterInfo.pageNumber;
|
|
1837
1838
|
var items = localItems.filter(function (item) {
|
|
1838
1839
|
var e_4, _t;
|
|
1839
1840
|
var _a, _b;
|
|
1840
1841
|
try {
|
|
1841
1842
|
for (var columns_1 = __values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
|
|
1842
1843
|
var column = columns_1_1.value;
|
|
1843
|
-
var
|
|
1844
|
-
var
|
|
1844
|
+
var field = column.field;
|
|
1845
|
+
var filterValue = (rawColumnFilter[field] || '').toString().trim().toLowerCase();
|
|
1846
|
+
var columnValue = (item[field] || '').toString().trim().toLowerCase();
|
|
1845
1847
|
if (filterValue) {
|
|
1846
1848
|
if (!columnValue) {
|
|
1847
1849
|
return false;
|
|
@@ -1912,8 +1914,8 @@
|
|
|
1912
1914
|
return true;
|
|
1913
1915
|
});
|
|
1914
1916
|
// Sort
|
|
1915
|
-
if (
|
|
1916
|
-
var column = columns.find(function (e) { return e.field ===
|
|
1917
|
+
if (orderBy && orderDirection) {
|
|
1918
|
+
var column = columns.find(function (e) { return e.field === orderBy; });
|
|
1917
1919
|
if (column) {
|
|
1918
1920
|
var type_1 = column.type, field_1 = column.field;
|
|
1919
1921
|
items.sort(function (current, next) {
|
|
@@ -1935,18 +1937,15 @@
|
|
|
1935
1937
|
}
|
|
1936
1938
|
return 0;
|
|
1937
1939
|
});
|
|
1938
|
-
if (
|
|
1940
|
+
if (orderDirection === 'desc') {
|
|
1939
1941
|
items.reverse();
|
|
1940
1942
|
}
|
|
1941
1943
|
}
|
|
1942
1944
|
}
|
|
1943
1945
|
return {
|
|
1944
1946
|
items: items.filter(function (item, index) {
|
|
1945
|
-
|
|
1946
|
-
|
|
1947
|
-
var pageSize = ((_b = __classPrivateFieldGet(_this, _paginator)) === null || _b === void 0 ? void 0 : _b.pageSize) || ((_d = (_c = _this.gridOption) === null || _c === void 0 ? void 0 : _c.paginate) === null || _d === void 0 ? void 0 : _d.pageSize) || 50;
|
|
1948
|
-
return index >= pageIndex * pageSize
|
|
1949
|
-
&& index < (pageIndex + 1) * pageSize;
|
|
1947
|
+
return index >= pageNumber * pageSize
|
|
1948
|
+
&& index < (pageNumber + 1) * pageSize;
|
|
1950
1949
|
}),
|
|
1951
1950
|
total: items.length
|
|
1952
1951
|
};
|
|
@@ -1963,47 +1962,51 @@
|
|
|
1963
1962
|
pageSize: ((_j = __classPrivateFieldGet(_this, _paginator)) === null || _j === void 0 ? void 0 : _j.pageSize) || ((_l = (_k = _this.gridOption) === null || _k === void 0 ? void 0 : _k.paginate) === null || _l === void 0 ? void 0 : _l.pageSize) || 50
|
|
1964
1963
|
});
|
|
1965
1964
|
});
|
|
1966
|
-
_load$1.set(this, function (filterReq
|
|
1967
|
-
|
|
1968
|
-
return
|
|
1969
|
-
|
|
1970
|
-
|
|
1971
|
-
|
|
1972
|
-
|
|
1973
|
-
|
|
1974
|
-
|
|
1975
|
-
|
|
1976
|
-
|
|
1977
|
-
|
|
1978
|
-
result =
|
|
1979
|
-
|
|
1980
|
-
|
|
1981
|
-
|
|
1982
|
-
|
|
1983
|
-
|
|
1984
|
-
|
|
1985
|
-
|
|
1986
|
-
|
|
1987
|
-
|
|
1988
|
-
|
|
1989
|
-
|
|
1990
|
-
|
|
1991
|
-
|
|
1992
|
-
|
|
1993
|
-
|
|
1994
|
-
|
|
1995
|
-
|
|
1996
|
-
|
|
1997
|
-
|
|
1998
|
-
|
|
1999
|
-
|
|
2000
|
-
|
|
2001
|
-
|
|
2002
|
-
|
|
2003
|
-
|
|
2004
|
-
|
|
1965
|
+
_load$1.set(this, function (filterReq, force) {
|
|
1966
|
+
if (force === void 0) { force = true; }
|
|
1967
|
+
return __awaiter(_this, void 0, void 0, function () {
|
|
1968
|
+
var result, results, _t, error_1;
|
|
1969
|
+
return __generator(this, function (_u) {
|
|
1970
|
+
switch (_u.label) {
|
|
1971
|
+
case 0:
|
|
1972
|
+
this.isLoading = true;
|
|
1973
|
+
_u.label = 1;
|
|
1974
|
+
case 1:
|
|
1975
|
+
_u.trys.push([1, 8, 9, 10]);
|
|
1976
|
+
if (!(this.gridOption.type === 'server')) return [3 /*break*/, 3];
|
|
1977
|
+
result = this.gridOption.items(filterReq);
|
|
1978
|
+
if (rxjs.isObservable(result)) {
|
|
1979
|
+
result = result.toPromise();
|
|
1980
|
+
}
|
|
1981
|
+
return [4 /*yield*/, result];
|
|
1982
|
+
case 2: return [2 /*return*/, _u.sent()];
|
|
1983
|
+
case 3:
|
|
1984
|
+
if (!force) return [3 /*break*/, 6];
|
|
1985
|
+
results = this.gridOption.items();
|
|
1986
|
+
if (!(results instanceof Promise)) return [3 /*break*/, 5];
|
|
1987
|
+
_t = this;
|
|
1988
|
+
return [4 /*yield*/, results];
|
|
1989
|
+
case 4:
|
|
1990
|
+
_t.localItems = _u.sent();
|
|
1991
|
+
return [3 /*break*/, 6];
|
|
1992
|
+
case 5:
|
|
1993
|
+
this.localItems = results;
|
|
1994
|
+
_u.label = 6;
|
|
1995
|
+
case 6: return [2 /*return*/, __classPrivateFieldGet(this, _filterLocal).call(this, this.localItems, filterReq)];
|
|
1996
|
+
case 7: return [3 /*break*/, 10];
|
|
1997
|
+
case 8:
|
|
1998
|
+
error_1 = _u.sent();
|
|
1999
|
+
this.notifyService.handle.error(error_1);
|
|
2000
|
+
return [3 /*break*/, 10];
|
|
2001
|
+
case 9:
|
|
2002
|
+
this.isLoading = false;
|
|
2003
|
+
this.ref.detectChanges();
|
|
2004
|
+
return [7 /*endfinally*/];
|
|
2005
|
+
case 10: return [2 /*return*/];
|
|
2006
|
+
}
|
|
2007
|
+
});
|
|
2005
2008
|
});
|
|
2006
|
-
});
|
|
2009
|
+
});
|
|
2007
2010
|
_render.set(this, function (args) { return __awaiter(_this, void 0, void 0, function () {
|
|
2008
2011
|
var _a, _b, _c;
|
|
2009
2012
|
return __generator(this, function (_t) {
|
|
@@ -2630,7 +2633,7 @@
|
|
|
2630
2633
|
__classPrivateFieldGet(this, _subscription$1).add(gridFilter.filterChange.pipe(operators.debounceTime(200), operators.map(function () {
|
|
2631
2634
|
__classPrivateFieldGet(_this, _paginator).pageIndex = 0;
|
|
2632
2635
|
return __classPrivateFieldGet(_this, _getFilter).call(_this);
|
|
2633
|
-
}), operators.switchMap(__classPrivateFieldGet(
|
|
2636
|
+
}), operators.switchMap(function (filterInfo) { return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, false); })).subscribe(__classPrivateFieldGet(this, _render)));
|
|
2634
2637
|
}
|
|
2635
2638
|
},
|
|
2636
2639
|
enumerable: false,
|
|
@@ -2660,9 +2663,10 @@
|
|
|
2660
2663
|
});
|
|
2661
2664
|
Object.defineProperty(SdGridMaterial.prototype, "paginator", {
|
|
2662
2665
|
set: function (paginator) {
|
|
2666
|
+
var _this = this;
|
|
2663
2667
|
if (paginator && __classPrivateFieldGet(this, _paginator) !== paginator) {
|
|
2664
2668
|
__classPrivateFieldSet(this, _paginator, paginator);
|
|
2665
|
-
__classPrivateFieldGet(this, _subscription$1).add(paginator.page.pipe(operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(__classPrivateFieldGet(
|
|
2669
|
+
__classPrivateFieldGet(this, _subscription$1).add(paginator.page.pipe(operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(function (filterInfo) { return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, false); })).subscribe(__classPrivateFieldGet(this, _render)));
|
|
2666
2670
|
}
|
|
2667
2671
|
},
|
|
2668
2672
|
enumerable: false,
|
|
@@ -2670,9 +2674,10 @@
|
|
|
2670
2674
|
});
|
|
2671
2675
|
Object.defineProperty(SdGridMaterial.prototype, "sort", {
|
|
2672
2676
|
set: function (sort) {
|
|
2677
|
+
var _this = this;
|
|
2673
2678
|
if (sort && __classPrivateFieldGet(this, _sort) !== sort) {
|
|
2674
2679
|
__classPrivateFieldSet(this, _sort, sort);
|
|
2675
|
-
__classPrivateFieldGet(this, _subscription$1).add(sort.sortChange.pipe(operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(__classPrivateFieldGet(
|
|
2680
|
+
__classPrivateFieldGet(this, _subscription$1).add(sort.sortChange.pipe(operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(function (filterInfo) { return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, false); })).subscribe(__classPrivateFieldGet(this, _render)));
|
|
2676
2681
|
}
|
|
2677
2682
|
},
|
|
2678
2683
|
enumerable: false,
|
|
@@ -2682,10 +2687,11 @@
|
|
|
2682
2687
|
__classPrivateFieldGet(this, _initCellDef).call(this);
|
|
2683
2688
|
};
|
|
2684
2689
|
SdGridMaterial.prototype.ngAfterViewInit = function () {
|
|
2690
|
+
var _this = this;
|
|
2685
2691
|
__classPrivateFieldGet(this, _subscription$1).add(this.sdCellDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initCellDef)));
|
|
2686
2692
|
__classPrivateFieldGet(this, _subscription$1).add(this.sdFooterDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initFooterDef)));
|
|
2687
2693
|
__classPrivateFieldGet(this, _subscription$1).add(this.sdFilterDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initFilterDef)));
|
|
2688
|
-
__classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _optionChanges).pipe(operators.startWith({}), operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(__classPrivateFieldGet(
|
|
2694
|
+
__classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _optionChanges).pipe(operators.startWith({}), operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(function (filterInfo) { return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, true); })).subscribe(__classPrivateFieldGet(this, _render)));
|
|
2689
2695
|
this.ref.detectChanges();
|
|
2690
2696
|
};
|
|
2691
2697
|
SdGridMaterial.prototype.ngOnDestroy = function () {
|