diff --git a/components/calendar/index.vue b/components/calendar/index.vue
index 522c66a3d..b358188b1 100644
--- a/components/calendar/index.vue
+++ b/components/calendar/index.vue
@@ -205,7 +205,9 @@ export default {
       <LocaleReceiver
         componentName='Calendar'
         defaultLocale={enUS}
-        children={this.renderCalendar}
+        scopedSlots={
+          { default: this.renderCalendar }
+        }
       />
     )
   },
diff --git a/components/locale-provider/default.js b/components/locale-provider/default.js
index d0224bed9..a77bc1784 100644
--- a/components/locale-provider/default.js
+++ b/components/locale-provider/default.js
@@ -1,14 +1,14 @@
 import Pagination from '../vc-pagination/locale/en_US'
-// import DatePicker from '../date-picker/locale/en_US'
+import DatePicker from '../date-picker/locale/en_US'
 import TimePicker from '../time-picker/locale/en_US'
-// import Calendar from '../calendar/locale/en_US'
+import Calendar from '../calendar/locale/en_US'
 
 export default {
   locale: 'en',
   Pagination,
-  // DatePicker,
+  DatePicker,
   TimePicker,
-  // Calendar,
+  Calendar,
   Table: {
     filterTitle: 'Filter menu',
     filterConfirm: 'OK',
diff --git a/components/locale-provider/zh_CN.js b/components/locale-provider/zh_CN.js
index 148e02e6c..a8e33d801 100644
--- a/components/locale-provider/zh_CN.js
+++ b/components/locale-provider/zh_CN.js
@@ -1,14 +1,14 @@
 import Pagination from '../vc-pagination/locale/zh_CN'
-// import DatePicker from '../date-picker/locale/zh_CN'
+import DatePicker from '../date-picker/locale/zh_CN'
 import TimePicker from '../time-picker/locale/zh_CN'
-// import Calendar from '../calendar/locale/zh_CN'
+import Calendar from '../calendar/locale/zh_CN'
 
 export default {
   locale: 'zh-cn',
   Pagination,
-  // DatePicker,
+  DatePicker,
   TimePicker,
-  // Calendar,
+  Calendar,
   Table: {
     filterTitle: '筛选',
     filterConfirm: '确定',