Skip to content

Commit

Permalink
fix: fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@anlyyao
anlyyao committed Sep 3, 2024
1 parent 96690f8 commit 4456d37
Show file tree
Hide file tree
Showing 2 changed files with 113 additions and 100 deletions.
100 changes: 50 additions & 50 deletions src/slider/README.en-US.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,62 +5,62 @@

### Slider Props

| name | type | default | description | required |
| ------------------ | ---------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------- |
| style | Object | - | CSS(Cascading Style Sheets) | N |
| custom-style | Object | - | CSS(Cascading Style Sheets)，used to set style on virtual component | N |
| colors | Array | [] | `deprecated`。Typescript：`Array<string>` | N |
| disabled | Boolean | undefined | \- | N |
| disabled-color | Array | [] | `deprecated`。Typescript：`Array<string>` | N |
| label | String / Boolean | false | Typescript：`string \| boolean` | N |
| marks | Object / Array | {} | Typescript：`Record<number, string> \| Array<number>` | N |
| max | Number | 100 | \- | N |
| min | Number | 0 | \- | N |
| range | Boolean | false | \- | N |
| show-extreme-value | Boolean | false | \- | N |
| step | Number | 1 | \- | N |
| theme | String | default | `0.30.0`。options: default/capsule | N |
| value | Number / Array | 0 | Typescript：`SliderValue` `type SliderValue = number \| Array<number>`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/slider/type.ts) | N |
| default-value | Number / Array | undefined | uncontrolled property。Typescript：`SliderValue` `type SliderValue = number \| Array<number>`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/slider/type.ts) | N |
| vertical | Boolean | false | \- | N |
name | type | default | description | required
-- | -- | -- | -- | --
style | Object | - | CSS(Cascading Style Sheets) | N
custom-style | Object | - | CSS(Cascading Style Sheets)，used to set style on virtual component | N
colors | Array | [] | `deprecated`。Typescript：`Array<string>` | N
disabled | Boolean | undefined | \- | N
disabled-color | Array | [] | `deprecated`。Typescript：`Array<string>` | N
label | String / Boolean | false | Typescript：`string \| boolean` | N
marks | Object / Array | {} | Typescript：`Record<number, string> \| Array<number>` | N
max | Number | 100 | \- | N
min | Number | 0 | \- | N
range | Boolean | false | \- | N
show-extreme-value | Boolean | false | \- | N
step | Number | 1 | \- | N
theme | String | default | `0.30.0`。options: default/capsule | N
value | Number / Array | 0 | Typescript：`SliderValue` `type SliderValue = number \| Array<number>`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/slider/type.ts) | N
default-value | Number / Array | undefined | uncontrolled property。Typescript：`SliderValue` `type SliderValue = number \| Array<number>`。[see more ts definition](https://github.com/Tencent/tdesign-miniprogram/tree/develop/src/slider/type.ts) | N
vertical | Boolean | false | \- | N

### Slider Events

| name | params | description |
| --------- | ------------------------------------- | ----------- |
| change | `(value: SliderValue)` | \- |
| dragend | `(value: SliderValue, e: TouchEvent)` | \- |
| dragstart | `(e: TouchEvent)` | \- |

name | params | description
-- | -- | --
change | `(value: SliderValue)` | \-
dragend | `(value: SliderValue, e: TouchEvent)` | \-
dragstart | `(e: TouchEvent)` | \-
### Slider External Classes

| className | Description |
| -------------------- | ----------- |
| t-class | \- |
| t-class-bar | \- |
| t-class-bar-active | \- |
| t-class-bar-disabled | \- |
| t-class-cursor | \- |
className | Description
-- | --
t-class | \-
t-class-bar | \-
t-class-bar-active | \-
t-class-bar-disabled | \-
t-class-cursor | \-


### CSS Variables

The component provides the following CSS variables, which can be used to customize styles.
| Name | Default Value | Description |
| --------------------------------- | ---------------------------- | ----------- |
| --td-slider-active-color | @brand-color | - |
| --td-slider-bar-height | 8rpx | - |
| --td-slider-bar-width | 8rpx | - |
| --td-slider-capsule-bar-color | @bg-color-component | - |
| --td-slider-capsule-bar-heihgt | 48rpx | - |
| --td-slider-capsule-bar-width | 48rpx | - |
| --td-slider-capsule-line-heihgt | 36rpx | - |
| --td-slider-default-color | @bg-color-component | - |
| --td-slider-default-color | @bg-color-component-disabled | - |
| --td-slider-disabled-color | @brand-color-disabled | - |
| --td-slider-disabled-text-color | @text-color-disabled | - |
| --td-slider-dot-bg-color | #fff | - |
| --td-slider-dot-color | @component-border | - |
| --td-slider-dot-disabled-bg-color | #fff | - |
| --td-slider-dot-disabled-color | #f3f3f3 | - |
| --td-slider-dot-size | 40rpx | - |
| --td-slider-text-color | @text-color-primary | - |
Name | Default Value | Description
-- | -- | --
--td-slider-active-color | @brand-color | -
--td-slider-bar-height | 8rpx | -
--td-slider-bar-width | 8rpx | -
--td-slider-capsule-bar-color | @bg-color-component | -
--td-slider-capsule-bar-heihgt | 48rpx | -
--td-slider-capsule-bar-width | 48rpx | -
--td-slider-capsule-line-heihgt | 36rpx | -
--td-slider-default-color | @bg-color-component | -
--td-slider-default-color | @bg-color-component-disabled | -
--td-slider-disabled-color | @brand-color-disabled | -
--td-slider-disabled-text-color | @text-color-disabled | -
--td-slider-dot-bg-color | #fff | -
--td-slider-dot-color | @component-border | -
--td-slider-dot-disabled-bg-color | #fff | -
--td-slider-dot-disabled-border-color | #f3f3f3 | -
--td-slider-dot-size | 40rpx | -
--td-slider-text-color | @text-color-primary | -
Loading

0 comments on commit 4456d37

Please sign in to comment.