Skip to content

Commit a59258a

Browse files
mimaoxiaomimaoxiao
committed
Merge branch 'feature/chat-skyline' of https://github.com/Tencent/tdesign-miniprogram into feature/chat-skyline
# Conflicts: # packages/pro-components/chat/attachments/_example/attachments.wxml # packages/pro-components/chat/attachments/attachments.ts # packages/pro-components/chat/attachments/attachments.wxml # packages/pro-components/chat/chat-content/_example/chat-content.wxml # packages/pro-components/chat/chat-markdown/_example/chat-markdown.wxml # packages/pro-components/chat/chat-message/_example/chat-message.wxml # packages/pro-components/chat/chat-sender/_example/chat-sender.wxml # packages/pro-components/chat/chat-thinking/_example/chat-thinking.wxml
2 parents 9d707ca + 201435a commit a59258a

File tree

178 files changed

+1018
-664
lines changed

Some content is hidden

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

178 files changed

+1018
-664
lines changed

‎packages/components/action-sheet/_example/action-sheet.wxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<t-navbar class="demo-navbar" title="ActionSheet" leftArrow />
1+
<t-navbar class="demo-navbar" title="ActionSheet" leftArrow placeholder />
22
<view class="demo">
33
<t-demo-header
44
title="ActionSheet 动作面板"

‎packages/components/avatar/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ isComponent: true
1919

2020
## 代码演示
2121

22-
<a href="https://developers.weixin.qq.com/s/a86Sfimw7VSO" title="在开发者工具中预览效果" target="_blank" rel="noopener noreferrer"> 在开发者工具中预览效果 </a>
22+
<a href="https://developers.weixin.qq.com/s/oiQl6pmr855m" title="在开发者工具中预览效果" target="_blank" rel="noopener noreferrer"> 在开发者工具中预览效果 </a>
2323

2424
<blockquote style="background-color: #d9e1ff; font-size: 15px; line-height: 26px;margin: 16px 0 0;padding: 16px; border-radius: 6px; color: #0052d9" >
2525
<p>Tips: 请确保开发者工具为打开状态。导入开发者工具后，依次执行：npm i > 构建npm包 > 勾选 "将JS编译成ES5"</p>

‎packages/components/avatar/_example/avatar.wxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<view class="skyline">
2-
<t-navbar class="demo-navbar" title="Avatar" leftArrow />
2+
<t-navbar class="demo-navbar" title="Avatar" leftArrow placeholder zIndex="{{99}}" />
33
<scroll-view scroll-y type="list" class="scroll-view">
44
<view class="demo">
55
<t-demo-header

‎packages/components/back-top/_example/back-top.wxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<t-navbar class="demo-navbar" title="BackTop" leftArrow />
1+
<t-navbar class="demo-navbar" title="BackTop" leftArrow placeholder />
22
<view class="demo">
33
<t-demo-header
44
title="BackTop 返回顶部"

‎packages/components/badge/README.en-US.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ content | String | - | \- | N
1313
count | String / Number | 0 | \- | N
1414
dot | Boolean | false | \- | N
1515
max-count | Number | 99 | \- | N
16-
offset | Array | - | Typescript：`Array<string \| number>` | N
17-
shape | String | circle | options: circle/square/bubble/ribbon | N
16+
offset | Array | - | Typescript: `Array<string \| number>` | N
17+
shape | String | circle | options: circle/square/bubble/ribbon/ribbon-right/ribbon-left/triangle-right/triangle-left | N
1818
show-zero | Boolean | false | \- | N
1919
size | String | medium | options: medium/large | N
2020

‎packages/components/badge/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ isComponent: true
1818

1919
## 代码演示
2020

21-
<a href="https://developers.weixin.qq.com/s/TgaeQimG73SD" title="在开发者工具中预览效果" target="_blank" rel="noopener noreferrer"> 在开发者工具中预览效果 </a>
21+
<a href="https://developers.weixin.qq.com/s/omQZvpmT8g5q" title="在开发者工具中预览效果" target="_blank" rel="noopener noreferrer"> 在开发者工具中预览效果 </a>
2222

2323
<blockquote style="background-color: #d9e1ff; font-size: 15px; line-height: 26px;margin: 16px 0 0;padding: 16px; border-radius: 6px; color: #0052d9" >
2424
<p>Tips: 请确保开发者工具为打开状态。导入开发者工具后，依次执行：npm i > 构建npm包 > 勾选 "将JS编译成ES5"</p>
@@ -55,7 +55,7 @@ count | String / Number | 0 | 徽标右上角内容。可以是数字，也可
5555
dot | Boolean | false | 是否为红点 | N
5656
max-count | Number | 99 | 封顶的数字值 | N
5757
offset | Array | - | 设置状态点的位置偏移，示例：[-10, 20] 或 ['10em', '8rem']。TS 类型：`Array<string \| number>` | N
58-
shape | String | circle | 形状。可选项：circle/square/bubble/ribbon | N
58+
shape | String | circle | 徽标形状，其中 ribbon 和 ribbon-right 等效。可选项：circle/square/bubble/ribbon/ribbon-right/ribbon-left/triangle-right/triangle-left | N
5959
show-zero | Boolean | false | 当数值为 0 时，是否展示徽标 | N
6060
size | String | medium | 尺寸。可选项：medium/large | N
6161

‎packages/components/badge/__test__/__snapshots__/demo.test.js.snap‎

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ exports[`Badge Badge size demo works fine 1`] = `
152152
<wx-view
153153
class="demo-desc"
154154
>
155-
Middle
155+
Medium
156156
</wx-view>
157157
<wx-view
158158
class="block"
@@ -256,7 +256,24 @@ exports[`Badge Badge theme demo works fine 1`] = `
256256
title="单行标题"
257257
>
258258
<t-badge
259-
count="New"
259+
count="NEW"
260+
offset="{{
261+
Array [
262+
0,
263+
0,
264+
]
265+
}}"
266+
shape="ribbon-left"
267+
slot="note"
268+
/>
269+
</t-cell>
270+
<t-cell
271+
bordered="{{false}}"
272+
tClass="t-class-cell"
273+
title="单行标题"
274+
>
275+
<t-badge
276+
count="NEW"
260277
offset="{{
261278
Array [
262279
0,
@@ -267,5 +284,44 @@ exports[`Badge Badge theme demo works fine 1`] = `
267284
slot="note"
268285
/>
269286
</t-cell>
287+
<wx-view
288+
class="demo-desc"
289+
style="margin-bottom: 32rpx"
290+
>
291+
三角角标
292+
</wx-view>
293+
<t-cell
294+
tClass="t-class-cell"
295+
title="单行标题"
296+
>
297+
<t-badge
298+
count="NEW"
299+
offset="{{
300+
Array [
301+
0,
302+
0,
303+
]
304+
}}"
305+
shape="triangle-left"
306+
slot="note"
307+
/>
308+
</t-cell>
309+
<t-cell
310+
bordered="{{false}}"
311+
tClass="t-class-cell"
312+
title="单行标题"
313+
>
314+
<t-badge
315+
count="NEW"
316+
offset="{{
317+
Array [
318+
0,
319+
0,
320+
]
321+
}}"
322+
shape="triangle-right"
323+
slot="note"
324+
/>
325+
</t-cell>
270326
</theme>
271327
`;

‎packages/components/badge/_example/badge.wxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<t-navbar title="Badge" leftArrow />
1+
<t-navbar title="Badge" leftArrow placeholder zIndex="{{99}}" />
22
<t-demo-header
33
title="Badge 徽标"
44
desc="用于告知用户，该区域的状态变化或者待处理任务的数量。"

‎packages/components/badge/_example/size/index.wxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<t-avatar icon="user" size="large" badge-props="{{ {count: 8, size: 'large', offset: [7, 7]} }}" />
55
</view>
66

7-
<view class="demo-desc">Middle</view>
7+
<view class="demo-desc">Medium</view>
88

99
<view class="block">
1010
<t-avatar icon="user" badge-props="{{ {count: 8, offset: [5, 5]} }}" />

‎packages/components/badge/_example/skyline/badge.wxml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<view class="skyline">
2-
<t-navbar class="block" title="Badge" left-arrow />
2+
<t-navbar class="block" title="Badge" left-arrow placeholder zIndex="{{99}}" />
33
<scroll-view scroll-y type="list" class="scroll-view">
44
<view class="demo-title">Badge 徽标</view>
55
<view class="demo-desc">用于告知用户，该区域的状态变化或者待处理任务的数量。</view>

0 commit comments

Comments
 (0)