diff --git a/.prettierignore b/.prettierignore index 6a0eec280..c73a42d2e 100644 --- a/.prettierignore +++ b/.prettierignore @@ -27,3 +27,6 @@ components/style/color/*.less .png .npmrc.template .huskyrc +.gitmodules +*.png + diff --git a/antdv-demo b/antdv-demo index 48d6f869a..cf073b545 160000 --- a/antdv-demo +++ b/antdv-demo @@ -1 +1 @@ -Subproject commit 48d6f869a283826b5ec7bc9a75ea76142d43186c +Subproject commit cf073b5456c67002c02d911b0d50f804d77ee6b1 diff --git a/components/date-picker/style/TimePicker.less b/components/date-picker/style/TimePicker.less index 8bb10cf2e..0c6f57e77 100644 --- a/components/date-picker/style/TimePicker.less +++ b/components/date-picker/style/TimePicker.less @@ -82,7 +82,7 @@ text-align: center; list-style: none; cursor: pointer; - transition: all .3s; + transition: all 0.3s; user-select: none; &:last-child::after { diff --git a/components/select/style/index.less b/components/select/style/index.less index 99cf643aa..c647b7451 100644 --- a/components/select/style/index.less +++ b/components/select/style/index.less @@ -469,7 +469,7 @@ &-menu { max-height: 250px; margin-bottom: 0; - padding: @select-dropdown-edge-child-vertical-padding 0; //Change + padding: @select-dropdown-edge-child-vertical-padding 0; //Change padding-left: 0; // Override default ul/ol overflow: auto; list-style: none; diff --git a/components/vc-slider/src/Range.jsx b/components/vc-slider/src/Range.jsx index 740ed5d80..9985f781c 100644 --- a/components/vc-slider/src/Range.jsx +++ b/components/vc-slider/src/Range.jsx @@ -71,27 +71,23 @@ const Range = { watch: { value: { handler(val) { - const { min, max, bounds } = this; - this.setChangeValue(val || bounds, min, max); + const { bounds } = this; + this.setChangeValue(val || bounds); }, deep: true, }, - min(val) { - const { value = bounds, max } = this; - this.setChangeValue(value, val, max); + min() { + const { value } = this; + this.setChangeValue(value || this.bounds); }, - max(val) { - const { value = bounds, min } = this; - this.setChangeValue(value, min, val); + max() { + const { value } = this; + this.setChangeValue(value || this.bounds); }, }, methods: { - setChangeValue(value, min, max) { + setChangeValue(value) { const { bounds } = this; - const minAmaxProps = { - min, - max, - }; const nextBounds = value.map((v, i) => trimAlignValue({ value: v, diff --git a/components/vc-slider/src/Slider.jsx b/components/vc-slider/src/Slider.jsx index 9393523d1..f0e8fe579 100644 --- a/components/vc-slider/src/Slider.jsx +++ b/components/vc-slider/src/Slider.jsx @@ -41,26 +41,21 @@ const Slider = { watch: { value: { handler(val) { - const { min, max } = this; - this.setChangeValue(val, min, max); + this.setChangeValue(val); }, deep: true, }, - min(val) { - const { sValue, max } = this; - this.setChangeValue(sValue, val, max); + min() { + const { sValue } = this; + this.setChangeValue(sValue); }, - max(val) { - const { sValue, min } = this; - this.setChangeValue(sValue, min, val); + max() { + const { sValue } = this; + this.setChangeValue(sValue); }, }, methods: { - setChangeValue(value, min, max) { - const minAmaxProps = { - min, - max, - }; + setChangeValue(value) { const newValue = value !== undefined ? value : this.sValue; const nextValue = this.trimAlignValue(newValue, this.$props); if (nextValue === this.sValue) return;