Browse Source

fix: switch label

richard1015 5 years ago
parent
commit
20b5de98c2

+ 1 - 1
package.json

@@ -1,6 +1,6 @@
 {
     "name": "@nutui/nutui",
-    "version": "2.2.4",
+    "version": "2.2.5",
     "description": "一套轻量级移动端Vue组件库",
     "typings": "dist/types/index.d.ts",
     "main": "dist/nutui.js",

+ 0 - 8
src/packages/switch/__test__/switch.spec.js

@@ -83,12 +83,4 @@ describe('Switch.vue', () => {
             }, 350);
         });
     });
-
-    it("接受label标记", () => {
-        wrapper.setProps({ label: 'a' });
-        return Vue.nextTick().then(function() {
-          expect(wrapper.vm.label).toBe('a');
-        });
-      });
-
 });

+ 3 - 3
src/packages/switch/demo.vue

@@ -47,7 +47,7 @@
         <div v-for="(item, index) of list" :key="index">
             <nut-cell>
                 <span slot="title"> {{ item.name }}</span>
-                <span slot="desc"><nut-switch :label="item.id" @change="onChangeLabel" :active="true"></nut-switch></span>
+                <span slot="desc"><nut-switch @change="onChangeLabel($event,index)" :active="true"></nut-switch></span>
             </nut-cell>
         </div>
         <h4>自定义Class</h4>
@@ -75,8 +75,8 @@ export default {
     onChange(status) {
       alert(status);
     },
-    onChangeLabel(status,label){
-      alert('status:'+status+',selected:'+label);
+    onChangeLabel(status,index){
+      alert('status:'+status+',selected:'+index);
     }
   }
 };

+ 4 - 7
src/packages/switch/doc.md

@@ -49,21 +49,19 @@ export default {
 ## change事件
 ```html
 <nut-switch 
-  @change="onChange"
+  @change="onChange($event,'1')"
 >
 </nut-switch>
 ```
 ```javascript
 export default {
   methods: {
-    onChange(status,label) {
-      alert('status:'+status+',selected:'+label);
+    onChange(status,index) {
+      alert('status:'+status+',selected:'+index);
     }
   }
 };
 ```
-## label参数
-
 
 ## 禁用状态
 ```html
@@ -90,5 +88,4 @@ export default {
 |----- | ----- | ----- | -----
 | active | 开关状态 | Boolean | false
 | size | 尺寸,可选值small/base/large | String | base
-| disabled | 是否禁用 | Boolean | false
-| label | 标记值,用于onChange(status,label) | String | false
+| disabled | 是否禁用 | Boolean | false

+ 3 - 11
src/packages/switch/switch.vue

@@ -22,17 +22,11 @@ export default {
     disabled: {
       type: Boolean,
       default: false
-    },
-    label:
-    {
-      type: String,
-      default: ""
     }
   },
   data() {
     return {
-      isActive: false,
-      isAnimating:false
+      isActive: false
     };
   },
   created() {
@@ -45,16 +39,14 @@ export default {
   },
   methods: {
     toggle() {
-      if(this.isAnimating) return;
       const status = this.isActive;
       if (!this.disabled) {
         this.isActive = !status;
       }
-      this.isAnimating = true;
+
       setTimeout(() => {
-        this.$emit("change", this.isActive, this.label);
+        this.$emit("change", this.isActive);
         this.$emit("update:active", this.isActive);
-        this.isAnimating = false;
       }, 300);
     }
   }