Skip to content

Commit 14bcfba

Browse files
committed
fix #1184
1 parent f932c6d commit 14bcfba

File tree

1 file changed

+31
-10
lines changed

1 file changed

+31
-10
lines changed

src/store/TableDataStore.js

Lines changed: 31 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -303,17 +303,22 @@ export class TableDataStore {
303303
}
304304

305305
filterDate(targetVal, filterVal, comparator) {
306-
// if (!targetVal) {
307-
// return false;
308-
// }
309-
// return (targetVal.getDate() === filterVal.getDate() &&
310-
// targetVal.getMonth() === filterVal.getMonth() &&
311-
// targetVal.getFullYear() === filterVal.getFullYear());
306+
if (!targetVal) return false;
307+
308+
const filterDate = filterVal.getDate();
309+
const filterMonth = filterVal.getMonth();
310+
const filterYear = filterVal.getFullYear();
311+
312+
const targetDate = targetVal.getDate();
313+
const targetMonth = targetVal.getMonth();
314+
const targetYear = targetVal.getFullYear();
312315

313316
let valid = true;
314317
switch (comparator) {
315318
case '=': {
316-
if (targetVal != filterVal) {
319+
if (filterDate !== targetDate ||
320+
filterMonth !== targetMonth ||
321+
filterYear !== targetYear) {
317322
valid = false;
318323
}
319324
break;
@@ -325,7 +330,14 @@ export class TableDataStore {
325330
break;
326331
}
327332
case '>=': {
328-
if (targetVal < filterVal) {
333+
if (targetYear < filterYear) {
334+
valid = false;
335+
} else if (targetYear === filterYear &&
336+
targetMonth < filterMonth) {
337+
valid = false;
338+
} else if (targetYear === filterYear &&
339+
targetMonth === filterMonth &&
340+
targetDate < filterDate) {
329341
valid = false;
330342
}
331343
break;
@@ -337,13 +349,22 @@ export class TableDataStore {
337349
break;
338350
}
339351
case '<=': {
340-
if (targetVal > filterVal) {
352+
if (targetYear > filterYear) {
353+
valid = false;
354+
} else if (targetYear === filterYear &&
355+
targetMonth > filterMonth) {
356+
valid = false;
357+
} else if (targetYear === filterYear &&
358+
targetMonth === filterMonth &&
359+
targetDate > filterDate) {
341360
valid = false;
342361
}
343362
break;
344363
}
345364
case '!=': {
346-
if (targetVal == filterVal) {
365+
if (filterDate === targetDate &&
366+
filterMonth === targetMonth &&
367+
filterYear === targetYear) {
347368
valid = false;
348369
}
349370
break;

0 commit comments

Comments
 (0)