fix: merge

dennis.zpf · dennis.zpf · commit 1e2d7c791998 · 2025-01-24T17:29:28.000+08:00
diff --git a/.dumirc.ts b/.dumirc.ts
@@ -58,7 +58,7 @@ export default defineConfig({
         },
         {
           title: 'Copilot',
-          link: '/copilots/conversations',
+          link: '/copilots/bubble',
           // @ts-ignore
           isNew: true,
           rightIcon:
diff --git a/copilot-demo/pages/Prompts/index.axml b/copilot-demo/pages/Prompts/index.axml
@@ -2,43 +2,43 @@
 
 <ant-container title="基础用法">
   <ant-prompts
-    list="{{ baseList }}"
-    promptsTitle="{{ promptsTitle }}"
+    items="{{ baseList }}"
+    title="{{ promptsTitle }}"
     onItemTap="onItemTap"  />
 </ant-container>
 
 <ant-container title="有箭头">
   <ant-prompts
-    list="{{ arrowList }}"
-    promptsTitle="{{ promptsTitle }}"
+    items="{{ arrowList }}"
+    title="{{ promptsTitle }}"
     onItemTap="onItemTap"  />
 </ant-container>
 
 <ant-container title="样式覆盖">
   <ant-prompts
-    list="{{ styleList }}"
+    items="{{ styleList }}"
     className="customizeStyle"
-    promptsTitle="{{ promptsTitle }}"
+    title="{{ promptsTitle }}"
     onItemTap="onItemTap"  />
 </ant-container>
 
 <ant-container title="横向展示">
   <ant-prompts
-    promptsTitle="超长滑动"
-    list="{{ horizontalList }}"
+    title="超长滑动"
+    items="{{ horizontalList }}"
     vertical="{{false}}"
     onItemTap="onItemTap"
   />
   <ant-prompts
-    promptsTitle="超长换行"
-    list="{{ horizontalList }}"
+    title="超长换行"
+    items="{{ horizontalList }}"
     vertical="{{false}}"
     wrap
     onItemTap="onItemTap"
   />
   <ant-prompts
-    promptsTitle="自定义"
-    list="{{ horizontalList }}"
+    title="自定义"
+    items="{{ horizontalList }}"
     vertical="{{false}}"
     wrap
     onItemTap="onItemTap"
@@ -50,7 +50,7 @@
 <!-- #if ALIPAY -->
 <ant-container title="自定义提示标题">
   <ant-prompts
-    list="{{ arrowList }}"
+    items="{{ arrowList }}"
     onItemTap="onItemTap">
     <view slot="prompts-title" class="customize-prompts-title">
       我可以帮助您：
@@ -60,7 +60,7 @@
 
 <ant-container title="自定义提示项">
   <ant-prompts
-    list="{{ baseList }}"
+    items="{{ baseList }}"
     onItemTap="onItemTap">
     <view slot="prompts-item" slot-scope="props" class="customize-prompts-item">
       自定义提示项：{{ props.item.label }}
diff --git a/copilot-demo/pages/Sender/index.axml b/copilot-demo/pages/Sender/index.axml
@@ -45,13 +45,13 @@
       </scroll-view>
       <ant-sender
         value="{{value4}}"
-        placeholder="自定义样式"
+        placeholder="组合使用"
         onChange="handleChange4"
         onSubmit="handleSend4"
       >
         <ant-prompts
           slot="header"
-          list="{{horizontalList}}"
+          items="{{horizontalList}}"
           vertical="{{false}}"
           onItemTap="onItemTap"
         ></ant-prompts>
diff --git a/copilot/Prompts/index.axml b/copilot/Prompts/index.axml
@@ -4,14 +4,14 @@
   <!-- #if ALIPAY -->
   <slot name="prompts-title">
   <!-- #endif -->
-    <view a:if="{{ promptsTitle }}" class="ant-copilot-prompts-title">
-      {{ promptsTitle }}
+    <view a:if="{{ title }}" class="ant-copilot-prompts-title">
+      {{ title }}
     </view>
   <!-- #if ALIPAY -->
   </slot>
   <!-- #endif -->
   <view a:if="{{vertical}}" class="ant-copilot-prompts-vertical-list">
-    <block a:for="{{ list }}">
+    <block a:for="{{ items }}">
       <!-- #if ALIPAY -->
       <slot name="prompts-item" item="{{ item }}">
       <!-- #endif -->
@@ -38,7 +38,7 @@
   </view>
 
   <scroll-view a:else scroll-x="{{!wrap}}" enable-flex="true" class="ant-copilot-prompts-horizontal-list {{wrap ? 'wrap' : ''}}">
-    <view a:for="{{list}}" class="ant-copilot-prompts-horizontal-list-item">
+    <view a:for="{{items}}" class="ant-copilot-prompts-horizontal-list-item">
       <!-- #if ALIPAY -->
       <slot name="prompts-item" item="{{item}}" index="{{index}}">
       <!-- #endif -->
diff --git a/copilot/Prompts/index.en.md b/copilot/Prompts/index.en.md
@@ -32,8 +32,8 @@ In `index.json` Introducing Components in
 
 ```xml
 <ant-prompts
-  list="{{baseList}}"
-  promptsTitle="{{promptsTitle}}"
+  items="{{baseList}}"
+  title="{{promptsTitle}}"
 #if ALIPAY
   onItemTap="onItemTap"
 #endif
@@ -78,8 +78,8 @@ Page({
 
 ```xml
 <ant-prompts
-  list="{{ arrowList }}"
-  promptsTitle="{{ promptsTitle }}"
+  items="{{ arrowList }}"
+  title="{{ promptsTitle }}"
 />
 ```
 
@@ -118,9 +118,9 @@ Page({
 
 ```xml
 <ant-prompts
-  list="{{ styleList }}"
+  items="{{ styleList }}"
   className="customizeStyle"
-  promptsTitle="{{ promptsTitle }}"
+  title="{{ promptsTitle }}"
 />
 ```
 
@@ -136,7 +136,7 @@ Page({
 ### Custom Prompt Title
 
 ```xml
-<ant-prompts list="{{ arrowList }}">
+<ant-prompts items="{{ arrowList }}">
   <view slot="prompts-title" class="customize-prompts-title">
     Custom prompt title:
   </view>
@@ -146,7 +146,7 @@ Page({
 ### Custom Prompt Item
 
 ```xml
-<ant-prompts list="{{ baseList }}">
+<ant-prompts items="{{ baseList }}">
   <view slot="prompts-item" slot-scope="props" class="customize-prompts-item">
     Custom prompt items :{{ props.item.title}}
   </view>
@@ -157,19 +157,19 @@ Page({
 
 ```xml
 <ant-prompts
-  promptsTitle="超长滑动"
-  list="{{ horizontalList }}"
+  title="超长滑动"
+  items="{{ horizontalList }}"
   vertical="{{false}}"
 />
 <ant-prompts
-  promptsTitle="超长换行"
-  list="{{ horizontalList }}"
+  title="超长换行"
+  items="{{ horizontalList }}"
   vertical="{{false}}"
   wrap
 />
 <ant-prompts
-  promptsTitle="自定义"
-  list="{{ horizontalList }}"
+  title="自定义"
+  items="{{ horizontalList }}"
   vertical="{{false}}"
   wrap
 >
@@ -190,8 +190,8 @@ The following table describes the API properties for Prompts components:
 | Property                   | Description                 | Type                                                      | Default Value |
 | ---------------------- | -------------------- | --------------------------------------------------------- | ------ |
 | className              | Class Name                 | string                                                    | -      |
-| list                   | Prompt List             | [PromptsItem](#promptsitem)[]                             | -      |
-| promptsTitle           | Prompt Title             | string                                                    | -      |
+| items                   | Prompt Items             | [PromptsItem](#promptsitem)[]                             | -      |
+| title           | Prompt Title             | string                                                    | -      |
 | vertical               | Under horizontal layout, automatic line wrap | boolean                                                   | true   |
 | wrap                   | Class Name                 | boolean                                                   | false  |
 | #if ALIPAY onItemTap   | Prompt for click callback         | (item: [PromptsItem](#promptsitem),index:number) => void; | -      |
diff --git a/copilot/Prompts/index.md b/copilot/Prompts/index.md
@@ -32,8 +32,8 @@ toc: 'content'
 
 ```xml
 <ant-prompts
-  list="{{baseList}}"
-  promptsTitle="{{promptsTitle}}"
+  items="{{baseList}}"
+  title="{{promptsTitle}}"
 #if ALIPAY
   onItemTap="onItemTap"
 #endif
@@ -78,8 +78,8 @@ Page({
 
 ```xml
 <ant-prompts
-  list="{{ arrowList }}"
-  promptsTitle="{{ promptsTitle }}"
+  items="{{ arrowList }}"
+  title="{{ promptsTitle }}"
 />
 ```
 
@@ -118,9 +118,9 @@ Page({
 
 ```xml
 <ant-prompts
-  list="{{ styleList }}"
+  items="{{ styleList }}"
   className="customizeStyle"
-  promptsTitle="{{ promptsTitle }}"
+  title="{{ promptsTitle }}"
 />
 ```
 
@@ -136,7 +136,7 @@ Page({
 ### 自定义提示标题
 
 ```xml
-<ant-prompts list="{{ arrowList }}">
+<ant-prompts items="{{ arrowList }}">
   <view slot="prompts-title" class="customize-prompts-title">
     自定义提示标题:
   </view>
@@ -146,7 +146,7 @@ Page({
 ### 自定义提示项
 
 ```xml
-<ant-prompts list="{{ baseList }}">
+<ant-prompts items="{{ baseList }}">
   <view slot="prompts-item" slot-scope="props" class="customize-prompts-item">
     自定义提示项：{{ props.item.title }}
   </view>
@@ -157,19 +157,19 @@ Page({
 
 ```xml
 <ant-prompts
-  promptsTitle="超长滑动"
-  list="{{ horizontalList }}"
+  title="超长滑动"
+  items="{{ horizontalList }}"
   vertical="{{false}}"
 />
 <ant-prompts
-  promptsTitle="超长换行"
-  list="{{ horizontalList }}"
+  title="超长换行"
+  items="{{ horizontalList }}"
   vertical="{{false}}"
   wrap
 />
 <ant-prompts
-  promptsTitle="自定义"
-  list="{{ horizontalList }}"
+  title="自定义"
+  items="{{ horizontalList }}"
   vertical="{{false}}"
   wrap
 >
@@ -190,8 +190,8 @@ Page({
 | 属性                   | 说明                 | 类型                                                      | 默认值 |
 | ---------------------- | -------------------- | --------------------------------------------------------- | ------ |
 | className              | 类名                 | string                                                    | -      |
-| list                   | 提示列表             | [PromptsItem](#promptsitem)[]                             | -      |
-| promptsTitle           | 提示标题             | string                                                    | -      |
+| items                   | 提示列表             | [PromptsItem](#promptsitem)[]                             | -      |
+| title           | 提示标题             | string                                                    | -      |
 | vertical               | 横向布局下，自动换行 | boolean                                                   | true   |
 | wrap                   | 类名                 | boolean                                                   | false  |
 | #if ALIPAY onItemTap   | 提示点击回调         | (item: [PromptsItem](#promptsitem),index:number) => void; | -      |
diff --git a/copilot/Prompts/props.ts b/copilot/Prompts/props.ts
@@ -35,13 +35,13 @@ export interface IPromptsProps extends IBaseProps {
    * @description 提示列表
    * @default []
    */
-  list?: IPromptsItem[];
+  items?: IPromptsItem[];
 
   /**
    * @description 提示列表的标题
    * @default ''
    */
-  promptsTitle?: string;
+  title?: string;
 
   /**
    * @description 纵向布局
@@ -62,9 +62,9 @@ export interface IPromptsProps extends IBaseProps {
 }
 
 export const PromptsProps: Partial<IPromptsProps> = {
-  list: [],
+  items: [],
   className: '',
-  promptsTitle: '',
+  title: '',
   vertical: true,
   wrap: false,
   onItemTap() {},
diff --git a/copilot/ThoughtChain/index.md b/copilot/ThoughtChain/index.md
@@ -7,7 +7,7 @@ group:
 toc: 'content'
 ---
 
-# ThoughtChain 思考链
+# ThoughtChain 思维链
 
 用于可视化展示 AI 处理请求、生成内容或执行任务的进程与状态。这是一个与动画相关的组件，需要提供各节点动画的 props 和 API 和使用方进行交互。
 
diff --git a/copilot/ThoughtChain/props.ts b/copilot/ThoughtChain/props.ts
@@ -22,7 +22,7 @@ interface IThoughtChainItemProps {
   icon?: string;
 
   /**
-   * @description 二级思考链
+   * @description 二级思维链
    */
   items?: IThoughtChainItemProps[];
 }
@@ -32,14 +32,14 @@ export interface ICollapsibleOptions extends IBaseProps {
 }
 
 /**
- * @description 思考链
+ * @description 思维链
  * 用于可视化展示AI处理请求、生成内容或执行任务的进程与状态
  * 这是一个与动画相关的组件，需要提供各节点动画的props和API和使用方进行交互。
  */
 
 export interface IThoughtChainProps extends IBaseProps {
   /**
-   * @description 思考节点列表
+   * @description 思维节点列表
    * @default default
    */
   items?: IThoughtChainItemProps[];
diff --git a/demo/utils/constants.ts b/demo/utils/constants.ts
@@ -18,7 +18,7 @@ export const componentList = [
         path: '/pages/Suggestion/index',
       },
       { name: 'Prompts', nameZN: 'Prompts', path: '/pages/Prompts/index' },
-      { name: 'ThoughtChain', nameZN: '思考链', path: '/pages/ThoughtChain/index' },
+      { name: 'ThoughtChain', nameZN: '思维链', path: '/pages/ThoughtChain/index' },
       { name: 'Welcome', nameZN: '欢迎', path: '/pages/Welcome/index' },
       { name: 'Button', nameZN: '按钮', path: '/pages/Button/index' },
       { name: 'Icon', nameZN: '图标', path: '/pages/Icon/index' },

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ export default defineConfig({`
`58`	`58`	`},`
`59`	`59`	`{`
`60`	`60`	`title: 'Copilot',`
`61`		`- link: '/copilots/conversations',`
	`61`	`+ link: '/copilots/bubble',`
`62`	`62`	`// @ts-ignore`
`63`	`63`	`isNew: true,`
`64`	`64`	`rightIcon:`