vxe-table 3.5.9 → 3.6.0-beta.10

package/styles/input.scss

@@ -237,6 +237,9 @@ $iconWidth: 1.6em;
     left: 50%;
     top: 50%;
     transform: translate(-50%, -50%);
+    &[class*="vxe-icon-"] {
+      font-size: 1.2em;
+    }
   }
 
   .vxe-input--date-picker-suffix {
@@ -258,6 +261,7 @@ $iconWidth: 1.6em;
   }
   .vxe-input--number-prev-icon,
   .vxe-input--number-next-icon {
+    line-height: 0.8em;
     position: absolute;
     left: 50%;
     transform: translateX(-50%);
@@ -676,6 +680,7 @@ $iconWidth: 1.6em;
 .vxe-input {
   font-size: $vxe-font-size;
   height: $vxe-input-height-default;
+  line-height: $vxe-input-height-default;
   .vxe-input--inner {
     &[type="date"]::-webkit-inner-spin-button,
     &[type="month"]::-webkit-inner-spin-button,
@@ -692,6 +697,7 @@ $iconWidth: 1.6em;
   &.size--medium {
     font-size: $vxe-font-size-medium;
     height: $vxe-input-height-medium;
+    line-height: $vxe-input-height-medium;
     .vxe-input--inner {
       &[type="date"]::-webkit-inner-spin-button,
       &[type="month"]::-webkit-inner-spin-button,
@@ -703,6 +709,7 @@ $iconWidth: 1.6em;
   &.size--small {
     font-size: $vxe-font-size-small;
     height: $vxe-input-height-small;
+    line-height: $vxe-input-height-small;
     .vxe-input--inner {
       &[type="date"]::-webkit-inner-spin-button,
       &[type="month"]::-webkit-inner-spin-button,
@@ -714,6 +721,7 @@ $iconWidth: 1.6em;
   &.size--mini {
     font-size: $vxe-font-size-mini;
     height: $vxe-input-height-mini;
+    line-height: $vxe-input-height-mini;
     .vxe-input--inner {
       &[type="date"]::-webkit-inner-spin-button,
       &[type="month"]::-webkit-inner-spin-button,

package/styles/loading.scss

@@ -19,10 +19,10 @@
     left: 0;
     transform: translateY(-50%);
     text-align: center;
-    color: $vxe-primary-color;
+    color: $vxe-loading-color;
   }
   .vxe-loading--default-icon {
-    font-size: 1.2em;
+    font-size: 1.4em;
   }
   .vxe-loading--text {
     padding: 0.4em 0;

package/styles/modal.scss

@@ -150,11 +150,6 @@
     }
   }
 
-  &.type--modal {
-    .vxe-modal--header {
-      padding: 0.6em 4.6em 0.6em 1em;
-    }
-  }
   &.type--alert,
   &.type--confirm {
     .vxe-modal--status-wrapper {
@@ -238,37 +233,44 @@
     flex-grow: 1;
   }
   .vxe-modal--header {
+    display: flex;
+    flex-direction: row;
     flex-shrink: 0;
     font-size: 1.1em;
     font-weight: 700;
-    padding: 0.6em 2.8em 0.6em 1em;
     border-bottom: 1px solid $vxe-modal-border-color;
     background-color: $vxe-modal-header-background-color;
     border-radius: $vxe-border-radius $vxe-border-radius 0 0;
     user-select: none;
     &.is--draggable {
-      cursor: move;
+      .vxe-modal--header-title {
+        cursor: move;
+      }
     }
     &.is--ellipsis {
-      overflow: hidden;
-      text-overflow: ellipsis;
-      white-space: nowrap;
+      .vxe-modal--header-title {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
     }
   }
+  .vxe-modal--header-title {
+    flex-grow: 1;
+    padding: 0.6em 0 0.6em 1em;
+  }
+  .vxe-modal--header-right {
+    flex-shrink: 0;
+    padding: 0.6em 1em 0.6em 0;
+  }
   .vxe-modal--zoom-btn,
   .vxe-modal--close-btn {
-    position: absolute;
-    right: 14px;
-    top: 0.85em;
-    z-index: 1;
     cursor: pointer;
+    margin-left: 0.6em;
     &:hover {
       color: $vxe-primary-color;
     }
   }
-  .vxe-modal--zoom-btn {
-    right: 44px;
-  }
   .vxe-modal--footer {
     flex-shrink: 0;
     text-align: right;