drip-public/iview
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update TimePicker

Browse source 
update TimePicker
This commit is contained in:
梁灏 2016-12-29 18:09:16 +08:00
parent 4db5926d6b
commit d596b9e4f8
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/date-picker/panel/time-range.vue
View file

@ -30,6 +30,7 @@
@on-pick-click="handlePickClick"></time-spinner> @on-pick-click="handlePickClick"></time-spinner>
</div> </div>
<Confirm <Confirm
v-if="confirm"
@on-pick-clear="handlePickClear" @on-pick-clear="handlePickClear"
@on-pick-success="handlePickSuccess"></Confirm> @on-pick-success="handlePickSuccess"></Confirm>
</div> </div>
@ -66,7 +67,8 @@
disabledHours: [], disabledHours: [],
disabledMinutes: [], disabledMinutes: [],
disabledSeconds: [], disabledSeconds: [],
hideDisabledOptions: false hideDisabledOptions: false,
confirm: false
}; };
}, },
computed: { computed: {

4
src/components/date-picker/panel/time.vue
View file

@ -15,6 +15,7 @@
@on-pick-click="handlePickClick"></time-spinner> @on-pick-click="handlePickClick"></time-spinner>
</div> </div>
<Confirm <Confirm
v-if="confirm"
@on-pick-clear="handlePickClear" @on-pick-clear="handlePickClear"
@on-pick-success="handlePickSuccess"></Confirm> @on-pick-success="handlePickSuccess"></Confirm>
</div> </div>
@ -47,7 +48,8 @@
disabledHours: [], disabledHours: [],
disabledMinutes: [], disabledMinutes: [],
disabledSeconds: [], disabledSeconds: [],
hideDisabledOptions: false hideDisabledOptions: false,
confirm: false
}; };
}, },
computed: { computed: {

4
src/styles/components/time-picker.less
View file

@ -18,10 +18,10 @@
border-left: 1px solid @border-color-split; border-left: 1px solid @border-color-split;
&:first-child{ &:first-child{
border-left: none; border-left: none;
border-radius: @btn-border-radius 0 0 0; border-radius: @btn-border-radius 0 0 @btn-border-radius;
} }
&:last-child{ &:last-child{
border-radius: 0 @btn-border-radius 0 0; border-radius: 0 @btn-border-radius @btn-border-radius 0;
} }
ul{ ul{
width: 100%; width: 100%;

8
test/routers/date.vue
View file

@ -24,7 +24,7 @@
<!--style="width: 168px"></time-picker>--> <!--style="width: 168px"></time-picker>-->
<!--</i-col>--> <!--</i-col>-->
<i-col span="12"> <i-col span="12">
<Time-picker type="time" :value="value" placeholder="选择时间" style="width: 168px"></Time-picker> <Time-picker type="timerange" confirm placeholder="选择时间" style="width: 168px"></Time-picker>
<!--<time-picker--> <!--<time-picker-->
<!--:value="value2"--> <!--:value="value2"-->
<!--type="timerange"--> <!--type="timerange"-->
@ -36,6 +36,7 @@
<!--@on-clear="clear"--> <!--@on-clear="clear"-->
<!--style="width: 168px"></time-picker>--> <!--style="width: 168px"></time-picker>-->
</i-col> </i-col>
<i-button @click="time">time</i-button>
</row> </row>
</template> </template>
<script> <script>
@ -43,7 +44,7 @@
data () { data () {
return { return {
// value: '2016-12-12 03:03:03', // value: '2016-12-12 03:03:03',
value: '15:12:01', value: '03:12:01',
value2: ['08:40:00', '09:40:00'], value2: ['08:40:00', '09:40:00'],
// value2: [new Date(), new Date()], // value2: [new Date(), new Date()],
value3: ['2016-12-01', '2016-12-25'] value3: ['2016-12-01', '2016-12-25']
@ -60,6 +61,9 @@
}, },
clear () { clear () {
console.log('clear'); console.log('clear');
},
time () {
this.value = new Date();
} }
} }
} }