vxe-table 3.5.9-beta.7 → 3.5.9

package/styles/header.scss

@@ -1,135 +1 @@
 /**Variable**/
-
-.vxe-table {
-  .vxe-table--header-wrapper {
-    color: $vxe-table-header-font-color;
-    .vxe-table--header-border-line {
-      position: absolute;
-      left: 0;
-      bottom: 0;
-      height: 0;
-      border-bottom: $vxe-table-border-width solid $vxe-table-border-color;
-    }
-  }
-  /*排序*/
-  .vxe-cell--sort {
-    width: 1.5em;
-    height: 1.35em;
-    vertical-align: middle;
-    text-align: center;
-    display: inline-block;
-    position: relative;
-  }
-  .vxe-sort--asc-btn,
-  .vxe-sort--desc-btn {
-    position: absolute;
-    left: 0.35em;
-    color: $vxe-table-column-icon-border-color;
-    width: 1em;
-    text-align: center;
-    cursor: pointer;
-    &:hover {
-      color: $vxe-table-font-color;
-    }
-    &.sort--active {
-      color: $vxe-primary-color;
-    }
-  }
-  .vxe-sort--asc-btn {
-    top: -0.15em;
-  }
-  .vxe-sort--desc-btn {
-    bottom: -0.15em;
-  }
-}
-
-.vxe-header--column {
-  position: relative;
-  font-weight: $vxe-table-header-font-weight;
-  // user-select: none;
-  &.col--ellipsis {
-    & > .vxe-cell {
-      display: flex;
-      align-items: center;
-      .vxe-cell--title {
-        overflow: hidden;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-      }
-      & > i,
-      & > span {
-        &:not(.vxe-cell--title) {
-          flex-shrink: 0;
-        }
-      }
-    }
-  }
-  .vxe-cell--required-icon {
-    display: inline-block;
-    color: $vxe-table-validate-error-color;
-    width: 0.8em;
-    height: 1em;
-    line-height: 1em;
-    font-family: $vxe-icon-font-family;
-    font-weight: normal;
-    position: relative;
-    &:before {
-      content: "*";
-      position: absolute;
-      left: 0;
-      top: 0.2em;
-    }
-  }
-  // .vxe-cell--required-icon,
-  // .vxe-cell--edit-icon,
-  // .vxe-cell-help-icon,
-  // .vxe-cell--title {
-  //   vertical-align: middle;
-  // }
-  .vxe-cell--required-icon {
-    margin-right: 0.1em;
-  }
-  .vxe-cell--edit-icon,
-  .vxe-cell-help-icon {
-    margin-right: 0.2em;
-  }
-  .vxe-cell-help-icon {
-    cursor: help;
-  }
-  .vxe-resizable {
-    position: absolute;
-    right: -7px;
-    bottom: 0;
-    width: 14px;
-    height: 100%;
-    text-align: center;
-    z-index: 1;
-    cursor: col-resize;
-    &.is--line {
-      &:before,
-      &:after {
-        content: "";
-        display: inline-block;
-        vertical-align: middle;
-      }
-      &:before {
-        width: 1px;
-        height: 50%;
-        background-color: $vxe-table-resizable-line-color;
-      }
-      &:after {
-        width: 0;
-        height: 100%;
-      }
-    }
-  }
-}
-
-.vxe-table--fixed-right-wrapper {
-  .vxe-header--column {
-    .vxe-resizable {
-      right: auto;
-      left: -7px;
-    }
-  }
-}

package/styles/table.scss

@@ -311,6 +311,140 @@
   }
 }
 
+/*header*/
+.vxe-table {
+  .vxe-table--header-wrapper {
+    color: $vxe-table-header-font-color;
+    .vxe-table--header-border-line {
+      position: absolute;
+      left: 0;
+      bottom: 0;
+      height: 0;
+      border-bottom: $vxe-table-border-width solid $vxe-table-border-color;
+    }
+  }
+  /*排序*/
+  .vxe-cell--sort {
+    width: 1.5em;
+    height: 1.35em;
+    vertical-align: middle;
+    text-align: center;
+    display: inline-block;
+    position: relative;
+  }
+  .vxe-sort--asc-btn,
+  .vxe-sort--desc-btn {
+    position: absolute;
+    left: 0.35em;
+    color: $vxe-table-column-icon-border-color;
+    width: 1em;
+    text-align: center;
+    cursor: pointer;
+    &:hover {
+      color: $vxe-table-font-color;
+    }
+    &.sort--active {
+      color: $vxe-primary-color;
+    }
+  }
+  .vxe-sort--asc-btn {
+    top: -0.15em;
+  }
+  .vxe-sort--desc-btn {
+    bottom: -0.15em;
+  }
+}
+
+.vxe-header--column {
+  position: relative;
+  font-weight: $vxe-table-header-font-weight;
+  // user-select: none;
+  &.col--ellipsis {
+    & > .vxe-cell {
+      display: flex;
+      align-items: center;
+      .vxe-cell--title {
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+      & > i,
+      & > span {
+        &:not(.vxe-cell--title) {
+          flex-shrink: 0;
+        }
+      }
+    }
+  }
+  .vxe-cell--required-icon {
+    display: inline-block;
+    color: $vxe-table-validate-error-color;
+    width: 0.8em;
+    height: 1em;
+    line-height: 1em;
+    font-family: $vxe-icon-font-family;
+    font-weight: normal;
+    position: relative;
+    &:before {
+      content: "*";
+      position: absolute;
+      left: 0;
+      top: 0.2em;
+    }
+  }
+  // .vxe-cell--required-icon,
+  // .vxe-cell--edit-icon,
+  // .vxe-cell-help-icon,
+  // .vxe-cell--title {
+  //   vertical-align: middle;
+  // }
+  .vxe-cell--required-icon {
+    margin-right: 0.1em;
+  }
+  .vxe-cell--edit-icon,
+  .vxe-cell-help-icon {
+    margin-right: 0.2em;
+  }
+  .vxe-cell-help-icon {
+    cursor: help;
+  }
+  .vxe-resizable {
+    position: absolute;
+    right: -7px;
+    bottom: 0;
+    width: 14px;
+    height: 100%;
+    text-align: center;
+    z-index: 1;
+    cursor: col-resize;
+    &.is--line {
+      &:before,
+      &:after {
+        content: "";
+        display: inline-block;
+        vertical-align: middle;
+      }
+      &:before {
+        width: 1px;
+        height: 50%;
+        background-color: $vxe-table-resizable-line-color;
+      }
+      &:after {
+        width: 0;
+        height: 100%;
+      }
+    }
+  }
+}
+.vxe-table--fixed-right-wrapper {
+  .vxe-header--column {
+    .vxe-resizable {
+      right: auto;
+      left: -7px;
+    }
+  }
+}
+
 /*table*/
 .vxe-table--render-default {
   position: relative;

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.2) !default;
+$vxe-loading-background-color: rgba(0, 0, 0, 0.3) !default;
 $vxe-loading-z-index: 999 !default;
 
 /*validate*/

package/types/column.d.ts

@@ -1,5 +1,5 @@
 import { CreateElement, VNode } from 'vue'
-import { VXETableComponent } from './component'
+import { VXETableComponent, SlotVNodeType } from './component'
 import { ColumnFilterOption, ColumnFilterParams, ColumnFilterRenderOptions, ColumnFilterSlotParams, ColumnFilterMethodParams } from './filter'
 import { ColumnCellRenderParams, ColumnDefaultSlotParams, ColumnIconSlotParams, ColumnContentSlotParams, RenderOptions, OptionProps, OptionGroupProps } from './v-x-e-table'
 import { ColumnHeaderSlotParams, ColumnHeaderRenderParams } from './header'
@@ -292,13 +292,13 @@ export interface ColumnOptions {
   params?: any;
 
   slots?: {
-    default?(params: ColumnDefaultSlotParams, h: CreateElement): VNode[] | string[];
-    header?(params: ColumnHeaderSlotParams, h: CreateElement): VNode[] | string[];
-    footer?(params: ColumnFooterSlotParams, h: CreateElement): VNode[] | string[];
-    content?(params: ColumnContentSlotParams, h: CreateElement): VNode[] | string[];
-    filter?(params: ColumnFilterSlotParams, h: CreateElement): VNode[] | string[];
-    edit?(params: ColumnEditSlotParams, h: CreateElement): VNode[] | string[];
-    icon?(params: ColumnIconSlotParams, h: CreateElement): VNode[] | string[];
+    default?(params: ColumnDefaultSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
+    header?(params: ColumnHeaderSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
+    footer?(params: ColumnFooterSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
+    content?(params: ColumnContentSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
+    filter?(params: ColumnFilterSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
+    edit?(params: ColumnEditSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
+    icon?(params: ColumnIconSlotParams, h: CreateElement): SlotVNodeType | SlotVNodeType[]
   };
 }
 

package/types/component.d.ts

@@ -1,4 +1,4 @@
-import Vue from 'vue'
+import Vue, { VNode } from 'vue'
 
 declare type SizeType = null | '' | 'medium' | 'small' | 'mini'
 
@@ -22,3 +22,5 @@ export interface RecordInfo {
 export interface RowInfo {
   [key: string]: any;
 }
+
+export type SlotVNodeType = VNode | string | number

package/types/v-x-e-table/renderer.d.ts

@@ -21,9 +21,20 @@ export interface VxeGlobalRenderer {
 }
 
 export interface RendererMapOptions {
-  // 筛选渲染
+  /**
+   * 请使用 filterClassName
+   * @deprecated
+   */
   className?: string;
+  /**
+   * 请使用 showFilterFooter
+   * @deprecated
+   */
   isFooter?: boolean;
+
+  // 筛选渲染
+  filterClassName?: string | ((params: ColumnFilterRenderParams) => string | { [key: string]: boolean })
+  showFilterFooter?: boolean;
   renderFilter?(h: CreateElement, renderOpts: ColumnFilterRenderOptions, params: ColumnFilterRenderParams): VNode[] | string[];
   filterMethod?(params: ColumnFilterMethodParams): boolean;
   filterResetMethod?(params: ColumnFilterResetParams): void;
@@ -31,6 +42,7 @@ export interface RendererMapOptions {
   defaultFilterMethod?(params: ColumnFilterMethodParams): boolean;
 
   // 单元格渲染
+  cellClassName?: string | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => string | { [key: string]: boolean })
   renderHeader?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
   renderDefault?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
   renderFooter?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnFooterRenderParams): VNode[] | string[];
@@ -38,7 +50,7 @@ export interface RendererMapOptions {
   footerExportMethod?(params: ColumnExportFooterRenderParams): string;
 
   // 编辑渲染
-  autofocus?: string;
+  autofocus?: string | ((params: ColumnCellRenderParams | ColumnEditRenderParams) => HTMLElement | null);
   renderEdit?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
   renderCell?(h: CreateElement, renderOpts: ColumnCellRenderOptions | ColumnEditRenderOptions, params: ColumnCellRenderParams | ColumnEditRenderParams): VNode[] | string[];
 
@@ -50,6 +62,7 @@ export interface RendererMapOptions {
   renderToolbarTool?(h: CreateElement, renderOpts: ToolbarToolRenderOptions, params: ToolbarToolRenderParams): VNode[] | string[];
 
   // 表单-项渲染
+  itemClassName?: string | ((params: FormItemRenderParams) => string | { [key: string]: boolean })
   renderItemTitle?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): VNode[] | string[];
   renderItemContent?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): VNode[] | string[];
   itemVisibleMethod?(params: FormItemVisibleParams): boolean;