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

demo/pages/Calendar/index.axml

@@ -150,7 +150,9 @@
     width="{{250}}"
     height="{{600}}"
     onClose="onPopupClose">
-    <ant-calendar></ant-calendar>
+    <ant-calendar
+      monthRange="{{demo10.monthRange}}"
+      ></ant-calendar>
   </ant-popup>
 
 </view>

demo/pages/Calendar/index.ts

@@ -102,6 +102,10 @@ Page({
     },
     demo10: {
       visible: false,
+      monthRange: [
+        dayjs().subtract(1, 'year').valueOf(),
+        dayjs().add(1, 'year').valueOf(),
+      ],
     },
   },
   demo3NextMonth() {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mini",
-  "version": "3.1.14",
+  "version": "3.1.6-beta.20",
   "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/Calendar/index.less

@@ -76,10 +76,10 @@
   }
 
   &-cell {
-    box-sizing: border-box;
+    box-sizing: content-box;
     width: calc((100% - 6 * @calendar-cell-space-size) / 7);
     height: @calendar-cell-height;
-    margin-bottom: @calendar-cell-bottom-margin;
+    padding-bottom: @calendar-cell-bottom-margin;
     position: relative;
 
     &-container {

src/Calendar/index.ts

@@ -82,34 +82,37 @@ ComponentWithSignalStoreImpl({
     },
     measurement() {
       const { elementSize } = this.data;
-      // 组件如果内嵌在 slot 里, 一定会被渲染出来, 但是此时 cellHight 为 0
+      // 组件如果内嵌在 slot 里, 一定会被渲染出来, 但是此时 cellHeight 为 0
       // 此时需要重新计算
-      if (!elementSize || elementSize.cellHight === 0) {
+      if (!elementSize || elementSize.cellHeight === 0) {
         this.measurementFn();
       }
     },
     measurementFn() {
       Promise.all([
         this.getBoundingClientRect('.ant-calendar-body-container'),
         this.getBoundingClientRect('.ant-calendar-cells'),
+        this.getBoundingClientRect('.ant-calendar-cell'),
         this.getBoundingClientRect('.ant-calendar-title-container'),
       ])
-        .then(([bodyContainer, cellContainer, Title]) => {
-          // 滚动的时候 top 和 bottom 等尺寸会变
-          // 所以只能依赖 height 来计算
-          const paddingHeight =
-            bodyContainer.height - cellContainer.height - Title.height;
-          const monthTitleHeight = Title.height + paddingHeight;
-          const cellHight =
-            cellContainer.height / (this.data.monthList[0].cells.length / 7);
-          this.setData({
-            elementSize: {
-              monthTitleHeight,
-              cellHight,
-              paddingHeight,
-            },
-          });
-        })
+        .then(
+          ([bodyContainer, cellsContainer, cellContainer, titleContainer]) => {
+            // 滚动的时候 top 和 bottom 等尺寸会变
+            // 所以只能依赖 height 来计算
+            const paddingHeight =
+              bodyContainer.height -
+              cellsContainer.height -
+              titleContainer.height;
+            const monthTitleHeight = titleContainer.height + paddingHeight;
+            this.setData({
+              elementSize: {
+                monthTitleHeight,
+                cellHeight: cellContainer.height,
+                paddingHeight,
+              },
+            });
+          }
+        )
         .catch(() => {
           this.setData({ elementSize: null });
         });

src/Calendar/scroll.sjs.ts

@@ -5,8 +5,8 @@ function handleScroll(event, ownerComponent) {
   if (!elementSize) {
     return;
   }
-  // 组件如果内嵌在 slot 里, 一定会被渲染出来, 但是此时 cellHight 为 0
-  if (elementSize.cellHight === 0) {
+  // 组件如果内嵌在 slot 里, 一定会被渲染出来, 但是此时 cellHeight 为 0
+  if (elementSize.cellHeight === 0) {
     ownerComponent.callMethod('measurement');
     return;
   }
@@ -19,7 +19,7 @@ function handleScroll(event, ownerComponent) {
   }
   const monthHeight = elementSize.monthTitleHeight;
   const paddingHeight = elementSize.paddingHeight;
-  const cellHeight = elementSize.cellHight;
+  const cellHeight = elementSize.cellHeight;
   const heightList = monthList.map((p) => {
     return monthHeight + (cellHeight * p.cells.length) / 7;
   });