vxe-table 3.6.0-beta.0 → 3.6.0-beta.3

package/styles/base/checked.scss

@@ -1,179 +1,75 @@
-// 单选框和复选框
-%RadioAndCheckboxSpan {
-  position: relative;
-  user-select: none;
-  cursor: pointer;
-}
-%RadioAndCheckboxIcon {
-  display: none;
-  position: absolute;
-  height: 1em;
-  width: 1em;
-}
-
-%XERadio {
-  @extend %RadioAndCheckboxSpan;
-  .vxe-radio--icon {
-    @extend %RadioAndCheckboxIcon;
-    font-size: $vxe-radio-font-size-default;
-    &:before {
-      content: "";
-      position: absolute;
-      height: 1em;
-      width: 1em;
-      top: 0;
-      left: 0;
-      border: $vxe-radio-border-width solid $vxe-input-border-color;
-      background-color: $vxe-radio-icon-background-color;
-      border-radius: 50%;
-    }
-  }
-  .vxe-radio--unchecked-icon {
-    display: inline-block;
+%XECheckboxIcon {
+  .vxe-checkbox--icon {
+    font-size: 1.16em;
   }
-  .vxe-radio--checked-icon {
-    &:after {
-      content: "";
-      position: absolute;
-      height: 0.25em;
-      width: 0.25em;
-      top: 0.4em;
-      left: 0.4em;
-      border-radius: 50%;
-      background-color: $vxe-radio-checked-icon-background-color;
-    }
+  .vxe-checkbox--icon {
+    color: $vxe-input-border-color;
+    vertical-align: middle;
+    font-weight: 700;
+    user-select: none;
   }
-  &.is--checked {
+  &.is--checked,
+  &.is--indeterminate {
     color: $vxe-primary-color;
-    .vxe-radio--unchecked-icon {
-      display: none;
-    }
-    .vxe-radio--checked-icon {
-      display: inline-block;
-      &:before {
-        border-color: $vxe-primary-color;
-        background-color: $vxe-primary-color;
-      }
+    .vxe-checkbox--icon {
+      color: $vxe-primary-color;
     }
   }
   &:not(.is--disabled) {
+    cursor: pointer;
     &:hover {
-      .vxe-radio--icon {
-        &:before {
-          border-color: $vxe-primary-color;
-        }
+      .vxe-checkbox--icon {
+        color: $vxe-primary-color;
       }
     }
   }
   &.is--disabled {
-    cursor: not-allowed;
     color: $vxe-disabled-color;
-    .vxe-radio--icon {
-      &:before {
-        border-color: $vxe-input-disabled-color;
-        background-color: $vxe-input-disabled-background-color;
-      }
-      &:after {
-        background-color: $vxe-primary-disabled-color;
-      }
+    cursor: not-allowed;
+    .vxe-checkbox--icon {
+      color: $vxe-input-disabled-color;
     }
   }
+  .vxe-checkbox--label {
+    padding-left: 0.5em;
+    vertical-align: middle;
+  }
 }
 
-%XECheckbox {
-  @extend %RadioAndCheckboxSpan;
-  .vxe-checkbox--icon {
-    @extend %RadioAndCheckboxIcon;
-    font-size: $vxe-checkbox-font-size-default;
-    &:before {
-      content: "";
-      position: absolute;
-      height: 1em;
-      width: 1em;
-      top: 0;
-      left: 0;
-      background-color: $vxe-checkbox-icon-background-color;
-      border-radius: $vxe-checkbox-border-radius;
-      border: $vxe-checkbox-border-width solid $vxe-input-border-color;
-    }
-  }
-  .vxe-checkbox--unchecked-icon {
-    display: inline-block;
-  }
-  .vxe-checkbox--checked-icon {
-    &:after {
-      content: "";
-      position: absolute;
-      height: $vxe-checkbox-checked-height;
-      width: $vxe-checkbox-checked-width;
-      top: 50%;
-      left: 50%;
-      border: $vxe-checkbox-border-width solid $vxe-checkbox-checked-icon-border-color;
-      border-left: 0;
-      border-top: 0;
-      transform: translate(-50%, -50%) rotate(45deg);
-    }
-  }
-  .vxe-checkbox--indeterminate-icon {
-    &:after {
-      content: "";
-      position: absolute;
-      top: 50%;
-      left: 50%;
-      height: $vxe-checkbox-indeterminate-height;
-      width: $vxe-checkbox-indeterminate-width;
-      background-color: $vxe-checkbox-indeterminate-icon-background-color;
-      transform: translate(-50%, -50%);
-    }
+%XERadioIcon {
+  cursor: pointer;
+  .vxe-radio--icon {
+    font-size: 1.34em;
   }
-  &.is--checked,
-  &.is--indeterminate {
-    color: $vxe-primary-color;
-    .vxe-checkbox--unchecked-icon {
-      display: none;
-    }
-    .vxe-checkbox--icon {
-      &:before {
-        border-color: $vxe-primary-color;
-        background-color: $vxe-primary-color;
-      }
-    }
+  .vxe-radio--icon {
+    color: $vxe-input-border-color;
+    vertical-align: middle;
+    font-weight: 700;
+    user-select: none;
   }
   &.is--checked {
-    .vxe-checkbox--checked-icon {
-      display: inline-block;
-    }
-  }
-  &.is--indeterminate {
-    .vxe-checkbox--indeterminate-icon {
-      display: inline-block;
+    color: $vxe-primary-color;
+    .vxe-radio--icon {
+      color: $vxe-primary-color;
     }
   }
   &:not(.is--disabled) {
+    cursor: pointer;
     &:hover {
-      .vxe-checkbox--icon {
-        &:before {
-          border-color: $vxe-primary-color;
-        }
+      .vxe-radio--icon {
+        color: $vxe-primary-color;
       }
     }
   }
   &.is--disabled {
-    cursor: not-allowed;
     color: $vxe-disabled-color;
-    .vxe-checkbox--icon {
-      &:before {
-        border-color: $vxe-input-disabled-color;
-        background-color: $vxe-input-disabled-background-color;
-      }
-      &:after {
-        border-color: $vxe-primary-disabled-color;
-      }
-    }
-    .vxe-checkbox--indeterminate-icon {
-      &:after {
-        background-color: $vxe-primary-disabled-color;
-      }
+    cursor: not-allowed;
+    .vxe-radio--icon {
+      color: $vxe-input-disabled-color;
     }
   }
+  .vxe-radio--label {
+    padding-left: 0.5em;
+    vertical-align: middle;
+  }
 }

package/styles/button.scss

@@ -58,11 +58,6 @@ $btnThemeList: (
   &:not(.is--disabled) {
     color: $vxe-font-color;
     cursor: pointer;
-    .vxe-button--icon {
-      &.vxe-icon--zoomin {
-        border-color: $vxe-font-color;
-      }
-    }
   }
   &.is--loading {
     cursor: progress;
@@ -80,11 +75,6 @@ $btnThemeList: (
   }
   &.is--disabled {
     color: $vxe-disabled-color;
-    .vxe-button--icon {
-      &.vxe-icon--zoomin {
-        border-color: $vxe-disabled-color;
-      }
-    }
     &:not(.is--loading) {
       cursor: no-drop;
     }
@@ -140,11 +130,6 @@ $btnThemeList: (
     &:not(.is--disabled) {
       &:hover {
         color: lighten($vxe-primary-color, 6%);
-        .vxe-button--icon {
-          &.vxe-icon--zoomin {
-            border-color: lighten($vxe-primary-color, 6%);
-          }
-        }
       }
       &:focus {
         border-color: $vxe-primary-color;
@@ -154,16 +139,6 @@ $btnThemeList: (
         color: darken($vxe-primary-color, 3%);
         border-color: darken($vxe-primary-color, 3%);
         background-color: darken($vxe-button-default-background-color, 3%);
-        .vxe-button--icon {
-          &.vxe-icon--zoomin {
-            background-color: darken($vxe-button-default-background-color, 3%);
-          }
-          &.vxe-icon--zoomout {
-            &:after {
-              background-color: darken($vxe-button-default-background-color, 3%);
-            }
-          }
-        }
       }
     }
     @for $index from 0 to length($btnThemeList) {
@@ -172,11 +147,6 @@ $btnThemeList: (
       $btnBackground: map-get($item, btnBackground);
       &.theme--#{map-get($item, name)} {
         color: $btnColor;
-        .vxe-button--icon {
-          &.vxe-icon--zoomin {
-            border-color: $btnColor;
-          }
-        }
         &:not(.is--disabled) {
           border-color: $btnBackground;
           background-color: $btnBackground;
@@ -184,24 +154,11 @@ $btnThemeList: (
             color: $btnColor;
             background-color: lighten($btnBackground, 6%);
             border-color: lighten($btnBackground, 6%);
-            .vxe-button--icon {
-              &.vxe-icon--zoomin {
-                border-color: lighten($btnBackground, 6%);
-              }
-            }
           }
           &:active {
             color: $btnColor;
             background-color: darken($btnBackground, 3%);
             border-color: darken($btnBackground, 3%);
-            &.vxe-icon--zoomin {
-              background-color: darken($btnBackground, 3%);
-            }
-            &.vxe-icon--zoomout {
-              &:after {
-                background-color: darken($btnBackground, 3%);
-              }
-            }
           }
         }
         &.is--disabled {
@@ -333,6 +290,7 @@ $btnThemeList: (
 }
 
 .vxe-button--dropdown-arrow {
+  display: inline-block;
   font-size: 12px;
   margin-left: 4px;
   @include animatTransition(transform, .2s);

package/styles/checkbox.scss

@@ -1,6 +1,7 @@
 /**Variable**/
 @import './helpers/mixin.scss';
 @import './base/common.scss';
+@import './base/checked.scss';
 
 /*checkbox-group*/
 .vxe-checkbox-group {
@@ -11,13 +12,11 @@
 
 /*checkbox*/
 .vxe-checkbox {
+  @extend %XECheckboxIcon;
   display: inline-block;
   vertical-align: middle;
   white-space: nowrap;
-  user-select: none;
   line-height: 1;
-  cursor: pointer;
-  color: $vxe-font-color;
   &+.vxe-checkbox {
     margin-left: 10px;
   }
@@ -29,53 +28,12 @@
       border: 0;
       appearance: none;
     }
-    &+.vxe-checkbox--icon {
-      position: relative;
-      display: inline-block;
-      width: 1em;
-      height: 1em;
-      background-color: $vxe-checkbox-icon-background-color;
-      vertical-align: middle;
-      border-radius: $vxe-checkbox-border-radius;
-      border: $vxe-checkbox-border-width solid $vxe-input-border-color;
-      &:before {
-        content: "";
-        position: absolute;
-      }
-    }
-    &:checked+.vxe-checkbox--icon {
-      background-color: $vxe-primary-color;
-      border-color: $vxe-primary-color;
-      &:before {
-        height: $vxe-checkbox-checked-height;
-        width: $vxe-checkbox-checked-width;
-        left: 50%;
-        top: 50%;
-        border: $vxe-checkbox-border-width solid $vxe-checkbox-checked-icon-border-color;
-        border-left: 0;
-        border-top: 0;
-        transform: translate(-50%, -50%) rotate(45deg);
-      }
-      &+.vxe-checkbox--label {
-        color: $vxe-primary-color;
-      }
-    }
   }
   &.is--indeterminate {
     > input {
       &:not(:checked) {
         &+.vxe-checkbox--icon {
-          background-color: $vxe-primary-color;
-          border-color: $vxe-primary-color;
-          &:before {
-            border: 0;
-            left: 50%;
-            top: 50%;
-            height: $vxe-checkbox-indeterminate-height;
-            width: $vxe-checkbox-indeterminate-width;
-            background-color: $vxe-checkbox-indeterminate-icon-background-color;
-            transform: translate(-50%, -50%);
-          }
+          color: $vxe-primary-color;
         }
       }
     }
@@ -84,7 +42,7 @@
     & > input {
       &:focus {
         &+.vxe-checkbox--icon {
-          border-color: $vxe-primary-color;
+          color: $vxe-primary-color;
           box-shadow: 0 0 0.2em 0 $vxe-primary-color;
         }
       }
@@ -101,18 +59,13 @@
     cursor: not-allowed;
     > input {
       &+.vxe-checkbox--icon {
-        border-color: $vxe-input-disabled-color;
-        background-color: $vxe-input-disabled-background-color;
-        &:before {
-          border-color: $vxe-primary-disabled-color;
-        }
+        color: $vxe-input-disabled-color;
         &+.vxe-checkbox--label {
           color: $vxe-disabled-color;
         }
       }
       &:checked+.vxe-checkbox--icon {
-        border-color: $vxe-input-disabled-color;
-        background-color: $vxe-input-disabled-background-color;
+        color: $vxe-input-disabled-color;
       }
     }
   }
@@ -127,25 +80,13 @@
 
 .vxe-checkbox {
   font-size: $vxe-font-size;
-  .vxe-checkbox--icon {
-    font-size: $vxe-checkbox-font-size-default;
-  }
   &.size--medium {
     font-size: $vxe-font-size-medium;
-    .vxe-checkbox--icon {
-      font-size: $vxe-checkbox-font-size-medium;
-    }
   }
   &.size--small {
     font-size: $vxe-font-size-small;
-    .vxe-checkbox--icon {
-      font-size: $vxe-checkbox-font-size-small;
-    }
   }
   &.size--mini {
     font-size: $vxe-font-size-mini;
-    .vxe-checkbox--icon {
-      font-size: $vxe-checkbox-font-size-mini;
-    }
   }
 }

package/styles/export.scss

@@ -50,7 +50,7 @@
     user-select: none;
     & > ul {
       & > li {
-        padding: 0.2em 1em 0.2em 2.3em;
+        padding: 0.2em 1em 0.2em 1em;
         @for $i from 2 through 8 {
           $interval: $i - 1 + 0.2;
           &.level--#{$i}{
@@ -121,14 +121,7 @@
 }
 
 .vxe-export--panel-column-option {
-  @extend %XECheckbox;
-  .vxe-checkbox--icon {
-    left: 0.6em;
-    top: 0.38em;
-  }
-  &:hover {
-    background-color: $vxe-table-row-hover-background-color;
-  }
+  @extend %XECheckboxIcon;
 }
 
 .vxe-modal--wrapper {

package/styles/filter.scss

@@ -8,7 +8,7 @@
   vertical-align: middle;
   display: inline-block;
   line-height: 0;
-  &.col--active {
+  &.col--filter {
     .vxe-filter--btn {
       color: $vxe-table-font-color;
     }
@@ -80,7 +80,7 @@
   &.is--multiple {
     & > ul {
       & > li {
-        padding: 0.25em 0.8em 0.25em 2.3em;
+        padding: 0.25em 0.8em 0.25em 1em;
       }
     }
   }
@@ -109,11 +109,7 @@
 }
 
 .vxe-table--filter-option {
-  @extend %XECheckbox;
-  .vxe-checkbox--icon {
-    left: 0.6em;
-    top: 0.38em;
-  }
+  @extend %XECheckboxIcon;
 }
 
 .vxe-table {

package/styles/form.scss

@@ -44,9 +44,6 @@
   .vxe-form--item-title-suffix {
     cursor: help;
     vertical-align: middle;
-    & > i {
-      vertical-align: middle;
-    }
   }
   .vxe-form--item-title-prefix {
     margin-right: 0.25em;