Browse Source

Merge branch 'next' of https://github.com/guoxiao158/nutui into next

guoxiaoxiao8 4 years ago
parent
commit
74fd50df66
2 changed files with 3 additions and 2 deletions
  1. 1 0
      src/packages/__VUE/checkboxgroup/index.vue
  2. 2 2
      src/packages/__VUE/col/index.scss

+ 1 - 0
src/packages/__VUE/checkboxgroup/index.vue

@@ -37,6 +37,7 @@ export default create({
 
 
     const updateValue = (value: any[]) => {
     const updateValue = (value: any[]) => {
       emit('update:modelValue', value);
       emit('update:modelValue', value);
+      emit('change', value);
     };
     };
 
 
     const toggleAll = (checked: boolean) => {
     const toggleAll = (checked: boolean) => {

+ 2 - 2
src/packages/__VUE/col/index.scss

@@ -17,10 +17,10 @@
 
 
 @for $i from 1 through 24 {
 @for $i from 1 through 24 {
   .nut-col-offset-#{$i} {
   .nut-col-offset-#{$i} {
-    margin-left: 100/ 24 * $i * 1%;
+    margin-left: math.div(100, 24) * $i * 1%;
   }
   }
 
 
   .nut-col-#{$i} {
   .nut-col-#{$i} {
-    width: 100/ 24 * $i * 1%;
+    width: math.div(100, 24) * $i * 1%;
   }
   }
 }
 }