feat: 合并master

Author: dennis.zpf

CHANGELOG.md

@@ -4,6 +4,41 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [3.0.7](https://github.com/ant-design/ant-design-mini/compare/3.0.6...3.0.7)
+
+- fix: display range problem [`#1383`](https://github.com/ant-design/ant-design-mini/pull/1383)
+- Fix card divier [`#1378`](https://github.com/ant-design/ant-design-mini/pull/1378)
+- fix: card divider [`#1377`](https://github.com/ant-design/ant-design-mini/pull/1377)
+
+#### [3.0.6](https://github.com/ant-design/ant-design-mini/compare/3.0.6-beta.1...3.0.6)
+
+> 9 January 2025
+
+- fix: form onValueChange validate time series problem [`#1372`](https://github.com/ant-design/ant-design-mini/pull/1372)
+- Feat/table ellipse [`#1365`](https://github.com/ant-design/ant-design-mini/pull/1365)
+- Add wx:key [`#1370`](https://github.com/ant-design/ant-design-mini/pull/1370)
+- Wx problem fix [`#1364`](https://github.com/ant-design/ant-design-mini/pull/1364)
+
+#### [3.0.6-beta.1](https://github.com/ant-design/ant-design-mini/compare/3.0.5...3.0.6-beta.1)
+
+> 8 January 2025
+
+- feat: 表头也支持换行 [`8372463`](https://github.com/ant-design/ant-design-mini/commit/8372463e104f4b05b557ccfb5b4550a35a837ee6)
+- fix: 去掉注释 [`ec936a0`](https://github.com/ant-design/ant-design-mini/commit/ec936a03d87dcc978490a5d078679c385f8ec75e)
+- fix: merge master [`5edad2b`](https://github.com/ant-design/ant-design-mini/commit/5edad2bf8cbe585199b545ba577d7499f4f4e4d1)
+
+#### [3.0.5](https://github.com/ant-design/ant-design-mini/compare/3.0.4...3.0.5)
+
+> 7 January 2025
+
+- Feat/table ellipse [`#1359`](https://github.com/ant-design/ant-design-mini/pull/1359)
+- Update the link to the correct migration documentation [`#1325`](https://github.com/ant-design/ant-design-mini/pull/1325)
+- fix-some-demo-op [`#1341`](https://github.com/ant-design/ant-design-mini/pull/1341)
+- fix: popup title cant display in wechat platform [`#1358`](https://github.com/ant-design/ant-design-mini/pull/1358)
+- CascaderPicker引用路径错误修正 [`#1343`](https://github.com/ant-design/ant-design-mini/pull/1343)
+- Optimize docs [`#1354`](https://github.com/ant-design/ant-design-mini/pull/1354)
+- docs: update doc [`6832e64`](https://github.com/ant-design/ant-design-mini/commit/6832e64d97eff3d6bf951033e48ff2c18fe19bd7)
+
 #### [3.0.4](https://github.com/ant-design/ant-design-mini/compare/3.0.3...3.0.4)
 
 > 30 December 2024
@@ -628,14 +663,36 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - feat: 增加函数式组件的说明 [`#828`](https://github.com/ant-design/ant-design-mini/pull/828)
 - fix: 修改 demo 的 appid [`#830`](https://github.com/ant-design/ant-design-mini/pull/830)
 
-### [2.11.0](https://github.com/ant-design/ant-design-mini/compare/1.10.8...2.11.0)
+### [2.11.0](https://github.com/ant-design/ant-design-mini/compare/1.10.9...2.11.0)
 
 > 12 September 2023
 
 - feat: 升级到 2.0 [`#826`](https://github.com/ant-design/ant-design-mini/pull/826)
 - fix: should not use element selector [`#808`](https://github.com/ant-design/ant-design-mini/pull/808)
 - feat: 使用 vm 进行测试 [`#817`](https://github.com/ant-design/ant-design-mini/pull/817)
 
+#### [1.10.9](https://github.com/ant-design/ant-design-mini/compare/1.10.9-alpha.2...1.10.9)
+
+> 9 January 2025
+
+- chore: update version [`f7ceaa5`](https://github.com/ant-design/ant-design-mini/commit/f7ceaa51f428162444609463323e9775c3c64a27)
+
+#### [1.10.9-alpha.2](https://github.com/ant-design/ant-design-mini/compare/1.10.9-alpha.1...1.10.9-alpha.2)
+
+> 8 January 2025
+
+- fix: form onValueChange validate time series problem [`0d8ea96`](https://github.com/ant-design/ant-design-mini/commit/0d8ea966341de9e9707ecf8b168483b31019ca2f)
+- fix: picker view render [`be21b03`](https://github.com/ant-design/ant-design-mini/commit/be21b036622f05b747fe1c7dcac88fa2a5fe7f06)
+- chore: update version [`4bd2c5a`](https://github.com/ant-design/ant-design-mini/commit/4bd2c5a4e6b1d0d4a26714ef49d6055c199cf8b2)
+
+#### [1.10.9-alpha.1](https://github.com/ant-design/ant-design-mini/compare/1.10.8...1.10.9-alpha.1)
+
+> 8 January 2025
+
+- fix: form onValueChange validate time series problem [`d33653b`](https://github.com/ant-design/ant-design-mini/commit/d33653bdebf6b5da6e21da2713b117c3fdffc8dc)
+- fix: form onValueChange validate time series problem [`eb5faed`](https://github.com/ant-design/ant-design-mini/commit/eb5faedd487c605679bd5591b5f477f32b0a7364)
+- fix: form onValueChange validate time series problem [`8613b1e`](https://github.com/ant-design/ant-design-mini/commit/8613b1ee116ec23f4ce3bd919dc10f10cd0f23b0)
+
 #### [1.10.8](https://github.com/ant-design/ant-design-mini/compare/1.10.7...1.10.8)
 
 > 30 December 2024

demo/pages/Checkbox/index.axml

@@ -107,12 +107,14 @@
   <block
     a:for="{{ customOptions }}"
     a:for-index="index"
-    a:for-item="option">
+    a:for-item="option"
+    a:key="title">
     <ant-list header="{{ option.title }}">
       <block
         a:for="{{ option.list }}"
         a:for-index="index"
-        a:for-item="item">
+        a:for-item="item"
+        a:key="value">
         <ant-list-item>
           <ant-checkbox
             data-value="{{ item.value }}"

demo/pages/Dialog/index.axml

@@ -145,10 +145,11 @@
     三个按钮 竖排
   </ant-button>
 </ant-container>
+
+<!-- #if ALIPAY -->
 <ant-container
   title="局部插槽"
   className="list">
-  <!-- #if ALIPAY -->
   <ant-button
     data-field="slotWeakVisible"
     onTap="handleOpen">
@@ -159,17 +160,17 @@
     onTap="handleOpen">
     强活动氛围弹框
   </ant-button>
-  <!-- #endif -->
 </ant-container>
+<!-- #endif -->
 
+<!-- #if ALIPAY -->
 <ant-container
   title="自定义"
   className="list">
-  <!-- #if ALIPAY -->
   <ant-button
     data-field="customBodyVisible"
     onTap="handleOpen">
     完全自定义内容区
   </ant-button>
-  <!-- #endif -->
 </ant-container>
+<!-- #endif -->

demo/pages/Empty/index.ts

@@ -1,24 +1,28 @@
 const BUTTON_LISt = [
   {
     type: 'primary',
-    text: '刷新重试'
+    text: '刷新重试',
   },
   {
     type: 'default',
-    text: '网络诊断'
+    text: '网络诊断',
   },
 ];
 Page({
   data: {
-    imageUrl: 'https://mdn.alipayobjects.com/huamei_mnxlps/afts/img/A*oV92T4FXR64AAAAAAAAAAAAADkqGAQ/original',
+    imageUrl:
+      'https://mdn.alipayobjects.com/huamei_mnxlps/afts/img/A*oV92T4FXR64AAAAAAAAAAAAADkqGAQ/original',
     mode: 'page',
-    modeList: [{
-      label: '全页空状态',
-      value: 'page',
-    }, {
-      label: '局部空状态',
-      value: 'section',
-    }],
+    modeList: [
+      {
+        label: '全页空状态',
+        value: 'page',
+      },
+      {
+        label: '局部空状态',
+        value: 'section',
+      },
+    ],
     horizontalButtonInfo: {
       layout: 'horizontal',
       list: BUTTON_LISt,
@@ -30,6 +34,12 @@ Page({
   },
   onClickButton(buttonInfo) {
     console.log('onClickButton buttonInfo: ', buttonInfo);
+    /// #if ALIPAY
     my.showToast({ content: `点击了按钮「${buttonInfo.text}」` });
+    /// #endif
+    /// #if WECHAT
+    // @ts-ignore
+    wx.showToast({ title: `点击了按钮「${buttonInfo.detail.text}」` });
+    /// #endif
   },
 });

demo/pages/Form/FormBasic/index.ts

@@ -36,12 +36,30 @@ Page({
   onLoad() {
     this.form = new Form({
       initialValues: { user: { account: 'andy', phone: '10000' } },
+      rules: {
+        account: [
+          {
+            required: true,
+            message: '请输入账号',
+          },
+          () => ({
+            // 一定需要时异步函数，返回Promise对象
+            validator: async (_, value) => {
+              if (value.length !== 11) {
+                throw new Error('请输入正确的账号');
+              }
+            },
+          }),
+        ],
+      },
     });
     this.form.onValueChange('user.account', (value, allValues) => {
-      console.log('onValueChange:', value, allValues);
+      const validates = this.form.getFieldsValidatorStatus();
+      console.log('onValueChange:', value, allValues, validates);
     });
     this.form.onValuesChange((value, allValues) => {
-      console.log('onValuesChange:', value, allValues);
+      const validates = this.form.getFieldsValidatorStatus();
+      console.log('onValuesChange:', value, allValues, validates);
     });
     /// #if WECHAT
     if (this.formRefList) {

demo/pages/SelectContact/index.axml

@@ -2,7 +2,7 @@
 
 <ant-container title="基础用法">
   <ant-select-contact
-    height="1000rpx"
+    height="1280rpx"
     onSelect="onSelect"
     recommendContactsList="{{recommendContactsList}}"
     allContactsList="{{allContactsList}}"

demo/pages/Table/index.axml

@@ -56,3 +56,10 @@
 >
   <ant-table dataSource="{{dataSource}}" columns="{{fullColumns}}" displayType="FULL" className='full-table-table' />
 </ant-container>
+
+<ant-container
+  title="超出行数省略展示"
+  className="list"
+>
+  <ant-table dataSource="{{[{key: '0', name: '这是一行很长的数据，需要换行展示blablablabla', age: 18, sex: '男', address: '成都'}]}}" columns="{{fullColumns}}" className='full-table-table' />
+</ant-container>

demo/pages/Table/index.ts

@@ -1,5 +1,5 @@
 const nameArr = [
-  '小明',
+  '小红',
   '小何',
   '小花',
   '小美',
@@ -43,6 +43,7 @@ Page({
         key: 'name',
         width: 150,
         fixed: true,
+        ellipsisRow: 2,
       },
       {
         title: '年龄',
@@ -84,9 +85,11 @@ Page({
     ],
     fullColumns: [
       {
-        title: '姓名',
+        title: '这是一段很长的表头这是一段很长的表头这是一段很长的表头',
         dataIndex: 'name',
         key: 'name',
+        ellipsisRow: 2,
+        width: 400,
       },
       {
         title: '年龄',

docs/guide/faq.en.md

@@ -7,7 +7,7 @@ toc: true
 
 ### 3. Can x be used with 2.x, 1.x, 0.x
 
-Because there is no migration cost to upgrade from 2.x, 1.x to 3.x, you can do it directly from 2.x, 1.x. upgrade to 3.x, under reference[Upgrade Guide](http://localhost:8000/guide/migration)。
+Because there is no migration cost to upgrade from 2.x, 1.x to 3.x, you can do it directly from 2.x, 1.x. upgrade to 3.x, under reference[Upgrade Guide](https://mini.ant.design/guide/migration)。
 
 For 0.x, you can use the npm alias to install.
 

docs/guide/faq.md

@@ -7,7 +7,7 @@ toc: true
 
 ### 3.x 能否和 2.x, 1.x, 0.x 一起使用
 
-因为 2.x, 1.x 升级到 3.x 没有迁移成本，所以你可以直接从 2.x, 1.x 升级到 3.x，参考下[升级指南](http://localhost:8000/guide/migration)。
+因为 2.x, 1.x 升级到 3.x 没有迁移成本，所以你可以直接从 2.x, 1.x 升级到 3.x，参考下[升级指南](https://mini.ant.design/guide/migration)。
 
 对于 0.x, 你可以使用 npm 别名来安装。
 

docs/guide/using-wechat.en.md

@@ -54,6 +54,30 @@ Page({
 });
 ```
 
+## FAQ
+
+1. The WeChat applet does not support setting default values and scope slots for slots, so the slot capability of components in the WeChat version is limited. Reference:[Slot Default Value Related Discussions](https://developers.weixin.qq.com/community/develop/doc/000a0e58acc32809d04cc948856c00)、[Scope Slot Related Discussions](https://developers.weixin.qq.com/community/develop/doc/00008c24ad42083cea899887851800)
+
+```axml
+<!-- 微信小程序本身不支持下面例子中这样的 给插槽设置默认值 -->
+<slot>默认值</slot>
+
+<!-- 微信小程序本身不支持下面例子中这样的 作用域插槽 -->
+<slot item="{{item}}" index="{{index}}"></slot>
+```
+
+2. After introducing the component, encounter `[WXML file compile error] undefined?`、 `[WXML file compile error] WXML file not found: ./xxx` Relevant report error. Remove the following configuration from app.json and try it.
+
+```diff
+{
+  "pages": [
+    "pages/index/index"
+  ],
+- "componentFramework": "glass-easel",
+- "lazyCodeLoading": "requiredComponents
+}
+```
+
 ## List of adapted components
 
 The following is a list of components that have been adapted to WeChat applets in the antd-mini. You can use these components directly in the project.

docs/guide/using-wechat.md

@@ -54,6 +54,30 @@ Page({
 });
 ```
 
+## 常见问题
+
+1. 微信小程序不支持给插槽设置默认值和作用域插槽，所以微信版本中组件的插槽能力受限。参考：[插槽默认值相关讨论](https://developers.weixin.qq.com/community/develop/doc/000a0e58acc32809d04cc948856c00)、[作用域插槽相关讨论](https://developers.weixin.qq.com/community/develop/doc/00008c24ad42083cea899887851800)
+
+```axml
+<!-- 微信小程序本身不支持下面例子中这样的 给插槽设置默认值 -->
+<slot>默认值</slot>
+
+<!-- 微信小程序本身不支持下面例子中这样的 作用域插槽 -->
+<slot item="{{item}}" index="{{index}}"></slot>
+```
+
+2. 引入组件后，遇到 `[ WXML 文件编译错误] undefined？`、 `[ WXML 文件编译错误] WXML file not found: ./xxx` 相关报错。去掉 app.json 以下配置，试试。
+
+```diff
+{
+  "pages": [
+    "pages/index/index"
+  ],
+- "componentFramework": "glass-easel",
+- "lazyCodeLoading": "requiredComponents
+}
+```
+
 ## 已适配的组件列表
 
 以下是 antd-mini 中已经适配微信小程序的组件列表，您可以直接在项目中使用这些组件。

package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-mini",
-  "version": "3.0.4",
+  "version": "3.0.7",
   "description": "antd-mini 是支付宝小程序 UI 组件库，遵循 Ant Design 规范。",
   "miniprogram": "compiled/wechat/src",
   "scripts": {

scripts/axml/mapping.ts

@@ -198,4 +198,7 @@ export const wechatCustomMapping = {
   'ant-suggestion': {
     onSelect: 'bindselect',
   },
+  'ant-empty': {
+    onClickButton: 'bindclickbutton',
+  },
 };

src/ActionSheet/index.axml

@@ -28,7 +28,7 @@
         a:for="{{ actions }}"
         a:for-index="index"
         a:for-item="item"
-        key="{{ index }}">
+        a:key="text">
         <view
           class="ant-actionsheet-list-item {{ item.disabled ? 'ant-actionsheet-list-item-disabled' : '' }}"
           hover-class="{{ item.disabled ? '' : 'ant-actionsheet-list-item-active' }}"

src/Alphabet/index.axml

@@ -1,6 +1,7 @@
 <view class="alphabet-container">
   <view
     a:for="{{alphabet}}"
+    a:key="*this"
     class="alphabet-container-item {{item === touchKey ? 'alphabet-container-active' : ''}}"
     catchTouchStart="onTouchStart"
     catchTouchMove="onTouchMove"
@@ -14,4 +15,4 @@
     </view>
     <view class="alphabet-container-item-triangle" a:if="{{ item === touchKey }}" />
   </view>
-</view>
+</view>