kui-vue 3.2.11-rc2 → 3.2.11-rc5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/components/dropdown/demo/base.md +12 -4
- package/components/form/demo/base.md +1 -1
- package/components/form/styles/index.less +0 -5
- package/components/grid/row.jsx +10 -4
- package/components/grid/styles/index.less +9 -23
- package/components/icon/demo/stroke.md +2 -2
- package/components/inputNumber/inputNumber.jsx +6 -4
- package/components/inputNumber/styles/index.less +4 -0
- package/components/layout/styles/index.less +12 -12
- package/components/progress/demo/dashboard.md +1 -1
- package/components/progress/demo/size.md +4 -4
- package/components/progress/progress.jsx +1 -1
- package/components/slider/demo/base.md +9 -4
- package/components/slider/demo/marks.md +37 -26
- package/components/slider/slider.jsx +56 -22
- package/components/slider/styles/index.less +6 -3
- package/components/slider/thumb.jsx +18 -17
- package/dist/k-ui.css +2 -2
- package/dist/k-ui.js +2 -2
- package/package.json +1 -1
- package/readme.md +38 -21
|
@@ -21,9 +21,9 @@
|
|
|
21
21
|
</MenuItem>
|
|
22
22
|
</Menu>
|
|
23
23
|
</Dropdown>
|
|
24
|
-
<Dropdown show-placement-arrow trigger="
|
|
25
|
-
<Button theme="light">
|
|
26
|
-
|
|
24
|
+
<Dropdown show-placement-arrow trigger="normal" placement="bottom" v-model="show">
|
|
25
|
+
<Button theme="light" @click="show=!show">
|
|
26
|
+
Toggle <Icon type="chevron-down" />
|
|
27
27
|
</Button>
|
|
28
28
|
<Menu slot="content">
|
|
29
29
|
<MenuItem>
|
|
@@ -55,5 +55,13 @@
|
|
|
55
55
|
</Menu>
|
|
56
56
|
</Dropdown>
|
|
57
57
|
</template>
|
|
58
|
-
|
|
58
|
+
<script>
|
|
59
|
+
export default{
|
|
60
|
+
data(){
|
|
61
|
+
return {
|
|
62
|
+
show:false
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
</script>
|
|
59
67
|
```
|
package/components/grid/row.jsx
CHANGED
|
@@ -2,8 +2,8 @@
|
|
|
2
2
|
export default {
|
|
3
3
|
name: "Row",
|
|
4
4
|
props: {
|
|
5
|
-
gutter: Number,
|
|
6
|
-
type: String,
|
|
5
|
+
gutter: [Number, Array],
|
|
6
|
+
type: { type: String, default: 'flex' },
|
|
7
7
|
justify: {
|
|
8
8
|
type: String,
|
|
9
9
|
validator: (value) => {
|
|
@@ -32,10 +32,16 @@ export default {
|
|
|
32
32
|
|
|
33
33
|
}],
|
|
34
34
|
style: {
|
|
35
|
-
|
|
36
|
-
marginRight: gutter ? gutter / -2 + "px" : null,
|
|
35
|
+
|
|
37
36
|
}
|
|
38
37
|
}
|
|
38
|
+
if (Array.isArray(gutter)) {
|
|
39
|
+
props.style.gap = gutter + 'px'
|
|
40
|
+
} else if (!isNaN(Number(gutter))) {
|
|
41
|
+
props.style.marginLeft = gutter / -2 + "px"
|
|
42
|
+
props.style.marginRight = gutter / -2 + "px"
|
|
43
|
+
props.style.gap = gutter + 'px'
|
|
44
|
+
}
|
|
39
45
|
return (<div {...props}>{$slots.default}</div >)
|
|
40
46
|
}
|
|
41
47
|
};
|
|
@@ -1,33 +1,22 @@
|
|
|
1
1
|
@import '../../styles/var.less';
|
|
2
2
|
.k-row {
|
|
3
|
-
|
|
4
|
-
margin-left: 0;
|
|
5
|
-
margin-right: 0;
|
|
6
|
-
height: auto;
|
|
7
|
-
zoom: 1;
|
|
8
|
-
display: block;
|
|
3
|
+
display: flex;
|
|
9
4
|
box-sizing: border-box;
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
clear: both;
|
|
17
|
-
visibility: hidden;
|
|
18
|
-
font-size: 0;
|
|
19
|
-
height: 0;
|
|
20
|
-
}
|
|
5
|
+
flex-flow: row wrap;
|
|
6
|
+
}
|
|
7
|
+
.k-col{
|
|
8
|
+
position: relative;
|
|
9
|
+
max-width: 100%;
|
|
10
|
+
min-height: 1px;
|
|
21
11
|
}
|
|
22
|
-
|
|
23
12
|
@fix :~'k-col';
|
|
24
13
|
@counts :24;
|
|
25
14
|
.makecol(@index) when(@index>0) {
|
|
26
15
|
.@{fix}-@{index} {
|
|
27
16
|
display: block;
|
|
28
|
-
float: left;
|
|
29
17
|
box-sizing: border-box;
|
|
30
|
-
width: percentage((@index / @counts));
|
|
18
|
+
max-width: percentage((@index / @counts));
|
|
19
|
+
flex:0 0 percentage((@index / @counts));
|
|
31
20
|
}
|
|
32
21
|
.@{fix}-offset-@{index} {
|
|
33
22
|
margin-left: percentage((@index / @counts));
|
|
@@ -39,9 +28,6 @@
|
|
|
39
28
|
.k-row-flex {
|
|
40
29
|
display: flex;
|
|
41
30
|
flex-flow: row wrap;
|
|
42
|
-
&::after,&::before{
|
|
43
|
-
display: none;
|
|
44
|
-
}
|
|
45
31
|
}
|
|
46
32
|
|
|
47
33
|
.k-row-flex-top {
|
|
@@ -7,9 +7,9 @@
|
|
|
7
7
|
<template>
|
|
8
8
|
<div>
|
|
9
9
|
<Icon type="chevron-double-forward-outline" />
|
|
10
|
-
<Icon type="chevron-double-forward-outline" strokeWidth="30"/>
|
|
10
|
+
<Icon type="chevron-double-forward-outline" :strokeWidth="30"/>
|
|
11
11
|
<Icon type="chevron-forward-outline" />
|
|
12
|
-
<Icon type="chevron-forward-outline" strokeWidth="30"/>
|
|
12
|
+
<Icon type="chevron-forward-outline" :strokeWidth="30"/>
|
|
13
13
|
</div>
|
|
14
14
|
</template>
|
|
15
15
|
```
|
|
@@ -42,12 +42,14 @@ export default {
|
|
|
42
42
|
}
|
|
43
43
|
if (v !== undefined && v !== '' && v !== null) {
|
|
44
44
|
if (isNaN(Number(v))) {
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
45
|
+
// ios not supper,可惜了
|
|
46
|
+
// v = (v + '').replace(/^([^-]+)(?=-\S*)/, '') // 移除第一个负号之前的所有字符
|
|
47
|
+
// .replace(/(?<!^)-/g, '') // 移除第一个负号之外的所有负号
|
|
48
|
+
// .replace(/[^0-9.-]/g, '') // 移除数字 小数点 负号之外的所有字符
|
|
49
|
+
// .replace(/(?<!^[\d-]+)\./g, '') // 移除第一个小数点之外的所有句点
|
|
49
50
|
// .replace(/^0*(-?\d+)(\.(\d{1,2}))?\S*?$/, '$1$2') // 保留两位小数
|
|
50
51
|
// console.log(v)
|
|
52
|
+
v = (v + '').replace(/(?!-).*?(([0-9]*\.)?[0-9]+).*/g, "$1")
|
|
51
53
|
}
|
|
52
54
|
if (v === '') return ''
|
|
53
55
|
v = toNumber(v + '')
|
|
@@ -38,8 +38,12 @@
|
|
|
38
38
|
color: var(--kui-color-main);
|
|
39
39
|
background-color: var(--kui-color-gray-80);
|
|
40
40
|
}
|
|
41
|
+
&:first-child {
|
|
42
|
+
border-radius: 0 @radius 0 0;
|
|
43
|
+
}
|
|
41
44
|
&:last-child {
|
|
42
45
|
border-top: 1px solid var(--kui-color-border);
|
|
46
|
+
border-radius: 0 0 @radius 0;
|
|
43
47
|
}
|
|
44
48
|
}
|
|
45
49
|
.k-input-number-text {
|
|
@@ -2,18 +2,18 @@
|
|
|
2
2
|
box-sizing: border-box;
|
|
3
3
|
display: flex;
|
|
4
4
|
flex-direction: column;
|
|
5
|
-
&::before {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
}
|
|
10
|
-
&::after {
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
}
|
|
5
|
+
// &::before {
|
|
6
|
+
// content: "";
|
|
7
|
+
// display: table;
|
|
8
|
+
// box-sizing: border-box;
|
|
9
|
+
// }
|
|
10
|
+
// &::after {
|
|
11
|
+
// content: "";
|
|
12
|
+
// clear: both;
|
|
13
|
+
// visibility: hidden;
|
|
14
|
+
// font-size: 0;
|
|
15
|
+
// height: 0;
|
|
16
|
+
// }
|
|
17
17
|
.k-layout-header {
|
|
18
18
|
box-sizing: border-box;
|
|
19
19
|
}
|
|
@@ -6,10 +6,10 @@
|
|
|
6
6
|
```vue
|
|
7
7
|
<template>
|
|
8
8
|
Custom:
|
|
9
|
-
<Progress strokeHeight="10" :percent="50" />
|
|
10
|
-
<Progress strokeHeight="3" :percent="50" />
|
|
11
|
-
<Progress strokeWidth="15" type="circle" :width="80" :percent="50" />
|
|
12
|
-
<Progress strokeWidth="3" type="circle" :width="80" :percent="50" />
|
|
9
|
+
<Progress :strokeHeight="10" :percent="50" />
|
|
10
|
+
<Progress :strokeHeight="3" :percent="50" />
|
|
11
|
+
<Progress :strokeWidth="15" type="circle" :width="80" :percent="50" />
|
|
12
|
+
<Progress :strokeWidth="3" type="circle" :width="80" :percent="50" />
|
|
13
13
|
<br/>
|
|
14
14
|
Small:
|
|
15
15
|
<div :style="{width:'300px',marginBottom:'30px'}">
|
|
@@ -6,10 +6,15 @@
|
|
|
6
6
|
```vue
|
|
7
7
|
<template>
|
|
8
8
|
<div style="width:520px;">
|
|
9
|
-
<Slider v-model="v1" :step="10" :disabled="disabled"/>
|
|
10
|
-
<Slider v-model="v2" range :disabled="disabled"/>
|
|
11
|
-
|
|
12
|
-
<
|
|
9
|
+
<Slider v-model="v1" :step="10" :disabled="disabled" :min="20"/>
|
|
10
|
+
<Slider v-model="v2" range :disabled="disabled" :min="10" :max="80"/>
|
|
11
|
+
|
|
12
|
+
<Slider :marks="{ 0: '0°C',25: '25°C', 36: '36°C',100: '100°C', }"
|
|
13
|
+
:step="null"
|
|
14
|
+
:disabled="disabled"
|
|
15
|
+
:value="25"></Slider>
|
|
16
|
+
<br />
|
|
17
|
+
<br />
|
|
13
18
|
Disabled: <Switch v-model="disabled" />
|
|
14
19
|
</div>
|
|
15
20
|
</template>
|
|
@@ -6,36 +6,47 @@
|
|
|
6
6
|
```vue
|
|
7
7
|
<template>
|
|
8
8
|
<div style="width:520px;">
|
|
9
|
-
|
|
10
|
-
<Slider
|
|
11
|
-
:
|
|
12
|
-
:
|
|
13
|
-
:
|
|
9
|
+
<div>step=10</div>
|
|
10
|
+
<Slider :step="10"
|
|
11
|
+
:marks="{ 10: '10', 20: '20', 30: '30', 40: '40', 50: '50', 80: '80' }"
|
|
12
|
+
:value="[10, 80]"
|
|
13
|
+
:max="80"
|
|
14
|
+
:min="10"
|
|
14
15
|
:range="true"></Slider>
|
|
15
|
-
<br/>
|
|
16
|
-
<br/>
|
|
16
|
+
<br />
|
|
17
|
+
<br />
|
|
17
18
|
<div>step=0.1</div>
|
|
18
|
-
<Slider
|
|
19
|
-
:
|
|
20
|
-
:
|
|
21
|
-
:
|
|
22
|
-
:
|
|
23
|
-
:value="[0.1, 0.5]"
|
|
19
|
+
<Slider :step="0.1"
|
|
20
|
+
:marks="{ 0.1: '0.1', 0.2: '0.2', 0.3: '0.3', 0.4: '0.4', 0.5: '0.5' }"
|
|
21
|
+
:min="0"
|
|
22
|
+
:max="1"
|
|
23
|
+
:value="[0.1, 0.5]"
|
|
24
24
|
:range="true"></Slider>
|
|
25
|
-
<br/>
|
|
26
|
-
<br/>
|
|
27
|
-
<div>Marks</div>
|
|
28
|
-
<Slider
|
|
29
|
-
:
|
|
30
|
-
:value="[0, 100]"
|
|
31
|
-
:range="true"
|
|
32
|
-
<br/>
|
|
33
|
-
<br/>
|
|
25
|
+
<br />
|
|
26
|
+
<br />
|
|
27
|
+
<div>Marks & step=10</div>
|
|
28
|
+
<Slider :marks="{ 25: '25°C', 36: '36°C' }"
|
|
29
|
+
:step="10"
|
|
30
|
+
:value="[0, 100]"
|
|
31
|
+
:range="true"></Slider>
|
|
32
|
+
<br />
|
|
33
|
+
<br />
|
|
34
|
+
<div>step=null</div>
|
|
35
|
+
<Slider :marks="{ 0: '0°C',25: '25°C', 36: '36°C',100: '100°C', }"
|
|
36
|
+
:step="null"
|
|
37
|
+
:value="[0, 100]"
|
|
38
|
+
:range="true"></Slider>
|
|
39
|
+
<br />
|
|
40
|
+
<br />
|
|
41
|
+
<Slider :marks="{ 0: '0°C',25: '25°C', 36: '36°C',100: '100°C', }"
|
|
42
|
+
:step="null"
|
|
43
|
+
:value="25"></Slider>
|
|
44
|
+
<br />
|
|
45
|
+
<br />
|
|
34
46
|
<div>Inclued</div>
|
|
35
|
-
<Slider
|
|
36
|
-
:
|
|
37
|
-
:
|
|
38
|
-
:value="[0, 100]"
|
|
47
|
+
<Slider :marks="{ 20: '20°C', 40: '40°C' }"
|
|
48
|
+
:included="false"
|
|
49
|
+
:value="[0, 100]"
|
|
39
50
|
:range="true"></Slider>
|
|
40
51
|
</div>
|
|
41
52
|
</template>
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import Thumb from './thumb'
|
|
2
|
+
import { times } from '../_tool/number'
|
|
2
3
|
export default {
|
|
3
4
|
props: {
|
|
4
5
|
value: [Array, Number, String],
|
|
@@ -8,7 +9,7 @@ export default {
|
|
|
8
9
|
step: {
|
|
9
10
|
type: Number,
|
|
10
11
|
default: 1,
|
|
11
|
-
validator: (val) => val
|
|
12
|
+
validator: (val) => val !== 0
|
|
12
13
|
},
|
|
13
14
|
range: Boolean,
|
|
14
15
|
vertical: Boolean,
|
|
@@ -39,17 +40,46 @@ export default {
|
|
|
39
40
|
}
|
|
40
41
|
},
|
|
41
42
|
methods: {
|
|
43
|
+
getMinStep(percent) {
|
|
44
|
+
let { marks, step, min } = this
|
|
45
|
+
if (!marks) return times(Math.round((percent + min) / step), step)
|
|
46
|
+
let steps = Object.keys(marks)//, values = []
|
|
47
|
+
steps = steps.map(x => x * 1 + min)
|
|
48
|
+
if (step) {
|
|
49
|
+
steps.push(times(Math.round((percent + min) / step), step))
|
|
50
|
+
}
|
|
51
|
+
// steps.forEach(x => {
|
|
52
|
+
// values.push(x == 0 ? 0 : times(Math.round((percent + min) / x), x))
|
|
53
|
+
// })
|
|
54
|
+
|
|
55
|
+
let result = steps.reduce((x, y) => Math.abs(x - percent - min) > Math.abs(y - percent - min) ? y : x)
|
|
56
|
+
// console.log(percent, result, steps)
|
|
57
|
+
return result
|
|
58
|
+
},
|
|
42
59
|
getValue() {
|
|
43
|
-
let { value = 0, range, min, max } = this, v
|
|
60
|
+
let { value = 0, range, min, max } = this, v;
|
|
61
|
+
let diff = max - min;
|
|
44
62
|
if (!range) {
|
|
63
|
+
v = value
|
|
45
64
|
if (value >= max) v = max
|
|
46
65
|
else if (value <= min) v = min
|
|
66
|
+
// let percent = (v - min) * 100 / diff
|
|
67
|
+
// v = this.getMinStep(percent)
|
|
47
68
|
} else {
|
|
48
|
-
|
|
69
|
+
|
|
70
|
+
if (!Array.isArray(value)) {
|
|
49
71
|
v = [0, 0]
|
|
72
|
+
} else {
|
|
73
|
+
v = [].concat(value)
|
|
50
74
|
}
|
|
51
75
|
let [x, y] = v
|
|
52
76
|
|
|
77
|
+
// let p1 = (x - min) * 100 / diff
|
|
78
|
+
// let p2 = (y - min) * 100 / diff
|
|
79
|
+
// x = this.getMinStep(p1)
|
|
80
|
+
// y = this.getMinStep(p2)
|
|
81
|
+
// console.log(p1 * 100, p2 * 100)
|
|
82
|
+
|
|
53
83
|
if (x >= max) x = max
|
|
54
84
|
else if (x <= min) x = min
|
|
55
85
|
|
|
@@ -61,18 +91,21 @@ export default {
|
|
|
61
91
|
return v
|
|
62
92
|
},
|
|
63
93
|
click(e) {
|
|
64
|
-
let { disabled, range, vertical, step, max, defaultValue, reverse } = this
|
|
94
|
+
let { disabled, range, vertical, step, max, min, defaultValue, reverse } = this
|
|
65
95
|
if (disabled) return;
|
|
66
96
|
let { width, height } = e.target.getBoundingClientRect()
|
|
67
97
|
let { layerX, layerY } = e
|
|
68
98
|
|
|
69
|
-
let percent = 0
|
|
99
|
+
let percent = 0, diff = max - min;
|
|
70
100
|
if (reverse) {
|
|
71
|
-
percent = vertical ? (((height - layerY) / height) *
|
|
101
|
+
percent = vertical ? (((height - layerY) / height) * diff) : (((width - layerX) / width) * diff);
|
|
72
102
|
} else {
|
|
73
|
-
percent = vertical ? ((layerY / height) *
|
|
103
|
+
percent = vertical ? ((layerY / height) * diff) : ((layerX / width) * diff);
|
|
74
104
|
}
|
|
75
|
-
let value =
|
|
105
|
+
let value = this.getMinStep(percent)
|
|
106
|
+
// let value = times(Math.round((percent + min) / step), step)
|
|
107
|
+
// console.log(value, step)
|
|
108
|
+
|
|
76
109
|
if (range) {
|
|
77
110
|
let [x, y] = defaultValue
|
|
78
111
|
let half = y > x ? (y - x) / 2 + x : (x - y) / 2 + y
|
|
@@ -83,15 +116,17 @@ export default {
|
|
|
83
116
|
this.$emit('input', value)
|
|
84
117
|
},
|
|
85
118
|
isActice(a) {
|
|
86
|
-
let { defaultValue, reverse, max, vertical } = this
|
|
119
|
+
let { defaultValue, reverse, max, min, vertical } = this
|
|
87
120
|
let active;
|
|
88
121
|
if (this.range) {
|
|
89
122
|
let [x, y] = defaultValue
|
|
90
|
-
active = x < y ? a >= x && a <= y : a <= x && a >= y
|
|
123
|
+
active = x < y ? (a >= x && a <= y) : (a <= x && a >= y)
|
|
124
|
+
// console.log(a, active, `${a} >= ${x} && ${a} <= ${y}`)
|
|
91
125
|
} else {
|
|
92
126
|
active = a <= defaultValue
|
|
93
127
|
}
|
|
94
|
-
let
|
|
128
|
+
let diff = max - min
|
|
129
|
+
let pos = ((a - min) / diff) * 100 + '%'
|
|
95
130
|
let sty = {}
|
|
96
131
|
if (reverse) {
|
|
97
132
|
sty = vertical ?
|
|
@@ -113,7 +148,7 @@ export default {
|
|
|
113
148
|
return <div div class="k-slider-marks" >
|
|
114
149
|
{
|
|
115
150
|
mks.map(v => {
|
|
116
|
-
|
|
151
|
+
const { active, sty } = this.isActice(v);
|
|
117
152
|
return <div class={['k-slider-mark-symbol', { 'k-slider-mark-symbol-active': active }]} style={sty} />
|
|
118
153
|
})
|
|
119
154
|
}
|
|
@@ -126,21 +161,20 @@ export default {
|
|
|
126
161
|
</div>
|
|
127
162
|
},
|
|
128
163
|
renderTrack() {
|
|
129
|
-
let { vertical, max, defaultValue, range, included, marks, reverse } = this
|
|
130
|
-
let percent1 = 0, percent2 = 0,
|
|
164
|
+
let { vertical, max, min, defaultValue, range, included, marks, reverse } = this
|
|
165
|
+
let percent1 = 0, percent2 = 0, diff = max - min;
|
|
166
|
+
let w, l;
|
|
131
167
|
|
|
132
168
|
if (!range) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
percent2 = (defaultValue / max) * 100
|
|
169
|
+
percent2 = ((defaultValue - min) / diff) * 100
|
|
170
|
+
|
|
136
171
|
} else {
|
|
137
172
|
let [x, y] = defaultValue
|
|
138
|
-
percent1 = (x /
|
|
139
|
-
percent2 = (y /
|
|
140
|
-
x1 = x, x2 = y
|
|
173
|
+
percent1 = ((x - min) / diff) * 100
|
|
174
|
+
percent2 = ((y - min) / diff) * 100
|
|
141
175
|
}
|
|
142
176
|
let trackSty = {}
|
|
143
|
-
|
|
177
|
+
// console.log(percent1, percent2)
|
|
144
178
|
if (percent2 > percent1) {
|
|
145
179
|
w = percent2 - percent1
|
|
146
180
|
l = percent1
|
|
@@ -175,7 +209,7 @@ export default {
|
|
|
175
209
|
let { vertical, disabled, range, step, reverse, max, min, defaultValue, tooltipVisible, tipFormatter } = this
|
|
176
210
|
return {
|
|
177
211
|
props: {
|
|
178
|
-
vertical, disabled, range, step, reverse,
|
|
212
|
+
vertical, disabled, range, step, reverse, min,
|
|
179
213
|
max, tipFormatter, tooltipVisible,
|
|
180
214
|
value: range ? [].concat(defaultValue) : defaultValue * 1
|
|
181
215
|
},
|
|
@@ -72,10 +72,13 @@
|
|
|
72
72
|
.k-slider-mark-text {
|
|
73
73
|
position: absolute;
|
|
74
74
|
transform: translateX(-50%);
|
|
75
|
-
color: var(--kui-color-
|
|
75
|
+
color: var(--kui-color-disable-color);
|
|
76
76
|
z-index: 0;
|
|
77
77
|
line-height: 1;
|
|
78
78
|
margin-top: 18px;
|
|
79
|
+
&-active {
|
|
80
|
+
color: var(--kui-color-font);
|
|
81
|
+
}
|
|
79
82
|
}
|
|
80
83
|
}
|
|
81
84
|
|
|
@@ -110,8 +113,8 @@
|
|
|
110
113
|
.k-slider-mark-symbol, .k-slider-mark-text {
|
|
111
114
|
transform: translateY(-50%);
|
|
112
115
|
}
|
|
113
|
-
.k-slider-mark-text{
|
|
114
|
-
margin:0 0 0 18px;
|
|
116
|
+
.k-slider-mark-text {
|
|
117
|
+
margin: 0 0 0 18px;
|
|
115
118
|
}
|
|
116
119
|
}
|
|
117
120
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Tooltip from "../tooltip"
|
|
2
|
-
import {
|
|
2
|
+
import { times } from '../_tool/number'
|
|
3
3
|
export default {
|
|
4
4
|
props: {
|
|
5
5
|
vertical: Boolean,
|
|
@@ -23,19 +23,19 @@ export default {
|
|
|
23
23
|
showTip: false
|
|
24
24
|
}
|
|
25
25
|
},
|
|
26
|
-
computed: {
|
|
27
|
-
rect() {
|
|
28
|
-
return this.bar.$refs.rail.getBoundingClientRect()
|
|
29
|
-
}
|
|
30
|
-
},
|
|
31
26
|
methods: {
|
|
32
27
|
mouseMove(e) {
|
|
33
28
|
if (this.isMouseDown) {
|
|
34
29
|
let { clientX, clientY } = e
|
|
35
|
-
let
|
|
30
|
+
// let r = e.target.getBoundingClientRect()
|
|
31
|
+
// console.log(e)
|
|
32
|
+
// let clientX = r.left + r.width / 2, clientY = r.top + r.height / 2
|
|
33
|
+
// console.log(clientX, clientY, r)
|
|
34
|
+
|
|
35
|
+
let { width, height, left, right, top, bottom } = this.bar.$refs.rail.getBoundingClientRect()
|
|
36
36
|
let { value, range, step, max, min, vertical, reverse, type } = this, v = value;
|
|
37
37
|
|
|
38
|
-
let percent = 0;
|
|
38
|
+
let percent = 0, diff = max - min;
|
|
39
39
|
if (reverse) {
|
|
40
40
|
percent = vertical ? ((height - (clientY - top)) / height) : ((width - (clientX - left)) / width)
|
|
41
41
|
} else {
|
|
@@ -44,17 +44,18 @@ export default {
|
|
|
44
44
|
if (percent >= 1) percent = 1
|
|
45
45
|
else if (percent <= 0) percent = 0
|
|
46
46
|
// this.defaultValue = value
|
|
47
|
+
// console.log(percent)
|
|
47
48
|
let x = range ? (type == 'right' ? v[1] : v[0]) : v
|
|
48
49
|
|
|
49
|
-
|
|
50
|
-
x = (((percent *
|
|
51
|
-
x =
|
|
50
|
+
|
|
51
|
+
// x = times(Math.round((percent * diff + min) / step), step)
|
|
52
|
+
x = this.bar.getMinStep(percent * diff)
|
|
52
53
|
|
|
53
54
|
if (x >= max) x = max
|
|
54
55
|
else if (x <= min) x = min
|
|
55
56
|
|
|
56
57
|
v = range ? (type == 'right' ? [v[0], x] : [x, v[1]]) : x
|
|
57
|
-
|
|
58
|
+
// console.log(v)
|
|
58
59
|
this.$emit('input', v)
|
|
59
60
|
}
|
|
60
61
|
},
|
|
@@ -74,13 +75,13 @@ export default {
|
|
|
74
75
|
this.isMouseDown = true
|
|
75
76
|
this.showTip = true
|
|
76
77
|
this.index = 2
|
|
77
|
-
this.mouseMove(e)
|
|
78
|
+
// this.mouseMove(e)
|
|
78
79
|
document.addEventListener('mousemove', this.mouseMove)
|
|
79
80
|
document.addEventListener('mouseup', this.mouseUp)
|
|
80
81
|
}
|
|
81
82
|
},
|
|
82
83
|
render() {
|
|
83
|
-
let { vertical, value, index, disabled, max, tipFormatter, range, type, reverse, tooltipVisible } = this
|
|
84
|
+
let { vertical, value, index, disabled, max, min, tipFormatter, range, type, reverse, tooltipVisible } = this
|
|
84
85
|
const props = {
|
|
85
86
|
class: 'k-slider-thumb',
|
|
86
87
|
style: {
|
|
@@ -103,11 +104,11 @@ export default {
|
|
|
103
104
|
}
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
|
-
let percent
|
|
107
|
+
let percent, diff = max - min;;
|
|
107
108
|
if (type == 'right') {
|
|
108
|
-
percent = ((range ? value[1] : value) /
|
|
109
|
+
percent = (((range ? value[1] : value) - min) / diff) * 100
|
|
109
110
|
} else {
|
|
110
|
-
percent = (value[0] /
|
|
111
|
+
percent = ((value[0] - min) / diff) * 100
|
|
111
112
|
}
|
|
112
113
|
let sty = {}
|
|
113
114
|
if (vertical) {
|