vxe-table 3.8.0-beta.2 → 3.8.0-beta.4

package/styles/modules.scss

@@ -2,11 +2,12 @@
 
 @import './variable.scss';
 // @import './css-variable.scss';
-@import './icon.scss';
 @import './filter.scss';
 @import './menu.scss';
 @import './export.scss';
+@import './custom.scss';
 
+@import './icon.scss';
 @import './table.scss';
 @import './grid.scss';
 @import './toolbar.scss';

package/styles/radio.scss

@@ -1,7 +1,6 @@
 /**Variable**/
 @import './helpers/mixin.scss';
 @import './base/common.scss';
-@import './base/checked.scss';
 
 /*radio-group*/
 .vxe-radio-group {
@@ -16,7 +15,7 @@
 
 /*radio*/
 .vxe-radio {
-  @extend %XERadioIcon;
+  @include createRadioIcon();
   display: inline-block;
   vertical-align: middle;
   white-space: nowrap;

package/styles/table.scss

@@ -1,6 +1,5 @@
 /**Variable**/
 @import './helpers/mixin.scss';
-@import './base/checked.scss';
 @import './base/common.scss';
 @import './loading.scss';
 
@@ -659,11 +658,6 @@
       }
     }
   }
-  .vxe-body--column {
-    &.col--checkbox {
-      user-select: none;
-    }
-  }
   
   /*边框*/
   .vxe-table--footer-wrapper {
@@ -835,10 +829,10 @@
 
   // 单选框和复选框
   .vxe-cell--radio {
-    @extend %XERadioIcon;
+    @include createRadioIcon();
   }
   .vxe-cell--checkbox {
-    @extend %XECheckboxIcon;
+    @include createCheckboxIcon();
   }
 
   .fixed--hidden {

package/styles/toolbar.scss

@@ -1,5 +1,5 @@
 /**Variable**/
-@import './base/checked.scss';
+@import './helpers/mixin.scss';
 
 /*toolbar*/
 .vxe-toolbar {
@@ -80,122 +80,11 @@
   }
   .vxe-custom--wrapper {
     position: relative;
-    margin-left: 0.8em;
     &.is--active {
       & > .vxe-button {
         background-color: $vxe-toolbar-custom-active-background-color;
         border-radius: 50%;
       }
-      .vxe-custom--option-wrapper {
-        display: block;
-      }
-    }
-  }
-  .vxe-custom--option-wrapper {
-    display: none;
-    position: absolute;
-    right: 2px;
-    text-align: left;
-    background-color: $vxe-toolbar-panel-background-color;
-    z-index: 19;
-    border: 1px solid $vxe-table-border-color;
-    border-radius: $vxe-border-radius;
-    box-shadow: 0 1px 6px rgba(0,0,0,.2);
-    .vxe-custom--header {
-      padding: 0.28em 0;
-      font-weight: 700;
-      border-bottom: 1px solid $vxe-table-popup-border-color;
-    }
-    .vxe-custom--body {
-      padding: 0.2em 0;
-      max-height: 17.6em;
-      .vxe-custom--option {
-        &:hover {
-          background-color: $vxe-table-row-hover-background-color;
-        }
-      }
-    }
-    .vxe-custom--header,
-    .vxe-custom--body {
-      & > li {
-        max-width: 18em;
-        min-width: 14em;
-        padding: 0.2em 1em 0.2em 1em;
-        @for $i from 2 through 8 {
-          $interval: $i - 1 + 0.2;
-          &.level--#{$i}{
-            padding-left: #{$interval + 2.3}em;
-            .vxe-checkbox--icon {
-              left: #{$interval + 0.6}em;
-            }
-          }
-        }
-      }
-    }
-    .vxe-custom--footer {
-      border-top: 1px solid $vxe-table-popup-border-color;
-      text-align: right;
-      button {
-        background-color: transparent;
-        width: 50%;
-        height: 2.5em;
-        border: 0;
-        color: $vxe-font-color;
-        text-align: center;
-        cursor: pointer;
-        &:focus {
-          outline: none;
-        }
-        &:hover {
-          color: $vxe-primary-color;
-        }
-      }
-    }
-  }
-}
-
-.vxe-custom--option {
-  display: flex;
-  flex-direction: row;
-}
-
-.vxe-custom--option-wrapper .vxe-custom--header,
-.vxe-custom--option-wrapper .vxe-custom--body {
-  list-style-type: none;
-  overflow-x: hidden;
-  overflow-y: auto;
-  margin: 0;
-  padding: 0;
-  user-select: none;
-}
-
-.vxe-custom--checkbox-option {
-  @extend %XECheckboxIcon;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-  flex-grow: 1;
-}
-
-.vxe-custom--fixed-option {
-  flex-shrink: 0;
-  padding-left: 0.5em;
-  display: flex;
-  flex-direction: row;
-  align-items: center;
-  .vxe-custom--fixed-left-option,
-  .vxe-custom--fixed-right-option {
-    line-height: 1.34em;
-    font-size: 1.1em;
-    padding: 0 0.2em;
-    cursor: pointer;
-    &.is--checked,
-    &:hover {
-      color: $vxe-primary-color;
-    }
-    &.is--disabled {
-      cursor: no-drop;
-      color: $vxe-input-disabled-color;
     }
   }
 }

package/types/all.d.ts

@@ -42,13 +42,10 @@ declare global {
 export * from './v-x-e-table'
 export * from './component'
 
-export * from './filter'
-export * from './menu'
-export * from './edit'
-export * from './export'
-export * from './keyboard'
-export * from './validator'
+// Component
+export * from './module'
 
+// Table module
 export * from './icon'
 export * from './loading'
 export * from './table'

package/types/button-group.d.ts

@@ -3,7 +3,9 @@ import { VXETableComponent } from './component'
 /**
  * 按钮组
  */
-export declare class ButtonGroup extends VXETableComponent {
+export declare class VxeButtonGroup extends VXETableComponent {
   options?: any[];
   disabled?: boolean;
 }
+
+export class ButtonGroup extends VxeButtonGroup {}

package/types/button.d.ts

@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
 /**
  * 按钮
  */
-export declare class Button extends VXETableComponent {
+export declare class VxeButton extends VXETableComponent {
   /**
    * 按钮类型
    */
@@ -45,3 +45,5 @@ export declare class Button extends VXETableComponent {
    */
   transfer?: boolean;
 }
+
+export class Button extends VxeButton {}

package/types/checkbox-group.d.ts

@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
 /**
  * 组件 - 复选框组
  */
-export interface CheckboxGroup extends VXETableComponent {
+export interface VxeCheckboxGroup extends VXETableComponent {
   /**
    * 绑定值
    */
@@ -13,3 +13,5 @@ export interface CheckboxGroup extends VXETableComponent {
    */
   disabled?: boolean;
 }
+
+export class CheckboxGroup extends VxeCheckboxGroup {}

package/types/checkbox.d.ts

@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
 /**
  * 复选框
  */
-export declare class Checkbox extends VXETableComponent {
+export declare class VxeCheckbox extends VXETableComponent {
   /**
    * 绑定值
    */
@@ -29,3 +29,5 @@ export declare class Checkbox extends VXETableComponent {
    */
   disabled?: boolean;
 }
+
+export class Checkbox extends VxeCheckbox {}

package/types/colgroup.d.ts

@@ -1,10 +1,10 @@
 import { ColumnFixed, ColumnAlign, ColumnFormatterMethodParams, ColumnCellRenderOptions, ColumnContentRenderOptions, Column } from './column'
-import { ColumnFilterOption, ColumnFilterRenderOptions, ColumnFilterMethodParams } from './filter'
+import { ColumnFilterOption, ColumnFilterRenderOptions, ColumnFilterMethodParams } from './module/filter'
 import { ColumnCellRenderParams } from './v-x-e-table/renderer'
 import { ColumnHeaderRenderParams } from './header'
 import { ColumnFooterRenderParams } from './footer'
-import { ColumnEditRenderOptions } from './edit'
-import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams } from './export'
+import { ColumnEditRenderOptions } from './module/edit'
+import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams } from './module/export'
 import { TableOverflow } from './table'
 
 /* eslint-disable no-use-before-define */
@@ -12,7 +12,8 @@ import { TableOverflow } from './table'
 /**
  * 组件 - 表格分组列
  */
-export declare class Colgroup extends Column {}
+export declare class VxeColgroup extends Column {}
+export class Colgroup extends VxeColgroup {}
 
 export type ColgroupOptions = ColgroupProps
 

package/types/column.d.ts

@@ -1,11 +1,11 @@
 import { CreateElement, VNode } from 'vue'
 import { VXETableComponent, SlotVNodeType } from './component'
-import { ColumnFilterOption, ColumnFilterParams, ColumnFilterRenderOptions, ColumnFilterSlotParams, ColumnFilterMethodParams } from './filter'
+import { ColumnFilterOption, ColumnFilterParams, ColumnFilterRenderOptions, ColumnFilterSlotParams, ColumnFilterMethodParams } from './module/filter'
 import { ColumnCellRenderParams, ColumnDefaultSlotParams, ColumnIconSlotParams, ColumnContentSlotParams, RenderOptions, OptionProps, OptionGroupProps } from './v-x-e-table'
 import { ColumnHeaderSlotParams, ColumnHeaderRenderParams } from './header'
 import { ColumnFooterSlotParams, ColumnFooterRenderParams } from './footer'
-import { ColumnEditRenderOptions, ColumnEditSlotParams } from './edit'
-import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams, ColumnExportHeaderRenderParams } from './export'
+import { ColumnEditRenderOptions, ColumnEditSlotParams } from './module/edit'
+import { ColumnExportCellRenderParams, ColumnExportFooterRenderParams, ColumnExportHeaderRenderParams } from './module/export'
 import { TableOverflow } from './table'
 
 /* eslint-disable no-use-before-define */
@@ -13,7 +13,7 @@ import { TableOverflow } from './table'
 /**
  * 列
  */
-export declare class Column extends VXETableComponent {
+export declare class VxeColumn extends VXETableComponent {
   /**
    * 渲染类型
    */
@@ -153,6 +153,7 @@ export declare class Column extends VXETableComponent {
    */
   params?: any;
 }
+export class Column extends VxeColumn {}
 
 export type ColumnAlign = 'left' | 'center' | 'right' | null
 export type ColumnFixed = 'left' | 'right' | null

package/types/form-gather.d.ts

@@ -3,9 +3,11 @@ import { VXETableComponent } from './component'
 /**
  * 表单 - 表单项集合
  */
-export class FormGather extends VXETableComponent {
+export class VxeFormGather extends VXETableComponent {
   /**
    * 栅格占据的列数（共 24 分栏）
    */
   span?: string | number;
 }
+
+export class FormGather extends VxeFormGather {}

package/types/form-item.d.ts

@@ -7,7 +7,7 @@ import { RenderParams, RenderOptions, OptionProps, OptionGroupProps } from './v-
 /**
  * 表单 - 项
  */
-export class FormItem extends VXETableComponent {
+export class VxeFormItem extends VXETableComponent {
   /**
    * 标题
    */
@@ -63,6 +63,7 @@ export class FormItem extends VXETableComponent {
    */
   itemRender?: FormItemRenderOptions;
 }
+export class FormItem extends VxeFormItem {}
 
 export interface FormItemOptions {
   /**

package/types/form.d.ts

@@ -6,7 +6,7 @@ import { FormItemOptions } from './form-item'
 /**
  * 表单
  */
-export declare class Form extends VXETableComponent {
+export declare class VxeForm extends VXETableComponent {
   loading?: boolean;
   data?: any;
   span?: string | number;
@@ -58,6 +58,7 @@ export declare class Form extends VXETableComponent {
   toggleCollapse(): Promise<any>;
   [key: string]: any;
 }
+export class Form extends VxeForm {}
 
 export interface FormRule {
   /**

package/types/grid.d.ts

@@ -12,7 +12,7 @@ import { RowInfo } from './component'
 /**
  * 配置式表格
  */
-export declare class Grid extends Table {
+export declare class VxeGrid extends Table {
   /**
    * 列配置
    */
@@ -79,6 +79,7 @@ export declare class Grid extends Table {
 
   [key: string]: any;
 }
+export class Grid extends VxeGrid {}
 
 export interface GridProxyQueryPageParams {
   pageSize: number;

package/types/icon.d.ts

@@ -3,4 +3,5 @@ import { VXETableComponent } from './component'
 /**
  * 内置图标库
  */
-export declare class Icon extends VXETableComponent {}
+export declare class VxeIcon extends VXETableComponent {}
+export class Icon extends VxeIcon {}

package/types/input.d.ts

@@ -5,7 +5,7 @@ import { VXETableComponent } from './component'
 /**
  * 输入框
  */
-export declare class Input extends VXETableComponent {
+export declare class VxeInput extends VXETableComponent {
   /**
    * 绑定值
    */
@@ -120,6 +120,7 @@ export declare class Input extends VXETableComponent {
    */
   blur(): Promise<any>;
 }
+export class Input extends VxeInput {}
 
 export interface InputDateFestivalParams {
   date: Date;

package/types/list.d.ts

@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
 /**
  * 列表
  */
-export declare class List extends VXETableComponent {
+export declare class VxeList extends VXETableComponent {
   /**
    * 绑定值
    */
@@ -68,3 +68,4 @@ export declare class List extends VXETableComponent {
    */
   clearScroll(): Promise<any>;
 }
+export class List extends VxeList {}

package/types/loading.d.ts

@@ -7,4 +7,4 @@ export declare class VxeLoading extends VXETableComponent {}
 /**
  * 组件 - 加载中
  */
-export declare class Loading extends VXETableComponent {}
+export class Loading extends VxeLoading {}

package/types/modal.d.ts

@@ -6,7 +6,7 @@ import { VXETableComponent } from './component'
 /**
  * 弹窗
  */
-export declare class Modal extends VXETableComponent {
+export declare class VxeModal extends VXETableComponent {
   /**
    * 绑定值
    */
@@ -182,6 +182,7 @@ export declare class Modal extends VXETableComponent {
    */
   revert(): Promise<any>;
 }
+export class Modal extends VxeModal {}
 
 /**
  * 窗口类型

package/types/module/custom.d.ts

@@ -0,0 +1,11 @@
+import { VXETableComponent } from '../component'
+
+/**
+ * 表格模块 - 自定义列
+ */
+export declare class VxeTableCustomModule extends VXETableComponent {}
+
+/**
+ * 表格模块 - 自定义列
+ */
+export declare class Custom extends VXETableComponent {}

package/types/{edit.d.ts → module/edit.d.ts}

@@ -1,10 +1,15 @@
-import { VXETableComponent } from './component'
-import { ColumnCellRenderParams, RenderOptions, OptionProps, OptionGroupProps } from './v-x-e-table'
+import { VXETableComponent } from '../component'
+import { ColumnCellRenderParams, RenderOptions, OptionProps, OptionGroupProps } from '../v-x-e-table'
 
 /* eslint-disable no-use-before-define */
 
 /**
- * 编辑
+ * 表格模块 - 编辑
+ */
+export declare class VxeTableEditModule extends VXETableComponent {}
+
+/**
+ * 表格模块 - 编辑
  */
 export declare class Edit extends VXETableComponent {}
 

package/types/{export.d.ts → module/export.d.ts}

@@ -1,13 +1,18 @@
-import { VXETableComponent, RowInfo } from './component'
-import { Table } from './table'
-import { Grid } from './grid'
-import { ColumnInfo } from './column'
-import { GridRenderParams } from './v-x-e-table'
+import { VXETableComponent, RowInfo } from '../component'
+import { Table } from '../table'
+import { Grid } from '../grid'
+import { ColumnInfo } from '../column'
+import { GridRenderParams } from '../v-x-e-table'
 
 /* eslint-disable no-use-before-define */
 
 /**
- * 导出
+ * 表格模块 - 导出、导入、打印
+ */
+export declare class VxeTableExportModule extends VXETableComponent {}
+
+/**
+ * 表格模块 - 导出、导入、打印
  */
 export declare class Export extends VXETableComponent {}
 

package/types/{filter.d.ts → module/filter.d.ts}

@@ -1,11 +1,16 @@
-import { VXETableComponent } from './component'
-import { ColumnInfo } from './column'
-import { TableRenderParams, RenderOptions, OptionProps, OptionGroupProps } from './v-x-e-table'
+import { VXETableComponent } from '../component'
+import { ColumnInfo } from '../column'
+import { TableRenderParams, RenderOptions, OptionProps, OptionGroupProps } from '../v-x-e-table'
 
 /* eslint-disable no-use-before-define */
 
 /**
- * 筛选
+ * 表格模块 - 筛选
+ */
+export declare class VxeTableFilterModule extends VXETableComponent {}
+
+/**
+ * 表格模块 - 筛选
  */
 export declare class Filter extends VXETableComponent {}
 

package/types/module/index.d.ts

@@ -0,0 +1,7 @@
+export * from './filter'
+export * from './menu'
+export * from './edit'
+export * from './export'
+export * from './keyboard'
+export * from './validator'
+export * from './custom'

package/types/module/keyboard.d.ts

@@ -0,0 +1,11 @@
+import { VXETableComponent } from '../component'
+
+/**
+ * 表格模块 - 键盘导航
+ */
+export declare class VxeTableKeyboardModule extends VXETableComponent {}
+
+/**
+ * 表格模块 - 键盘导航
+ */
+export declare class Keyboard extends VXETableComponent {}

package/types/{menu.d.ts → module/menu.d.ts}

@@ -1,10 +1,15 @@
-import { VXETableComponent } from './component'
-import { ColumnCellRenderParams } from './v-x-e-table'
+import { VXETableComponent } from '../component'
+import { ColumnCellRenderParams } from '../v-x-e-table'
 
 /* eslint-disable no-use-before-define */
 
 /**
- * 快捷菜单
+ * 表格模块 - 快捷菜单
+ */
+export declare class VxeTableMenuModule extends VXETableComponent {}
+
+/**
+ * 表格模块 - 快捷菜单
  */
 export declare class Menu extends VXETableComponent {}
 

package/types/{validator.d.ts → module/validator.d.ts}

@@ -1,11 +1,16 @@
-import { VXETableComponent } from './component'
-import { ColumnInfo } from './column'
-import { Table } from './table'
+import { VXETableComponent } from '../component'
+import { ColumnInfo } from '../column'
+import { Table } from '../table'
 
 /* eslint-disable no-use-before-define */
 
 /**
- * 表格校验
+ * 表格模块 - 校验模块
+ */
+export declare class VxeTableValidatorModule extends VXETableComponent {}
+
+/**
+ * 表格模块 - 校验模块
  */
 export declare class Validator extends VXETableComponent {}
 

package/types/optgroup.d.ts

@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
 /**
  * 组件 - 下拉框选项分组
  */
-export declare class Optgroup extends VXETableComponent {
+export declare class VxeOptgroup extends VXETableComponent {
   /**
    * 显示内容
    */
@@ -17,3 +17,4 @@ export declare class Optgroup extends VXETableComponent {
    */
   disabled?: boolean;
 }
+export class Optgroup extends VxeOptgroup {}

package/types/option.d.ts

@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
 /**
  * 组件 - 下拉框选项
  */
-export declare class Option extends VXETableComponent {
+export declare class VxeOption extends VXETableComponent {
   /**
    * 绑定值
    */
@@ -21,3 +21,4 @@ export declare class Option extends VXETableComponent {
    */
   disabled?: boolean;
 }
+export class Option extends VxeOption {}

package/types/pager.d.ts

@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
 /**
  * 分页
  */
-export declare class Pager extends VXETableComponent {
+export declare class VxePager extends VXETableComponent {
   /**
    * 自定义布局
    */
@@ -61,6 +61,7 @@ export declare class Pager extends VXETableComponent {
   iconNextPage?: string;
   iconJumpMore?: string;
 }
+export class Pager extends VxePager {}
 
 export interface PagerOptions {
   /**

package/types/pulldown.d.ts

@@ -3,7 +3,7 @@ import { VXETableComponent } from './component'
 /**
  * 组件 - 下拉容器
  */
-export declare class Pulldown extends VXETableComponent {
+export declare class VxePulldown extends VXETableComponent {
   /**
    * 是否禁用
    */
@@ -41,3 +41,4 @@ export declare class Pulldown extends VXETableComponent {
    */
   hidePanel(): Promise<any>;
 }
+export class Pulldown extends VxePulldown {}