{props.renderFooter()}
{showToday || props.timePicker || showOkButton ? (
-
+
@@ -618,7 +605,7 @@ const RangeCalendar = createReactClass({
)
},
-})
+}
export default RangeCalendar
diff --git a/components/vc-calendar/src/calendar/CalendarFooter.vue b/components/vc-calendar/src/calendar/CalendarFooter.vue
index 27ca42d8a..462d69865 100644
--- a/components/vc-calendar/src/calendar/CalendarFooter.vue
+++ b/components/vc-calendar/src/calendar/CalendarFooter.vue
@@ -19,6 +19,11 @@ const CalendarFooter = {
value: PropTypes.object,
renderFooter: PropTypes.func,
defaultValue: PropTypes.object,
+ locale: PropTypes.object,
+ showToday: PropTypes.bool.def(true),
+ disabledDate: PropTypes.func,
+ showTimePicker: PropTypes.bool,
+ okDisabled: PropTypes.bool,
},
methods: {
onSelect (value) {
@@ -44,16 +49,17 @@ const CalendarFooter = {
},
on: $listeners,
}
- let nowEl
+ console.log(props)
+ let nowEl = null
if (showToday) {
nowEl =
}
delete btnProps.props.value
- let okBtn
+ let okBtn = null
if (showOk === true || showOk !== false && !!timePicker) {
okBtn =
}
- let timePickerBtn
+ let timePickerBtn = null
if (timePicker) {
timePickerBtn =
}
@@ -61,7 +67,7 @@ const CalendarFooter = {
let footerBtn
if (nowEl || timePickerBtn || okBtn) {
footerBtn = ()
}
const cls = {
diff --git a/components/vc-calendar/src/calendar/CalendarHeader.vue b/components/vc-calendar/src/calendar/CalendarHeader.vue
index d7915b08f..6490082cc 100644
--- a/components/vc-calendar/src/calendar/CalendarHeader.vue
+++ b/components/vc-calendar/src/calendar/CalendarHeader.vue
@@ -5,7 +5,7 @@ import { getOptionProps } from '@/components/_util/props-util'
import MonthPanel from '../month/MonthPanel'
import YearPanel from '../year/YearPanel'
import DecadePanel from '../decade/DecadePanel'
-
+function noop () {}
function goMonth (direction) {
const next = this.value.clone()
next.add(direction, 'months')
@@ -75,7 +75,7 @@ const CalendarHeader = {
const year = (
this.showYearPanel('date')}
+ onClick={showTimePicker ? noop : () => this.showYearPanel('date')}
title={locale.yearSelect}
>
{value.format(locale.yearFormat)}
@@ -83,7 +83,7 @@ const CalendarHeader = {
const month = (
{locale.monthFormat ? value.format(locale.monthFormat) : localeData.monthsShort(value)}
diff --git a/components/vc-calendar/src/calendar/TimePickerButton.vue b/components/vc-calendar/src/calendar/TimePickerButton.vue
index 911446ed6..b2cb72614 100644
--- a/components/vc-calendar/src/calendar/TimePickerButton.vue
+++ b/components/vc-calendar/src/calendar/TimePickerButton.vue
@@ -2,11 +2,12 @@
function noop () {}
export default {
functional: true,
- render: function (createElement, context) {
- const { data, listeners = {}} = context
+ render: function (h, context) {
+ const { props, listeners = {}} = context
+ console.log(context)
const {
prefixCls, locale, showTimePicker,
- timePickerDisabled } = data
+ timePickerDisabled } = props
const { closeTimePicker = noop, openTimePicker = noop } = listeners
const className = {
[`${prefixCls}-time-picker-btn`]: true,
@@ -16,13 +17,11 @@ export default {
if (!timePickerDisabled) {
onClick = showTimePicker ? closeTimePicker : openTimePicker
}
- return (
- {showTimePicker ? locale.dateSelect : locale.timeSelect}
- )
+ return (
+
+ {showTimePicker ? locale.dateSelect : locale.timeSelect}
+
+ )
},
}
diff --git a/components/vc-calendar/src/calendar/TodayButton.vue b/components/vc-calendar/src/calendar/TodayButton.vue
index 1be37ce5d..b1be9704b 100644
--- a/components/vc-calendar/src/calendar/TodayButton.vue
+++ b/components/vc-calendar/src/calendar/TodayButton.vue
@@ -4,7 +4,7 @@ function noop () {}
export default {
functional: true,
render (createElement, context) {
- const { data, listeners = {}} = context
+ const { props, listeners = {}} = context
const {
prefixCls,
locale,
@@ -14,7 +14,7 @@ export default {
disabledDate,
// onToday,
text,
- } = data
+ } = props
const { today = noop } = listeners
const localeNow = (!text && timePicker ? locale.now : text) || locale.today
const disabledToday =
diff --git a/components/vc-calendar/src/date/DateTBody.vue b/components/vc-calendar/src/date/DateTBody.vue
index 0596f8123..68ae5db92 100644
--- a/components/vc-calendar/src/date/DateTBody.vue
+++ b/components/vc-calendar/src/date/DateTBody.vue
@@ -4,7 +4,7 @@ import { getOptionProps } from '@/components/_util/props-util'
import cx from 'classnames'
import DateConstants from './DateConstants'
import { getTitleString, getTodayTime } from '../util/'
-
+function noop () {}
function isSameDay (one, two) {
return one && two && one.isSame(two, 'day')
}
@@ -35,7 +35,7 @@ const DateTBody = {
dateRender: PropTypes.func,
disabledDate: PropTypes.func,
prefixCls: PropTypes.string,
- selectedValue: PropTypes.oneOfType([PropTypes.object, PropTypes.arrayOf(PropTypes.object)]),
+ selectedValue: PropTypes.oneOfType([PropTypes.any, PropTypes.arrayOf(PropTypes.any)]),
value: PropTypes.object,
hoverValue: PropTypes.any.def([]),
showWeekNumber: PropTypes.bool,
@@ -48,6 +48,9 @@ const DateTBody = {
showWeekNumber, dateRender, disabledDate,
hoverValue,
} = props
+ console.log('selectedValue', selectedValue)
+ const { $listeners = {}} = this
+ const { select = noop, dayHover = noop } = $listeners
let iIndex
let jIndex
let current
@@ -208,9 +211,9 @@ const DateTBody = {
dateCells.push(
diff --git a/components/vc-calendar/src/date/DateTable.vue b/components/vc-calendar/src/date/DateTable.vue
index 566efbb82..8ea9c29ea 100644
--- a/components/vc-calendar/src/date/DateTable.vue
+++ b/components/vc-calendar/src/date/DateTable.vue
@@ -5,15 +5,15 @@ import DateTBody from './DateTBody'
export default {
functional: true,
render (createElement, context) {
- const { data, listeners = {}} = context
- const prefixCls = data.prefixCls
- const props = {
- props: data,
+ const { props, listeners = {}} = context
+ const prefixCls = props.prefixCls
+ const bodyProps = {
+ props,
on: listeners,
}
return ()
},
}
diff --git a/components/vc-calendar/src/mixin/CalendarMixin.js b/components/vc-calendar/src/mixin/CalendarMixin.js
index 24a030be1..f527a3a4c 100644
--- a/components/vc-calendar/src/mixin/CalendarMixin.js
+++ b/components/vc-calendar/src/mixin/CalendarMixin.js
@@ -56,7 +56,7 @@ const CalendarMixin = {
},
renderRoot (newProps) {
- const props = this.props
+ const props = this.$props
const prefixCls = props.prefixCls
const className = {
diff --git a/components/vc-calendar/src/mixin/CommonMixin.js b/components/vc-calendar/src/mixin/CommonMixin.js
index f1a1177c1..52866af33 100644
--- a/components/vc-calendar/src/mixin/CommonMixin.js
+++ b/components/vc-calendar/src/mixin/CommonMixin.js
@@ -6,7 +6,7 @@ export default {
locale: PropTypes.object.def(enUs),
visible: PropTypes.bool.def(true),
// onSelect: PropTypes.func,
- prefixCls: PropTypes.string.def('rc-calendat'),
+ prefixCls: PropTypes.string.def('rc-calendar'),
// onChange: PropTypes.func,
// onOk: PropTypes.func,
},
diff --git a/examples/routes.js b/examples/routes.js
index c798a71bd..da607af08 100644
--- a/examples/routes.js
+++ b/examples/routes.js
@@ -3,7 +3,7 @@ const AsyncComp = () => {
const hashs = window.location.hash.split('/')
const d = hashs[hashs.length - 1]
return {
- component: import(`../components/pagination/demo/${d}`),
+ component: import(`../components/vc-calendar/demo/${d}`),
}
}
export default [
|