@sd-angular/core 1.0.4 → 1.0.5

package/bundles/sd-angular-core-grid-material.umd.js

@@ -1837,28 +1837,28 @@
                 var rawColumnFilter = filterInfo.rawColumnFilter, orderBy = filterInfo.orderBy, orderDirection = filterInfo.orderDirection, pageSize = filterInfo.pageSize, pageNumber = filterInfo.pageNumber;
                 var items = localItems.filter(function (item) {
                     var e_4, _t;
-                    var _a, _b;
+                    var _a, _b, _c, _d;
                     try {
                         for (var columns_1 = __values(columns), columns_1_1 = columns_1.next(); !columns_1_1.done; columns_1_1 = columns_1.next()) {
                             var column = columns_1_1.value;
-                            var field = column.field;
+                            var field = column.field, type = column.type;
                             var filterValue = (rawColumnFilter[field] || '').toString().trim().toLowerCase();
                             var 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') {
                                     var fValue = +filterValue.replace('>=', '').replace('<=', '').replace('>', '').replace('<', '');
                                     var cValue = +columnValue;
                                     if (fValue || fValue === 0) {
@@ -1882,7 +1882,7 @@
                                         }
                                     }
                                 }
-                                else if (column.type === 'bool') {
+                                else if (type === 'bool') {
                                     if (filterValue === '1' && columnValue !== '1' && columnValue !== 'true') {
                                         return false;
                                     }
@@ -1890,12 +1890,15 @@
                                         return false;
                                     }
                                 }
-                                else if (column.type === 'datetime' || column.type === 'date' || column.type === 'time') {
-                                    var from = (_a = filterInfo.rawColumnFilter[column.field]) === null || _a === void 0 ? void 0 : _a.from;
-                                    var to = (_b = filterInfo.rawColumnFilter[column.field]) === null || _b === void 0 ? void 0 : _b.to;
+                                else if (type === 'datetime' || type === 'date' || type === 'time') {
+                                    var from = (_b = (_a = rawColumnFilter[field]) === null || _a === void 0 ? void 0 : _a.from) !== null && _b !== void 0 ? _b : rawColumnFilter[field];
+                                    var to = (_d = (_c = rawColumnFilter[field]) === null || _c === void 0 ? void 0 : _c.to) !== null && _d !== void 0 ? _d : rawColumnFilter[field];
                                     var fromDate = Date.begin(from);
                                     var 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;
                                         }
@@ -1942,7 +1945,6 @@
                         }
                     }
                 }
-                console.log(localItems, items, rawColumnFilter);
                 return {
                     items: items.filter(function (item, index) {
                         return index >= pageNumber * pageSize