Merge pull request #720 from XiaoMi/hotfix/1.5.8-datepicker

fix:1970
XiaoMi · Oct 14, 2019 · 82aabc0 · 82aabc0
2 parents f172b8b + 2266342
commit 82aabc0
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 8 deletions.
diff --git a/components/date-picker/BasePicker.js b/components/date-picker/BasePicker.js
@@ -97,7 +97,7 @@ class BasePicker extends Component {
      */
     if (value === '' || !value) {
       // value 未传入情况
-      date = null
+      date = new Date()
       noText = true
     }
     if (typeof value === 'number' || (typeof value === 'string' && value.trim().length > 4)) {
@@ -109,12 +109,16 @@ class BasePicker extends Component {
     }
 
     if (type.includes('range') || type === 'timeperiod') {
-      if (value instanceof Date) {
-        // 如果为时间段选择，则取默认的第一个范围
-        date = {startDate: startOfDay(date), endDate: type === 'timeperiod' ? addHours(startOfDay(date), 4) : endOfDay(date)}
-      }
-      if (value && value.start && value.end) {
-        date = {startDate: value.start, endDate: value.end}
+      if (value) {
+        if (value instanceof Date) {
+          // 如果为时间段选择，则取默认的第一个范围
+          date = {startDate: startOfDay(date), endDate: type === 'timeperiod' ? addHours(startOfDay(date), 4) : endOfDay(date)}
+        }
+        if (value.start && value.end) {
+          date = {startDate: value.start, endDate: value.end}
+        }
+      } else {
+        date = {startDate: new Date(), endDate: new Date()}
       }
     }
     const leftText = noText ? '' : formatterDate(type, date.startDate || date, format, showTime, localeDatas, weekOffset)

diff --git a/components/date-picker/style/index.scss b/components/date-picker/style/index.scss
@@ -350,6 +350,7 @@ $basic-color: #4284f5 !default;
 
     p {
       cursor: pointer;
+      margin: 14px 0;
     }
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/hiui",
-  "version": "1.5.8",
+  "version": "1.5.9",
   "description": "HIUI for React",
   "scripts": {
     "test": "node_modules/.bin/standard && node_modules/.bin/stylelint --config .stylelintrc 'components/**/*.scss'",
-Original file line number
+Diff line change
@@ Expand Up / @@ -350,6 +350,7 @@ $basic-color: #4284f5 !default; @@
         p {
           cursor: pointer;
+          margin: 14px 0;
         }
       }
@@ Expand Down @@