Skip to content

Commit 1a501c8

Browse files
rayhomierayhomie
committed
Merge branch 'master' into feat-x-optimization
2 parents 2a13cac + 2b83791 commit 1a501c8

File tree

117 files changed

+2900
-554
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

117 files changed

+2900
-554
lines changed

‎CHANGELOG.md

+38-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,46 @@ All notable changes to this project will be documented in this file. Dates are d
44

55
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
66

7-
#### [3.1.3](https://github.com/ant-design/ant-design-mini/compare/3.1.2...3.1.3)
7+
#### [3.1.4](https://github.com/ant-design/ant-design-mini/compare/3.1.3...3.1.4)
8+
9+
- Form add readonly property [`#1407`](https://github.com/ant-design/ant-design-mini/pull/1407)
10+
11+
#### [3.1.3](https://github.com/ant-design/ant-design-mini/compare/3.1.3-beta.3...3.1.3)
12+
13+
> 10 February 2025
14+
15+
#### [3.1.3-beta.3](https://github.com/ant-design/ant-design-mini/compare/3.1.3-beta.2...3.1.3-beta.3)
16+
17+
> 13 February 2025
18+
19+
- feat: form add readonly [`4e151a4`](https://github.com/ant-design/ant-design-mini/commit/4e151a4c87bcaa50c821976b263b4d67c6f2f0d8)
20+
- feat: form add readonly [`6901efe`](https://github.com/ant-design/ant-design-mini/commit/6901efe309e594fb03939df2d6cdd9066dd4ced5)
21+
- feat: form add readonly [`1f16edb`](https://github.com/ant-design/ant-design-mini/commit/1f16edbac6b31c951cde5aae82db918c3d7cfd49)
22+
23+
#### [3.1.3-beta.2](https://github.com/ant-design/ant-design-mini/compare/3.1.3-beta.1...3.1.3-beta.2)
24+
25+
> 13 February 2025
26+
27+
- feat: form add readonly [`13047d0`](https://github.com/ant-design/ant-design-mini/commit/13047d01cccf3451df0e75e4017dfbd5daa455eb)
28+
- feat: form add readonly [`d6d2c24`](https://github.com/ant-design/ant-design-mini/commit/d6d2c24092bcc5dcfcf5a2cb9a13116daf634ab9)
29+
- feat: form add readonly [`0ee0127`](https://github.com/ant-design/ant-design-mini/commit/0ee0127eeb04a96c69d8cc6edaf507016beedef6)
30+
31+
#### [3.1.3-beta.1](https://github.com/ant-design/ant-design-mini/compare/3.1.3-alpha.1...3.1.3-beta.1)
32+
33+
> 11 February 2025
34+
35+
- feat: form add readonly [`a3bca4b`](https://github.com/ant-design/ant-design-mini/commit/a3bca4be93dcaaaafa9c94f8e766caacde23b9fb)
36+
- docs: optimize doc [`989cc37`](https://github.com/ant-design/ant-design-mini/commit/989cc37bca36c8d9f110e5565e7af061558fcda9)
37+
- docs: optimize doc [`b38e33c`](https://github.com/ant-design/ant-design-mini/commit/b38e33cea131ca91271c6579b045607561218937)
38+
39+
#### [3.1.3-alpha.1](https://github.com/ant-design/ant-design-mini/compare/3.1.2...3.1.3-alpha.1)
40+
41+
> 14 February 2025
842
943
- fix: copilot js path not find [`#1401`](https://github.com/ant-design/ant-design-mini/pull/1401)
44+
- feat: sender components add wrapper slot [`ec55f16`](https://github.com/ant-design/ant-design-mini/commit/ec55f16f804cd39a2288e666a10f957a809f433a)
45+
- feat: bubble components add wrapper slot [`8019edd`](https://github.com/ant-design/ant-design-mini/commit/8019edddd0c362f9bb16cd400f2fb0d970f3fd3a)
46+
- feat: prompts components add disabled props [`2a13cac`](https://github.com/ant-design/ant-design-mini/commit/2a13cac61c85cc48253b44c178e5697ee1b5afd3)
1047

1148
#### [3.1.2](https://github.com/ant-design/ant-design-mini/compare/3.1.1...3.1.2)
1249

‎copilot/Bubble/index.en.md

+28-26
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ group:
77
toc: 'content'
88
---
99

10-
# Bubble
10+
# Bubble Dialogue Bubbles
1111

1212
## When to use
1313

@@ -23,52 +23,54 @@ When you need to display the content of the dialogue, it supports a variety of b
2323

2424
### Property
2525

26-
| Property | Description | Type | Default Value |
27-
| --- | --- | --- | --- |
28-
| className | Class Name | string | - |
29-
| style | Style | string | - |
30-
| content | Bubble Content | string | - |
31-
| placement | Bubble position | 'start' \| 'end' | 'end' |
32-
| shape | Bubble shape | 'round' \| 'corner' \| 'default' | 'default' |
33-
| variant | Bubble Style | 'filled' \| 'borderless' \| 'outlined' \| 'shadow' | 'filled' |
34-
| avatar | avatar address | string | - |
35-
| loading | Loading | boolean | false |
36-
| typing | Typing Animation Configuration | boolean \| { step?: number, interval?: number } | false |
37-
| onTypingComplete | Triggers when typing animation completes | () => void | - |
26+
| Property | Description | Type | Default Value |
27+
| ---------------- | ------------------ | -------------------------------------------------- | --------- |
28+
| className | Class Name | string | - |
29+
| style | Style | string | - |
30+
| content | Bubble Content | string | - |
31+
| placement | Bubble position | 'start' \| 'end' | 'end' |
32+
| shape | Bubble shape | 'round' \| 'corner' \| 'default' | 'default' |
33+
| variant | Bubble Style | 'filled' \| 'borderless' \| 'outlined' \| 'shadow' | 'filled' |
34+
| avatar | avatar address | string | - |
35+
| loading | Loading | boolean | false |
36+
| typing | Typing Animation Configuration | boolean \| { step?: number, interval?: number } | false |
37+
| onTypingComplete | Triggers when typing animation completes | () => void | - |
3838

3939
### Slots
4040

41-
| Name | Description |
42-
| --- | --- |
43-
| default | Custom bubble content |
44-
| header | Custom header content (such as user name) |
45-
| footer | Custom footer content (such as custom operations) |
41+
| Name | Description |
42+
| ------- | ------------------------------ |
43+
| default | Custom bubble content |
44+
| header | Custom header content (such as user name) |
45+
| footer | Customize the bottom content (e. g. custom actions, etc.) |
4646

4747
### Theme customization
4848

4949
#### Style Variables
5050

5151
Component provides the following CSS variables, which can be used to customize styles. For more information, see ConfigProvider Components.
5252

53-
| Variable name | Default Value | Description |
54-
| --- | --- | --- |
55-
| --bubble-background-color | #F7F7F7 | Bubble background color |
56-
| --bubble-user-background-color | #1677FF | User message bubble background color |
57-
| --bubble-outlined-color | #EBEBEB | The border color of the stroke style |
58-
| --bubble-text-color | rgba(0,0,0,0.88) | Text Color |
59-
| --bubble-text-color-user | #ffffff | User Message Text Color |
53+
| Variable name | Default Value | Description |
54+
| ------------------------------ | ---------------- | ------------------ |
55+
| --bubble-background-color | #F7F7F7 | Bubble background color |
56+
| --bubble-user-background-color | #1677FF | User message bubble background color |
57+
| --bubble-outlined-color | #EBEBEB | The border color of the stroke style |
58+
| --bubble-text-color | rgba(0,0,0,0.88) | Text Color |
59+
| --bubble-text-color-user | #ffffff | User Message Text Color |
6060

6161
## FAQ
6262

6363
### 1. How to achieve the typewriter effect?
6464

6565
The typing animation can be configured via the typing property:
66+
6667
- Setup `typing="{{true}}"` Use default configuration
6768
- Setup `typing="{{{ step: 1, interval: 50 }}}"` Customize the number of characters per print and the interval
6869
- By `onTypingComplete` Monitor typing animation complete
6970

7071
### 2. What bubble styles are supported?
7172

7273
A variety of bubble styles can be achieved through the combination of shape and variant attributes:
74+
7375
- shape: control bubble shape, support default/round/corner
74-
- variant: control bubble appearance, support filled/borderless/outlined/shadow
76+
- variant: control bubble appearance, support filled/borderless/outlined/shadow

‎demo/pages/Form/FormBasic/index.axml

+12-11
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,9 @@
11
<view class="navigation-bar"/>
22

33
<form-input
4-
label="用户名"
4+
label="账号"
55
name="account"
6-
placeholder="请输入用户名"
7-
tooltip="用户名说明"
8-
allowClear
9-
ref="handleRef" />
10-
<form-input
11-
label="密码"
12-
name="password"
13-
placeholder="请输入密码"
6+
placeholder="请输入账号"
147
allowClear
158
ref="handleRef">
169
<view slot="tooltip">
@@ -19,7 +12,15 @@
1912
type="QuestionCircleOutline" />
2013
</view>
2114
</form-input>
22-
<form-input label="数字" name="number" type="number" ref="handleRef" />
15+
<form-input
16+
label="密码"
17+
name="password"
18+
placeholder="请输入密码"
19+
tooltip="密码说明"
20+
allowClear
21+
ref="handleRef">
22+
</form-input>
23+
<form-input label="数字" name="number" type="number" max="{{100}}" min="{{20}}" precision="{{2}}" ref="handleRef" />
2324
<form-input
2425
label="地址"
2526
name="address"
@@ -105,6 +106,6 @@
105106
<ant-button onTap="reset">重置</ant-button>
106107
</view>
107108
<ant-toast
108-
content="密码的自定义 tooltip"
109+
content="账号的自定义 tooltip"
109110
visible="{{ toastShow }}"
110111
onClose="handleCloseToast" />

‎demo/pages/Form/FormBasic/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ Page({
4545
() => ({
4646
// 一定需要时异步函数，返回Promise对象
4747
validator: async (_, value) => {
48-
if (value.length !== 11) {
49-
throw new Error('请输入正确的账号');
48+
if (value.length < 6) {
49+
throw new Error('请输入至少6位');
5050
}
5151
},
5252
}),

0 commit comments

Comments
 (0)