From affa6c1e225de9923682616b6a537756ceb61584 Mon Sep 17 00:00:00 2001
From: byqbai <byq1213@qq.com>
Date: Wed, 4 Jan 2023 17:22:36 +0800
Subject: [PATCH] =?UTF-8?q?fix(slider):=20=E6=97=A0=E9=9A=9C=E7=A2=8D?=
 =?UTF-8?q?=E6=BB=91=E5=9D=97valuetext=E8=A7=84=E8=8C=83.(#1402)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/slider/slider.less |  2 +-
 src/slider/slider.ts   |  6 +++---
 src/slider/slider.wxml | 15 ++++++---------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/slider/slider.less b/src/slider/slider.less
index 4223db93d..c78c5fc7d 100644
--- a/src/slider/slider.less
+++ b/src/slider/slider.less
@@ -80,7 +80,7 @@
       transform: translateX(-50%);
       top: -52rpx;
       text-align: center;
-      width: 48rpx;
+      width: 96rpx;
       height: 44rpx;
       line-height: 44rpx;
     }
diff --git a/src/slider/slider.ts b/src/slider/slider.ts
index 3bf68c51a..72f4bc5d1 100644
--- a/src/slider/slider.ts
+++ b/src/slider/slider.ts
@@ -91,14 +91,14 @@ export default class Slider extends SuperComponent {
         this.setSingleBarWidth(newValue as number);
       }
 
-      if(!label){
+      if (!label) {
         this.setData({
           isChange: true,
-        })
+        });
         setTimeout(() => {
           this.setData({
             isChange: false,
-          })
+          });
         }, 2e3);
       }
     },
diff --git a/src/slider/slider.wxml b/src/slider/slider.wxml
index 70337409a..1c0726749 100644
--- a/src/slider/slider.wxml
+++ b/src/slider/slider.wxml
@@ -40,8 +40,7 @@
           bind:touchcancel="onTouchEnd"
         >
           <view
-            wx:if="{{isChange}}"
-            id="singleValue"
+            wx:if="{{label || isChange}}"
             class="{{_.cls(classPrefix+'__dot-value', [['sr-only', !label]])}}"
             aria-role="alert"
             aria-live="assertive"
@@ -55,7 +54,7 @@
             aria-valuemax="{{max}}"
             aria-valuemin="{{min}}"
             aria-valuenow="{{_value}}"
-            aria-labelledby="singleValue"
+            aria-valuetext="{{t.getValue(label, _value) || _value}}"
           ></view>
         </view>
       </view>
@@ -104,8 +103,7 @@
           class="{{classPrefix}}__dot {{classPrefix}}__dot--left {{prefix}}-class-cursor"
         >
           <view
-            wx:if="{{isChange}}"
-            id="leftValue"
+            wx:if="{{label || isChange}}"
             class="{{_.cls(classPrefix+'__dot-value', [['sr-only', !label]])}}"
             aria-role="alert"
             aria-live="assertive"
@@ -119,7 +117,7 @@
             aria-valuemax="{{dotTopValue[1]}}"
             aria-valuemin="{{min}}"
             aria-valuenow="{{dotTopValue[0]}}"
-            aria-labelledby="leftValue"
+            aria-valuetext="{{t.getValue(label, dotTopValue[0]) || dotTopValue[0]}}"
           ></view>
         </view>
         <view
@@ -130,8 +128,7 @@
           class="{{classPrefix}}__dot {{classPrefix}}__dot--right {{prefix}}-class-cursor"
         >
           <view
-            wx:if="{{isChange}}"
-            id="rightValue"
+            wx:if="{{label || isChange}}"
             class="{{_.cls(classPrefix+'__dot-value', [['sr-only', !label]])}}"
             aria-role="alert"
             aria-live="assertive"
@@ -145,7 +142,7 @@
             aria-valuemax="{{max}}"
             aria-valuemin="{{dotTopValue[0]}}"
             aria-valuenow="{{dotTopValue[1]}}"
-            aria-labelledby="rightValue"
+            aria-valuetext="{{t.getValue(label, dotTopValue[1]) || dotTopValue[1]}}"
           >
           </view>
         </view>