From 15a98b49633ffa2bc4b1722e4c3f4c21868f11f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E9=9B=AA=E5=86=AC?=
 <xuedong.chen@xiaobaoonline.com>
Date: Thu, 11 Jul 2019 18:13:18 +0800
Subject: [PATCH 1/2] =?UTF-8?q?datePicker=20=20=E6=B7=BB=E5=8A=A0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E6=B8=B2=E6=9F=93slot=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/date-picker/RangePicker.jsx        |  3 +-
 .../__tests__/__snapshots__/demo.test.js.snap |  6 ++
 components/date-picker/createPicker.js        |  3 +-
 components/date-picker/demo/index.vue         |  2 +
 components/date-picker/demo/text.md           | 55 +++++++++++++++++++
 5 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 components/date-picker/demo/text.md

diff --git a/components/date-picker/RangePicker.jsx b/components/date-picker/RangePicker.jsx
index f9665d00f3..8ba682032e 100644
--- a/components/date-picker/RangePicker.jsx
+++ b/components/date-picker/RangePicker.jsx
@@ -409,6 +409,7 @@ export default {
           openChange: this.handleOpenChange,
         },
         style: popupStyle,
+        scopedSlots: $scopedSlots.default ? $scopedSlots : null,
       },
     );
     return (
@@ -422,7 +423,7 @@ export default {
         onMouseenter={this.onMouseEnter}
         onMouseleave={this.onMouseLeave}
       >
-        <VcDatePicker {...vcDatePickerProps}>{input}</VcDatePicker>
+        <VcDatePicker {...vcDatePickerProps}>{$scopedSlots.default ? '' : input}</VcDatePicker>
       </span>
     );
   },
diff --git a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap
index 95e81b2162..d4dcfd5d39 100644
--- a/components/date-picker/__tests__/__snapshots__/demo.test.js.snap
+++ b/components/date-picker/__tests__/__snapshots__/demo.test.js.snap
@@ -70,6 +70,12 @@ exports[`renders ./components/date-picker/demo/suffix.md correctly 1`] = `
     </svg></i></span></span> <br> <span class="ant-calendar-picker"><span class="" style="display: inline-block; width: 100%;"><input readonly="true" placeholder="Select week" class="ant-calendar-picker-input ant-input"><i class="anticon anticon-smile ant-calendar-picker-icon"><svg viewBox="64 64 896 896" data-icon="smile" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M288 421a48 48 0 1 0 96 0 48 48 0 1 0-96 0zm352 0a48 48 0 1 0 96 0 48 48 0 1 0-96 0zM512 64C264.6 64 64 264.6 64 512s200.6 448 448 448 448-200.6 448-448S759.4 64 512 64zm263 711c-34.2 34.2-74 61-118.3 79.8C611 874.2 562.3 884 512 884c-50.3 0-99-9.8-144.8-29.2A370.4 370.4 0 0 1 248.9 775c-34.2-34.2-61-74-79.8-118.3C149.8 611 140 562.3 140 512s9.8-99 29.2-144.8A370.4 370.4 0 0 1 249 248.9c34.2-34.2 74-61 118.3-79.8C413 149.8 461.7 140 512 140c50.3 0 99 9.8 144.8 29.2A370.4 370.4 0 0 1 775.1 249c34.2 34.2 61 74 79.8 118.3C874.2 413 884 461.7 884 512s-9.8 99-29.2 144.8A368.89 368.89 0 0 1 775 775zM664 533h-48.1c-4.2 0-7.8 3.2-8.1 7.4C604 589.9 562.5 629 512 629s-92.1-39.1-95.8-88.6c-.3-4.2-3.9-7.4-8.1-7.4H360a8 8 0 0 0-8 8.4c4.4 84.3 74.5 151.6 160 151.6s155.6-67.3 160-151.6a8 8 0 0 0-8-8.4z"></path></svg></i></span></span> <br> <span class="ant-calendar-picker"><div class=""><input readonly="true" placeholder="Select date" class="ant-calendar-picker-input ant-input"><span class="ant-calendar-picker-icon">ab</span></div></span> <br> <span class="ant-calendar-picker"><div class=""><input readonly="true" placeholder="Select month" class="ant-calendar-picker-input ant-input"><span class="ant-calendar-picker-icon">ab</span></div></span> <br> <span tabindex="0" class="ant-calendar-picker"><span class="ant-calendar-picker-input ant-input"><input readonly="true" placeholder="Start date" tabindex="-1" class="ant-calendar-range-picker-input"><span class="ant-calendar-range-picker-separator"> ~ </span><input readonly="true" placeholder="End date" tabindex="-1" class="ant-calendar-range-picker-input"><span class="ant-calendar-picker-icon">ab</span></span></span> <br> <span class="ant-calendar-picker"><span class="" style="display: inline-block; width: 100%;"><input readonly="true" placeholder="Select week" class="ant-calendar-picker-input ant-input"><span class="ant-calendar-picker-icon">ab</span></span></span></div>
 `;
 
+exports[`renders ./components/date-picker/demo/text.md correctly 1`] = `
+<div><span class="ant-calendar-picker"><span class="">SelectTime</span></span> <br> <span tabindex="0" class="ant-calendar-picker"><span class="">
+    请选择
+    </span></span></div>
+`;
+
 exports[`renders ./components/date-picker/demo/time.md correctly 1`] = `
 <div><span class="ant-calendar-picker" style="width: 195px;"><div class=""><input readonly="true" placeholder="Select Time" class="ant-calendar-picker-input ant-input"><i class="ant-calendar-picker-icon anticon anticon-calendar"><svg viewBox="64 64 896 896" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class=""><path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path></svg></i></div></span> <br> <span tabindex="0" class="ant-calendar-picker" style="width: 350px;"><span class="ant-calendar-picker-input ant-input"><input readonly="true" placeholder="Start Time" tabindex="-1" class="ant-calendar-range-picker-input"><span class="ant-calendar-range-picker-separator"> ~ </span><input readonly="true" placeholder="End Time" tabindex="-1" class="ant-calendar-range-picker-input"><i class="ant-calendar-picker-icon anticon anticon-calendar"><svg viewBox="64 64 896 896" data-icon="calendar" width="1em" height="1em" fill="currentColor" aria-hidden="true" focusable="false" class="">
       <path d="M880 184H712v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H384v-64c0-4.4-3.6-8-8-8h-56c-4.4 0-8 3.6-8 8v64H144c-17.7 0-32 14.3-32 32v664c0 17.7 14.3 32 32 32h736c17.7 0 32-14.3 32-32V216c0-17.7-14.3-32-32-32zm-40 656H184V460h656v380zM184 392V256h128v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h256v48c0 4.4 3.6 8 8 8h56c4.4 0 8-3.6 8-8v-48h128v136H184z"></path>
diff --git a/components/date-picker/createPicker.js b/components/date-picker/createPicker.js
index 14915e828a..a27e098d77 100644
--- a/components/date-picker/createPicker.js
+++ b/components/date-picker/createPicker.js
@@ -244,6 +244,7 @@ export default function createPicker(TheCalendar, props) {
           onOpenChange: this.handleOpenChange,
         },
         style: props.popupStyle,
+        scopedSlots: $scopedSlots.default ? $scopedSlots : null,
       };
       return (
         <span
@@ -255,7 +256,7 @@ export default function createPicker(TheCalendar, props) {
           onMouseenter={this.onMouseEnter}
           onMouseleave={this.onMouseLeave}
         >
-          <VcDatePicker {...vcDatePickerProps}>{input}</VcDatePicker>
+          <VcDatePicker {...vcDatePickerProps}>{$scopedSlots.default ? '' : input}</VcDatePicker>
         </span>
       );
     },
diff --git a/components/date-picker/demo/index.vue b/components/date-picker/demo/index.vue
index 7d402765af..f0c823c304 100644
--- a/components/date-picker/demo/index.vue
+++ b/components/date-picker/demo/index.vue
@@ -11,6 +11,7 @@ import Size from './size';
 import StartEnd from './start-end';
 import Time from './time';
 import Suffix from './suffix';
+import Text from './text';
 import CN from '../index.zh-CN.md';
 import US from '../index.en-US.md';
 const md = {
@@ -47,6 +48,7 @@ export default {
         <Size/>
         <StartEnd/>
         <Time/>
+        <Text />
         <Suffix />
         <api>
           <CN slot='cn' />
diff --git a/components/date-picker/demo/text.md b/components/date-picker/demo/text.md
new file mode 100644
index 0000000000..b7f69fa84d
--- /dev/null
+++ b/components/date-picker/demo/text.md
@@ -0,0 +1,55 @@
+
+<cn>
+#### 自定义渲染
+增加选择时间功能，当 `showTime` 为一个对象时，其属性会传递给内建的 `TimePicker`。
+</cn>
+
+<us>
+#### Custum Time
+This property provide an additional time selection. When `showTime` is an Object, its properties will be passed on to built-in `TimePicker`.
+</us>
+
+```html
+<template>
+  <div>
+    <a-date-picker
+      placeholder="Select Time"
+      v-model="time1"
+      @change="onChange"
+      @ok="onOk"
+    >
+      <span>{{time1?time1:'SelectTime'}}</span>
+    </a-date-picker>
+    <br />
+    <a-range-picker v-model="time2">
+      <span>
+      {{time2?time2:'请选择'}}
+      </span>
+    </a-range-picker>
+  </div>
+</template>
+<script>
+import moment from 'moment'
+export default {
+    data(){
+        return {
+            time1:undefined,
+            time2:undefined
+        }
+    },
+  methods: {
+    onChange(value, dateString) {
+      console.log('Selected Time: ', value);
+      console.log('Formatted Selected Time: ', dateString);
+    },
+    onOk(value) {
+      console.log('onOk: ', value);
+    },
+    clearTime(){
+      this.time1 = undefined
+    }
+  }
+}
+</script>
+```
+

From 2d909c09c827650b2a219932d82602d0eaae29a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E9=9B=AA=E5=86=AC?=
 <xuedong.chen@xiaobaoonline.com>
Date: Tue, 16 Jul 2019 19:10:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/date-picker/RangePicker.jsx | 4 ++--
 components/date-picker/createPicker.js | 4 ++--
 components/date-picker/demo/text.md    | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/date-picker/RangePicker.jsx b/components/date-picker/RangePicker.jsx
index 8ba682032e..c2915141c6 100644
--- a/components/date-picker/RangePicker.jsx
+++ b/components/date-picker/RangePicker.jsx
@@ -409,7 +409,7 @@ export default {
           openChange: this.handleOpenChange,
         },
         style: popupStyle,
-        scopedSlots: $scopedSlots.default ? $scopedSlots : null,
+        scopedSlots: { default: input, ...$scopedSlots },
       },
     );
     return (
@@ -423,7 +423,7 @@ export default {
         onMouseenter={this.onMouseEnter}
         onMouseleave={this.onMouseLeave}
       >
-        <VcDatePicker {...vcDatePickerProps}>{$scopedSlots.default ? '' : input}</VcDatePicker>
+        <VcDatePicker {...vcDatePickerProps} />
       </span>
     );
   },
diff --git a/components/date-picker/createPicker.js b/components/date-picker/createPicker.js
index a27e098d77..a44d8343c4 100644
--- a/components/date-picker/createPicker.js
+++ b/components/date-picker/createPicker.js
@@ -244,7 +244,7 @@ export default function createPicker(TheCalendar, props) {
           onOpenChange: this.handleOpenChange,
         },
         style: props.popupStyle,
-        scopedSlots: $scopedSlots.default ? $scopedSlots : null,
+        scopedSlots: { default: input, ...$scopedSlots },
       };
       return (
         <span
@@ -256,7 +256,7 @@ export default function createPicker(TheCalendar, props) {
           onMouseenter={this.onMouseEnter}
           onMouseleave={this.onMouseLeave}
         >
-          <VcDatePicker {...vcDatePickerProps}>{$scopedSlots.default ? '' : input}</VcDatePicker>
+          <VcDatePicker {...vcDatePickerProps} />
         </span>
       );
     },
diff --git a/components/date-picker/demo/text.md b/components/date-picker/demo/text.md
index b7f69fa84d..0e89781dd2 100644
--- a/components/date-picker/demo/text.md
+++ b/components/date-picker/demo/text.md
@@ -1,12 +1,12 @@
 
 <cn>
 #### 自定义渲染
-增加选择时间功能，当 `showTime` 为一个对象时，其属性会传递给内建的 `TimePicker`。
+增加自定义渲染功能，在默认 `slot` 中，你可以设置任何你想渲染的组件。
 </cn>
 
 <us>
 #### Custum Time
-This property provide an additional time selection. When `showTime` is an Object, its properties will be passed on to built-in `TimePicker`.
+Added custom rendering function, in the default `slot', you can set any component you want to render..
 </us>
 
 ```html