Merge pull request #2120 from SergioCrisostomo/fix-2119

correct behaviour when initialising date-picker with a empty string

Merge pull request #2120 from SergioCrisostomo/fix-2119
correct behaviour when initialising date-picker with a empty string
Aresn · GitHub
2 parents 3c6d8eab 5d1c24c7
Showing 2 changed files with 29 additions and 14 deletions Show diff stats
src/components/date-picker/picker.vue
test/unit/specs/date-picker.spec.js
@@ -517,7 +517,7 @@
                         val = val.join(RANGE_SEPARATOR);
                         val = parser(val, this.format || DEFAULT_FORMATS[type]);
                     } else if (typeof val === 'string' && type.indexOf('time') !== 0 ){
-                        val = parser(val, this.format || DEFAULT_FORMATS[type]);
+                        val = parser(val, this.format || DEFAULT_FORMATS[type]) || val;
                     }
                     this.internalValue = val;
@@ -103,19 +103,19 @@ describe(&#39;DatePicker.vue&#39;, () =&gt; {
       vm.dateType = 'year';
       promissedTick(picker)
-		.then(() => {
-          expect(picker.type).to.equal('year');
-          expect(picker.selectionMode).to.equal('year');
-
-          vm.dateType = 'date';
-          return promissedTick(picker);
-        })
-		.then(() => {
-          expect(picker.type).to.equal('date');
-          expect(picker.selectionMode).to.equal('day');
-
-          done();
-        });
+          .then(() => {
+            expect(picker.type).to.equal('year');
+            expect(picker.selectionMode).to.equal('year');
+
+            vm.dateType = 'date';
+            return promissedTick(picker);
+          })
+          .then(() => {
+            expect(picker.type).to.equal('date');
+            expect(picker.selectionMode).to.equal('day');
+
+            done();
+          });
     });
   });
@@ -176,4 +176,19 @@ describe(&#39;DatePicker.vue&#39;, () =&gt; {
       });
     });
   });
+
+  it('should accept a empty string as input v-model value', done => {
+    vm = createVue({
+      template: '<date-picker v-model="value" type="date"></date-picker>',
+      data(){
+        return {value: ''};
+      }
+    });
+
+    vm.$nextTick(() => {
+      expect(vm.value).to.equal('');
+      done();
+    });
+  });
+
 });