npm - @sd-angular/core - Versions diffs - 0.0.955 → 0.0.956 - Mend

@sd-angular/core 0.0.955 → 0.0.956

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 (9) hide show

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

@@ -1788,6 +1788,7 @@
                 var columns = _this.gridOption.columns;
                 var items = localItems.filter(function (item) {
                     var e_4, _t;
+                    var _a, _b;
                     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;
@@ -1802,6 +1803,11 @@
                                         return false;
                                     }
                                 }
+                                else if (column.type === 'values') {
+                                    if (columnValue !== filterValue) {
+                                        return false;
+                                    }
+                                }
                                 else if (column.type === 'number') {
                                     var fValue = +filterValue.replace('>=', '').replace('<=', '').replace('>', '').replace('<', '');
                                     var cValue = +columnValue;
@@ -1835,12 +1841,14 @@
                                     }
                                 }
                                 else if (column.type === 'date' || column.type === 'datetime') {
-                                    var date = Date.toFormat(filterValue, 'MM/yyyy/dd');
-                                    var fromDate = new Date(date);
-                                    var toDate = new Date(date);
-                                    toDate.setDate(toDate.getDate() + 1);
-                                    if (new Date(columnValue).getTime() < fromDate.getTime() || new Date(columnValue).getTime() >= toDate.getTime()) {
-                                        return false;
+                                    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;
+                                    var fromDate = Date.begin(from);
+                                    var toDate = Date.end(to);
+                                    if (!fromDate || !toDate) {
+                                        if (new Date(columnValue).getTime() < fromDate.getTime() || new Date(columnValue).getTime() >= toDate.getTime()) {
+                                            return false;
+                                        }
                                     }
                                 }
                             }