Skip to content

Commit 9e7c8d3

Browse files
jasper-opsMoonofweisheng
authored andcommitted
feat: ✨ Slider组件min值允许负数
Closes: #266
1 parent 1802cd4 commit 9e7c8d3

File tree

3 files changed

+18
-24
lines changed

3 files changed

+18
-24
lines changed

docs/component/slider.md

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,17 @@ const value = ref<number[]>([10, 30])
5555
```
5656

5757
## Attributes
58-
| 参数 | 说明 | 类型 | 可选值 | 默认值 | 最低版本 |
59-
|-----|------|-----|-------|-------|--------|
60-
| v-model | 滑块值,如果为array,则为双向滑块 | number / array | - | - | - |
61-
| hide-min-max | 是否显示左右的最大最小值 | boolean | - | false | - |
62-
| hide-label | 是否显示当前滑块值 | boolean | - | false | - |
63-
| disabled | 是否禁用 | boolean | - | false | - |
64-
| max | 最大值 | number | - | 100 | - |
65-
| min | 最小值 | number | - | 0 | - |
66-
| step | 步进值 | number | - | 1 | - |
67-
| active-color | 进度条激活背景颜色 | string | - | linear-gradient(315deg, rgba(81,124,240,1) 0%,rgba(118,158,245,1) 100%) | - |
68-
| inactive-color | 进度条未激活背景颜色 | string | - | #e5e5e5 | - |
58+
| 参数 | 说明 | 类型 | 可选值 | 默认值 | 最低版本 |
59+
|-----|---------------------------|-----|-------|-------|--------|
60+
| v-model | 滑块值,如果为array,则为双向滑块 | number / array | - | - | - |
61+
| hide-min-max | 是否显示左右的最大最小值 | boolean | - | false | - |
62+
| hide-label | 是否显示当前滑块值 | boolean | - | false | - |
63+
| disabled | 是否禁用 | boolean | - | false | - |
64+
| max | 最大值 | number | - | 100 | - |
65+
| min | 最小值,允许负数`($LOWEST_VERSION$)` | number | - | 0 | - |
66+
| step | 步进值 | number | - | 1 | - |
67+
| active-color | 进度条激活背景颜色 | string | - | linear-gradient(315deg, rgba(81,124,240,1) 0%,rgba(118,158,245,1) 100%) | - |
68+
| inactive-color | 进度条未激活背景颜色 | string | - | #e5e5e5 | - |
6969

7070
## Events
7171

src/pages/slider/Index.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* @Date: 2023-10-10 17:02:32
44
* @LastEditTime: 2023-10-10 18:08:19
55
* @LastEditors: weisheng
6-
* @Description:
6+
* @Description:
77
* @FilePath: \wot-design-uni\src\pages\slider\Index.vue
88
* 记得注释
99
-->
@@ -13,7 +13,7 @@
1313
<wd-slider v-model="value1" />
1414
</demo-block>
1515
<demo-block title="指定选择范围">
16-
<wd-slider v-model="value2" :min="4" :max="1000" />
16+
<wd-slider v-model="value2" :min="-10" :max="10" />
1717
</demo-block>
1818
<demo-block title="指定步长">
1919
<wd-slider v-model="value4" hide-min-max :step="10" />

src/uni_modules/wot-design-uni/components/wd-slider/wd-slider.vue

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -95,35 +95,29 @@ const stepValue = ref<number>(1) // 步长
9595
watch(
9696
() => props.max,
9797
(newValue) => {
98-
if (newValue < 0) {
99-
maxValue.value = 100
100-
console.warn('[wot design] warning(wd-slider): max value must be greater than 0')
101-
} else if (newValue <= props.min) {
98+
if (newValue <= props.min) {
10299
maxValue.value = props.min // 交换最大值和最小值
103100
minValue.value = newValue
104101
console.warn('[wot design] warning(wd-slider): max value must be greater than min value')
105102
} else {
106103
maxValue.value = newValue // 更新最大值
107104
}
108105
},
109-
{ deep: true, immediate: true }
106+
{ immediate: true }
110107
)
111108
112109
watch(
113110
() => props.min,
114111
(newValue) => {
115-
if (newValue < 0) {
116-
minValue.value = 0
117-
console.warn('[wot design] warning(wd-slider): min value must be greater than 0')
118-
} else if (newValue >= props.max) {
112+
if (newValue >= props.max) {
119113
minValue.value = props.max // 交换最小值和最大值
120114
maxValue.value = newValue
121115
console.warn('[wot design] warning(wd-slider): min value must be less than max value')
122116
} else {
123117
minValue.value = newValue // 更新最小值
124118
}
125119
},
126-
{ deep: true, immediate: true }
120+
{ immediate: true }
127121
)
128122
129123
watch(
@@ -134,7 +128,7 @@ watch(
134128
console.warn('[wot design] warning(wd-slider): step must be greater than 0')
135129
}
136130
},
137-
{ deep: true, immediate: true }
131+
{ immediate: true }
138132
)
139133
140134
watch(

0 commit comments

Comments
 (0)