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

package/packages/modal/src/modal.js

@@ -127,6 +127,7 @@ export default {
     const footerSlot = $scopedSlots.footer || slots.footer
     const headerSlot = $scopedSlots.header || slots.header
     const titleSlot = $scopedSlots.title || slots.title
+    const cornerSlot = $scopedSlots.corner || slots.corner
     const headerOns = {}
     if (draggable) {
       headerOns.mousedown = this.mousedownEvent
@@ -170,27 +171,34 @@ export default {
           }],
           on: headerOns
         }, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : getSlotVNs(headerSlot.call(this, { $modal: this }, h))) : [
-          titleSlot ? getSlotVNs(titleSlot.call(this, { $modal: this }, h)) : h('span', {
-            class: 'vxe-modal--title'
-          }, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')),
-          showZoom ? h('i', {
-            class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN],
-            attrs: {
-              title: GlobalConfig.i18n(`vxe.modal.zoom${zoomLocat ? 'Out' : 'In'}`)
-            },
-            on: {
-              click: this.toggleZoomEvent
-            }
-          }) : _e(),
-          showClose ? h('i', {
-            class: ['vxe-modal--close-btn', 'trigger--btn', GlobalConfig.icon.MODAL_CLOSE],
-            attrs: {
-              title: GlobalConfig.i18n('vxe.modal.close')
-            },
-            on: {
-              click: this.closeEvent
-            }
-          }) : _e()
+          h('div', {
+            class: 'vxe-modal--header-title'
+          }, titleSlot ? getSlotVNs(titleSlot.call(this, { $modal: this }, h)) : (title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title'))),
+          h('div', {
+            class: 'vxe-modal--header-right'
+          }, [
+            cornerSlot ? h('span', {
+              class: 'vxe-modal--corner-warpper'
+            }, getSlotVNs(cornerSlot({ $modal: this }))) : _e(),
+            showZoom ? h('i', {
+              class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN],
+              attrs: {
+                title: GlobalConfig.i18n(`vxe.modal.zoom${zoomLocat ? 'Out' : 'In'}`)
+              },
+              on: {
+                click: this.toggleZoomEvent
+              }
+            }) : _e(),
+            showClose ? h('i', {
+              class: ['vxe-modal--close-btn', 'trigger--btn', GlobalConfig.icon.MODAL_CLOSE],
+              attrs: {
+                title: GlobalConfig.i18n('vxe.modal.close')
+              },
+              on: {
+                click: this.closeEvent
+              }
+            }) : _e()
+          ])
         ]) : null,
         h('div', {
           class: 'vxe-modal--body'

package/styles/button.scss

@@ -86,7 +86,7 @@ $btnThemeList: (
     background-color: transparent;
     &:not(.is--disabled) {
       &:focus {
-        box-shadow: 0 0 0.25em 0 $vxe-primary-color;
+        color: darken($vxe-font-color, 20%);
       }
       &:hover {
         color: lighten($vxe-primary-color, 10%);
@@ -98,6 +98,9 @@ $btnThemeList: (
       &.theme--#{map-get($item, name)} {
         color: $textColor;
         &:not(.is--disabled) {
+          &:focus {
+            color: darken($textColor, 10%);
+          }
           &:hover {
             color: lighten($textColor, 10%);
           }
@@ -133,7 +136,6 @@ $btnThemeList: (
       }
       &:focus {
         border-color: $vxe-primary-color;
-        box-shadow: 0 0 0.25em 0 $vxe-primary-color;
       }
       &:active {
         color: darken($vxe-primary-color, 3%);

package/styles/export.scss

@@ -123,32 +123,3 @@
 .vxe-export--panel-column-option {
   @extend %XECheckboxIcon;
 }
-
-.vxe-modal--wrapper {
-  .vxe-export--panel-column-option {
-    & > .vxe-checkbox--icon {
-      font-size: $vxe-checkbox-font-size-default;
-    }
-  }
-  &.size--medium {
-    .vxe-export--panel-column-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-medium;
-      }
-    }
-  }
-  &.size--small {
-    .vxe-export--panel-column-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-small;
-      }
-    }
-  }
-  &.size--mini {
-    .vxe-export--panel-column-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-mini;
-      }
-    }
-  }
-}

package/styles/filter.scss

@@ -110,33 +110,4 @@
 
 .vxe-table--filter-option {
   @extend %XECheckboxIcon;
-}
-
-.vxe-table {
-  .vxe-table--filter-option {
-    & > .vxe-checkbox--icon {
-      font-size: $vxe-checkbox-font-size-default;
-    }
-  }
-  &.size--medium {
-    .vxe-table--filter-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-medium;
-      }
-    }
-  }
-  &.size--small {
-    .vxe-table--filter-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-small;
-      }
-    }
-  }
-  &.size--mini {
-    .vxe-table--filter-option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-mini;
-      }
-    }
-  }
 }

package/styles/icon.scss

@@ -3,16 +3,7 @@
 @font-face {
   font-family: "vxeiconfont";
   src: 
-       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
-}
-
-@keyframes rollCircle {
-  0% { 
-    transform: rotate(0deg);
-  }
-  100% { 
-    transform: rotate(360deg);
-  }
+       url('data:application/x-font-woff2;charset=utf-8;base64,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') format('woff2');
 }
 
 [class*="vxe-icon-"] {
@@ -20,6 +11,7 @@
   font-style: normal;
   font-weight: 400;
   font-size: 1.1em;
+  line-height: 1;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
   &.animat,
@@ -43,12 +35,92 @@
   }
 }
 
-.vxe-icon-checkbox-checked:before {
-  content: "\e67d";
+.vxe-icon-checkbox-unchecked:before {
+  content: "\e727";
 }
 
-.vxe-icon-checkbox-unchecked:before {
-  content: "\e638";
+.vxe-icon-information:before {
+  content: "\e7b9";
+}
+
+.vxe-icon-info-circle-fill:before {
+  content: "\e697";
+}
+
+.vxe-icon-info-circle:before {
+  content: "\e618";
+}
+
+.vxe-icon-chart-radar:before {
+  content: "\e7dc";
+}
+
+.vxe-icon-chart-bar-x:before {
+  content: "\e60c";
+}
+
+.vxe-icon-repeat:before {
+  content: "\ea4a";
+}
+
+.vxe-icon-voice-fill:before {
+  content: "\e7c3";
+}
+
+.vxe-icon-voice:before {
+  content: "\e6be";
+}
+
+.vxe-icon-flow-branch:before {
+  content: "\e604";
+}
+
+.vxe-icon-comment:before {
+  content: "\e70c";
+}
+
+.vxe-icon-envelope:before {
+  content: "\e628";
+}
+
+.vxe-icon-folder:before {
+  content: "\e7d1";
+}
+
+.vxe-icon-folder-open:before {
+  content: "\e7d2";
+}
+
+.vxe-icon-picture:before {
+  content: "\ea13";
+}
+
+.vxe-icon-picture-fill:before {
+  content: "\e653";
+}
+
+.vxe-icon-bell:before {
+  content: "\e680";
+}
+
+.vxe-icon-bell-fill:before {
+  content: "\e681";
+}
+
+.vxe-icon-undo:before {
+  content: "\e739";
+}
+
+.vxe-icon-home:before {
+  content: "\e7c6";
+}
+
+.vxe-icon-home-fill:before {
+  content: "\e867";
+}
+
+.vxe-icon-checkbox-checked:before {
+  content: "\e67d";
 }
 
 .vxe-icon-checkbox-indeterminate:before {
@@ -251,10 +323,6 @@
   content: "\e617";
 }
 
-.vxe-icon-information:before {
-  content: "\e7f7";
-}
-
 .vxe-icon-ellipsis-h:before {
   content: "\e636";
 }
@@ -347,7 +415,7 @@
   content: "\e682";
 }
 
-.vxe-icon-chart-bar:before {
+.vxe-icon-chart-bar-y:before {
   content: "\e84e";
 }
 
@@ -371,10 +439,6 @@
   content: "\e690";
 }
 
-.vxe-icon-info-circle-fill:before {
-  content: "\e6e4";
-}
-
 .vxe-icon-error-circle-fill:before {
   content: "\e62b";
 }
@@ -403,10 +467,6 @@
   content: "\e600";
 }
 
-.vxe-icon-info-circle:before {
-  content: "\e77e";
-}
-
 .vxe-icon-question-circle:before {
   content: "\e782";
 }
@@ -479,10 +539,6 @@
   content: "\e677";
 }
 
-.vxe-icon-repeat:before {
-  content: "\e67b";
-}
-
 .vxe-icon-warning-triangle-fill:before {
   content: "\e68b";
 }

package/styles/input.scss

@@ -238,7 +238,7 @@ $iconWidth: 1.6em;
     top: 50%;
     transform: translate(-50%, -50%);
     &[class*="vxe-icon-"] {
-      font-size: 1.5em;
+      font-size: 1.2em;
     }
   }
 

package/styles/loading.scss

@@ -22,7 +22,7 @@
     color: $vxe-primary-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,36 +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;
-    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;

package/styles/toolbar.scss

@@ -175,33 +175,13 @@
 
 .vxe-toolbar {
   font-size: $vxe-font-size;
-  .vxe-custom--option {
-    & > .vxe-checkbox--icon {
-      font-size: $vxe-checkbox-font-size-default;
-    }
-  }
   &.size--medium {
     font-size: $vxe-font-size-medium;
-    .vxe-custom--option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-medium;
-      }
-    }
   }
   &.size--small {
     font-size: $vxe-font-size-small;
-    .vxe-custom--option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-small;
-      }
-    }
   }
   &.size--mini {
     font-size: $vxe-font-size-mini;
-    .vxe-custom--option {
-      & > .vxe-checkbox--icon {
-        font-size: $vxe-checkbox-font-size-mini;
-      }
-    }
   }
 }

package/styles/variable.scss

@@ -108,7 +108,7 @@ $vxe-table-menu-item-width: 178px !default;
 $vxe-table-menu-background-color: #fff !default;
 
 /*loading*/
-$vxe-loading-background-color: rgba(0, 0, 0, 0.3) !default;
+$vxe-loading-background-color: rgba(0, 0, 0, 0.2) !default;
 $vxe-loading-z-index: 999 !default;
 
 /*validate*/

package/types/table.d.ts

@@ -859,41 +859,79 @@ export declare class Table extends VXETableComponent {
    */
   getUpdateRecords(): RowInfo[];
   /**
-   * 手动清除单元格激活状态
+   * 请使用 clearEdit
+   * @deprecated
    */
-  clearActived(): Promise<any>;
+  clearActived(evnt?: Event): Promise<any>
+   /**
+    * 手动清除单元格激活状态
+    */
+  clearEdit(evnt?: Event): Promise<any>
   /**
    * 用于 mouse-config.area，用于清除鼠标选择的区域，可以指定清除的区域
    */
   clearCellAreas(area?: number | MouseCellArea): Promise<any>;
   /**
-   * 用于 edit-config，获取已激活的行数据
+   * 请使用 getEditRecord
+   * @deprecated
    */
   getActiveRecord(): {
-    row: RowInfo;
-    rowIndex: number;
-    $rowIndex: number;
-    column: ColumnInfo;
-    columnIndex: number;
-    $columnIndex: number;
-    cell: HTMLElement;
-  };
+    row: any
+    rowIndex: number
+    $rowIndex: number
+    column: ColumnInfo
+    columnIndex: number
+    $columnIndex: number
+    cell: HTMLElement
+  }
   /**
-   * 用于 edit-config，判断行是否为激活编辑状态
-   * @param row 指定行
+   * 用于 edit-config，获取已激活的行数据
+   */
+  getEditRecord(): {
+    row: any
+    rowIndex: number
+    $rowIndex: number
+    column: ColumnInfo
+    columnIndex: number
+    $columnIndex: number
+    cell: HTMLElement
+  }
+  /**
+   * 请使用 isEditByRow
+   * @deprecated
    */
-  isActiveByRow(row: RowInfo): boolean;
+  isActiveByRow(row: any): boolean
+   /**
+    * 用于 edit-config，判断行是否为激活编辑状态
+    * @param row 指定行
+    */
+  isEditByRow(row: any): boolean
   /**
    * 用于 edit-config，激活行编辑并激活第一个单元格
    * @param row 指定行
    */
   setActiveRow(row: RowInfo): Promise<any>;
   /**
-   * 用于 edit-config，激活单元格编辑
-   * @param row 指定行
-   * @param field 字段名
+   * 请使用 setEditRow
+   * @deprecated
    */
-  setActiveCell(row: RowInfo, field: string): Promise<any>;
+  setActiveRow(row: any): Promise<any>
+   /**
+    * 用于 edit-config，激活行编辑并激活第一个单元格
+    * @param row 指定行
+    */
+  setEditRow(row: any): Promise<any>
+   /**
+    * 请使用 setEditCell
+    * @deprecated
+    */
+  setActiveCell(row: any, fieldOrColumn: string | ColumnInfo): Promise<any>
+   /**
+    * 用于 edit-config，激活单元格编辑
+    * @param row 指定行
+    * @param field 字段名
+    */
+  setEditCell(row: any, fieldOrColumn: string | ColumnInfo): Promise<any>
   /**
    * 用于 mouse-config.mouse-config，选中某个单元格
    * @param row 指定行