upd: 修改disable状态下不分发事件

jdf2e · Aug 21, 2020 · bdcb03b · bdcb03b
1 parent f791f76
commit bdcb03b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/packages/switch/demo.vue b/src/packages/switch/demo.vue
@@ -38,7 +38,7 @@
         <span slot="title"><nut-switch :disabled="true"></nut-switch></span>
       </nut-cell>
       <nut-cell>
-        <span slot="title"><nut-switch @change="onChange" :active="true" :disabled="true"></nut-switch></span>
+        <span slot="title"><nut-switch :active="true" :disabled="true"></nut-switch></span>
       </nut-cell>
     </div>
     <p>禁用状态下，change事件参数永远为初始值</p>

diff --git a/src/packages/switch/switch.vue b/src/packages/switch/switch.vue
@@ -45,12 +45,11 @@ export default {
       const status = this.isActive;
       if (!this.disabled) {
         this.isActive = !status;
+        setTimeout(() => {
+          this.$emit('change', this.isActive);
+          this.$emit('update:active', this.isActive);
+        }, 300);
       }
-
-      setTimeout(() => {
-        this.$emit('change', this.isActive);
-        this.$emit('update:active', this.isActive);
-      }, 300);
     }
   }
 };