Skip to content

Commit ed7ef21

Browse files
authored
Merge branch 'develop' into feature/uniapp-theme
2 parents 249fc8a + 9adf814 commit ed7ef21

14 files changed

Lines changed: 66 additions & 9 deletions

File tree

packages/components/fab/template/draggable.wxml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
<template name="draggable">
55
<t-draggable
66
id="draggable"
7+
class="class"
8+
t-class="{{prefix}}-class"
79
style="right: 16px; bottom: 32px; {{_._style([style, customStyle, moveStyle])}}"
810
direction="{{draggable === true ? 'all' : draggable}}"
911
bind:start="onStart"

packages/components/indexes/README.en-US.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ style | Object | - | CSS(Cascading Style Sheets) | N
1010
custom-style | Object | - | CSS(Cascading Style Sheets),used to set style on virtual component | N
1111
current | String / Number | - | `1.9.7` | N
1212
default-current | String / Number | undefined | `1.9.7`。uncontrolled property | N
13-
index-list | Array | - | `0.32.0`。Typescript:`Array<string \| number>` | N
14-
list | Array | [] | `deprecated`。Typescript:`ListItem[] ` `interface ListItem { title: string; index: string; children: { title: string; [key: string]: any} [] }`[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/indexes/type.ts) | N
15-
sticky | Boolean | true | Typescript:`Boolean` | N
13+
index-list | Array | - | `0.32.0`。Typescript: `Array<string \| number>` | N
14+
list | Array | [] | `deprecated`。Typescript: `ListItem[] ` `interface ListItem { title: string; index: string; children: { title: string; [key: string]: any} [] }`[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/indexes/type.ts) | N
15+
show-full-index | Boolean | false | `1.13.2`。Typescript: `Boolean` | N
16+
sticky | Boolean | true | Typescript: `Boolean` | N
1617
sticky-offset | Number | 0 | `1.0.0` | N
1718

1819
### Indexes Events

packages/components/indexes/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ current | String / Number | - | `1.9.7`。索引列表的激活项,默认首
6161
default-current | String / Number | undefined | `1.9.7`。索引列表的激活项,默认首项。非受控属性 | N
6262
index-list | Array | - | `0.32.0`。索引字符列表。不传默认 `A-Z`。TS 类型:`Array<string \| number>` | N
6363
list | Array | [] | 已废弃。索引列表的列表数据。每个元素包含三个子元素,index(string):索引值,例如1,2,3,...或A,B,C等;title(string): 索引标题,可不填将默认设为索引值;children(Array<{title: string}>): 子元素列表,title为子元素的展示文案。TS 类型:`ListItem[] ` `interface ListItem { title: string; index: string; children: { title: string; [key: string]: any} [] }`[详细类型定义](https://github.com/Tencent/tdesign-miniprogram/blob/develop/packages/components/indexes/type.ts) | N
64+
show-full-index | Boolean | false | `1.13.2`。是否显示完整的索引内容,默认只显示首字符。TS 类型:`Boolean` | N
6465
sticky | Boolean | true | 索引是否吸顶,默认为true。TS 类型:`Boolean` | N
6566
sticky-offset | Number | 0 | `1.0.0`。锚点吸顶时与顶部的距离 | N
6667

packages/components/indexes/__test__/__snapshots__/demo.test.js.snap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,7 @@ exports[`Indexes Indexes custom demo works fine 1`] = `
453453
"#",
454454
]
455455
}}"
456+
showFullIndex="{{true}}"
456457
stickyOffset="{{8}}"
457458
tClass="wrapper"
458459
bind:change="onChange"

packages/components/indexes/_example/custom/index.wxml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,13 @@
22
<t-navbar title="TDesign" leftArrow placeholder />
33
</view>
44
<view class="indexes">
5-
<t-indexes bind:change="onChange" index-list="{{indexList}}" sticky-offset="{{stickyOffset + 8}}" t-class="wrapper">
5+
<t-indexes
6+
bind:change="onChange"
7+
show-full-index
8+
index-list="{{indexList}}"
9+
sticky-offset="{{stickyOffset + 8}}"
10+
t-class="wrapper"
11+
>
612
<block wx:for="{{list}}" wx:key="index">
713
<t-indexes-anchor index="{{item.index}}" t-class="anchor-wrapper">
814
<view class="capsule{{curIndex == item.index ? ' capsule--active' : ''}}">{{item.index}}</view>

packages/components/indexes/indexes.less

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,22 @@
2020
&__sidebar {
2121
position: fixed;
2222
right: @indexes-sidebar-right;
23-
width: @indexes-sidebar-item-size;
2423
color: @indexes-sidebar-color;
2524
font: @indexes-sidebar-font;
2625
display: flex;
26+
align-items: center;
27+
justify-content: center;
2728
flex-flow: column nowrap;
2829
top: 50%;
2930
transform: translateY(-50%);
3031
z-index: 1;
3132

3233
&-item {
33-
border-radius: 50%;
34+
min-width: @indexes-sidebar-item-size;
35+
height: @indexes-sidebar-item-size;
36+
padding: 0 calc(@spacer / 2);
37+
box-sizing: border-box;
38+
border-radius: @indexes-sidebar-item-size;
3439
position: relative;
3540
text-align: center;
3641

packages/components/indexes/indexes.wxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
bind:tap="onClick"
1818
>
1919
<view aria-role="button" aria-label="{{ current === item ? '已选中' + item : ''}}">
20-
{{ _this.getFirstCharacter(item) }}
20+
{{ _this.getFirstCharacter(item, showFullIndex) }}
2121
</view>
2222
<view class="{{classPrefix}}__sidebar-tips" wx:if="{{ showTips && current === item }}"> {{ item }} </view>
2323
</view>

packages/components/indexes/indexes.wxs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
function getFirstCharacter(str) {
2-
return str.toString().substring(0, 1);
1+
function getFirstCharacter(str, showFullIndex) {
2+
var res = str.toString();
3+
if (showFullIndex) {
4+
return res;
5+
}
6+
return res.substring(0, 1);
37
}
48

59
module.exports = {

packages/components/indexes/props.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ const props: TdIndexesProps = {
1919
indexList: {
2020
type: Array,
2121
},
22+
/** 是否显示完整的索引内容,默认只显示首字符 */
23+
showFullIndex: {
24+
type: Boolean,
25+
value: false,
26+
},
2227
/** 索引是否吸顶,默认为true */
2328
sticky: {
2429
type: Boolean,

packages/components/indexes/type.ts

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,14 @@ export interface TdIndexesProps {
2626
type: ArrayConstructor;
2727
value?: Array<string | number>;
2828
};
29+
/**
30+
* 是否显示完整的索引内容,默认只显示首字符
31+
* @default false
32+
*/
33+
showFullIndex?: {
34+
type: BooleanConstructor;
35+
value?: Boolean;
36+
};
2937
/**
3038
* 索引是否吸顶,默认为true
3139
* @default true

0 commit comments

Comments
 (0)