From 75f7f3feaabbcbe9753699485549a88cf9b8c0f2 Mon Sep 17 00:00:00 2001
From: tangjinzhou <415800467@qq.com>
Date: Mon, 9 Aug 2021 14:09:45 +0800
Subject: [PATCH] refactor: calendar

---
 components/calendar/generateCalendar.tsx      |  2 +-
 .../generatePicker/generateSinglePicker.tsx   |  2 +-
 components/locale-provider/LocaleReceiver.tsx |  2 +-
 examples/App.vue                              | 52 +++++++++++--------
 v2-doc                                        |  2 +-
 5 files changed, 35 insertions(+), 25 deletions(-)

diff --git a/components/calendar/generateCalendar.tsx b/components/calendar/generateCalendar.tsx
index 34242a5e1..32ad27f0a 100644
--- a/components/calendar/generateCalendar.tsx
+++ b/components/calendar/generateCalendar.tsx
@@ -140,7 +140,7 @@ function generateCalendar<DateType>(generateConfig: GenerateConfig<DateType>) {
         () => value.value || generateConfig.getNow(),
         {
           defaultValue: defaultValue.value,
-          value: value,
+          value,
         },
       );
 
diff --git a/components/date-picker/generatePicker/generateSinglePicker.tsx b/components/date-picker/generatePicker/generateSinglePicker.tsx
index f8aa817af..0d542755e 100644
--- a/components/date-picker/generatePicker/generateSinglePicker.tsx
+++ b/components/date-picker/generatePicker/generateSinglePicker.tsx
@@ -179,7 +179,7 @@ export default function generatePicker<DateType>(
           const pre = prefixCls.value;
           return (
             <RCPicker
-              monthCellRender={props.monthCellRender}
+              monthCellRender={monthCellRender}
               dateRender={dateRender}
               renderExtraFooter={renderExtraFooter}
               ref={pickerRef}
diff --git a/components/locale-provider/LocaleReceiver.tsx b/components/locale-provider/LocaleReceiver.tsx
index dc324e8ca..5918e96ed 100644
--- a/components/locale-provider/LocaleReceiver.tsx
+++ b/components/locale-provider/LocaleReceiver.tsx
@@ -1,5 +1,5 @@
 import type { VNodeTypes, PropType, ComputedRef } from 'vue';
-import { toRefs, unref } from 'vue';
+import { unref } from 'vue';
 import { inject, defineComponent, computed } from 'vue';
 import PropTypes from '../_util/vue-types';
 import defaultLocaleData from './default';
diff --git a/examples/App.vue b/examples/App.vue
index 696cba1fb..0b3bdf8a6 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -1,29 +1,39 @@
 <template>
-  <a-alert :message="`You selected date: ${selectedValue && selectedValue.format('YYYY-MM-DD')}`" />
-  <a-calendar :value="date" @select="onSelect" @panelChange="onPanelChange" />
+  <div>
+    <demo />
+  </div>
 </template>
-<script lang="ts">
-import { defineComponent, ref } from 'vue';
-import dayjs, { Dayjs } from 'dayjs';
-
+<script>
+import { defineComponent } from 'vue';
+import demo from '../v2-doc/src/docs/calendar/demo/index.vue';
+// import Affix from '../components/affix';
 export default defineComponent({
-  setup() {
-    const date = ref(dayjs('2017-01-25'));
-    const selectedValue = ref(dayjs('2017-01-25'));
-
-    const onSelect = (value: Dayjs) => {
-      date.value = value;
-      selectedValue.value = value;
-    };
-    const onPanelChange = (value: Dayjs) => {
-      date.value = value;
-    };
+  components: {
+    demo,
+    // Affix,
+  },
+  data() {
     return {
-      date,
-      selectedValue,
-      onSelect,
-      onPanelChange,
+      visible: false,
+      pStyle: {
+        fontSize: '16px',
+        color: 'rgba(0,0,0,0.85)',
+        lineHeight: '24px',
+        display: 'block',
+        marginBottom: '16px',
+      },
+      pStyle2: {
+        marginBottom: '24px',
+      },
     };
   },
+  methods: {
+    showDrawer() {
+      this.visible = true;
+    },
+    onClose() {
+      this.visible = false;
+    },
+  },
 });
 </script>
diff --git a/v2-doc b/v2-doc
index be726a081..c54ecff46 160000
--- a/v2-doc
+++ b/v2-doc
@@ -1 +1 @@
-Subproject commit be726a08199f185f8445b1cc068b8c6533151db2
+Subproject commit c54ecff46419ab3c9dafc204df37369c011ce422