@sd-angular/core 1.0.1 → 1.0.5

package/fesm2015/sd-angular-core-grid-material.js

@@ -1243,26 +1243,28 @@ class SdGridMaterial {
         });
         _filterLocal.set(this, (localItems, filterInfo) => {
             const { columns } = this.gridOption;
+            const { rawColumnFilter, orderBy, orderDirection, pageSize, pageNumber } = filterInfo;
             const items = localItems.filter(item => {
-                var _a, _b;
+                var _a, _b, _c, _d;
                 for (const column of columns) {
-                    const filterValue = (filterInfo.rawColumnFilter[column.field] || '').toString().trim().toLowerCase();
-                    const columnValue = (item[column.field] || '').toString().trim().toLowerCase();
+                    const { field, type } = column;
+                    const filterValue = (rawColumnFilter[field] || '').toString().trim().toLowerCase();
+                    const columnValue = (item[field] || '').toString().trim().toLowerCase();
                     if (filterValue) {
-                        if (!columnValue) {
+                        if (!columnValue && type !== 'datetime' && type !== 'date' && type !== 'time') {
                             return false;
                         }
-                        if (column.type === 'string') {
+                        if (type === 'string') {
                             if (columnValue.indexOf(filterValue) === -1) {
                                 return false;
                             }
                         }
-                        else if (column.type === 'values') {
+                        else if (type === 'values') {
                             if (columnValue !== filterValue) {
                                 return false;
                             }
                         }
-                        else if (column.type === 'number') {
+                        else if (type === 'number') {
                             const fValue = +filterValue.replace('>=', '').replace('<=', '').replace('>', '').replace('<', '');
                             const cValue = +columnValue;
                             if (fValue || fValue === 0) {
@@ -1286,7 +1288,7 @@ class SdGridMaterial {
                                 }
                             }
                         }
-                        else if (column.type === 'bool') {
+                        else if (type === 'bool') {
                             if (filterValue === '1' && columnValue !== '1' && columnValue !== 'true') {
                                 return false;
                             }
@@ -1294,12 +1296,15 @@ class SdGridMaterial {
                                 return false;
                             }
                         }
-                        else if (column.type === 'datetime' || column.type === 'date' || column.type === 'time') {
-                            const from = (_a = filterInfo.rawColumnFilter[column.field]) === null || _a === void 0 ? void 0 : _a.from;
-                            const to = (_b = filterInfo.rawColumnFilter[column.field]) === null || _b === void 0 ? void 0 : _b.to;
+                        else if (type === 'datetime' || type === 'date' || type === 'time') {
+                            const from = (_b = (_a = rawColumnFilter[field]) === null || _a === void 0 ? void 0 : _a.from) !== null && _b !== void 0 ? _b : rawColumnFilter[field];
+                            const to = (_d = (_c = rawColumnFilter[field]) === null || _c === void 0 ? void 0 : _c.to) !== null && _d !== void 0 ? _d : rawColumnFilter[field];
                             const fromDate = Date.begin(from);
                             const toDate = Date.end(to);
                             if (fromDate && toDate) {
+                                if (!columnValue) {
+                                    return false;
+                                }
                                 if (new Date(columnValue).getTime() < fromDate.getTime() || new Date(columnValue).getTime() >= toDate.getTime()) {
                                     return false;
                                 }
@@ -1310,8 +1315,8 @@ class SdGridMaterial {
                 return true;
             });
             // Sort
-            if (filterInfo.orderBy && filterInfo.orderDirection) {
-                const column = columns.find(e => e.field === filterInfo.orderBy);
+            if (orderBy && orderDirection) {
+                const column = columns.find(e => e.field === orderBy);
                 if (column) {
                     const { type, field } = column;
                     items.sort((current, next) => {
@@ -1333,18 +1338,15 @@ class SdGridMaterial {
                         }
                         return 0;
                     });
-                    if (filterInfo.orderDirection === 'desc') {
+                    if (orderDirection === 'desc') {
                         items.reverse();
                     }
                 }
             }
             return {
                 items: items.filter((item, index) => {
-                    var _a, _b, _c, _d;
-                    const pageIndex = ((_a = __classPrivateFieldGet(this, _paginator)) === null || _a === void 0 ? void 0 : _a.pageIndex) || 0;
-                    const 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;
-                    return index >= pageIndex * pageSize
-                        && index < (pageIndex + 1) * pageSize;
+                    return index >= pageNumber * pageSize
+                        && index < (pageNumber + 1) * pageSize;
                 }),
                 total: items.length
             };
@@ -1361,7 +1363,7 @@ class SdGridMaterial {
                 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
             });
         });
-        _load$1.set(this, (filterReq) => __awaiter(this, void 0, void 0, function* () {
+        _load$1.set(this, (filterReq, force = true) => __awaiter(this, void 0, void 0, function* () {
             this.isLoading = true;
             try {
                 if (this.gridOption.type === 'server') {
@@ -1372,12 +1374,14 @@ class SdGridMaterial {
                     return yield result;
                 }
                 else {
-                    const results = this.gridOption.items();
-                    if (results instanceof Promise) {
-                        this.localItems = yield results;
-                    }
-                    else {
-                        this.localItems = results;
+                    if (force) {
+                        const results = this.gridOption.items();
+                        if (results instanceof Promise) {
+                            this.localItems = yield results;
+                        }
+                        else {
+                            this.localItems = results;
+                        }
                     }
                     return __classPrivateFieldGet(this, _filterLocal).call(this, this.localItems, filterReq);
                 }
@@ -1402,8 +1406,8 @@ class SdGridMaterial {
             this.isSelectAll = this.items.every(e => e.isSelected);
             __classPrivateFieldGet(this, _updateSelectedItems).call(this);
         }));
-        this.reload = () => __awaiter(this, void 0, void 0, function* () {
-            const data = yield __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this));
+        this.reload = (force = true) => __awaiter(this, void 0, void 0, function* () {
+            const data = yield __classPrivateFieldGet(this, _load$1).call(this, __classPrivateFieldGet(this, _getFilter).call(this), force);
             __classPrivateFieldGet(this, _render).call(this, data);
         });
         _exportedItems.set(this, (pageNumber = 0, pageSize = 10000) => __awaiter(this, void 0, void 0, function* () {
@@ -1655,7 +1659,7 @@ class SdGridMaterial {
         });
         this.onFilterChange = () => {
             __classPrivateFieldGet(this, _paginator).pageIndex = 0;
-            this.reload();
+            this.reload(false);
         };
         this.onExpand = (rowData) => __awaiter(this, void 0, void 0, function* () {
             var _q, _r, _s;
@@ -1901,7 +1905,7 @@ class SdGridMaterial {
             __classPrivateFieldGet(this, _subscription$1).add(gridFilter.filterChange.pipe(debounceTime(200), map(() => {
                 __classPrivateFieldGet(this, _paginator).pageIndex = 0;
                 return __classPrivateFieldGet(this, _getFilter).call(this);
-            }), switchMap(__classPrivateFieldGet(this, _load$1))).subscribe(__classPrivateFieldGet(this, _render)));
+            }), switchMap(filterInfo => __classPrivateFieldGet(this, _load$1).call(this, filterInfo, false))).subscribe(__classPrivateFieldGet(this, _render)));
         }
     }
     set option(option) {
@@ -1924,13 +1928,13 @@ class SdGridMaterial {
     set paginator(paginator) {
         if (paginator && __classPrivateFieldGet(this, _paginator) !== paginator) {
             __classPrivateFieldSet(this, _paginator, paginator);
-            __classPrivateFieldGet(this, _subscription$1).add(paginator.page.pipe(debounceTime(200), map(__classPrivateFieldGet(this, _getFilter)), switchMap(__classPrivateFieldGet(this, _load$1))).subscribe(__classPrivateFieldGet(this, _render)));
+            __classPrivateFieldGet(this, _subscription$1).add(paginator.page.pipe(debounceTime(200), map(__classPrivateFieldGet(this, _getFilter)), switchMap(filterInfo => __classPrivateFieldGet(this, _load$1).call(this, filterInfo, false))).subscribe(__classPrivateFieldGet(this, _render)));
         }
     }
     set sort(sort) {
         if (sort && __classPrivateFieldGet(this, _sort) !== sort) {
             __classPrivateFieldSet(this, _sort, sort);
-            __classPrivateFieldGet(this, _subscription$1).add(sort.sortChange.pipe(debounceTime(200), map(__classPrivateFieldGet(this, _getFilter)), switchMap(__classPrivateFieldGet(this, _load$1))).subscribe(__classPrivateFieldGet(this, _render)));
+            __classPrivateFieldGet(this, _subscription$1).add(sort.sortChange.pipe(debounceTime(200), map(__classPrivateFieldGet(this, _getFilter)), switchMap(filterInfo => __classPrivateFieldGet(this, _load$1).call(this, filterInfo, false))).subscribe(__classPrivateFieldGet(this, _render)));
         }
     }
     ngOnInit() {
@@ -1940,7 +1944,7 @@ class SdGridMaterial {
         __classPrivateFieldGet(this, _subscription$1).add(this.sdCellDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initCellDef)));
         __classPrivateFieldGet(this, _subscription$1).add(this.sdFooterDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initFooterDef)));
         __classPrivateFieldGet(this, _subscription$1).add(this.sdFilterDefs.changes.pipe(startWith([])).subscribe(__classPrivateFieldGet(this, _initFilterDef)));
-        __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _optionChanges).pipe(startWith({}), debounceTime(200), map(__classPrivateFieldGet(this, _getFilter)), switchMap(__classPrivateFieldGet(this, _load$1))).subscribe(__classPrivateFieldGet(this, _render)));
+        __classPrivateFieldGet(this, _subscription$1).add(__classPrivateFieldGet(this, _optionChanges).pipe(startWith({}), debounceTime(200), map(__classPrivateFieldGet(this, _getFilter)), switchMap(filterInfo => __classPrivateFieldGet(this, _load$1).call(this, filterInfo, true))).subscribe(__classPrivateFieldGet(this, _render)));
         this.ref.detectChanges();
     }
     ngOnDestroy() {