对异常值''，null，undefined进行判断

uxcore · Dec 8, 2017 · face752 · face752
1 parent 94511dc
commit face752
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/HISTORY.md b/HISTORY.md
@@ -1,3 +1,7 @@
+# 0.1.8
+* `CHANGED` undefined/null/''  return ''  
+* because they are all invalid value for date.
+
 # 0.1.7
 * `CHANGED` null check
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "uxcore-formatter",
- "version": "0.1.7",
+ "version": "0.1.8",
  "description": "a formatter library for uxcore",
  "repository": "https://github.com/uxcore/uxcore-formatter.git",
  "author": "eternalsky",

diff --git a/src/Formatter.js b/src/Formatter.js
@@ -10,8 +10,9 @@
 const Formatter = {};
 
 Formatter.date = (str, pattern) => {
-  // new Date(null) 会返回最初日期。
-  if(str == null){
+  // new Date(null,false) 会返回最初日期。
+  if (str === null || str === false || str === undefined || str === '') {
+    console.warn('Formatter: invalid date');
     return '';
   }
   const date = new Date(str);

diff --git a/tests/Formatter.spec.js b/tests/Formatter.spec.js
@@ -23,6 +23,9 @@ describe('Formatter.date', () => {
 
   it('returns empty string when date is null', () => {
     expect(Formatter.date(null, 'YYYY-MM-DD')).to.be('');
+    expect(Formatter.date(undefined, 'YYYY-MM-DD')).to.be('');
+    expect(Formatter.date(false, 'YYYY-MM-DD')).to.be('');
+    expect(Formatter.date('', 'YYYY-MM-DD')).to.be('');
   });
 
   it('works fine', () => {