From ab129f1976fd0dc972e4f1abcaafc5a177f56915 Mon Sep 17 00:00:00 2001
From: "wacky6.AriesMBP" <416707889@qq.com>
Date: Sat, 20 May 2017 01:20:04 +0800
Subject: [PATCH] Switch: simplity internal implementation

---
 packages/switch/src/component.vue     | 23 +++++++++++------------
 packages/theme-default/src/switch.css | 16 +++++++---------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/packages/switch/src/component.vue b/packages/switch/src/component.vue
index 407ae7d88..ab7d855a7 100644
--- a/packages/switch/src/component.vue
+++ b/packages/switch/src/component.vue
@@ -1,11 +1,11 @@
 <template>
-  <label class="el-switch" :class="{ 'is-disabled': disabled, 'el-switch--wide': hasText }">
+  <label class="el-switch" :class="{ 'is-disabled': disabled, 'el-switch--wide': hasText, 'is-checked': checked }">
     <div class="el-switch__mask" v-show="disabled"></div>
     <input
       class="el-switch__input"
       type="checkbox"
       @change="handleChange"
-      v-model="_value"
+      ref="input"
       :name="name"
       :true-value="onValue"
       :false-value="offValue"
@@ -105,20 +105,12 @@
         /* istanbul ignore next */
         return this.onText || this.offText;
       },
-      _value: {
-        get() {
-          return this.value;
-        },
-        set(val) {
-          this.$emit('input', val);
-        }
-      },
       transform() {
         return this.checked ? `translate(${ this.coreWidth - 20 }px, 2px)` : 'translate(2px, 2px)';
       }
     },
     watch: {
-      value() {
+      checked() {
         if (this.onColor || this.offColor) {
           this.setBackgroundColor();
         }
@@ -126,7 +118,13 @@
     },
     methods: {
       handleChange(event) {
-        this.$emit('change', event.currentTarget.checked ? this.onValue : this.offValue);
+        this.$emit('change', !this.checked ? this.onValue : this.offValue);
+        this.$emit('input', !this.checked ? this.onValue : this.offValue);
+        this.$nextTick(() => {
+          // set input's checked property
+          // in case parent refuses to change component's value
+          this.$refs.input.checked = this.checked;
+        });
       },
       setBackgroundColor() {
         let newColor = this.checked ? this.onColor : this.offColor;
@@ -142,6 +140,7 @@
       if (this.onColor || this.offColor) {
         this.setBackgroundColor();
       }
+      this.$refs.input.checked = this.checked;
     }
   };
 </script>
diff --git a/packages/theme-default/src/switch.css b/packages/theme-default/src/switch.css
index 43382b65d..85e7d4d8b 100644
--- a/packages/theme-default/src/switch.css
+++ b/packages/theme-default/src/switch.css
@@ -49,10 +49,6 @@
 
     @e input {
       display: none;
-      &:checked + .el-switch__core {
-        border-color: var(--switch-on-color);
-        background-color: var(--switch-on-color);
-      }
     }
 
     @e core {
@@ -77,6 +73,13 @@
       }
     }
 
+    @when checked {
+      .el-switch__core {
+        border-color: var(--switch-on-color);
+        background-color: var(--switch-on-color);
+      }
+    }
+
     @when disabled {
       .el-switch__core {
         border-color: var(--switch-disabled-color) !important;
@@ -90,11 +93,6 @@
           color: var(--switch-disabled-text-color) !important;
         }
       }
-
-      .el-switch__input:checked + .el-switch__core {
-        border-color: var(--switch-disabled-color);
-        background-color: var(--switch-disabled-color);
-      }
     }
 
     @modifier wide {