kui-vue 3.6.2 → 3.6.3

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.
Files changed (117) hide show
  1. package/components/card/card.jsx +19 -9
  2. package/components/card/demo/basic.md +3 -3
  3. package/components/card/demo/border.md +1 -7
  4. package/components/card/demo/index.jsx +9 -7
  5. package/components/card/demo/notitle.md +23 -0
  6. package/components/card/styles/index.less +5 -3
  7. package/components/checkbox/styles/index.less +1 -0
  8. package/components/collapse/styles/index.less +2 -2
  9. package/components/colorPicker/mode.jsx +1 -1
  10. package/components/components.js +3 -0
  11. package/components/drawer/demo/target.md +2 -2
  12. package/components/dropdown/demo/basic.md +1 -1
  13. package/components/dropdown/styles/index.less +1 -0
  14. package/components/flex/demo/size.md +14 -5
  15. package/components/form/demo/customvalid.md +1 -1
  16. package/components/form/demo/dynamicvalid.md +1 -1
  17. package/components/form/demo/length.md +1 -13
  18. package/components/form/demo/valid.md +9 -1
  19. package/components/form/form.jsx +1 -1
  20. package/components/input/input.jsx +12 -10
  21. package/components/inputNumber/demo/basic.md +1 -0
  22. package/components/inputNumber/demo/format.md +3 -8
  23. package/components/inputNumber/inputNumber.jsx +116 -139
  24. package/components/inputNumber/styles/index.less +3 -3
  25. package/components/layout/demo/layout5.md +0 -1
  26. package/components/locale/de.js +1 -0
  27. package/components/locale/el.js +1 -0
  28. package/components/locale/en.js +1 -0
  29. package/components/locale/fr.js +1 -0
  30. package/components/locale/it.js +1 -0
  31. package/components/locale/ja.js +1 -0
  32. package/components/locale/ko.js +1 -0
  33. package/components/locale/ru.js +1 -0
  34. package/components/locale/th.js +1 -0
  35. package/components/locale/uk.js +1 -0
  36. package/components/locale/vi.js +1 -0
  37. package/components/locale/zh-CN.js +1 -0
  38. package/components/locale/zh-TW.js +1 -0
  39. package/components/menu/demo/collapsed.md +9 -9
  40. package/components/menu/index.md +1 -0
  41. package/components/message/group.jsx +11 -4
  42. package/components/rate/rate.jsx +7 -2
  43. package/components/rate/star.jsx +20 -5
  44. package/components/select/select.jsx +5 -3
  45. package/components/slider/demo/vertical.md +2 -1
  46. package/components/slider/demo/withNumber.md +0 -2
  47. package/components/slider/index.md +2 -3
  48. package/components/slider/slider.jsx +296 -291
  49. package/components/slider/styles/index.less +11 -12
  50. package/components/slider/thumb.jsx +70 -148
  51. package/components/spin/demo/container.md +1 -1
  52. package/components/spin/demo/mode.md +1 -1
  53. package/components/statCard/countup.js +254 -0
  54. package/components/statCard/countup.jsx +45 -0
  55. package/components/statCard/demo/basic.md +31 -0
  56. package/components/statCard/demo/card.md +40 -0
  57. package/components/statCard/demo/index.jsx +19 -0
  58. package/components/statCard/demo/info.md +9 -0
  59. package/components/statCard/demo/with-card.md +43 -0
  60. package/components/statCard/index.js +3 -0
  61. package/components/statCard/index.md +28 -0
  62. package/components/statCard/rollup.jsx +64 -0
  63. package/components/statCard/statCard.jsx +42 -0
  64. package/components/statCard/statNumber.jsx +53 -0
  65. package/components/statCard/styles/index.less +76 -0
  66. package/components/styles/color.less +4 -2
  67. package/components/styles/index.less +1 -0
  68. package/components/styles/sys.less +2 -3
  69. package/components/styles/var.less +1 -0
  70. package/components/table/demo/col-row-span.md +1 -1
  71. package/components/table/demo/fixed-col-head.md +1 -1
  72. package/components/table/demo/head-span.md +2 -2
  73. package/components/table/demo/size.md +1 -1
  74. package/components/table/demo/table-check.md +11 -1
  75. package/components/table/index.md +13 -12
  76. package/components/table/styles/index.less +67 -58
  77. package/components/table/table.jsx +7 -5
  78. package/components/tabs/demo/sample.md +1 -8
  79. package/components/tabs/index.md +9 -9
  80. package/components/tabs/tabs.jsx +6 -4
  81. package/components/treeselect/treeselect.jsx +5 -3
  82. package/components/upload/demo/custom.md +5 -2
  83. package/components/upload/demo/exceed.md +1 -1
  84. package/components/upload/demo/pictures.md +14 -0
  85. package/components/upload/fileList.jsx +24 -47
  86. package/components/upload/index.md +13 -4
  87. package/components/upload/selector.jsx +37 -117
  88. package/components/upload/styles/index.less +2 -3
  89. package/components/upload/upload.jsx +189 -116
  90. package/components/utils/number.js +79 -65
  91. package/components/utils/placement.js +4 -4
  92. package/dist/k-ui.cjs.js +2 -2
  93. package/dist/k-ui.css +2 -2
  94. package/dist/k-ui.d.ts +160 -118
  95. package/dist/k-ui.esm.js +2 -2
  96. package/dist/k-ui.umd.js +2 -2
  97. package/dist/locale/de.js +2 -2
  98. package/dist/locale/el.js +2 -2
  99. package/dist/locale/en.js +2 -2
  100. package/dist/locale/fr.js +2 -2
  101. package/dist/locale/it.js +2 -2
  102. package/dist/locale/ja.js +2 -2
  103. package/dist/locale/ko.js +2 -2
  104. package/dist/locale/ru.js +2 -2
  105. package/dist/locale/th.js +2 -2
  106. package/dist/locale/ua.js +2 -2
  107. package/dist/locale/uk.js +2 -2
  108. package/dist/locale/vi.js +2 -2
  109. package/dist/locale/zh-CN.js +2 -2
  110. package/dist/locale/zh-TW.js +2 -2
  111. package/package.json +3 -1
  112. package/types/index.d.ts +14 -10
  113. package/types/rate/Rate.d.ts +1 -1
  114. package/types/slider/Slider.d.ts +7 -6
  115. package/types/statCard/StatCard.d.ts +20 -0
  116. package/types/statCard/StatNumber.d.ts +26 -0
  117. package/types/table/Table.d.ts +1 -0
@@ -1,367 +1,372 @@
1
+ import { defineComponent, ref, watch, nextTick, inject } from "vue";
1
2
  import Thumb from "./thumb";
2
- import { multiply, add, subtract } from "../utils/number";
3
- import { defineComponent, ref, provide, watch } from "vue";
4
3
  import { withInstall } from "../utils/vue";
4
+ import Big from "big.js";
5
+ import { getClosestStep } from "../utils/number";
6
+
5
7
  const Slider = defineComponent({
6
8
  name: "Slider",
7
9
  props: {
8
- value: [Array, Number, String],
10
+ value: { type: [Array, Number], default: 0 },
9
11
  min: { type: Number, default: 0 },
10
12
  max: { type: Number, default: 100 },
13
+ step: { type: [Number, Object], default: 1 },
11
14
  disabled: Boolean,
12
- step: {
13
- type: Number,
14
- default: 1,
15
- validator: (val) => val !== 0,
16
- },
17
- size: String,
18
15
  vertical: Boolean,
19
- range: Boolean,
20
16
  reverse: Boolean,
17
+ range: Boolean,
21
18
  marks: Object,
19
+ size: [String, Number],
22
20
  included: { type: Boolean, default: true },
23
- tipFormatter: [Function, Object],
21
+ tipFormatter: Function,
24
22
  tooltipVisible: Boolean,
25
23
  },
26
- setup(ps, { emit, slots }) {
24
+ emits: ["input", "change"],
25
+
26
+ setup(props, { emit }) {
27
+ const size = inject("size", null);
28
+ const thumbRefs = ref([]);
29
+ const setThumbRef = (el, index) => {
30
+ if (el) thumbRefs.value[index] = el;
31
+ };
32
+
27
33
  const railRef = ref();
28
- const getValue = (value) => {
29
- if (value === undefined) {
30
- value = ps.value;
31
- }
32
- let { min, max } = ps,
33
- v = 0;
34
- // let diff = max - min;
35
- if (!ps.range) {
36
- v = value;
37
- if (value >= max) v = max;
38
- else if (value <= min) v = min;
39
- // let percent = (v - min) * 100 / diff
40
- // v = this.getMinStep(percent)
41
- } else {
42
- if (!Array.isArray(value)) {
43
- v = [0, 0];
44
- } else {
45
- v = [].concat(value);
46
- }
47
- let [x, y] = v;
34
+ // 记录当前正在拖拽的是哪一个滑块 (0 或 1,-1表示未拖拽)
35
+ const draggingIndex = ref(-1);
48
36
 
49
- if (x >= max) x = max;
50
- else if (x <= min) x = min;
37
+ // 内部值始终保持排序状态
38
+ const internalValue = ref(props.range ? [props.min, props.min] : props.min);
51
39
 
52
- if (y >= max) y = max;
53
- else if (y <= min) y = min;
40
+ const sortValue = (val) => {
41
+ if (Array.isArray(val)) {
42
+ return [...val].sort((a, b) => a - b);
43
+ }
44
+ return val;
45
+ };
54
46
 
55
- v = [x, y];
47
+ const formatValue = (val) => {
48
+ if (props.range) {
49
+ const arr = Array.isArray(val) ? [...val] : [props.min, props.min];
50
+ return sortValue(arr.map((v) => getClosestStep(v, props)));
56
51
  }
57
- return v;
52
+ return getClosestStep(val, props);
58
53
  };
59
- const value = getValue();
60
- const defaultValue = ref(value);
54
+
61
55
  watch(
62
- () => ps.value,
63
- (nv, no) => {
64
- defaultValue.value = getValue();
65
- }
56
+ () => props.value,
57
+ (nv) => {
58
+ // 只有当不在拖拽状态时,才响应外部变化,防止拖拽时的抖动
59
+ if (draggingIndex.value === -1) {
60
+ internalValue.value = formatValue(nv);
61
+ }
62
+ },
63
+ { immediate: true }
66
64
  );
67
65
 
68
- const keydownUpdate = (e, type) => {
69
- // emit("keydown-update", e, ps.type);
70
- let step = ps.step || 1;
71
- const plus = e.key === "ArrowRight" || e.key === "ArrowUp";
72
- if (ps.range) {
73
- let [a, b] = defaultValue.value;
74
- let v;
75
- if (plus) {
76
- v = type === "right" ? [a, add(b, step)] : [add(a, step), b];
77
- } else {
78
- v =
79
- type === "right" ? [a, subtract(b, step)] : [subtract(a, step), b];
80
- }
81
- defaultValue.value = getValue(v);
82
- } else {
83
- let v = defaultValue.value;
84
- if (plus) {
85
- v = add(v, step);
86
- } else {
87
- v = subtract(v, step) * 1;
88
- }
89
- defaultValue.value = getValue(v);
90
- }
91
- // emit("update:value", defaultValue.value);
92
- emit("input", defaultValue.value);
66
+ const getPercent = (val) => {
67
+ const diff = props.max - props.min;
68
+ return diff === 0
69
+ ? 0
70
+ : Math.max(0, Math.min(100, ((val - props.min) / diff) * 100));
93
71
  };
94
72
 
95
- const mouseMove = (e, type) => {
96
- let clientX, clientY;
97
- if (e.touches && e.touches.length == 1) {
98
- clientX = e.touches[0].clientX;
99
- clientY = e.touches[0].clientY;
73
+ // 计算鼠标位置对应的数值
74
+ const getValueFromEvent = (e) => {
75
+ const rect = railRef.value.getBoundingClientRect();
76
+ const clientX = e.touches ? e.touches[0].clientX : e.clientX;
77
+ const clientY = e.touches ? e.touches[0].clientY : e.clientY;
78
+
79
+ let percent;
80
+ if (props.vertical) {
81
+ // 垂直模式:CSS bottom 是 0%,top 是 100%
82
+ // clientY 越小(越靠上),percent 越大
83
+ percent = (rect.bottom - clientY) / rect.height;
84
+ if (props.reverse) percent = 1 - percent;
100
85
  } else {
101
- clientX = e.clientX;
102
- clientY = e.clientY;
86
+ // 水平模式:CSS left 是 0%,right 是 100%
87
+ percent = (clientX - rect.left) / rect.width;
88
+ if (props.reverse) percent = 1 - percent;
103
89
  }
104
90
 
105
- let { width, height, left, top } = railRef.value.getBoundingClientRect();
106
- let { max, min, vertical, reverse, step } = ps;
91
+ const rawValue = new Big(props.max - props.min)
92
+ .times(percent)
93
+ .plus(props.min);
94
+ return getClosestStep(Number(rawValue), props);
95
+ };
107
96
 
108
- let percent = 0,
109
- diff = max - min;
110
- if (reverse) {
111
- percent = vertical
112
- ? (height - (clientY - top)) / height
113
- : (width - (clientX - left)) / width;
114
- } else {
115
- percent = vertical
116
- ? (clientY - top) / height
117
- : (clientX - left) / width;
118
- }
119
- if (percent >= 1) percent = 1;
120
- else if (percent <= 0) percent = 0;
97
+ // 处理滑块拖动
98
+ const handleThumbMove = (e) => {
99
+ if (props.disabled || draggingIndex.value === -1) return;
121
100
 
122
- let x = getMinStep(percent * diff);
101
+ const newValue = getValueFromEvent(e);
102
+ let nextInternal = null;
123
103
 
124
- if (x >= max) x = max;
125
- else if (x <= min) x = min;
104
+ if (props.range) {
105
+ const oldValues = [...internalValue.value];
106
+ // 暂时更新当前拖动的那个值,不去排序
107
+ oldValues[draggingIndex.value] = newValue;
126
108
 
127
- // 使用解构创建新数组,避免引用问题
128
- const v = ps.range ? [...defaultValue.value] : defaultValue.value;
129
- let newValue = null;
130
- if (ps.range) {
131
- let [a, b] = [...v];
132
- if (type == "right") {
133
- newValue = [a, x];
109
+ // 检查是否发生交错 (Crossover)
110
+ // 如果拖动的是 index 0 (左滑块),但它现在比 index 1 (右滑块) 大
111
+ // 那么它们需要交换值,并且我也要交换 draggingIndex,这样鼠标就依然抓着那个数值
112
+ if (oldValues[0] > oldValues[1]) {
113
+ // 交换值
114
+ nextInternal = [oldValues[1], oldValues[0]];
115
+ // 交换控制权
116
+ draggingIndex.value = draggingIndex.value === 0 ? 1 : 0;
134
117
  } else {
135
- newValue = [x, b];
118
+ nextInternal = oldValues;
136
119
  }
137
120
  } else {
138
- newValue = x;
121
+ nextInternal = newValue;
139
122
  }
140
123
 
141
- defaultValue.value = newValue;
142
- // emit("update:value", newValue);
143
- emit("input", newValue);
124
+ if (
125
+ JSON.stringify(nextInternal) !== JSON.stringify(internalValue.value)
126
+ ) {
127
+ internalValue.value = nextInternal;
128
+ emit("input", nextInternal);
129
+ emit("change", nextInternal);
130
+ }
144
131
  };
145
132
 
146
- const getMinStep = (percent) => {
147
- let { marks, step, min } = ps;
148
- if (!marks) return multiply(Math.round((percent + min) / step), step);
149
- let steps = Object.keys(marks); //, values = []
150
- steps = steps.map((x) => x - min);
151
- if (step) {
152
- steps.push(multiply(Math.round(percent / step), step));
153
- }
133
+ // 处理轨道点击
134
+ const handleRailClick = (e) => {
135
+ if (props.disabled) return;
136
+ const newValue = getValueFromEvent(e);
154
137
 
155
- let result = steps.reduce((x, y) =>
156
- Math.abs(x - percent) > Math.abs(y - percent) ? y : x
157
- );
158
- // let result = steps.reduce((x, y) => Math.abs(x - percent) > Math.abs(y - percent) ? y : x)
159
- // console.log(percent, result, steps)
160
- return result + min;
161
- };
138
+ if (props.range) {
139
+ const [v1, v2] = internalValue.value;
140
+ // 移动离点击点最近的那个滑块
141
+ const dist1 = Math.abs(newValue - v1);
142
+ const dist2 = Math.abs(newValue - v2);
143
+ const targetIndex = dist1 <= dist2 ? 0 : 1;
144
+
145
+ const nextValues = [...internalValue.value];
146
+ nextValues[targetIndex] = newValue;
162
147
 
163
- const click = (e) => {
164
- let { disabled, vertical, step, max, min, reverse } = ps;
165
- if (disabled) return;
166
- let { width, height } = e.target.getBoundingClientRect();
167
- let { layerX, layerY } = e;
168
-
169
- let percent = 0,
170
- diff = max - min;
171
- if (reverse) {
172
- percent = vertical
173
- ? ((height - layerY) / height) * diff
174
- : ((width - layerX) / width) * diff;
148
+ // 点击导致跳变时,也要保证顺序
149
+ internalValue.value = sortValue(nextValues);
175
150
  } else {
176
- percent = vertical ? (layerY / height) * diff : (layerX / width) * diff;
151
+ internalValue.value = newValue;
177
152
  }
178
- let value = getMinStep(percent);
153
+ emit("input", internalValue.value);
154
+ emit("change", internalValue.value);
155
+ };
179
156
 
180
- if (ps.range) {
181
- let [x, y] = defaultValue.value;
182
- let half = y > x ? (y - x) / 2 + x : (x - y) / 2 + y;
183
- value = value >= half && y > x ? [x, value] : [value, y];
184
- }
157
+ const handleThumbDown = (index) => {
158
+ if (props.disabled) return;
159
+ draggingIndex.value = index;
185
160
 
186
- defaultValue.value = value;
187
- // emit("update:value", value);
188
- emit("input", value);
161
+ const onMove = (e) => handleThumbMove(e);
162
+ const onUp = () => {
163
+ draggingIndex.value = -1;
164
+ document.removeEventListener("mousemove", onMove);
165
+ document.removeEventListener("mouseup", onUp);
166
+ document.removeEventListener("touchmove", onMove);
167
+ document.removeEventListener("touchend", onUp);
168
+ };
169
+
170
+ document.addEventListener("mousemove", onMove);
171
+ document.addEventListener("mouseup", onUp);
172
+ document.addEventListener("touchmove", onMove, { passive: false });
173
+ document.addEventListener("touchend", onUp);
189
174
  };
190
- const getActiveOps = (a) => {
191
- let { reverse, max, min, vertical } = ps;
192
- let active;
193
- if (ps.range) {
194
- let [x, y] = defaultValue.value;
195
- active = x < y ? a >= x && a <= y : a <= x && a >= y;
196
- } else {
197
- active = a <= defaultValue.value;
198
- }
199
- let diff = max - min;
200
- let pos = ((a - min) / diff) * 100 + "%";
201
- let sty = {};
202
- if (reverse) {
203
- sty = vertical
204
- ? { bottom: pos, transform: "translateY(50%)" }
205
- : { right: pos, transform: "translateX(50%)" };
175
+
176
+ const handleKeydown = (e, index) => {
177
+ if (props.disabled) return;
178
+ const isPlus = ["ArrowRight", "ArrowUp"].includes(e.key);
179
+ const isMinus = ["ArrowLeft", "ArrowDown"].includes(e.key);
180
+ if (!isPlus && !isMinus) return;
181
+ e.preventDefault();
182
+
183
+ let nextValue;
184
+ const currentValues = props.range
185
+ ? [...internalValue.value]
186
+ : [internalValue.value];
187
+ const targetValue = currentValues[index];
188
+
189
+ if (props.step === null || props.step === undefined) {
190
+ if (props.marks) {
191
+ const mKeys = Object.keys(props.marks)
192
+ .map(Number)
193
+ .sort((a, b) => a - b);
194
+ const currIdx = mKeys.indexOf(getClosestStep(targetValue, props));
195
+ let nextIdx = isPlus ? currIdx + 1 : currIdx - 1;
196
+ nextIdx = Math.max(0, Math.min(mKeys.length - 1, nextIdx));
197
+ nextValue = mKeys[nextIdx];
198
+ }
206
199
  } else {
207
- sty = vertical ? { top: pos } : { left: pos };
200
+ nextValue = Number(
201
+ new Big(targetValue).plus(isPlus ? props.step : -props.step)
202
+ );
208
203
  }
209
- return { active, sty };
210
- };
211
- const getThumbValue = (t) => {
212
- if (!ps.range) {
213
- return defaultValue.value;
204
+
205
+ // 理键盘交错逻辑 ---
206
+ if (props.range) {
207
+ const otherIndex = index === 0 ? 1 : 0;
208
+ const otherValue = currentValues[otherIndex];
209
+
210
+ // 检查是否发生越界交换
211
+ const isCrossForward = index === 0 && nextValue > otherValue;
212
+ const isCrossBackward = index === 1 && nextValue < otherValue;
213
+
214
+ if (isCrossForward || isCrossBackward) {
215
+ // 交换数据
216
+ const nextInternal = [];
217
+ nextInternal[index] = otherValue;
218
+ nextInternal[otherIndex] = getClosestStep(nextValue, props);
219
+ internalValue.value = nextInternal.sort((a, b) => a - b);
220
+
221
+ // 转移焦点
222
+ nextTick(() => {
223
+ // 找到另一个 Thumb 的原生 DOM 并聚焦
224
+ const targetThumb = thumbRefs.value[otherIndex];
225
+ if (targetThumb) {
226
+ targetThumb.focus();
227
+ }
228
+ });
229
+ } else {
230
+ // 正常非交错移动
231
+ currentValues[index] = nextValue;
232
+ internalValue.value = formatValue(currentValues);
233
+ }
214
234
  } else {
215
- let [a, b] = [...defaultValue.value];
216
- return t == 0 ? a * 1 : b * 1;
235
+ internalValue.value = formatValue(nextValue);
217
236
  }
237
+
238
+ emit("input", internalValue.value);
239
+ emit("change", internalValue.value);
218
240
  };
219
241
 
220
242
  return () => {
221
- let {
222
- vertical,
223
- disabled,
224
- step,
225
- reverse,
226
- max,
227
- marks,
228
- min,
229
- tooltipVisible,
230
- tipFormatter,
231
- size,
232
- included,
233
- } = ps;
234
- const renderMark = () => {
235
- let { marks } = ps;
236
- let mks = Object.keys(marks || {});
237
- let txt = Object.values(marks || {});
243
+ const { vertical, reverse, min, max, disabled, marks, included } = props;
244
+
245
+ const renderTrack = () => {
246
+ if (!included && marks) return null;
247
+
248
+ // 确保 v1 是小的,v2 是大的
249
+ const [rawV1, rawV2] = props.range
250
+ ? internalValue.value
251
+ : [min, internalValue.value];
252
+ const v1 = Math.min(rawV1, rawV2);
253
+ const v2 = Math.max(rawV1, rawV2);
254
+
255
+ const p1 = getPercent(v1);
256
+ const p2 = getPercent(v2);
257
+ const length = p2 - p1;
258
+
259
+ let style = {};
260
+ if (vertical) {
261
+ // 垂直模式
262
+ // reverse=false: bottom=p1, height=len
263
+ // reverse=true: top=p1, height=len
264
+ style = reverse
265
+ ? { top: `${p1}%`, height: `${length}%` }
266
+ : { bottom: `${p1}%`, height: `${length}%` };
267
+ } else {
268
+ // 水平模式
269
+ // reverse=false: left=p1, width=len
270
+ // reverse=true: right=p1, width=len
271
+ style = reverse
272
+ ? { right: `${p1}%`, width: `${length}%` }
273
+ : { left: `${p1}%`, width: `${length}%` };
274
+ }
275
+ return <div class="k-slider-track" style={style}></div>;
276
+ };
277
+
278
+ const renderMarks = () => {
279
+ if (!marks) return null;
280
+ const mKeys = Object.keys(marks).map(Number);
281
+
238
282
  return (
239
- <div div class="k-slider-marks">
240
- {mks.map((v) => {
241
- const { active, sty } = getActiveOps(v);
242
- return (
243
- <div
244
- class={[
245
- "k-slider-mark-symbol",
246
- { "k-slider-mark-symbol-active": active },
247
- ]}
248
- style={sty}
249
- />
250
- );
251
- })}
252
- {mks.map((v, i) => {
253
- let { active, sty } = getActiveOps(v);
283
+ <div class="k-slider-marks">
284
+ {mKeys.map((val) => {
285
+ const p = getPercent(val);
286
+ // 判断激活状态:值是否在当前选中范围内
287
+ let isActive = false;
288
+ if (props.range) {
289
+ isActive =
290
+ val >= internalValue.value[0] &&
291
+ val <= internalValue.value[1];
292
+ } else {
293
+ isActive = val <= internalValue.value;
294
+ }
295
+
296
+ let style = {};
297
+ if (vertical) {
298
+ style = reverse ? { top: `${p}%` } : { bottom: `${p}%` };
299
+ } else {
300
+ style = reverse ? { right: `${p}%` } : { left: `${p}%` };
301
+ }
302
+
254
303
  return (
255
- <div
256
- class={[
257
- "k-slider-mark-text",
258
- { "k-slider-mark-text-active": active },
259
- ]}
260
- style={sty}
261
- >
262
- {txt[i]}
304
+ <div key={val} class="k-slider-mark-item" style={style}>
305
+ <span
306
+ class={["k-slider-mark-dot", { "is-active": isActive }]}
307
+ ></span>
308
+ <div
309
+ class={["k-slider-mark-text", { "is-active": isActive }]}
310
+ >
311
+ {marks[val]}
312
+ </div>
263
313
  </div>
264
314
  );
265
315
  })}
266
316
  </div>
267
317
  );
268
318
  };
269
- const renderTrack = () => {
270
- let { vertical, max, min, reverse } = ps;
271
- let percent1 = 0,
272
- percent2 = 0,
273
- diff = max - min;
274
- let w, l;
275
-
276
- if (!ps.range) {
277
- percent2 = ((defaultValue.value - min) / diff) * 100;
278
- } else {
279
- let [x, y] = defaultValue.value;
280
- percent1 = ((x - min) / diff) * 100;
281
- percent2 = ((y - min) / diff) * 100;
282
- }
283
- let trackSty = {};
284
- if (percent2 > percent1) {
285
- w = percent2 - percent1;
286
- l = percent1;
287
- } else {
288
- w = percent1 - percent2;
289
- l = percent2;
290
- }
291
- if (reverse) {
292
- trackSty = vertical
293
- ? {
294
- height: `${w}%`,
295
- top: "auto",
296
- bottom: `${l}%`,
297
- }
298
- : {
299
- width: `${w}%`,
300
- left: "auto",
301
- right: `${l}%`,
302
- };
303
- } else {
304
- trackSty = vertical
305
- ? {
306
- height: `${w}%`,
307
- top: `${l}%`,
308
- }
309
- : {
310
- width: `${w}%`,
311
- left: `${l}%`,
312
- };
313
- }
314
- return <div class="k-slider-track" style={{ ...trackSty }}></div>;
315
- };
316
319
 
317
- const thumbProps = {
318
- props: {
319
- vertical,
320
- disabled,
321
- step,
322
- reverse,
323
- min,
324
- size,
325
- max,
326
- tipFormatter,
327
- tooltipVisible,
328
- },
329
- // onKeydownUpdate: keydownUpdate,
330
- // onThumbMove: mouseMove,
331
- on: {
332
- keydownUpdate: keydownUpdate,
333
- thumbMove: mouseMove,
334
- },
335
- };
336
- const children = [];
337
- if ((included && marks) || !marks) {
338
- const track = renderTrack();
339
- children.push(track);
340
- }
341
- if (ps.range) {
342
- let v = getThumbValue(0);
343
- children.push(<Thumb {...thumbProps} value={v} />);
344
- }
345
- let v2 = getThumbValue(1);
346
- children.push(<Thumb {...thumbProps} type="right" value={v2} />);
347
- if (marks) {
348
- const mark = renderMark();
349
- children.push(mark);
350
- }
320
+ const thumbs = (props.range ? [0, 1] : [0]).map((idx) => {
321
+ // 单滑块模式下,index 为 0,值取 internalValue
322
+ const val = props.range
323
+ ? internalValue.value[idx]
324
+ : internalValue.value;
325
+ return (
326
+ <Thumb
327
+ key={idx}
328
+ ref={(el) => setThumbRef(el, idx)}
329
+ value={val}
330
+ min={min}
331
+ max={max}
332
+ size={props.size || size}
333
+ vertical={vertical}
334
+ reverse={reverse}
335
+ disabled={disabled}
336
+ tooltipVisible={props.tooltipVisible}
337
+ tipFormatter={props.tipFormatter}
338
+ dragging={draggingIndex.value === idx} // 告诉子组件是否被激活
339
+ onDragStart={() => handleThumbDown(idx)}
340
+ onKeydownUpdate={(e) => handleKeydown(e, idx)}
341
+ />
342
+ );
343
+ });
344
+
351
345
  return (
352
346
  <div
353
347
  class={[
354
348
  "k-slider",
355
- { "k-slider-disabled": disabled, "k-slider-vertical": vertical },
349
+ {
350
+ "k-slider-disabled": disabled,
351
+ "k-slider-vertical": vertical,
352
+ "k-slider-reverse": reverse,
353
+ },
356
354
  ]}
357
355
  >
358
356
  <div class="k-slider-bar">
359
- <div class="k-slider-rail" ref={railRef} onClick={click}></div>
360
- {...children}
357
+ <div
358
+ class="k-slider-rail"
359
+ ref={railRef}
360
+ onClick={handleRailClick}
361
+ ></div>
362
+ {renderTrack()}
363
+ {renderMarks()}
364
+ {thumbs}
361
365
  </div>
362
366
  </div>
363
367
  );
364
368
  };
365
369
  },
366
370
  });
371
+
367
372
  export default withInstall(Slider);