Skip to content

Commit 2a26caa

Browse files
undefinedtangjinzhou
authored andcommitted
fix: slider marks support function #171
1 parent 647214c commit 2a26caa

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

components/slider/index.en-US.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
| disabled | If true, the slider will not be interactable. | boolean | false |
88
| dots | Whether the thumb can drag over tick only. | boolean | false |
99
| included | Make effect when `marks` not null,`true` means containment and `false` means coordinative | boolean | true |
10-
| marks | Tick mark of Slider, type of key must be `number`, and must in closed interval [min, max] ,each mark can declare its own style. | object | { number: string\|VNode } or { number: { style: object, label: string\|VNode } } |
10+
| marks | Tick mark of Slider, type of key must be `number`, and must in closed interval [min, max] ,each mark can declare its own style. | object | { number: string\|VNode } or { number: { style: object, label: string\|VNode } } or { number: () => VNode } |
1111
| max | The maximum value the slider can slide to | number | 100 |
1212
| min | The minimum value the slider can slide to. | number | 0 |
1313
| range | dual thumb mode | boolean | false |

components/slider/index.zh-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
| disabled | 值为 `true` 时,滑块为禁用状态 | boolean | false |
88
| dots | 是否只能拖拽到刻度上 | boolean | false |
99
| included | `marks` 不为空对象时有效,值为 true 时表示值为包含关系,false 表示并列 | boolean | true |
10-
| marks | 刻度标记,key 的类型必须为 `number` 且取值在闭区间 [min, max] 内,每个标签可以单独设置样式 | object | { number: string\|VNode } or { number: { style: object, label: string\|VNode } } |
10+
| marks | 刻度标记,key 的类型必须为 `number` 且取值在闭区间 [min, max] 内,每个标签可以单独设置样式 | object | { number: string\|VNode } or { number: { style: object, label: string\|VNode } } or { number: () => VNode } |
1111
| max | 最大值 | number | 100 |
1212
| min | 最小值 | number | 0 |
1313
| range | 双滑块模式 | boolean | false |

components/vc-slider/src/common/Marks.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { isValidElement } from '../../../_util/props-util'
33

44
const Marks = {
55
functional: true,
6-
render (createElement, context) {
6+
render (h, context) {
77
const {
88
className,
99
vertical,
@@ -22,7 +22,7 @@ const Marks = {
2222

2323
const range = max - min
2424
const elements = marksKeys.map(parseFloat).sort((a, b) => a - b).map(point => {
25-
const markPoint = marks[point]
25+
const markPoint = typeof marks[point] === 'function' ? marks[point](h) : marks[point]
2626
const markPointIsObject = typeof markPoint === 'object' &&
2727
!isValidElement(markPoint)
2828
const markLabel = markPointIsObject ? markPoint.label : markPoint

0 commit comments

Comments
 (0)