修改datetimepicker

zcoding · zcoding · commit 96a433a89072 · 2015-12-10T11:52:18.000+08:00
diff --git a/examples/app/views/dtpicker.vue b/examples/app/views/dtpicker.vue
@@ -4,10 +4,16 @@
   <column v-bind:sm="12">
     <p>{{ myDate1 | formatDate 'yyyy年MM月dd日,星期D hh:mm' }}</p>
   </column>
-  <column v-bind:sm="12">
+  <column v-bind:sm="3">
     <date-time-picker v-bind:date-time.sync="myDate1"></date-time-picker>
   </column>
-  <column v-bind:sm="4">
+  <column v-bind:sm="3">
+    <date-time-picker v-bind:date-time.sync="myDate1" v-bind:show-time-picker="false"></date-time-picker>
+  </column>
+  <column v-bind:sm="3">
+    <date-time-picker v-bind:date-time.sync="myDate1" v-bind:show-date-picker="false"></date-time-picker>
+  </column>
+  <column v-bind:sm="3">
     <date-time-input v-bind:date-time.sync="myDate2"></date-time-input>
   </column>
 </grid>
diff --git a/src/datetimepicker/datetimepicker.vue b/src/datetimepicker/datetimepicker.vue
@@ -11,7 +11,7 @@
   <div class="am-datepicker-toggle" v-if="showDatePicker&&showTimePicker" v-show="show.date" v-on:click="handleToggleTime">
     <icon name="clock-o"></icon>
   </div>
-  <div class="am-datepicker-toggle" v-if="showTimePicker&&showTimePicker" v-show="show.time" v-on:click="handleToggleDate">
+  <div class="am-datepicker-toggle" v-if="showDatePicker&&showTimePicker" v-show="show.time" v-on:click="handleToggleDate">
     <icon name="calendar"></icon>
   </div>
 </div>
@@ -88,6 +88,11 @@ export default {
     }
   },
 
+  compiled() {
+    this.show.date = this.showDatePicker;
+    this.show.time = !this.showDatePicker && this.showTimePicker;
+  },
+
   data() {
     return {
       show: {
@@ -115,7 +120,8 @@ export default {
     },
 
     handleViewChange(show) {
-      this.show = show;
+      this.show.date = show.date && this.showDatePicker;
+      this.show.time = show.time || !this.showDatePicker && this.showTimePicker;
     }
   }
 
diff --git a/src/datetimepicker/timepicker.vue b/src/datetimepicker/timepicker.vue
@@ -42,25 +42,21 @@ export default {
 
   props: {
     selectedDate: {
+      type: Date,
       twoWay: true,
-      default() {
-        return new Date();
-      }
+      required: true
     }
   },
 
-  created() {
-    this.viewDate = new Date(this.selectedDate.valueOf());
-  },
-
   data() {
+    var viewDate = new Date(this.selectedDate.valueOf());
     return {
       show: {
         wrapper: true,
         hours: false,
         minutes: false
       },
-      viewDate: new Date()
+      viewDate: viewDate
     };
   },
 
