From f545b0588231c3b5230b8bbc568a55200bd92228 Mon Sep 17 00:00:00 2001 From: HQ-Lin Date: Mon, 14 Nov 2022 15:45:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=20slider=20?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/slider/slider.tsx | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/slider/slider.tsx b/src/slider/slider.tsx index 29fb0bbd3..030c09e9b 100644 --- a/src/slider/slider.tsx +++ b/src/slider/slider.tsx @@ -346,14 +346,17 @@ export default mixins(classPrefixMixins).extend({ if (this.markList.length) { return (
-
- {this.markList.map((item, index) => ( -
- ))} +
+ {this.markList.map((item, index) => { + if (item.position === 0 || item.position === 1) return null; + return ( +
+ ); + })}
{this.markList.map((item, key) => ( From ee4253275da05f3e0773ea17f3dc955b34dffb0e Mon Sep 17 00:00:00 2001 From: HQ-Lin Date: Mon, 14 Nov 2022 15:54:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=20slider=20?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__snapshots__/index.test.jsx.snap | 16 +++---- test/snap/__snapshots__/csr.test.js.snap | 48 +++++++------------ test/snap/__snapshots__/ssr.test.js.snap | 6 +-- 3 files changed, 27 insertions(+), 43 deletions(-) diff --git a/src/slider/__tests__/__snapshots__/index.test.jsx.snap b/src/slider/__tests__/__snapshots__/index.test.jsx.snap index f83f7d744..dce2b7c56 100644 --- a/src/slider/__tests__/__snapshots__/index.test.jsx.snap +++ b/src/slider/__tests__/__snapshots__/index.test.jsx.snap @@ -64,11 +64,9 @@ exports[`Slider [marks] > render right 1`] = ` />
-
-
+
render right 1`] = ` />
-
-
+
csr test ./src/slider/_example/marks.vue 1`] = ` />
-
-
+
csr test ./src/slider/_example/marks.vue 1`] = ` />
-
-
+
csr test ./src/slider/_example/min-and-max.vue 1`] />
-
-
+
csr test ./src/slider/_example/min-and-max.vue 1`] />
-
-
+
csr test ./src/slider/_example/vertical-marks.vue 1 />
-
-
+
csr test ./src/slider/_example/vertical-marks.vue 1 />
-
-
+
renders ./src/slider/_example/input-number.vue corr exports[`ssr snapshot test > renders ./src/slider/_example/input-number-vertical.vue correctly 1`] = `"
"`; -exports[`ssr snapshot test > renders ./src/slider/_example/marks.vue correctly 1`] = `"
0°C
20°C
40°C
60°C
80°C
100°C
0°C
20°C
40°C
60°C
80°C
100°C
"`; +exports[`ssr snapshot test > renders ./src/slider/_example/marks.vue correctly 1`] = `"
0°C
20°C
40°C
60°C
80°C
100°C
0°C
20°C
40°C
60°C
80°C
100°C
"`; -exports[`ssr snapshot test > renders ./src/slider/_example/min-and-max.vue correctly 1`] = `"
min:10
max:30
min:10
max:30
"`; +exports[`ssr snapshot test > renders ./src/slider/_example/min-and-max.vue correctly 1`] = `"
min:10
max:30
min:10
max:30
"`; exports[`ssr snapshot test > renders ./src/slider/_example/step.vue correctly 1`] = `"
"`; exports[`ssr snapshot test > renders ./src/slider/_example/vertical.vue correctly 1`] = `"
"`; -exports[`ssr snapshot test > renders ./src/slider/_example/vertical-marks.vue correctly 1`] = `"
0°C
20°C
40°C
60°C
80°C
100°C
0°C
20°C
40°C
60°C
80°C
100°C
"`; +exports[`ssr snapshot test > renders ./src/slider/_example/vertical-marks.vue correctly 1`] = `"
0°C
20°C
40°C
60°C
80°C
100°C
0°C
20°C
40°C
60°C
80°C
100°C
"`; exports[`ssr snapshot test > renders ./src/space/_example/align.vue correctly 1`] = `"
start
center
end
baseline
"`; From 4286db999c99d571cc585b4ba4a13eb48d848560 Mon Sep 17 00:00:00 2001 From: HQ-Lin Date: Mon, 14 Nov 2022 16:57:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=20slider=20?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/slider/slider.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/slider/slider.tsx b/src/slider/slider.tsx index 030c09e9b..627e8bc31 100644 --- a/src/slider/slider.tsx +++ b/src/slider/slider.tsx @@ -464,10 +464,11 @@ export default mixins(classPrefixMixins).extend({ )} {this.showSteps && ( -
- {this.steps.map((item, key) => ( -
- ))} +
+ {this.steps.map((item, key) => { + if (item.position === 0 || item.position === 1) return null; + return
; + })}
)} {masks} From acefe77b9537cfbd6a16691859c71d19a069af17 Mon Sep 17 00:00:00 2001 From: HQ-Lin Date: Mon, 14 Nov 2022 17:28:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?feat:=20=E4=BF=AE=E5=A4=8D=20slider=20?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/slider/slider.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/slider/slider.tsx b/src/slider/slider.tsx index 627e8bc31..01a77a0c7 100644 --- a/src/slider/slider.tsx +++ b/src/slider/slider.tsx @@ -465,7 +465,7 @@ export default mixins(classPrefixMixins).extend({ {this.showSteps && (
- {this.steps.map((item, key) => { + {this.steps.map((item: any, key) => { if (item.position === 0 || item.position === 1) return null; return
; })}