From 8f5865dee0b3a7fcc3c3e984aee5f21cd8dee132 Mon Sep 17 00:00:00 2001
From: jin0209 <270246430@qq.com>
Date: Mon, 11 Apr 2022 17:03:06 +0800
Subject: [PATCH 1/2] fix(picker): add btn default text

---
 src/date-time-picker/props.ts | 4 ++--
 src/picker/picker.wxml        | 6 ++++--
 src/picker/props.ts           | 8 ++++----
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/date-time-picker/props.ts b/src/date-time-picker/props.ts
index 167eff115..8eaaa9b56 100644
--- a/src/date-time-picker/props.ts
+++ b/src/date-time-picker/props.ts
@@ -9,12 +9,12 @@ const props: TdDateTimePickerProps = {
   /** 取消按钮文字 */
   cancelBtn: {
     type: String,
-    value: '',
+    value: '取消',
   },
   /** 确定按钮文字 */
   confirmBtn: {
     type: String,
-    value: '',
+    value: '确认',
   },
   /** 禁用日期，示例：['A', 'B'] 表示日期 A 和日期 B 会被禁用。{ from: 'A', to: 'B' } 表示在 A 到 B 之间的日期会被禁用。{ before: 'A', after: 'B' } 表示在 A 之前和在 B 之后的日期都会被禁用。其中 A = '2021-01-01'，B = '2021-02-01'。值类型为 Function 则表示返回值为 true 的日期会被禁用 */
   disableDate: {
diff --git a/src/picker/picker.wxml b/src/picker/picker.wxml
index a697662f7..38f56f419 100644
--- a/src/picker/picker.wxml
+++ b/src/picker/picker.wxml
@@ -1,9 +1,11 @@
 <t-popup visible="{{visible}}" placement="bottom">
   <view slot="content" class="{{classPrefix}} t-class">
     <view class="{{classPrefix}}__toolbar" wx:if="{{header}}">
-      <view class="{{classPrefix}}__cancel t-class-cancel" bindtap="onCancel">{{cancelBtn}}</view>
+      <view class="{{classPrefix}}__cancel t-class-cancel" wx:if="{{cancelBtn}}" bindtap="onCancel">{{cancelBtn}}</view>
       <view class="{{classPrefix}}__title t-class-title">{{title}}</view>
-      <view class="{{classPrefix}}__confirm t-class-confirm" bindtap="onConfirm">{{confirmBtn}}</view>
+      <view class="{{classPrefix}}__confirm t-class-confirm" wx:if="{{confirmBtn}}" bindtap="onConfirm"
+        >{{confirmBtn}}</view
+      >
     </view>
     <!-- 扩展插槽 -->
     <slot name="header"></slot>
diff --git a/src/picker/props.ts b/src/picker/props.ts
index bf0be5c01..83b1c7a69 100644
--- a/src/picker/props.ts
+++ b/src/picker/props.ts
@@ -9,12 +9,12 @@ const props: TdPickerProps = {
   /** 取消按钮文字 */
   cancelBtn: {
     type: String,
-    value: '',
+    value: '取消',
   },
   /** 确定按钮文字 */
   confirmBtn: {
     type: String,
-    value: '',
+    value: '确认',
   },
   /** 头部内容。值为 true 显示空白头部，值为 false 不显示任何内容，值类型为 TNode 表示自定义头部内容 */
   header: {
@@ -29,11 +29,11 @@ const props: TdPickerProps = {
   /** 选中值 */
   value: {
     type: Array,
+    value: null,
   },
   /** 选中值，非受控属性 */
   defaultValue: {
-    type: null,
-    value: undefined,
+    type: Array,
   },
   /** 是否显示 */
   visible: {

From 468c2895b150e35ac7546422e94ec09cfbdf468c Mon Sep 17 00:00:00 2001
From: jin0209 <270246430@qq.com>
Date: Mon, 11 Apr 2022 17:34:08 +0800
Subject: [PATCH 2/2] fix(picker): delete btn default text

---
 example/pages/picker/picker.wxml | 88 ++++++++++----------------------
 src/date-time-picker/props.ts    |  4 +-
 src/picker/props.ts              |  4 +-
 3 files changed, 32 insertions(+), 64 deletions(-)

diff --git a/example/pages/picker/picker.wxml b/example/pages/picker/picker.wxml
index 53c32eaf5..07b39454c 100644
--- a/example/pages/picker/picker.wxml
+++ b/example/pages/picker/picker.wxml
@@ -4,24 +4,20 @@
   <t-demo title="01 类型" desc="基础选择器">
     <view class="pannel-item" bind:tap="onClickPicker" data-index="{{1}}">
       <view class="pannel-label">城市</view>
-      <view class="pannel-text {{selectedCityValue ? '' : 'empty'}}"
-        >{{selectedCityValue || '选择城市'}}</view
-      >
+      <view class="pannel-text {{selectedCityValue ? '' : 'empty'}}">{{selectedCityValue || '选择城市'}}</view>
       <t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
     </view>
     <view class="pannel-item" bind:tap="onClickPicker" data-index="{{2}}">
       <view class="pannel-label">年份和季节</view>
       <view class="pannel-text {{selectedYearsWithSeason ? '' : 'empty'}}">
-        {{selectedYearsWithSeason}} {{selectedSeason}} {{ !selectedYearsWithSeason ?
-        '选择年份和季节' : ''}}</view
+        {{selectedYearsWithSeason}} {{selectedSeason}} {{ !selectedYearsWithSeason ? '选择年份和季节' : ''}}</view
       >
       <t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
     </view>
     <view class="pannel-item last" bind:tap="onClickPicker" data-index="{{3}}">
       <view class="pannel-label">日期</view>
       <view class="pannel-text {{selectedYearsWithDate ? '' : 'empty'}}">
-        {{selectedYearsWithDate}} {{selectedMonth}} {{selectedDay}} {{!selectedYearsWithDate ?
-        '选择日期' : ''}}</view
+        {{selectedYearsWithDate}} {{selectedMonth}} {{selectedDay}} {{!selectedYearsWithDate ? '选择日期' : ''}}</view
       >
       <t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
     </view>
@@ -29,29 +25,21 @@
   <t-demo desc="带标题选择器">
     <view class="pannel-item" bind:tap="onClickPicker" data-index="{{4}}">
       <view class="pannel-label">城市</view>
-      <view class="pannel-text {{selectedCityValue2 ? '' : 'empty'}}"
-        >{{selectedCityValue2 || '选择城市'}}</view
-      >
+      <view class="pannel-text {{selectedCityValue2 ? '' : 'empty'}}">{{selectedCityValue2 || '选择城市'}}</view>
       <t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
     </view>
-    <view
-      class="pannel-item"
-      bind:tap="onClickPicker"
-      data-title="选择年份和季节"
-      data-index="{{5}}"
-    >
+    <view class="pannel-item" bind:tap="onClickPicker" data-title="选择年份和季节" data-index="{{5}}">
       <view class="pannel-label">年份和季节</view>
       <view class="pannel-text {{selectedYearsWithSeason2 ? '' : 'empty'}}">
-        {{selectedYearsWithSeason2}} {{selectedSeason2}} {{ !selectedYearsWithSeason2 ?
-        '选择年份和季节' : ''}}</view
+        {{selectedYearsWithSeason2}} {{selectedSeason2}} {{ !selectedYearsWithSeason2 ? '选择年份和季节' : ''}}</view
       >
       <t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
     </view>
     <view class="pannel-item" bind:tap="onClickPicker" data-title="选择日期" data-index="{{6}}">
       <view class="pannel-label">日期</view>
       <view class="pannel-text {{selectedYearsWithDate2 ? '' : 'empty'}}">
-        {{selectedYearsWithDate2}} {{selectedMonth2}} {{selectedDay2}} {{!selectedYearsWithDate2 ?
-        '选择日期' : ''}}</view
+        {{selectedYearsWithDate2}} {{selectedMonth2}} {{selectedDay2}} {{!selectedYearsWithDate2 ? '选择日期' :
+        ''}}</view
       >
       <t-icon name="chevron-right" color="rgba(0, 0, 0, 0.26)" size="24px" />
     </view>
@@ -61,21 +49,21 @@
   <t-picker
     visible="{{picker1Visible}}"
     title="{{pickerTitle}}"
+    cancelBtn="取消"
+    confirmBtn="确认"
     bindchange="onPickerChange"
     bindconfirm="onPicker1Confirm"
     bindcancel="onPicker1Cancel"
   >
-    <t-picker-column
-      options="{{citys}}"
-      value="{{selectedCityValue}}"
-      bindchange="onColumnChange"
-    ></t-picker-column>
+    <t-picker-column options="{{citys}}" value="{{selectedCityValue}}" bindchange="onColumnChange"></t-picker-column>
   </t-picker>
 
   <!-- 年+ 季节 不带标题 -->
   <t-picker
     visible="{{picker2Visible}}"
     title="{{pickerTitle}}"
+    cancelBtn="取消"
+    confirmBtn="确认"
     bindchange="onPickerChange"
     bindconfirm="onPicker2Confirm"
     bindcancel="onPicker2Cancel"
@@ -85,17 +73,15 @@
       value="{{selectedYearsWithSeason}}"
       bindchange="onColumnChange"
     ></t-picker-column>
-    <t-picker-column
-      options="{{seasons}}"
-      value="{{selectedSeason}}"
-      bindchange="onColumnChange"
-    ></t-picker-column>
+    <t-picker-column options="{{seasons}}" value="{{selectedSeason}}" bindchange="onColumnChange"></t-picker-column>
   </t-picker>
 
   <!-- 年月日 不带标题 -->
   <t-picker
     visible="{{picker3Visible}}"
     title="{{pickerTitle}}"
+    cancelBtn="取消"
+    confirmBtn="确认"
     bindchange="onPickerChange"
     bindconfirm="onPicker3Confirm"
     bindcancel="onPicker3Cancel"
@@ -105,37 +91,29 @@
       value="{{selectedYearsWithDate}}"
       bindchange="onColumnChange"
     ></t-picker-column>
-    <t-picker-column
-      options="{{months}}"
-      value="{{selectedMonth}}"
-      bindchange="onColumnChange"
-    ></t-picker-column>
-    <t-picker-column
-      options="{{days}}"
-      value="{{selectedDay}}"
-      bindchange="onColumnChange"
-    ></t-picker-column>
+    <t-picker-column options="{{months}}" value="{{selectedMonth}}" bindchange="onColumnChange"></t-picker-column>
+    <t-picker-column options="{{days}}" value="{{selectedDay}}" bindchange="onColumnChange"></t-picker-column>
   </t-picker>
 
   <!-- 城市带标题 -->
   <t-picker
     visible="{{picker4Visible}}"
     title="选中城市"
+    cancelBtn="取消"
+    confirmBtn="确认"
     bindchange="onPickerChange"
     bindconfirm="onPicker4Confirm"
     bindcancel="onPicker4Cancel"
   >
-    <t-picker-column
-      options="{{citys}}"
-      value="{{selectedCityValue2}}"
-      bindchange="onColumnChange"
-    ></t-picker-column>
+    <t-picker-column options="{{citys}}" value="{{selectedCityValue2}}" bindchange="onColumnChange"></t-picker-column>
   </t-picker>
 
   <!-- 年+季节 带标题 -->
   <t-picker
     visible="{{picker5Visible}}"
     title="选择年份和季节"
+    cancelBtn="取消"
+    confirmBtn="确认"
     bindchange="onPickerChange"
     bindconfirm="onPicker5Confirm"
     bindcancel="onPicker5Cancel"
@@ -145,17 +123,15 @@
       value="{{selectedYearsWithSeason2}}"
       bindchange="onColumnChange"
     ></t-picker-column>
-    <t-picker-column
-      options="{{seasons}}"
-      value="{{selectedSeason2}}"
-      bindchange="onColumnChange"
-    ></t-picker-column>
+    <t-picker-column options="{{seasons}}" value="{{selectedSeason2}}" bindchange="onColumnChange"></t-picker-column>
   </t-picker>
 
   <!-- 年月日带标题 -->
   <t-picker
     visible="{{picker6Visible}}"
     title="选择日期"
+    cancelBtn="取消"
+    confirmBtn="确认"
     bindchange="onPickerChange"
     bindconfirm="onPicker6Confirm"
     bindcancel="onPicker6Cancel"
@@ -165,15 +141,7 @@
       value="{{selectedYearsWithDate2}}"
       bindchange="onColumnChange"
     ></t-picker-column>
-    <t-picker-column
-      options="{{months}}"
-      value="{{selectedMonth2}}"
-      bindchange="onColumnChange"
-    ></t-picker-column>
-    <t-picker-column
-      options="{{days}}"
-      value="{{selectedDay2}}"
-      bindchange="onColumnChange"
-    ></t-picker-column>
+    <t-picker-column options="{{months}}" value="{{selectedMonth2}}" bindchange="onColumnChange"></t-picker-column>
+    <t-picker-column options="{{days}}" value="{{selectedDay2}}" bindchange="onColumnChange"></t-picker-column>
   </t-picker>
 </view>
diff --git a/src/date-time-picker/props.ts b/src/date-time-picker/props.ts
index 8eaaa9b56..167eff115 100644
--- a/src/date-time-picker/props.ts
+++ b/src/date-time-picker/props.ts
@@ -9,12 +9,12 @@ const props: TdDateTimePickerProps = {
   /** 取消按钮文字 */
   cancelBtn: {
     type: String,
-    value: '取消',
+    value: '',
   },
   /** 确定按钮文字 */
   confirmBtn: {
     type: String,
-    value: '确认',
+    value: '',
   },
   /** 禁用日期，示例：['A', 'B'] 表示日期 A 和日期 B 会被禁用。{ from: 'A', to: 'B' } 表示在 A 到 B 之间的日期会被禁用。{ before: 'A', after: 'B' } 表示在 A 之前和在 B 之后的日期都会被禁用。其中 A = '2021-01-01'，B = '2021-02-01'。值类型为 Function 则表示返回值为 true 的日期会被禁用 */
   disableDate: {
diff --git a/src/picker/props.ts b/src/picker/props.ts
index 83b1c7a69..444eb5d46 100644
--- a/src/picker/props.ts
+++ b/src/picker/props.ts
@@ -9,12 +9,12 @@ const props: TdPickerProps = {
   /** 取消按钮文字 */
   cancelBtn: {
     type: String,
-    value: '取消',
+    value: '',
   },
   /** 确定按钮文字 */
   confirmBtn: {
     type: String,
-    value: '确认',
+    value: '',
   },
   /** 头部内容。值为 true 显示空白头部，值为 false 不显示任何内容，值类型为 TNode 表示自定义头部内容 */
   header: {