Skip to content

Commit 1e2d7c7

Browse files
author
dennis.zpf
committed
fix: merge
2 parents 3fd007e + 312acb2 commit 1e2d7c7

File tree

10 files changed

+62
-62
lines changed

10 files changed

+62
-62
lines changed

‎.dumirc.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default defineConfig({
5858
},
5959
{
6060
title: 'Copilot',
61-
link: '/copilots/conversations',
61+
link: '/copilots/bubble',
6262
// @ts-ignore
6363
isNew: true,
6464
rightIcon:

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,43 @@
22

33
<ant-container title="基础用法">
44
<ant-prompts
5-
list="{{ baseList }}"
6-
promptsTitle="{{ promptsTitle }}"
5+
items="{{ baseList }}"
6+
title="{{ promptsTitle }}"
77
onItemTap="onItemTap" />
88
</ant-container>
99

1010
<ant-container title="有箭头">
1111
<ant-prompts
12-
list="{{ arrowList }}"
13-
promptsTitle="{{ promptsTitle }}"
12+
items="{{ arrowList }}"
13+
title="{{ promptsTitle }}"
1414
onItemTap="onItemTap" />
1515
</ant-container>
1616

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

2525
<ant-container title="横向展示">
2626
<ant-prompts
27-
promptsTitle="超长滑动"
28-
list="{{ horizontalList }}"
27+
title="超长滑动"
28+
items="{{ horizontalList }}"
2929
vertical="{{false}}"
3030
onItemTap="onItemTap"
3131
/>
3232
<ant-prompts
33-
promptsTitle="超长换行"
34-
list="{{ horizontalList }}"
33+
title="超长换行"
34+
items="{{ horizontalList }}"
3535
vertical="{{false}}"
3636
wrap
3737
onItemTap="onItemTap"
3838
/>
3939
<ant-prompts
40-
promptsTitle="自定义"
41-
list="{{ horizontalList }}"
40+
title="自定义"
41+
items="{{ horizontalList }}"
4242
vertical="{{false}}"
4343
wrap
4444
onItemTap="onItemTap"
@@ -50,7 +50,7 @@
5050
<!-- #if ALIPAY -->
5151
<ant-container title="自定义提示标题">
5252
<ant-prompts
53-
list="{{ arrowList }}"
53+
items="{{ arrowList }}"
5454
onItemTap="onItemTap">
5555
<view slot="prompts-title" class="customize-prompts-title">
5656
我可以帮助您：
@@ -60,7 +60,7 @@
6060

6161
<ant-container title="自定义提示项">
6262
<ant-prompts
63-
list="{{ baseList }}"
63+
items="{{ baseList }}"
6464
onItemTap="onItemTap">
6565
<view slot="prompts-item" slot-scope="props" class="customize-prompts-item">
6666
自定义提示项：{{ props.item.label }}

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
</scroll-view>
4646
<ant-sender
4747
value="{{value4}}"
48-
placeholder="自定义样式"
48+
placeholder="组合使用"
4949
onChange="handleChange4"
5050
onSubmit="handleSend4"
5151
>
5252
<ant-prompts
5353
slot="header"
54-
list="{{horizontalList}}"
54+
items="{{horizontalList}}"
5555
vertical="{{false}}"
5656
onItemTap="onItemTap"
5757
></ant-prompts>

‎copilot/Prompts/index.axml

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
<!-- #if ALIPAY -->
55
<slot name="prompts-title">
66
<!-- #endif -->
7-
<view a:if="{{ promptsTitle }}" class="ant-copilot-prompts-title">
8-
{{ promptsTitle }}
7+
<view a:if="{{ title }}" class="ant-copilot-prompts-title">
8+
{{ title }}
99
</view>
1010
<!-- #if ALIPAY -->
1111
</slot>
1212
<!-- #endif -->
1313
<view a:if="{{vertical}}" class="ant-copilot-prompts-vertical-list">
14-
<block a:for="{{ list }}">
14+
<block a:for="{{ items }}">
1515
<!-- #if ALIPAY -->
1616
<slot name="prompts-item" item="{{ item }}">
1717
<!-- #endif -->
@@ -38,7 +38,7 @@
3838
</view>
3939

4040
<scroll-view a:else scroll-x="{{!wrap}}" enable-flex="true" class="ant-copilot-prompts-horizontal-list {{wrap ? 'wrap' : ''}}">
41-
<view a:for="{{list}}" class="ant-copilot-prompts-horizontal-list-item">
41+
<view a:for="{{items}}" class="ant-copilot-prompts-horizontal-list-item">
4242
<!-- #if ALIPAY -->
4343
<slot name="prompts-item" item="{{item}}" index="{{index}}">
4444
<!-- #endif -->

‎copilot/Prompts/index.en.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ In `index.json` Introducing Components in
3232

3333
```xml
3434
<ant-prompts
35-
list="{{baseList}}"
36-
promptsTitle="{{promptsTitle}}"
35+
items="{{baseList}}"
36+
title="{{promptsTitle}}"
3737
#if ALIPAY
3838
onItemTap="onItemTap"
3939
#endif
@@ -78,8 +78,8 @@ Page({
7878

7979
```xml
8080
<ant-prompts
81-
list="{{ arrowList }}"
82-
promptsTitle="{{ promptsTitle }}"
81+
items="{{ arrowList }}"
82+
title="{{ promptsTitle }}"
8383
/>
8484
```
8585

@@ -118,9 +118,9 @@ Page({
118118

119119
```xml
120120
<ant-prompts
121-
list="{{ styleList }}"
121+
items="{{ styleList }}"
122122
className="customizeStyle"
123-
promptsTitle="{{ promptsTitle }}"
123+
title="{{ promptsTitle }}"
124124
/>
125125
```
126126

@@ -136,7 +136,7 @@ Page({
136136
### Custom Prompt Title
137137

138138
```xml
139-
<ant-prompts list="{{ arrowList }}">
139+
<ant-prompts items="{{ arrowList }}">
140140
<view slot="prompts-title" class="customize-prompts-title">
141141
Custom prompt title:
142142
</view>
@@ -146,7 +146,7 @@ Page({
146146
### Custom Prompt Item
147147

148148
```xml
149-
<ant-prompts list="{{ baseList }}">
149+
<ant-prompts items="{{ baseList }}">
150150
<view slot="prompts-item" slot-scope="props" class="customize-prompts-item">
151151
Custom prompt items :{{ props.item.title}}
152152
</view>
@@ -157,19 +157,19 @@ Page({
157157

158158
```xml
159159
<ant-prompts
160-
promptsTitle="超长滑动"
161-
list="{{ horizontalList }}"
160+
title="超长滑动"
161+
items="{{ horizontalList }}"
162162
vertical="{{false}}"
163163
/>
164164
<ant-prompts
165-
promptsTitle="超长换行"
166-
list="{{ horizontalList }}"
165+
title="超长换行"
166+
items="{{ horizontalList }}"
167167
vertical="{{false}}"
168168
wrap
169169
/>
170170
<ant-prompts
171-
promptsTitle="自定义"
172-
list="{{ horizontalList }}"
171+
title="自定义"
172+
items="{{ horizontalList }}"
173173
vertical="{{false}}"
174174
wrap
175175
>
@@ -190,8 +190,8 @@ The following table describes the API properties for Prompts components:
190190
| Property | Description | Type | Default Value |
191191
| ---------------------- | -------------------- | --------------------------------------------------------- | ------ |
192192
| className | Class Name | string | - |
193-
| list | Prompt List | [PromptsItem](#promptsitem)[] | - |
194-
| promptsTitle | Prompt Title | string | - |
193+
| items | Prompt Items | [PromptsItem](#promptsitem)[] | - |
194+
| title | Prompt Title | string | - |
195195
| vertical | Under horizontal layout, automatic line wrap | boolean | true |
196196
| wrap | Class Name | boolean | false |
197197
| #if ALIPAY onItemTap | Prompt for click callback | (item: [PromptsItem](#promptsitem),index:number) => void; | - |

‎copilot/Prompts/index.md

+16-16
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ toc: 'content'
3232

3333
```xml
3434
<ant-prompts
35-
list="{{baseList}}"
36-
promptsTitle="{{promptsTitle}}"
35+
items="{{baseList}}"
36+
title="{{promptsTitle}}"
3737
#if ALIPAY
3838
onItemTap="onItemTap"
3939
#endif
@@ -78,8 +78,8 @@ Page({
7878

7979
```xml
8080
<ant-prompts
81-
list="{{ arrowList }}"
82-
promptsTitle="{{ promptsTitle }}"
81+
items="{{ arrowList }}"
82+
title="{{ promptsTitle }}"
8383
/>
8484
```
8585

@@ -118,9 +118,9 @@ Page({
118118

119119
```xml
120120
<ant-prompts
121-
list="{{ styleList }}"
121+
items="{{ styleList }}"
122122
className="customizeStyle"
123-
promptsTitle="{{ promptsTitle }}"
123+
title="{{ promptsTitle }}"
124124
/>
125125
```
126126

@@ -136,7 +136,7 @@ Page({
136136
### 自定义提示标题
137137

138138
```xml
139-
<ant-prompts list="{{ arrowList }}">
139+
<ant-prompts items="{{ arrowList }}">
140140
<view slot="prompts-title" class="customize-prompts-title">
141141
自定义提示标题:
142142
</view>
@@ -146,7 +146,7 @@ Page({
146146
### 自定义提示项
147147

148148
```xml
149-
<ant-prompts list="{{ baseList }}">
149+
<ant-prompts items="{{ baseList }}">
150150
<view slot="prompts-item" slot-scope="props" class="customize-prompts-item">
151151
自定义提示项：{{ props.item.title }}
152152
</view>
@@ -157,19 +157,19 @@ Page({
157157

158158
```xml
159159
<ant-prompts
160-
promptsTitle="超长滑动"
161-
list="{{ horizontalList }}"
160+
title="超长滑动"
161+
items="{{ horizontalList }}"
162162
vertical="{{false}}"
163163
/>
164164
<ant-prompts
165-
promptsTitle="超长换行"
166-
list="{{ horizontalList }}"
165+
title="超长换行"
166+
items="{{ horizontalList }}"
167167
vertical="{{false}}"
168168
wrap
169169
/>
170170
<ant-prompts
171-
promptsTitle="自定义"
172-
list="{{ horizontalList }}"
171+
title="自定义"
172+
items="{{ horizontalList }}"
173173
vertical="{{false}}"
174174
wrap
175175
>
@@ -190,8 +190,8 @@ Page({
190190
| 属性 | 说明 | 类型 | 默认值 |
191191
| ---------------------- | -------------------- | --------------------------------------------------------- | ------ |
192192
| className | 类名 | string | - |
193-
| list | 提示列表 | [PromptsItem](#promptsitem)[] | - |
194-
| promptsTitle | 提示标题 | string | - |
193+
| items | 提示列表 | [PromptsItem](#promptsitem)[] | - |
194+
| title | 提示标题 | string | - |
195195
| vertical | 横向布局下，自动换行 | boolean | true |
196196
| wrap | 类名 | boolean | false |
197197
| #if ALIPAY onItemTap | 提示点击回调 | (item: [PromptsItem](#promptsitem),index:number) => void; | - |

‎copilot/Prompts/props.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@ export interface IPromptsProps extends IBaseProps {
3535
* @description 提示列表
3636
* @default []
3737
*/
38-
list?: IPromptsItem[];
38+
items?: IPromptsItem[];
3939

4040
/**
4141
* @description 提示列表的标题
4242
* @default ''
4343
*/
44-
promptsTitle?: string;
44+
title?: string;
4545

4646
/**
4747
* @description 纵向布局
@@ -62,9 +62,9 @@ export interface IPromptsProps extends IBaseProps {
6262
}
6363

6464
export const PromptsProps: Partial<IPromptsProps> = {
65-
list: [],
65+
items: [],
6666
className: '',
67-
promptsTitle: '',
67+
title: '',
6868
vertical: true,
6969
wrap: false,
7070
onItemTap() {},

‎copilot/ThoughtChain/index.md

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

10-
# ThoughtChain 思考链
10+
# ThoughtChain 思维链
1111

1212
用于可视化展示 AI 处理请求、生成内容或执行任务的进程与状态。这是一个与动画相关的组件，需要提供各节点动画的 props 和 API 和使用方进行交互。
1313

‎copilot/ThoughtChain/props.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ interface IThoughtChainItemProps {
2222
icon?: string;
2323

2424
/**
25-
* @description 二级思考链
25+
* @description 二级思维链
2626
*/
2727
items?: IThoughtChainItemProps[];
2828
}
@@ -32,14 +32,14 @@ export interface ICollapsibleOptions extends IBaseProps {
3232
}
3333

3434
/**
35-
* @description 思考链
35+
* @description 思维链
3636
* 用于可视化展示AI处理请求、生成内容或执行任务的进程与状态
3737
* 这是一个与动画相关的组件，需要提供各节点动画的props和API和使用方进行交互。
3838
*/
3939

4040
export interface IThoughtChainProps extends IBaseProps {
4141
/**
42-
* @description 思考节点列表
42+
* @description 思维节点列表
4343
* @default default
4444
*/
4545
items?: IThoughtChainItemProps[];

‎demo/utils/constants.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ export const componentList = [
1818
path: '/pages/Suggestion/index',
1919
},
2020
{ name: 'Prompts', nameZN: 'Prompts', path: '/pages/Prompts/index' },
21-
{ name: 'ThoughtChain', nameZN: '思考链', path: '/pages/ThoughtChain/index' },
21+
{ name: 'ThoughtChain', nameZN: '思维链', path: '/pages/ThoughtChain/index' },
2222
{ name: 'Welcome', nameZN: '欢迎', path: '/pages/Welcome/index' },
2323
{ name: 'Button', nameZN: '按钮', path: '/pages/Button/index' },
2424
{ name: 'Icon', nameZN: '图标', path: '/pages/Icon/index' },

0 commit comments

Comments
 (0)