vxe-table 3.4.12-beta.1 → 3.4.14-beta.0

package/packages/tools/src/utils.js

@@ -57,6 +57,7 @@ class ColumnInfo {
       // 基本属性
       type: _vm.type,
       property: _vm.field,
+      field: _vm.field,
       title: _vm.title,
       width: _vm.width,
       minWidth: _vm.minWidth,

package/packages/validator/src/mixin.js

@@ -127,7 +127,16 @@ export default {
                 colVailds.push(
                   this.validCellRules('all', row, column)
                     .catch(({ rule, rules }) => {
-                      const rest = { rule, rules, rowIndex: this.getRowIndex(row), row, columnIndex: this.getColumnIndex(column), column, $table: this }
+                      const rest = {
+                        rule,
+                        rules,
+                        rowIndex: this.getRowIndex(row),
+                        row,
+                        columnIndex: this.getColumnIndex(column),
+                        column,
+                        field: column.property,
+                        $table: this
+                      }
                       if (!validRest[column.property]) {
                         validRest[column.property] = []
                       }
@@ -250,6 +259,7 @@ export default {
                   rowIndex: this.getRowIndex(row),
                   column,
                   columnIndex: this.getColumnIndex(column),
+                  field: column.property,
                   $table: this
                 })
                 if (customValid) {

package/styles/button.scss

@@ -124,7 +124,7 @@ $btnThemeList: (
     line-height: 1;
     border: 1px solid $vxe-input-border-color;
     &.is--round {
-      border-radius: $vxe-button-height-default * 0.5;
+      border-radius: $vxe-button-round-border-radius-default;
     }
     &:not(.is--round) {
       border-radius: $vxe-border-radius;
@@ -223,7 +223,7 @@ $btnThemeList: (
         min-width: $vxe-button-height-medium;
       }
       &.is--round {
-        border-radius: $vxe-button-height-medium * 0.5;
+        border-radius: $vxe-button-round-border-radius-medium;
       }
     }
     .vxe-button--loading-icon,
@@ -239,7 +239,7 @@ $btnThemeList: (
         min-width: $vxe-button-height-small;
       }
       &.is--round {
-        border-radius: $vxe-button-height-small * 0.5;
+        border-radius: $vxe-button-round-border-radius-small;
       }
     }
     .vxe-button--loading-icon,
@@ -255,7 +255,7 @@ $btnThemeList: (
         min-width: $vxe-button-height-mini;
       }
       &.is--round {
-        border-radius: $vxe-button-height-mini * 0.5;
+        border-radius: $vxe-button-round-border-radius-mini;
       }
     }
     .vxe-button--loading-icon,

package/styles/modal.scss

@@ -294,7 +294,8 @@
     }
   }
   .vxe-modal--resize {
-    $SpaceSize: 8;
+    $SpaceSize: 8px;
+    $SpaceWidth: 5px;
     .wl-resize,
     .wr-resize,
     .swst-resize,
@@ -308,32 +309,32 @@
     }
     .wl-resize,
     .wr-resize {
-      width: #{$SpaceSize}px;
+      width: $SpaceSize;
       height: 100%;
       top: 0;
       cursor: w-resize;
     }
     .wl-resize {
-      left: -#{$SpaceSize * 0.5 + 1}px;
+      left: -$SpaceWidth;
     }
     .wr-resize {
-      right: -#{$SpaceSize * 0.5 + 1}px;
+      right: -$SpaceWidth;
     }
     .swst-resize,
     .sest-resize,
     .swlb-resize,
     .selb-resize {
-      width: #{$SpaceSize + 2}px;
-      height: #{$SpaceSize + 2}px;
+      width: $SpaceSize + 2;
+      height: $SpaceSize + 2;
       z-index: 101;
     }
     .swst-resize,
     .sest-resize {
-      top: -#{$SpaceSize}px;
+      top: -$SpaceSize;
     }
     .swlb-resize,
     .selb-resize {
-      bottom: -#{$SpaceSize}px;
+      bottom: -$SpaceSize;
     }
     .sest-resize,
     .swlb-resize {
@@ -345,24 +346,24 @@
     }
     .swst-resize,
     .swlb-resize {
-      left: -#{$SpaceSize}px;
+      left: -$SpaceSize;
     }
     .sest-resize,
     .selb-resize {
-      right: -#{$SpaceSize}px;
+      right: -$SpaceSize;
     }
     .st-resize,
     .sb-resize {
       width: 100%;
-      height: #{$SpaceSize}px;
+      height: $SpaceSize;
       left: 0;
       cursor: s-resize;
     }
     .st-resize {
-      top: -#{$SpaceSize * 0.5 + 1}px;
+      top: -$SpaceWidth;
     }
     .sb-resize {
-      bottom: -#{$SpaceSize * 0.5 + 1}px;
+      bottom: -$SpaceWidth;
     }
   }
 }

package/styles/table.scss

@@ -474,7 +474,7 @@
     line-height: $vxe-table-row-line-height;
     text-align: left;
     &:not(.col--ellipsis) {
-      padding: #{floor(($vxe-table-row-height-default - $vxe-table-row-line-height) * 0.5)} 0;
+      padding: $vxe-table-column-padding-default;
     }
     &.col--current {
       background-color: $vxe-table-column-current-background-color;
@@ -612,7 +612,7 @@
     .vxe-body--column,
     .vxe-footer--column {
       &:not(.col--ellipsis) {
-        padding: #{floor(($vxe-table-row-height-medium - $vxe-table-row-line-height) * 0.5)} 0;
+        padding: $vxe-table-column-padding-medium;
       }
     }
     .vxe-cell {
@@ -638,7 +638,7 @@
     .vxe-body--column,
     .vxe-footer--column {
       &:not(.col--ellipsis) {
-        padding: #{floor(($vxe-table-row-height-small - $vxe-table-row-line-height) * 0.5)} 0;
+        padding: $vxe-table-column-padding-small;
       }
     }
     .vxe-cell {
@@ -664,7 +664,7 @@
     .vxe-body--column,
     .vxe-footer--column {
       &:not(.col--ellipsis) {
-        padding: #{floor(($vxe-table-row-height-mini - $vxe-table-row-line-height) * 0.5)} 0;
+        padding: $vxe-table-column-padding-mini;
       }
     }
     .vxe-cell {

package/styles/variable.scss

@@ -62,6 +62,10 @@ $vxe-table-row-hover-checkbox-checked-background-color: #ffebbc !default;
 $vxe-table-row-current-background-color: #e6f7ff !default;
 $vxe-table-row-hover-current-background-color: #d7effb !default;
 
+$vxe-table-column-padding-default: 13px 0 !default;
+$vxe-table-column-padding-medium: 11px 0 !default;
+$vxe-table-column-padding-small: 9px 0 !default;
+$vxe-table-column-padding-mini: 7px 0 !default;
 $vxe-table-column-hover-background-color: #d7effb !default;
 $vxe-table-column-current-background-color: #e6f7ff !default;
 $vxe-table-column-icon-border-color: #c0c4cc !default;
@@ -175,6 +179,10 @@ $vxe-button-height-default: 34px !default;
 $vxe-button-height-medium: 32px !default;
 $vxe-button-height-small: 30px !default;
 $vxe-button-height-mini: 28px !default;
+$vxe-button-round-border-radius-default: 17px !default;
+$vxe-button-round-border-radius-medium: 16px !default;
+$vxe-button-round-border-radius-small: 15px !default;
+$vxe-button-round-border-radius-mini: 14px !default;
 
 /*input*/
 $vxe-input-background-color: #fff !default;

package/types/all.d.ts

@@ -73,6 +73,7 @@ export * from './modal'
 export * from './tooltip'
 export * from './form'
 export * from './form-item'
+export * from './form-gather'
 export * from './switch'
 export * from './list'
 export * from './pulldown'

package/types/column.d.ts

@@ -306,6 +306,13 @@ export interface ColumnOptions {
  * 列对象
  */
 export class ColumnInfo {
+  /**
+   * 该属性已废弃，该属性被 field 替换
+   * @deprecated
+   */
+  property: string;
+
+  field: string;
   title: string;
   width: number | string;
   minWidth: number | string;
@@ -314,7 +321,6 @@ export class ColumnInfo {
   align: ColumnAlign;
   headerAlign: ColumnAlign;
   footerAlign: ColumnAlign;
-  property: string;
   type: string;
   sortable: boolean;
   treeNode: boolean;

package/types/form.d.ts

@@ -33,7 +33,7 @@ export declare class Form extends VXETableComponent {
    * 对表单执行项进行校验，参数为一个回调函数。该回调函数会在校验结束后被调用 callback(errMap)。若不传入回调函数，则会返回一个 promise
    * @param callback 回调函数
    */
-   validateField(callback?: (errMap?: FormValidErrMapParams) => void): Promise<any>;
+  validateField(callback?: (errMap?: FormValidErrMapParams) => void): Promise<any>;
   /**
    * 手动清除校验状态，如果指定 field 则清除指定的项，否则清除整个表单
    * @param field 字段名
@@ -108,6 +108,7 @@ export interface FormValidErrParams {
   rules: FormRule[];
   data: any;
   property: string;
+  field: string;
 }
 
 export interface FormValidErrMapParams {

package/types/table.d.ts

@@ -983,13 +983,17 @@ export declare class Table extends VXETableComponent {
    */
   openPrint(options?: TablePrintConfig): Promise<any>;
   /**
-   * 用于 mouse-config.area，打开单元格查找功能
+   * 打开单元格查找窗口
    */
   openFind(): Promise<any>;
   /**
-   * 用于 mouse-config.area，打开单元格替换功能
+   * 打开单元格替换窗口
    */
   openReplace(): Promise<any>;
+  /**
+   * 手动关闭查找与替换窗口
+   */
+  closeFNR(): Promise<any>;
   /**
    * 连接工具栏
    * @param toolbar 工具栏组件实例