@sd-angular/core 1.0.1 → 1.0.5

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 (22) hide show
  1. package/bundles/sd-angular-core-grid-material.umd.js +87 -75
  2. package/bundles/sd-angular-core-grid-material.umd.js.map +1 -1
  3. package/bundles/sd-angular-core-grid-material.umd.min.js +1 -1
  4. package/bundles/sd-angular-core-grid-material.umd.min.js.map +1 -1
  5. package/bundles/sd-angular-core-grid.umd.js +4 -123
  6. package/bundles/sd-angular-core-grid.umd.js.map +1 -1
  7. package/bundles/sd-angular-core-grid.umd.min.js +1 -1
  8. package/bundles/sd-angular-core-grid.umd.min.js.map +1 -1
  9. package/esm2015/grid/src/lib/grid.module.js +1 -3
  10. package/esm2015/grid/src/public-api.js +1 -2
  11. package/esm2015/grid-material/src/lib/grid-material.component.js +38 -34
  12. package/fesm2015/sd-angular-core-grid-material.js +37 -33
  13. package/fesm2015/sd-angular-core-grid-material.js.map +1 -1
  14. package/fesm2015/sd-angular-core-grid.js +1 -113
  15. package/fesm2015/sd-angular-core-grid.js.map +1 -1
  16. package/grid/sd-angular-core-grid.metadata.json +1 -1
  17. package/grid/src/public-api.d.ts +0 -1
  18. package/grid-material/src/lib/grid-material.component.d.ts +1 -1
  19. package/package.json +1 -1
  20. package/{sd-angular-core-1.0.1.tgz → sd-angular-core-1.0.5.tgz} +0 -0
  21. package/esm2015/grid/src/lib/components/grid-date-picker-control/grid-date-picker-control.component.js +0 -114
  22. package/grid/src/lib/components/grid-date-picker-control/grid-date-picker-control.component.d.ts +0 -23
package/bundles/sd-angular-core-grid-material.umd.js CHANGED
@@ -1834,29 +1834,31 @@
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
- var _a, _b;
1840
+ var _a, _b, _c, _d;
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 filterValue = (filterInfo.rawColumnFilter[column.field] || '').toString().trim().toLowerCase();
1844
- var columnValue = (item[column.field] || '').toString().trim().toLowerCase();
1844
+ var field = column.field, type = column.type;
1845
+ var filterValue = (rawColumnFilter[field] || '').toString().trim().toLowerCase();
1846
+ var columnValue = (item[field] || '').toString().trim().toLowerCase();
1845
1847
  if (filterValue) {
1846
- if (!columnValue) {
1848
+ if (!columnValue && type !== 'datetime' && type !== 'date' && type !== 'time') {
1847
1849
  return false;
1848
1850
  }
1849
- if (column.type === 'string') {
1851
+ if (type === 'string') {
1850
1852
  if (columnValue.indexOf(filterValue) === -1) {
1851
1853
  return false;
1852
1854
  }
1853
1855
  }
1854
- else if (column.type === 'values') {
1856
+ else if (type === 'values') {
1855
1857
  if (columnValue !== filterValue) {
1856
1858
  return false;
1857
1859
  }
1858
1860
  }
1859
- else if (column.type === 'number') {
1861
+ else if (type === 'number') {
1860
1862
  var fValue = +filterValue.replace('>=', '').replace('<=', '').replace('>', '').replace('<', '');
1861
1863
  var cValue = +columnValue;
1862
1864
  if (fValue || fValue === 0) {
@@ -1880,7 +1882,7 @@
1880
1882
  }
1881
1883
  }
1882
1884
  }
1883
- else if (column.type === 'bool') {
1885
+ else if (type === 'bool') {
1884
1886
  if (filterValue === '1' && columnValue !== '1' && columnValue !== 'true') {
1885
1887
  return false;
1886
1888
  }
@@ -1888,12 +1890,15 @@
1888
1890
  return false;
1889
1891
  }
1890
1892
  }
1891
- else if (column.type === 'datetime' || column.type === 'date' || column.type === 'time') {
1892
- var from = (_a = filterInfo.rawColumnFilter[column.field]) === null || _a === void 0 ? void 0 : _a.from;
1893
- var to = (_b = filterInfo.rawColumnFilter[column.field]) === null || _b === void 0 ? void 0 : _b.to;
1893
+ else if (type === 'datetime' || type === 'date' || type === 'time') {
1894
+ var from = (_b = (_a = rawColumnFilter[field]) === null || _a === void 0 ? void 0 : _a.from) !== null && _b !== void 0 ? _b : rawColumnFilter[field];
1895
+ var to = (_d = (_c = rawColumnFilter[field]) === null || _c === void 0 ? void 0 : _c.to) !== null && _d !== void 0 ? _d : rawColumnFilter[field];
1894
1896
  var fromDate = Date.begin(from);
1895
1897
  var toDate = Date.end(to);
1896
1898
  if (fromDate && toDate) {
1899
+ if (!columnValue) {
1900
+ return false;
1901
+ }
1897
1902
  if (new Date(columnValue).getTime() < fromDate.getTime() || new Date(columnValue).getTime() >= toDate.getTime()) {
1898
1903
  return false;
1899
1904
  }
@@ -1912,8 +1917,8 @@
1912
1917
  return true;
1913
1918
  });
1914
1919
  // Sort
1915
- if (filterInfo.orderBy && filterInfo.orderDirection) {
1916
- var column = columns.find(function (e) { return e.field === filterInfo.orderBy; });
1920
+ if (orderBy && orderDirection) {
1921
+ var column = columns.find(function (e) { return e.field === orderBy; });
1917
1922
  if (column) {
1918
1923
  var type_1 = column.type, field_1 = column.field;
1919
1924
  items.sort(function (current, next) {
@@ -1935,18 +1940,15 @@
1935
1940
  }
1936
1941
  return 0;
1937
1942
  });
1938
- if (filterInfo.orderDirection === 'desc') {
1943
+ if (orderDirection === 'desc') {
1939
1944
  items.reverse();
1940
1945
  }
1941
1946
  }
1942
1947
  }
1943
1948
  return {
1944
1949
  items: items.filter(function (item, index) {
1945
- var _a, _b, _c, _d;
1946
- var pageIndex = ((_a = __classPrivateFieldGet(_this, _paginator)) === null || _a === void 0 ? void 0 : _a.pageIndex) || 0;
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;
1950
+ return index >= pageNumber * pageSize
1951
+ && index < (pageNumber + 1) * pageSize;
1950
1952
  }),
1951
1953
  total: items.length
1952
1954
  };
@@ -1963,47 +1965,51 @@
1963
1965
  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
1966
  });
1965
1967
  });
1966
- _load$1.set(this, function (filterReq) { return __awaiter(_this, void 0, void 0, function () {
1967
- var result, results, _t, error_1;
1968
- return __generator(this, function (_u) {
1969
- switch (_u.label) {
1970
- case 0:
1971
- this.isLoading = true;
1972
- _u.label = 1;
1973
- case 1:
1974
- _u.trys.push([1, 8, 9, 10]);
1975
- if (!(this.gridOption.type === 'server')) return [3 /*break*/, 3];
1976
- result = this.gridOption.items(filterReq);
1977
- if (rxjs.isObservable(result)) {
1978
- result = result.toPromise();
1979
- }
1980
- return [4 /*yield*/, result];
1981
- case 2: return [2 /*return*/, _u.sent()];
1982
- case 3:
1983
- results = this.gridOption.items();
1984
- if (!(results instanceof Promise)) return [3 /*break*/, 5];
1985
- _t = this;
1986
- return [4 /*yield*/, results];
1987
- case 4:
1988
- _t.localItems = _u.sent();
1989
- return [3 /*break*/, 6];
1990
- case 5:
1991
- this.localItems = results;
1992
- _u.label = 6;
1993
- case 6: return [2 /*return*/, __classPrivateFieldGet(this, _filterLocal).call(this, this.localItems, filterReq)];
1994
- case 7: return [3 /*break*/, 10];
1995
- case 8:
1996
- error_1 = _u.sent();
1997
- this.notifyService.handle.error(error_1);
1998
- return [3 /*break*/, 10];
1999
- case 9:
2000
- this.isLoading = false;
2001
- this.ref.detectChanges();
2002
- return [7 /*endfinally*/];
2003
- case 10: return [2 /*return*/];
2004
- }
1968
+ _load$1.set(this, function (filterReq, force) {
1969
+ if (force === void 0) { force = true; }
1970
+ return __awaiter(_this, void 0, void 0, function () {
1971
+ var result, results, _t, error_1;
1972
+ return __generator(this, function (_u) {
1973
+ switch (_u.label) {
1974
+ case 0:
1975
+ this.isLoading = true;
1976
+ _u.label = 1;
1977
+ case 1:
1978
+ _u.trys.push([1, 8, 9, 10]);
1979
+ if (!(this.gridOption.type === 'server')) return [3 /*break*/, 3];
1980
+ result = this.gridOption.items(filterReq);
1981
+ if (rxjs.isObservable(result)) {
1982
+ result = result.toPromise();
1983
+ }
1984
+ return [4 /*yield*/, result];
1985
+ case 2: return [2 /*return*/, _u.sent()];
1986
+ case 3:
1987
+ if (!force) return [3 /*break*/, 6];
1988
+ results = this.gridOption.items();
1989
+ if (!(results instanceof Promise)) return [3 /*break*/, 5];
1990
+ _t = this;
1991
+ return [4 /*yield*/, results];
1992
+ case 4:
1993
+ _t.localItems = _u.sent();
1994
+ return [3 /*break*/, 6];
1995
+ case 5:
1996
+ this.localItems = results;
1997
+ _u.label = 6;
1998
+ case 6: return [2 /*return*/, __classPrivateFieldGet(this, _filterLocal).call(this, this.localItems, filterReq)];
1999
+ case 7: return [3 /*break*/, 10];
2000
+ case 8:
2001
+ error_1 = _u.sent();
2002
+ this.notifyService.handle.error(error_1);
2003
+ return [3 /*break*/, 10];
2004
+ case 9:
2005
+ this.isLoading = false;
2006
+ this.ref.detectChanges();
2007
+ return [7 /*endfinally*/];
2008
+ case 10: return [2 /*return*/];
2009
+ }
2010
+ });
2005
2011
  });
2006
- }); });
2012
+ });
2007
2013
  _render.set(this, function (args) { return __awaiter(_this, void 0, void 0, function () {
2008
2014
  var _a, _b, _c;
2009
2015
  return __generator(this, function (_t) {
@@ -2024,18 +2030,21 @@
2024
2030
  }
2025
2031
  });
2026
2032
  }); });
2027
- this.reload = function () { return __awaiter(_this, void 0, void 0, function () {
2028
- var data;
2029
- return __generator(this, function (_t) {
2030
- switch (_t.label) {
2031
- case 0: return [4 /*yield*/, __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this))];
2032
- case 1:
2033
- data = _t.sent();
2034
- __classPrivateFieldGet(this, _render).call(this, data);
2035
- return [2 /*return*/];
2036
- }
2033
+ this.reload = function (force) {
2034
+ if (force === void 0) { force = true; }
2035
+ return __awaiter(_this, void 0, void 0, function () {
2036
+ var data;
2037
+ return __generator(this, function (_t) {
2038
+ switch (_t.label) {
2039
+ case 0: return [4 /*yield*/, __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this), force)];
2040
+ case 1:
2041
+ data = _t.sent();
2042
+ __classPrivateFieldGet(this, _render).call(this, data);
2043
+ return [2 /*return*/];
2044
+ }
2045
+ });
2037
2046
  });
2038
- }); };
2047
+ };
2039
2048
  _exportedItems.set(this, function (pageNumber, pageSize) {
2040
2049
  if (pageNumber === void 0) { pageNumber = 0; }
2041
2050
  if (pageSize === void 0) { pageSize = 10000; }
@@ -2366,7 +2375,7 @@
2366
2375
  }); };
2367
2376
  this.onFilterChange = function () {
2368
2377
  __classPrivateFieldGet(_this, _paginator).pageIndex = 0;
2369
- _this.reload();
2378
+ _this.reload(false);
2370
2379
  };
2371
2380
  this.onExpand = function (rowData) { return __awaiter(_this, void 0, void 0, function () {
2372
2381
  var _q, _r, _s, data;
@@ -2630,7 +2639,7 @@
2630
2639
  __classPrivateFieldGet(this, _subscription$1).add(gridFilter.filterChange.pipe(operators.debounceTime(200), operators.map(function () {
2631
2640
  __classPrivateFieldGet(_this, _paginator).pageIndex = 0;
2632
2641
  return __classPrivateFieldGet(_this, _getFilter).call(_this);
2633
- }), operators.switchMap(__classPrivateFieldGet(this, _load$1))).subscribe(__classPrivateFieldGet(this, _render)));
2642
+ }), operators.switchMap(function (filterInfo) { return __classPrivateFieldGet(_this, _load$1).call(_this, filterInfo, false); })).subscribe(__classPrivateFieldGet(this, _render)));
2634
2643
  }
2635
2644
  },
2636
2645
  enumerable: false,
@@ -2660,9 +2669,10 @@
2660
2669
  });
2661
2670
  Object.defineProperty(SdGridMaterial.prototype, "paginator", {
2662
2671
  set: function (paginator) {
2672
+ var _this = this;
2663
2673
  if (paginator && __classPrivateFieldGet(this, _paginator) !== paginator) {
2664
2674
  __classPrivateFieldSet(this, _paginator, paginator);
2665
- __classPrivateFieldGet(this, _subscription$1).add(paginator.page.pipe(operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(__classPrivateFieldGet(this, _load$1))).subscribe(__classPrivateFieldGet(this, _render)));
2675
+ __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
2676
  }
2667
2677
  },
2668
2678
  enumerable: false,
@@ -2670,9 +2680,10 @@
2670
2680
  });
2671
2681
  Object.defineProperty(SdGridMaterial.prototype, "sort", {
2672
2682
  set: function (sort) {
2683
+ var _this = this;
2673
2684
  if (sort && __classPrivateFieldGet(this, _sort) !== sort) {
2674
2685
  __classPrivateFieldSet(this, _sort, sort);
2675
- __classPrivateFieldGet(this, _subscription$1).add(sort.sortChange.pipe(operators.debounceTime(200), operators.map(__classPrivateFieldGet(this, _getFilter)), operators.switchMap(__classPrivateFieldGet(this, _load$1))).subscribe(__classPrivateFieldGet(this, _render)));
2686
+ __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
2687
  }
2677
2688
  },
2678
2689
  enumerable: false,
@@ -2682,10 +2693,11 @@
2682
2693
  __classPrivateFieldGet(this, _initCellDef).call(this);
2683
2694
  };
2684
2695
  SdGridMaterial.prototype.ngAfterViewInit = function () {
2696
+ var _this = this;
2685
2697
  __classPrivateFieldGet(this, _subscription$1).add(this.sdCellDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initCellDef)));
2686
2698
  __classPrivateFieldGet(this, _subscription$1).add(this.sdFooterDefs.changes.pipe(operators.startWith([])).subscribe(__classPrivateFieldGet(this, _initFooterDef)));
2687
2699
  __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(this, _load$1))).subscribe(__classPrivateFieldGet(this, _render)));
2700
+ __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
2701
  this.ref.detectChanges();
2690
2702
  };
2691
2703
  SdGridMaterial.prototype.ngOnDestroy = function () {