chore(release): v3.1.6-beta.15

demo/pages/DatePicker/index.axml

@@ -12,7 +12,9 @@
       onPickerChange="handlePickerChange"
       onVisibleChange="handleTriggerPicker"
       onCancel="handleDismiss"
-      onOk="handleOk" />
+      onOk="handleOk" >
+      <view slot="content-header">插入一些内容</view>
+    </ant-date-picker>
   </ant-list-item>
   <ant-list-item>
     请选择日期（点击蒙层不关闭）
@@ -109,7 +111,9 @@
       defaultValue="{{ defaultDateRange }}"
       onPickerChange="handlePickerRangeChange"
       onVisibleChange="handleTriggerPicker"
-      onOk="handleRangeOk" />
+      onOk="handleRangeOk" >
+      <view slot="content-header">插入一些内容</view>
+    </ant-date-picker>
   </ant-list-item>
   <ant-list-item>
     受控模式

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mini",
-  "version": "3.1.12",
+  "version": "3.1.6-beta.15",
   "description": "antd-mini 是支付宝小程序 UI 组件库，遵循 Ant Design 规范。",
   "miniprogram": "compiled/wechat/src",
   "scripts": {
@@ -159,4 +159,4 @@
   ],
   "license": "MIT",
   "homepage": "https://github.com/ant-design/ant-design-mini"
-}
+}

src/DatePicker/RangePicker/index.axml

@@ -44,10 +44,13 @@
   onVisibleChange="onVisibleChange"
   maskClosable="{{ maskClosable }}"
 >
-  <view class="ant-range-picker-selector" slot="content-header">
-    <template is="selector" data="{{ placeholder: u.isPropsEmpty(startPlaceholder) ? locale.RangePicker.startPlaceholder : startPlaceholder, active: pickerType === 'start', type: 'start', value: currentStartValueStr, precision: precision }}" />
-    <view class="ant-range-picker-selector-split">{{ splitCharacter }}</view>
-    <template is="selector" data="{{ placeholder: u.isPropsEmpty(endPlaceholder) ? locale.RangePicker.endPlaceholder : endPlaceholder, active: pickerType === 'end', type: 'end', value: currentEndValueStr, precision: precision }}" />
+  <view slot="content-header">
+    <slot name="content-header"></slot>
+    <view class="ant-range-picker-selector">
+      <template is="selector" data="{{ placeholder: u.isPropsEmpty(startPlaceholder) ? locale.RangePicker.startPlaceholder : startPlaceholder, active: pickerType === 'start', type: 'start', value: currentStartValueStr, precision: precision }}" />
+      <view class="ant-range-picker-selector-split">{{ splitCharacter }}</view>
+      <template is="selector" data="{{ placeholder: u.isPropsEmpty(endPlaceholder) ? locale.RangePicker.endPlaceholder : endPlaceholder, active: pickerType === 'end', type: 'end', value: currentEndValueStr, precision: precision }}" />
+    </view>
   </view>
   <slot name="content" slot="content" />
   <slot name="title" slot="title" />

src/DatePicker/RangePicker/index.ts

@@ -365,6 +365,11 @@ ComponentWithSignalStoreImpl({
         this.setCurrentValue(currentProps);
       }
     }
+    if (!equal(currentProps, prevProps)) {
+      if (this.pickerVisible) {
+        this.setCurrentValue(currentProps);
+      }
+    }
   },
   /// #endif
   /// #if WECHAT
@@ -380,6 +385,15 @@ ComponentWithSignalStoreImpl({
     });
   },
   observers: {
+    '**': function (data) {
+      const prevData = this._prevData || this.data;
+      this._prevData = { ...data };
+      if (!equal(prevData, data)) {
+        if (this.pickerVisible) {
+          this.setCurrentValue(getValueFromProps(this));
+        }
+      }
+    },
     'visible': function (data) {
       const prevVisible = this._prevVisible;
       this._prevVisible = data;

src/DatePicker/index.axml

@@ -23,6 +23,10 @@
   formattedValueText="{{ formattedValueText }}"
   onVisibleChange="onVisibleChange"
   maskClosable="{{ maskClosable }}">
+  <slot
+    name="content-header"
+    slot="content-header"
+  />
   <slot
     name="content"
     slot="content" />

src/DatePicker/index.md

@@ -249,6 +249,8 @@ Page({
 | popClassName                 | 弹出框类名                                                                                                                                                                           | string                                                                                                         | -            |
 | popStyle                     | 弹出框样式                                                                                                                                                                           | string                                                                                                         | -            |
 | precision                    | 选择精度，可选 `year` `month` `day` `hour` `minute` `second`                                                                                                                         | string                                                                                                         | `day`        |
+| content-header                       | 弹窗内容顶部                                                                                                                                                                                 | slot                                                                                                                                   | -            |
+| style                        | 样式                                                                                                                                                                                 | string                                                                                                                                 | -            |
 | prefix                       | 前缀                                                                                                                                                                                 | slot                                                                                                           | -            |
 | style                        | 样式                                                                                                                                                                                 | string                                                                                                         | -            |
 | suffix                       | 后缀                                                                                                                                                                                 | slot                                                                                                           | -            |
@@ -294,6 +296,8 @@ Page({
 | precision                    | 选择精度，可选 `year` `month` `day` `hour` `minute`                                                                                                                                  | string                                                                                                                                 | `day`        |
 | splitCharacter               | 显示连接符                                                                                                                                                                           | string                                                                                                                                 | -            |
 | startPlaceholder             | 开始时间提示文案                                                                                                                                                                     | string                                                                                                                                 | "未选择"     |
+| content-header                       | 弹窗内容顶部                                                                                                                                                                                 | slot                                                                                                                                   | -            |
+| style                        | 样式                                                                                                                                                                                 | string                                                                                                                                 | -            |
 | prefix                       | 前缀                                                                                                                                                                                 | slot                                                                                                                                   | -            |
 | style                        | 样式                                                                                                                                                                                 | string                                                                                                                                 | -            |
 | suffix                       | 后缀                                                                                                                                                                                 | slot                                                                                                                                   | -            |

src/DatePicker/index.ts

@@ -43,7 +43,7 @@ Component({
       const { min, max, precision, defaultPickerValue } = currentProps;
       if (realValue) {
         return getValueByDate(realValue, precision,);
-      } 
+      }
       // 处理默认值
       let baseDate: Date | null = null;
       if (defaultPickerValue) {
@@ -300,6 +300,11 @@ Component({
         this.setCurrentValue(currentProps);
       }
     }
+    if (!equal(currentProps, prevProps)) {
+      if (this.pickerVisible) {
+        this.setCurrentValue(currentProps);
+      }
+    }
   },
   /// #endif
   /// #if WECHAT
@@ -315,6 +320,15 @@ Component({
     });
   },
   observers: {
+    '**': function (data) {
+      const prevData = this._prevData || this.data;
+      this._prevData = { ...data };
+      if (!equal(prevData, data)) {
+        if (this.pickerVisible) {
+          this.setCurrentValue(getValueFromProps(this));
+        }
+      }
+    },
     'mixin.value': function () {
       this.setData({
         forceUpdate: this.data.forceUpdate + 1,