fix(date-picker): min update didi#256

swvv · Jul 31, 2018 · 4a89d1d · 4a89d1d
1 parent 3556149
commit 4a89d1d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/components/date-picker/date-picker.vue b/src/components/date-picker/date-picker.vue
@@ -154,7 +154,7 @@
             return this.valueArray[i] && item.value === this.valueArray[i]
           })
           selectedIndex[i] = index !== -1 ? index : 0
-          data = data[selectedIndex[i]].children
+          data = data[selectedIndex[i]] && data[selectedIndex[i]].children
         }
 
         return selectedIndex
@@ -189,7 +189,7 @@
         }
         if (count < this.columnCount - 1 && i < 5) {
           (item.children || item).forEach(subItem => {
-            !subItem.children && this._generateData(i + 1, count + 1, subItem)
+            (!subItem.children || subItem.isMin || subItem.isMax) && this._generateData(i + 1, count + 1, subItem)
           })
         }
       },