vxe-table 3.6.14-beta.5 → 3.6.14

package/styles/input.scss

@@ -35,7 +35,7 @@ $iconWidth: 1.6em;
   }
   &[disabled] {
     cursor: not-allowed;
-    color: $vxe-disabled-color;
+    color: $vxe-font-disabled-color;
     background-color: $vxe-input-disabled-background-color;
   }
 }
@@ -399,12 +399,12 @@ $iconWidth: 1.6em;
   border-color: $vxe-primary-color;
   background-color: $vxe-primary-color;
   &:hover {
-    background-color: lighten($vxe-primary-color, 6%);
-    border-color: lighten($vxe-primary-color, 6%);
+    background-color: $vxe-primary-lighten-color;
+    border-color: $vxe-primary-lighten-color;
   }
   &:active {
-    background-color: darken($vxe-primary-color, 3%);
-    border-color: darken($vxe-primary-color, 3%);
+    background-color: $vxe-primary-darken-color;
+    border-color: $vxe-primary-darken-color;
   }
 }
 
@@ -446,16 +446,16 @@ $iconWidth: 1.6em;
 }
 .vxe-input--date-picker-btn {
   &.is--disabled {
-    color: $vxe-disabled-color;
+    color: $vxe-font-disabled-color;
     cursor: no-drop;
   }
   &:not(.is--disabled) {
     cursor: pointer;
     &:hover {
-      background-color: lighten($vxe-button-default-background-color, 6%);
+      background-color: #fff;
     }
     &:active {
-      background-color: darken($vxe-button-default-background-color, 3%);
+      background-color: #fff;
     }
   }
 }
@@ -481,10 +481,10 @@ $iconWidth: 1.6em;
   td {
     &.is--prev,
     &.is--next {
-      color: $vxe-disabled-color;
+      color: $vxe-font-disabled-color;
       .vxe-input--date-label,
       .vxe-input--date-festival {
-        color: $vxe-disabled-color;
+        color: $vxe-font-disabled-color;
       }
     }
     &.is--now {
@@ -507,7 +507,7 @@ $iconWidth: 1.6em;
       background-color: $vxe-primary-color;
       &.is--prev,
       &.is--next {
-        background-color: lighten($vxe-primary-color, 10%);
+        background-color: $vxe-primary-lighten-color;
       }
       .vxe-input--date-label,
       .vxe-input--date-festival {
@@ -819,7 +819,7 @@ $iconWidth: 1.6em;
   }
   .vxe-input--date-picker-body table,
   .vxe-input--time-picker-body {
-    height: nth($timeWeekRowHeightList, $sizeIndex) * 6 + nth($titleRowHeightList, $sizeIndex);
+    height: calc(nth($timeWeekRowHeightList, $sizeIndex) * 6 + nth($titleRowHeightList, $sizeIndex));
   }
   .vxe-input--time-picker-body {
     $ulWidthList: 48px, 48px, 44px, 42px;
@@ -839,7 +839,7 @@ $iconWidth: 1.6em;
       left: nth($ulWidthList, $sizeIndex);
     }
     .vxe-input--time-picker-second-list {
-      left: nth($ulWidthList, $sizeIndex) * 2;
+      left: calc(nth($ulWidthList, $sizeIndex) * 2);
     }
   }
   .vxe-input--date-day-view,
@@ -870,7 +870,7 @@ $iconWidth: 1.6em;
     padding: 0 10px - $sizeIndex;
   }
   .vxe-input--date-label {
-    line-height: nth($fontSizeList, $sizeIndex) + 1;
+    line-height: calc(nth($fontSizeList, $sizeIndex) + 1px);
   }
 }
 

package/styles/menu.scss

@@ -1,6 +1,12 @@
 /**Variable**/
 
 /*快捷菜单*/
+.vxe-table--context-menu-wrapper {
+  display: none;
+  &.is--visible {
+    display: block;
+  }
+}
 .vxe-table--context-menu-wrapper,
 .vxe-table--context-menu-clild-wrapper {
   position: absolute;
@@ -11,7 +17,7 @@
   box-shadow: 3px 3px 4px -2px rgba(0,0,0,.6);
   padding: 0 1px;
   user-select: none;
-  color: $vxe-table-font-color;
+  color: $vxe-font-color;
   font-family: $vxe-font-family;
   background-color: $vxe-table-menu-background-color;
 }
@@ -20,7 +26,7 @@
   padding: 0 2.5em;
   width: $vxe-table-menu-item-width;
   line-height: 26px;
-  color: $vxe-table-font-color;
+  color: $vxe-font-color;
   cursor: pointer;
   .vxe-context-menu--link-prefix,
   .vxe-context-menu--link-suffix {
@@ -78,7 +84,7 @@
     }
     &.link--disabled {
       & > .vxe-context-menu--link {
-        color: $vxe-disabled-color;
+        color: $vxe-font-disabled-color;
         cursor: no-drop;
       }
       &.link--active {

package/styles/modal.scss

@@ -210,7 +210,7 @@
   }
   &.status--loading {
     .vxe-modal--status-wrapper {
-      color: $vxe-disabled-color;
+      color: $vxe-font-disabled-color;
     }
   }
   .vxe-modal--status-wrapper {

package/styles/modules.scss

@@ -20,6 +20,7 @@
 @import './tooltip.scss';
 @import './form.scss';
 @import './form-item.scss';
+@import './form-gather.scss';
 @import './select.scss';
 @import './optgroup.scss';
 @import './option.scss';

package/styles/pager.scss

@@ -47,10 +47,10 @@
         box-shadow: 0 0 0.25em 0 $vxe-primary-color;
       }
       &:hover {
-        color: lighten($vxe-primary-color, 6%);
+        color: $vxe-primary-lighten-color;
       }
       &:active {
-        background-color: darken($vxe-button-default-background-color, 3%);
+        background-color: #fff;
       }
     }
   }
@@ -83,14 +83,14 @@
           color: #fff;
           background-color: $vxe-primary-color;
           &:hover {
-            background-color: lighten($vxe-primary-color, 6%);
+            background-color: $vxe-primary-lighten-color;
           }
           &:focus {
             border-color: $vxe-primary-color;
           }
           &:active {
-            border-color: darken($vxe-primary-color, 3%);
-            background-color: darken($vxe-primary-color, 3%);
+            border-color: $vxe-primary-darken-color;
+            background-color: $vxe-primary-darken-color;
           }
         }
       }
@@ -200,21 +200,21 @@
     background-color: $vxe-pager-background-color;
     &:not(.is--disabled) {
       &:hover {
-        color: lighten($vxe-primary-color, 6%);
+        color: $vxe-primary-lighten-color;
       }
       &.is--active,
       &:focus {
         color: $vxe-primary-color;
       }
       &:active {
-        color: darken($vxe-primary-color, 3%);
+        color: $vxe-primary-darken-color;
       }
     }
     &.is--disabled {
       cursor: no-drop;
-      color: $vxe-disabled-color;
+      color: $vxe-font-disabled-color;
       &:hover {
-        color: $vxe-disabled-color;
+        color: $vxe-font-disabled-color;
       }
     }
   }

package/styles/radio.scss

@@ -74,7 +74,7 @@
   }
   .vxe-radio--label {
     padding: 0 1em;
-    line-height: $vxe-button-height-default - 2;
+    line-height: calc($vxe-button-height-default - 2px);
     display: inline-block;
     border-style: solid;
     border-color: $vxe-input-border-color;
@@ -92,8 +92,8 @@
       }
       &:checked {
         &+.vxe-radio--label {
-          border-color: lighten($vxe-primary-color, 20%);
-          background-color: lighten($vxe-primary-color, 20%);
+          border-color: $vxe-primary-lighten-color;
+          background-color: $vxe-primary-lighten-color;
         }
       }
     }
@@ -119,17 +119,17 @@
   }
   &.size--medium {
     .vxe-radio--label {
-      line-height: $vxe-button-height-medium - 2;
+      line-height: calc($vxe-button-height-medium - 2px);
     }
   }
   &.size--small {
     .vxe-radio--label {
-      line-height: $vxe-button-height-small - 2;
+      line-height: calc($vxe-button-height-small - 2px);
     }
   }
   &.size--mini {
     .vxe-radio--label {
-      line-height: $vxe-button-height-mini - 2;
+      line-height: calc($vxe-button-height-mini - 2px);
     }
   }
 }

package/styles/select.scss

@@ -131,7 +131,7 @@
     }
   }
   &.is--disabled {
-    color: $vxe-disabled-color;
+    color: $vxe-font-disabled-color;
     cursor: no-drop;
   }
 }

package/styles/switch.scss

@@ -61,7 +61,7 @@
     }
     &.is--on {
       .vxe-switch--button {
-        background-color: lighten($vxe-primary-color, 20%);
+        background-color: $vxe-primary-lighten-color;
       }
     }
     &.is--off {

package/styles/table.scss

@@ -57,7 +57,7 @@
     outline: 0;
     padding: 0 2px;
     width: 100%;
-    color: $vxe-table-font-color;
+    color: $vxe-font-color;
     border-radius: $vxe-border-radius;
     border: 1px solid $vxe-input-border-color;
     &:focus {
@@ -219,95 +219,93 @@
 }
 
 /*圆角*/
-@if $vxe-table-border-radius {
-  .vxe-table--render-default {
-    &.is--round {
-      %AllRadius {
-        border-radius: $vxe-table-border-radius;
-      }
-      %TopRadius {
-        border-radius: $vxe-table-border-radius $vxe-table-border-radius 0 0;
-      }
-      %TopLeftRadius {
-        border-radius: $vxe-table-border-radius 0 0 0;
-      }
-      %TopRightRadius {
-        border-radius: 0 $vxe-table-border-radius 0 0;
-      }
-      %BottomRadius {
-        border-radius: 0 0 $vxe-table-border-radius $vxe-table-border-radius;
-      }
-      %BottomLeftRadius {
-        border-radius: 0 0 0 $vxe-table-border-radius;
-      }
-      %BottomRightRadius {
-        border-radius: 0 0 $vxe-table-border-radius 0;
-      }
+.vxe-table--render-default {
+  &.is--round {
+    %AllRadius {
+      border-radius: $vxe-table-border-radius;
+    }
+    %TopRadius {
+      border-radius: $vxe-table-border-radius $vxe-table-border-radius 0 0;
+    }
+    %TopLeftRadius {
+      border-radius: $vxe-table-border-radius 0 0 0;
+    }
+    %TopRightRadius {
+      border-radius: 0 $vxe-table-border-radius 0 0;
+    }
+    %BottomRadius {
+      border-radius: 0 0 $vxe-table-border-radius $vxe-table-border-radius;
+    }
+    %BottomLeftRadius {
+      border-radius: 0 0 0 $vxe-table-border-radius;
+    }
+    %BottomRightRadius {
+      border-radius: 0 0 $vxe-table-border-radius 0;
+    }
+    @extend %AllRadius;
+    .vxe-table--border-line {
       @extend %AllRadius;
-      .vxe-table--border-line {
-        @extend %AllRadius;
-      }
-      &.is--header {
-        &:not(.is--footer) {
-          .vxe-table--body-wrapper {
-            &.fixed-left--wrapper {
-              @extend %BottomLeftRadius;
-            }
-            &.body--wrapper {
-              @extend %BottomRadius;
-            }
-            &.fixed-right--wrapper {
-              @extend %BottomRightRadius;
-            }
-          }
-        }
-        .vxe-table--header-wrapper {
+    }
+    &.is--header {
+      &:not(.is--footer) {
+        .vxe-table--body-wrapper {
           &.fixed-left--wrapper {
-            @extend %TopLeftRadius;
+            @extend %BottomLeftRadius;
           }
           &.body--wrapper {
-            @extend %TopRadius;
+            @extend %BottomRadius;
           }
           &.fixed-right--wrapper {
-            @extend %TopRightRadius;
+            @extend %BottomRightRadius;
           }
         }
       }
-      &:not(.is--header) {
-        &:not(.is--footer) {
-          .vxe-table--body-wrapper {
-            &.body--wrapper {
-              @extend %AllRadius;
-            }
-          }
+      .vxe-table--header-wrapper {
+        &.fixed-left--wrapper {
+          @extend %TopLeftRadius;
+        }
+        &.body--wrapper {
+          @extend %TopRadius;
+        }
+        &.fixed-right--wrapper {
+          @extend %TopRightRadius;
         }
       }
-      &.is--footer {
-        &:not(.is--header) {
-          .vxe-table--body-wrapper {
-            &.fixed-left--wrapper {
-              @extend %BottomLeftRadius;
-            }
-            &.body--wrapper {
-              @extend %TopRadius;
-            }
-            &.fixed-right--wrapper {
-              @extend %BottomRightRadius;
-            }
+    }
+    &:not(.is--header) {
+      &:not(.is--footer) {
+        .vxe-table--body-wrapper {
+          &.body--wrapper {
+            @extend %AllRadius;
           }
         }
-        .vxe-table--footer-wrapper {
+      }
+    }
+    &.is--footer {
+      &:not(.is--header) {
+        .vxe-table--body-wrapper {
           &.fixed-left--wrapper {
             @extend %BottomLeftRadius;
           }
           &.body--wrapper {
-            @extend %BottomRadius;
+            @extend %TopRadius;
           }
           &.fixed-right--wrapper {
             @extend %BottomRightRadius;
           }
         }
       }
+      .vxe-table--footer-wrapper {
+        &.fixed-left--wrapper {
+          @extend %BottomLeftRadius;
+        }
+        &.body--wrapper {
+          @extend %BottomRadius;
+        }
+        &.fixed-right--wrapper {
+          @extend %BottomRightRadius;
+        }
+      }
     }
   }
 }
@@ -344,7 +342,7 @@
     line-height: 0.8em;
     cursor: pointer;
     &:hover {
-      color: $vxe-table-font-color;
+      color: $vxe-font-color;
     }
     &.sort--active {
       color: $vxe-primary-color;
@@ -452,7 +450,7 @@
 .vxe-table--render-default {
   position: relative;
   font-size: $vxe-font-size;
-  color: $vxe-table-font-color;
+  color: $vxe-font-color;
   font-family: $vxe-font-family;
   direction: ltr;
   .vxe-table--body-wrapper {
@@ -980,9 +978,9 @@
   }
   .vxe-tree--node-btn {
     display: block;
-    color: lighten($vxe-table-font-color, 20%);
+    color: $vxe-font-lighten-color;
     &:hover {
-      color: $vxe-table-font-color;
+      color: $vxe-font-color;
     }
   }
   .vxe-tree-cell {
@@ -1010,9 +1008,9 @@
       height: 1em;
       text-align: center;
       user-select: none;
-      color: lighten($vxe-table-font-color, 20%);
+      color: $vxe-font-lighten-color;
       &:hover {
-        color: $vxe-table-font-color;
+        color: $vxe-font-color;
       }
     }
     &+.vxe-table--expand-label {
@@ -1232,8 +1230,8 @@
         position: relative;
         &:before {
           content: "";
-          top: -$vxe-table-cell-dirty-width;
-          left: -$vxe-table-cell-dirty-width;
+          top: $vxe-table-cell-dirty-width;
+          left: $vxe-table-cell-dirty-width;
           position: absolute;
           border-width: $vxe-table-cell-dirty-width;
           border-style: solid;
@@ -1248,8 +1246,8 @@
       position: relative;
       &:before {
         content: "";
-        top: -$vxe-table-cell-dirty-width;
-        left: -$vxe-table-cell-dirty-width;
+        top: $vxe-table-cell-dirty-width;
+        left: $vxe-table-cell-dirty-width;
         position: absolute;
         border-width: $vxe-table-cell-dirty-width;
         border-style: solid;
@@ -1284,7 +1282,7 @@
               }
             }
             .vxe-textarea {
-              height: $vxe-table-row-line-height - 1;
+              height: calc($vxe-table-row-line-height - 1px);
               .vxe-textarea--inner {
                 border: 0;
               }
@@ -1323,4 +1321,4 @@
       }
     }
   }
-}
+}

package/styles/variable.scss

@@ -1,6 +1,5 @@
 /*font*/
 $vxe-font-family: -apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol !default;
-$vxe-font-color: #606266 !default;
 $vxe-font-size: 14px !default;
 $vxe-font-size-medium: 14px !default;
 $vxe-font-size-small: 13px !default;
@@ -14,13 +13,33 @@ $vxe-icon-font-family: Verdana,Arial,Tahoma !default;
 $vxe-icon-background-color: #fff !default;
 
 /*color*/
+$vxe-font-color: #606266 !default;
 $vxe-primary-color: #409eff !default;
 $vxe-success-color: #67c23a !default;
 $vxe-info-color: #909399 !default;
 $vxe-warning-color: #e6a23c !default;
 $vxe-danger-color: #f56c6c !default;
-$vxe-disabled-color: #BFBFBF !default;
-$vxe-primary-disabled-color: #c0c4cc !default;
+
+$vxe-font-lighten-color: lighten($vxe-font-color, 10%) !default;
+$vxe-primary-lighten-color: lighten($vxe-primary-color, 10%) !default;
+$vxe-success-lighten-color: lighten($vxe-success-color, 10%) !default;
+$vxe-info-lighten-color: lighten($vxe-info-color, 10%) !default;
+$vxe-warning-lighten-color: lighten($vxe-warning-color, 10%) !default;
+$vxe-danger-lighten-color: lighten($vxe-danger-color, 10%) !default;
+
+$vxe-font-darken-color: darken($vxe-font-color, 10%) !default;
+$vxe-primary-darken-color: darken($vxe-primary-color, 10%) !default;
+$vxe-success-darken-color: darken($vxe-success-color, 10%) !default;
+$vxe-info-darken-color: darken($vxe-info-color, 10%) !default;
+$vxe-warning-darken-color: darken($vxe-warning-color, 10%) !default;
+$vxe-danger-darken-color: darken($vxe-danger-color, 10%) !default;
+
+$vxe-font-disabled-color: #BFBFBF !default;
+$vxe-primary-disabled-color: lighten($vxe-primary-color, 20%) !default;
+$vxe-success-disabled-color: lighten($vxe-success-color, 20%) !default;
+$vxe-info-disabled-color: lighten($vxe-info-color, 20%) !default;
+$vxe-warning-disabled-color: lighten($vxe-warning-color, 20%) !default;
+$vxe-danger-disabled-color: lighten($vxe-danger-color, 20%) !default;
 
 /*input/radio/checkbox*/
 $vxe-input-border-color: #dcdfe6 !default;
@@ -32,7 +51,6 @@ $vxe-input-placeholder-color: #C0C4CC !default;
 $vxe-table-popup-border-color: #DADCE0 !default;
 
 /*table*/
-$vxe-table-font-color: $vxe-font-color !default;
 $vxe-table-header-font-color: $vxe-font-color !default;
 $vxe-table-footer-font-color: $vxe-font-color !default;
 $vxe-table-border-radius: $vxe-border-radius !default;
@@ -171,7 +189,7 @@ $vxe-radio-button-default-background-color: #fff !default;
 /*button*/
 $vxe-button-max-width: 500px !default;
 $vxe-button-default-background-color: #fff !default;
-$vxe-button-dropdown-panel-background-color: #fff !default;
+$vxe-button-dropdown-panel-background-color: $vxe-button-default-background-color !default;
 $vxe-button-height-default: 34px !default;
 $vxe-button-height-medium: 32px !default;
 $vxe-button-height-small: 30px !default;