Browse Source

Merge branch 'main' into fix/ImagecustomContainer

代强 1 year ago
parent
commit
5c82888e34

+ 13 - 0
packages/semi-foundation/slider/foundation.ts

@@ -686,7 +686,16 @@ export default class SliderFoundation extends BaseFoundation<SliderAdapter> {
         }
     }
 
+    _noTooltip = () => {
+        const { tipFormatter, tooltipVisible } = this.getProps();
+        return tipFormatter === null || tooltipVisible === false;
+    }
+
     onFocus = (e: any, handler: 'min'| 'max') => {
+        const noTooltip = this._noTooltip();
+        if (noTooltip) {
+            return;
+        }
         handlePrevent(e);
         const { target } = e;
         try {
@@ -703,6 +712,10 @@ export default class SliderFoundation extends BaseFoundation<SliderAdapter> {
     }
 
     onBlur = (e: any, handler: 'min'| 'max') => {
+        const noTooltip = this._noTooltip();
+        if (noTooltip) {
+            return;
+        }
         const { firstDotFocusVisible, secondDotFocusVisible } = this.getStates();
         if (handler === 'min') {
             firstDotFocusVisible && this._adapter.setStateVal('firstDotFocusVisible', false);

+ 9 - 0
packages/semi-ui/slider/_story/slider.stories.jsx

@@ -84,6 +84,15 @@ export const HorizontalSlider = () => (
         }}
       ></Slider>
     </div>
+    <div style={divStyle}>
+      <div>tooltipVisible=false,不显示tooltip</div>
+      <Slider
+        tooltipVisible={false}
+        onChange={value => {
+          console.log('value改变了' + value);
+        }}
+      ></Slider>
+    </div>
     <div style={divStyle}>
       <div>step=10</div>
       <Slider