Skip to content

Commit 596b8b1

Browse files
author
dennis.zpf
committed
fix: 合并x-components组件
2 parents 1ff4918 + 08d59f1 commit 596b8b1

File tree

158 files changed

+1857
-1201
lines changed

Some content is hidden

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

158 files changed

+1857
-1201
lines changed

‎CHANGELOG.md

+23-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@ 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.0.4](https://github.com/ant-design/ant-design-mini/compare/3.0.3...3.0.4)
8+
9+
> 30 December 2024
10+
11+
- Feat a part of component support wechat [`#1349`](https://github.com/ant-design/ant-design-mini/pull/1349)
12+
713
#### [3.0.3](https://github.com/ant-design/ant-design-mini/compare/3.0.2...3.0.3)
814

15+
> 17 December 2024
16+
917
- fix: tabs wechat error [`#1340`](https://github.com/ant-design/ant-design-mini/pull/1340)
1018
- docs: popover theme color [`#1338`](https://github.com/ant-design/ant-design-mini/pull/1338)
1119

@@ -53,12 +61,18 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
5361
- Docs new dev [`#1307`](https://github.com/ant-design/ant-design-mini/pull/1307)
5462
- fix: 修复部分组件 props 命名规范问题 [`#1306`](https://github.com/ant-design/ant-design-mini/pull/1306)
5563

56-
### [3.0.0](https://github.com/ant-design/ant-design-mini/compare/2.36.8...3.0.0)
64+
### [3.0.0](https://github.com/ant-design/ant-design-mini/compare/2.36.10-alpha.1...3.0.0)
5765

5866
> 21 November 2024
5967
6068
- Docs site dev [`#1304`](https://github.com/ant-design/ant-design-mini/pull/1304)
6169

70+
#### [2.36.10-alpha.1](https://github.com/ant-design/ant-design-mini/compare/2.36.8...2.36.10-alpha.1)
71+
72+
> 25 December 2024
73+
74+
- feat: 为 Tabs 添加 catchTouchStart/catchTouchMove 属性 [`#1350`](https://github.com/ant-design/ant-design-mini/pull/1350)
75+
6276
#### [2.36.8](https://github.com/ant-design/ant-design-mini/compare/2.36.7...2.36.8)
6377

6478
> 12 November 2024
@@ -614,14 +628,21 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
614628
- feat: 增加函数式组件的说明 [`#828`](https://github.com/ant-design/ant-design-mini/pull/828)
615629
- fix: 修改 demo 的 appid [`#830`](https://github.com/ant-design/ant-design-mini/pull/830)
616630

617-
### [2.11.0](https://github.com/ant-design/ant-design-mini/compare/1.10.7...2.11.0)
631+
### [2.11.0](https://github.com/ant-design/ant-design-mini/compare/1.10.8...2.11.0)
618632

619633
> 12 September 2023
620634
621635
- feat: 升级到 2.0 [`#826`](https://github.com/ant-design/ant-design-mini/pull/826)
622636
- fix: should not use element selector [`#808`](https://github.com/ant-design/ant-design-mini/pull/808)
623637
- feat: 使用 vm 进行测试 [`#817`](https://github.com/ant-design/ant-design-mini/pull/817)
624638

639+
#### [1.10.8](https://github.com/ant-design/ant-design-mini/compare/1.10.7...1.10.8)
640+
641+
> 30 December 2024
642+
643+
- fix: picker view render [`be21b03`](https://github.com/ant-design/ant-design-mini/commit/be21b036622f05b747fe1c7dcac88fa2a5fe7f06)
644+
- fix: picker view render [`58ec4c9`](https://github.com/ant-design/ant-design-mini/commit/58ec4c91025fef6e5d2d58d914d838cfb7164bac)
645+
625646
#### [1.10.7](https://github.com/ant-design/ant-design-mini/compare/1.10.6...1.10.7)
626647

627648
> 10 July 2024

‎config/wechat/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
"fast-deep-equal": "3.1.3",
88
"lodash.filter": "^4.6.0",
99
"lodash.get": "^4.4.2",
10-
"lodash.isequal": "^4.5.0",
1110
"lodash.isfunction": "^3.0.9",
1211
"lodash.kebabcase": "^4.1.1",
1312
"lodash.reduce": "^4.6.0",

‎copilot-demo/pages/Copilotbutton/index.axml

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<view class="navigation-bar"/>
2+
3+
<view>button page</view>
4+
<ant-copilot-button />

‎copilot-demo/pages/Prompts/index.axml

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

33
<ant-container title="基础用法">
4-
<prompts
5-
list="{{ baseList }}"
4+
<ant-prompts
5+
list="{{ baseList }}"
66
promptsTitle="{{ promptsTitle }}"
77
onTapPromptsItem="onTapPromptsItem" />
88
</ant-container>
99

1010
<ant-container title="有箭头">
11-
<prompts
12-
list="{{ arrowList }}"
11+
<ant-prompts
12+
list="{{ arrowList }}"
1313
promptsTitle="{{ promptsTitle }}"
1414
onTapPromptsItem="onTapPromptsItem" />
1515
</ant-container>
1616

1717
<ant-container title="样式覆盖">
18-
<prompts
19-
list="{{ styleList }}"
18+
<ant-prompts
19+
list="{{ styleList }}"
2020
className="customizeStyle"
2121
promptsTitle="{{ promptsTitle }}"
2222
onTapPromptsItem="onTapPromptsItem" />
2323
</ant-container>
2424

2525
<ant-container title="自定义提示标题">
26-
<prompts
27-
list="{{ arrowList }}"
26+
<ant-prompts
27+
list="{{ arrowList }}"
2828
onTapPromptsItem="onTapPromptsItem">
2929
<view slot="prompts-title" class="customize-prompts-title">
3030
自定义提示标题:
3131
</view>
32-
</prompts>
32+
</ant-prompts>
3333
</ant-container>
3434

3535
<ant-container title="自定义提示项">
36-
<prompts
37-
list="{{ baseList }}"
36+
<ant-prompts
37+
list="{{ baseList }}"
3838
onTapPromptsItem="onTapPromptsItem">
3939
<view slot="prompts-item" slot-scope="props" class="customize-prompts-item">
4040
自定义提示项：{{ props.item.title }}
4141
</view>
42-
</prompts>
42+
</ant-prompts>
4343
</ant-container>
4444

‎copilot-demo/pages/Prompts/index.json5

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
{
22
/// #if WECHAT
3-
"navigationBarTitleText": "",
3+
"navigationBarTitleText": "Prompts",
44
/// #endif
55

66
/// #if ALIPAY
7-
"defaultTitle": "Prompts 组件",
7+
"defaultTitle": "Prompts",
8+
"transparentTitle": "auto",
9+
"titlePenetrate": "YES",
810
/// #endif
911

1012
"usingComponents": {
1113
"ant-container": "../../../src/Container/index",
12-
"prompts": "../../../src/Prompts/index"
13-
},
14-
"transparentTitle": "always"
14+
"ant-prompts": "../../../src/Prompts/index"
15+
}
1516
}

‎copilot-demo/pages/Suggestion/index.axml

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
<view class="navigation-bar"/>
2+
3+
<ant-container title="基础用法">
4+
<ant-suggestion
5+
items="{{items1}}"
6+
onSelect="handleSelect"
7+
/>
8+
</ant-container>
9+
10+
<ant-container title="支持 ant-icon">
11+
<ant-suggestion
12+
items="{{items2}}"
13+
onSelect="handleSelect"
14+
/>
15+
</ant-container>
16+
17+
<!-- #if ALIPAY -->
18+
<ant-container title="插槽">
19+
<ant-suggestion
20+
items="{{items2}}"
21+
onSelect="handleSelect"
22+
>
23+
<view slot-scope="prop" a:if="{{prop.index === 0}}">
24+
<ant-icon type="PictureOutline"/>
25+
</view>
26+
<view slot-scope="prop" a:if="{{prop.item.value === 'suggestion'}}">
27+
<ant-icon type="VideoOutline"/>
28+
</view>
29+
</ant-suggestion>
30+
</ant-container>
31+
<!-- #endif -->
32+

‎copilot-demo/pages/Suggestion/index.json5

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
/// #if WECHAT
3+
"navigationBarTitleText": "Suggestion",
4+
/// #endif
5+
6+
/// #if ALIPAY
7+
"defaultTitle": "Suggestion",
8+
"transparentTitle": "auto",
9+
"titlePenetrate": "YES",
10+
/// #endif
11+
12+
"usingComponents": {
13+
"ant-suggestion": "../../../src/Suggestion/index",
14+
"ant-container": "../../../src/Container/index",
15+
"ant-icon": "../../../src/Icon/index"
16+
}
17+
}

‎copilot-demo/pages/Suggestion/index.less

Whitespace-only changes.

‎copilot-demo/pages/Suggestion/index.ts

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
Page({
2+
data: {
3+
items1: [
4+
{
5+
icon: 'https://mdn.alipayobjects.com/huamei_2jrq4g/afts/img/A*AdC9RZfDwicAAAAAAAAAAAAADtF8AQ/original',
6+
label: '我的日程',
7+
value: 'schedule',
8+
},
9+
{
10+
icon: 'https://mdn.alipayobjects.com/huamei_2jrq4g/afts/img/A*Mbi1R5eGTecAAAAAAAAAAAAADtF8AQ/original',
11+
label: '快捷功能',
12+
value: 'suggestion',
13+
},
14+
{
15+
icon: 'https://mdn.alipayobjects.com/huamei_2jrq4g/afts/img/A*WqBJSZEpPbwAAAAAAAAAAAAADtF8AQ/original',
16+
label: '诊断分析',
17+
value: 'analyze',
18+
},
19+
{
20+
icon: 'https://mdn.alipayobjects.com/huamei_2jrq4g/afts/img/A*fVpIQZbRi4IAAAAAAAAAAAAADtF8AQ/original',
21+
label: '更多',
22+
value: 'more',
23+
},
24+
],
25+
items2: [
26+
{
27+
icon: 'UserOutline',
28+
label: '我的日程',
29+
value: 'schedule',
30+
},
31+
{
32+
icon: 'UnorderedListOutline',
33+
label: '快捷功能',
34+
value: 'suggestion',
35+
},
36+
{
37+
icon: 'HistogramOutline',
38+
label: '诊断分析',
39+
value: 'analyze',
40+
},
41+
{
42+
icon: 'MoreOutline',
43+
label: '更多',
44+
value: 'SendOutline',
45+
},
46+
],
47+
},
48+
handleSelect(item) {
49+
/// #if ALIPAY
50+
console.log(item);
51+
my.showToast({ content: item.value });
52+
/// #endif
53+
},
54+
});

‎copilot-demo/pages/ThoughtChain/index.json5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
/// #if WECHAT
3-
"navigationBarTitleText": "",
3+
"navigationBarTitleText": "Copilotbutton",
44
/// #endif
55

66
/// #if ALIPAY

0 commit comments

Comments
 (0)