kui-vue 3.2.11-rc3 → 3.2.11-rc4
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/grid/row.jsx +10 -4
- package/components/grid/styles/index.less +9 -20
- package/components/progress/progress.jsx +1 -1
- package/components/slider/demo/base.md +9 -4
- package/components/slider/slider.jsx +42 -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/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));
|
|
@@ -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="30"></Slider>
|
|
16
|
+
<br />
|
|
17
|
+
<br />
|
|
13
18
|
Disabled: <Switch v-model="disabled" />
|
|
14
19
|
</div>
|
|
15
20
|
</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,6 +40,21 @@ 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
|
+
if (step) {
|
|
48
|
+
steps.push(times(Math.round((percent + min) / step), step))
|
|
49
|
+
}
|
|
50
|
+
// steps.forEach(x => {
|
|
51
|
+
// values.push(x == 0 ? 0 : times(Math.round((percent + min) / x), x))
|
|
52
|
+
// })
|
|
53
|
+
|
|
54
|
+
let result = steps.reduce((x, y) => Math.abs(x - percent) > Math.abs(y - percent) ? y : x)
|
|
55
|
+
// console.log(percent, result, steps)
|
|
56
|
+
return result
|
|
57
|
+
},
|
|
42
58
|
getValue() {
|
|
43
59
|
let { value = 0, range, min, max } = this, v = value;
|
|
44
60
|
if (!range) {
|
|
@@ -61,18 +77,21 @@ export default {
|
|
|
61
77
|
return v
|
|
62
78
|
},
|
|
63
79
|
click(e) {
|
|
64
|
-
let { disabled, range, vertical, step, max, defaultValue, reverse } = this
|
|
80
|
+
let { disabled, range, vertical, step, max, min, defaultValue, reverse } = this
|
|
65
81
|
if (disabled) return;
|
|
66
82
|
let { width, height } = e.target.getBoundingClientRect()
|
|
67
83
|
let { layerX, layerY } = e
|
|
68
84
|
|
|
69
|
-
let percent = 0
|
|
85
|
+
let percent = 0, diff = max - min;
|
|
70
86
|
if (reverse) {
|
|
71
|
-
percent = vertical ? (((height - layerY) / height) *
|
|
87
|
+
percent = vertical ? (((height - layerY) / height) * diff) : (((width - layerX) / width) * diff);
|
|
72
88
|
} else {
|
|
73
|
-
percent = vertical ? ((layerY / height) *
|
|
89
|
+
percent = vertical ? ((layerY / height) * diff) : ((layerX / width) * diff);
|
|
74
90
|
}
|
|
75
|
-
let value =
|
|
91
|
+
let value = this.getMinStep(percent)
|
|
92
|
+
// let value = times(Math.round((percent + min) / step), step)
|
|
93
|
+
// console.log(value, step)
|
|
94
|
+
|
|
76
95
|
if (range) {
|
|
77
96
|
let [x, y] = defaultValue
|
|
78
97
|
let half = y > x ? (y - x) / 2 + x : (x - y) / 2 + y
|
|
@@ -83,15 +102,17 @@ export default {
|
|
|
83
102
|
this.$emit('input', value)
|
|
84
103
|
},
|
|
85
104
|
isActice(a) {
|
|
86
|
-
let { defaultValue, reverse, max, vertical } = this
|
|
105
|
+
let { defaultValue, reverse, max, min, vertical } = this
|
|
87
106
|
let active;
|
|
88
107
|
if (this.range) {
|
|
89
108
|
let [x, y] = defaultValue
|
|
90
|
-
active = x < y ? a >= x && a <= y : a <= x && a >= y
|
|
109
|
+
active = (a >= x && a <= y)//x < y ? (a >= x && a <= y) : (a <= x && a >= y)
|
|
110
|
+
console.log(a, active, `${a} >= ${x} && ${a} <= ${y}`)
|
|
91
111
|
} else {
|
|
92
112
|
active = a <= defaultValue
|
|
93
113
|
}
|
|
94
|
-
let
|
|
114
|
+
let diff = max - min
|
|
115
|
+
let pos = ((a - min) / diff) * 100 + '%'
|
|
95
116
|
let sty = {}
|
|
96
117
|
if (reverse) {
|
|
97
118
|
sty = vertical ?
|
|
@@ -113,34 +134,33 @@ export default {
|
|
|
113
134
|
return <div div class="k-slider-marks" >
|
|
114
135
|
{
|
|
115
136
|
mks.map(v => {
|
|
116
|
-
|
|
137
|
+
const { active, sty } = this.isActice(v);
|
|
117
138
|
return <div class={['k-slider-mark-symbol', { 'k-slider-mark-symbol-active': active }]} style={sty} />
|
|
118
139
|
})
|
|
119
140
|
}
|
|
120
|
-
{
|
|
141
|
+
{/* {
|
|
121
142
|
mks.map((v, i) => {
|
|
122
143
|
let { active, sty } = this.isActice(v);
|
|
123
144
|
return <div class={['k-slider-mark-text', { 'k-slider-mark-text-active': active }]} style={sty}>{txt[i]}</div>
|
|
124
145
|
})
|
|
125
|
-
}
|
|
146
|
+
} */}
|
|
126
147
|
</div>
|
|
127
148
|
},
|
|
128
149
|
renderTrack() {
|
|
129
|
-
let { vertical, max, defaultValue, range, included, marks, reverse } = this
|
|
130
|
-
let percent1 = 0, percent2 = 0,
|
|
150
|
+
let { vertical, max, min, defaultValue, range, included, marks, reverse } = this
|
|
151
|
+
let percent1 = 0, percent2 = 0, diff = max - min;
|
|
152
|
+
let w, l;
|
|
131
153
|
|
|
132
154
|
if (!range) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
percent2 = (defaultValue / max) * 100
|
|
155
|
+
percent2 = ((defaultValue - min) / diff) * 100
|
|
156
|
+
|
|
136
157
|
} else {
|
|
137
158
|
let [x, y] = defaultValue
|
|
138
|
-
percent1 = (x /
|
|
139
|
-
percent2 = (y /
|
|
140
|
-
x1 = x, x2 = y
|
|
159
|
+
percent1 = ((x - min) / diff) * 100
|
|
160
|
+
percent2 = ((y - min) / diff) * 100
|
|
141
161
|
}
|
|
142
162
|
let trackSty = {}
|
|
143
|
-
|
|
163
|
+
// console.log(percent1, percent2)
|
|
144
164
|
if (percent2 > percent1) {
|
|
145
165
|
w = percent2 - percent1
|
|
146
166
|
l = percent1
|
|
@@ -175,7 +195,7 @@ export default {
|
|
|
175
195
|
let { vertical, disabled, range, step, reverse, max, min, defaultValue, tooltipVisible, tipFormatter } = this
|
|
176
196
|
return {
|
|
177
197
|
props: {
|
|
178
|
-
vertical, disabled, range, step, reverse,
|
|
198
|
+
vertical, disabled, range, step, reverse, min,
|
|
179
199
|
max, tipFormatter, tooltipVisible,
|
|
180
200
|
value: range ? [].concat(defaultValue) : defaultValue * 1
|
|
181
201
|
},
|
|
@@ -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) {
|