fix: 同步 V4 分支问题修复 jd-opensource#2252 (jd-opensource#2258)

mikasayw · Apr 24, 2023 · 36a2741 · 36a2741
1 parent c134f72
commit 36a2741
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/packages/__VUE/switch/index.taro.vue b/src/packages/__VUE/switch/index.taro.vue
@@ -4,8 +4,8 @@
       <nut-icon v-if="loading" v-bind="$attrs" :name="name" :size="size" :color="color"></nut-icon>
       <!-- <view v-show="!modelValue" class="close-line"></view> -->
       <template v-if="activeText">
-        <view class="nut-switch-label open" v-show="modelValue">{{ activeText }}</view>
-        <view class="nut-switch-label close" v-show="!modelValue">{{ inactiveText }}</view>
+        <view class="nut-switch-label open" v-show="isActive">{{ activeText }}</view>
+        <view class="nut-switch-label close" v-show="!isActive">{{ inactiveText }}</view>
       </template>
     </view>
   </view>
@@ -110,7 +110,8 @@ export default create({
     return {
       classes,
       style,
-      onClick
+      onClick,
+      isActive
     };
   }
 });

diff --git a/src/packages/__VUE/switch/index.vue b/src/packages/__VUE/switch/index.vue
@@ -4,8 +4,8 @@
       <nut-icon v-if="loading" :name="name" v-bind="$attrs" :size="size" :color="color"></nut-icon>
       <!-- <view v-show="!modelValue" class="close-line"></view> -->
       <template v-if="activeText">
-        <view class="nut-switch-label open" v-show="modelValue">{{ activeText }}</view>
-        <view class="nut-switch-label close" v-show="!modelValue">{{ inactiveText }}</view>
+        <view class="nut-switch-label open" v-show="isActive">{{ activeText }}</view>
+        <view class="nut-switch-label close" v-show="!isActive">{{ inactiveText }}</view>
       </template>
     </view>
   </view>
@@ -110,7 +110,8 @@ export default create({
     return {
       classes,
       style,
-      onClick
+      onClick,
+      isActive
     };
   }
 });