vxe-table 3.6.11 → 3.6.12-beta.1

package/lib/validator/src/mixin.js

@@ -3,12 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports["default"] = void 0;
 var _xeUtils = _interopRequireDefault(require("xe-utils"));
 var _conf = _interopRequireDefault(require("../../v-x-e-table/src/conf"));
 var _utils = require("../../tools/utils");
 var _dom = _interopRequireDefault(require("../../tools/dom"));
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
@@ -54,21 +54,21 @@ function validErrorRuleValue(rule, val) {
     max = rule.max,
     pattern = rule.pattern;
   var isNumType = type === 'number';
-  var numVal = isNumType ? _xeUtils.default.toNumber(val) : _xeUtils.default.getSize(val);
+  var numVal = isNumType ? _xeUtils["default"].toNumber(val) : _xeUtils["default"].getSize(val);
   // 判断数值
   if (isNumType && isNaN(val)) {
     return true;
   }
   // 如果存在 min，判断最小值
-  if (!_xeUtils.default.eqNull(min) && numVal < _xeUtils.default.toNumber(min)) {
+  if (!_xeUtils["default"].eqNull(min) && numVal < _xeUtils["default"].toNumber(min)) {
     return true;
   }
   // 如果存在 max，判断最大值
-  if (!_xeUtils.default.eqNull(max) && numVal > _xeUtils.default.toNumber(max)) {
+  if (!_xeUtils["default"].eqNull(max) && numVal > _xeUtils["default"].toNumber(max)) {
     return true;
   }
   // 如果存在 pattern，正则校验
-  if (pattern && !(_xeUtils.default.isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
+  if (pattern && !(_xeUtils["default"].isRegExp(pattern) ? pattern : new RegExp(pattern)).test(val)) {
     return true;
   }
   return false;
@@ -128,10 +128,10 @@ var _default = {
       if (rows === true) {
         vaildDatas = afterFullData;
       } else if (rows) {
-        if (_xeUtils.default.isFunction(rows)) {
+        if (_xeUtils["default"].isFunction(rows)) {
           cb = rows;
         } else {
-          vaildDatas = _xeUtils.default.isArray(rows) ? rows : [rows];
+          vaildDatas = _xeUtils["default"].isArray(rows) ? rows : [rows];
         }
       }
       if (!vaildDatas) {
@@ -147,8 +147,8 @@ var _default = {
           if (isFull || !_this2.validRuleErr) {
             var colVailds = [];
             columns.forEach(function (column) {
-              if ((isFull || !_this2.validRuleErr) && _xeUtils.default.has(editRules, column.property)) {
-                colVailds.push(_this2.validCellRules('all', row, column).catch(function (_ref) {
+              if ((isFull || !_this2.validRuleErr) && _xeUtils["default"].has(editRules, column.property)) {
+                colVailds.push(_this2.validCellRules('all', row, column)["catch"](function (_ref) {
                   var rule = _ref.rule,
                     rules = _ref.rules;
                   var rest = {
@@ -176,7 +176,7 @@ var _default = {
           }
         };
         if (treeConfig) {
-          _xeUtils.default.eachTree(vaildDatas, handleVaild, treeOpts);
+          _xeUtils["default"].eachTree(vaildDatas, handleVaild, treeOpts);
         } else {
           vaildDatas.forEach(handleVaild);
         }
@@ -190,7 +190,7 @@ var _default = {
               cb();
             }
           });
-        }).catch(function (firstErrParams) {
+        })["catch"](function (firstErrParams) {
           return new Promise(function (resolve, reject) {
             var finish = function finish() {
               _this2.$nextTick(function () {
@@ -198,7 +198,7 @@ var _default = {
                   cb(validRest);
                   resolve();
                 } else {
-                  if (_conf.default.validToReject === 'obsolete') {
+                  if (_conf["default"].validToReject === 'obsolete') {
                     // 已废弃，校验失败将不会执行catch
                     reject(validRest);
                   } else {
@@ -209,7 +209,7 @@ var _default = {
             };
             var posAndFinish = function posAndFinish() {
               firstErrParams.cell = _this2.getCell(firstErrParams.row, firstErrParams.column);
-              _dom.default.scrollToView(firstErrParams.cell);
+              _dom["default"].scrollToView(firstErrParams.cell);
               _this2.handleValidError(firstErrParams).then(finish);
             };
             /**
@@ -242,8 +242,8 @@ var _default = {
       var editRules = this.editRules;
       var property = column.property;
       if (property && editRules) {
-        var rules = _xeUtils.default.get(editRules, property);
-        return rules && _xeUtils.default.find(rules, function (rule) {
+        var rules = _xeUtils["default"].get(editRules, property);
+        return rules && _xeUtils["default"].find(rules, function (rule) {
           return type === 'all' || !rule.trigger || type === rule.trigger;
         });
       }
@@ -270,15 +270,15 @@ var _default = {
       var errorRules = [];
       var syncVailds = [];
       if (property && editRules) {
-        var rules = _xeUtils.default.get(editRules, property);
+        var rules = _xeUtils["default"].get(editRules, property);
         if (rules) {
-          var cellValue = _xeUtils.default.isUndefined(val) ? _xeUtils.default.get(row, property) : val;
+          var cellValue = _xeUtils["default"].isUndefined(val) ? _xeUtils["default"].get(row, property) : val;
           rules.forEach(function (rule) {
             var type = rule.type,
               trigger = rule.trigger,
               required = rule.required;
             if (validType === 'all' || !trigger || validType === trigger) {
-              if (_xeUtils.default.isFunction(rule.validator)) {
+              if (_xeUtils["default"].isFunction(rule.validator)) {
                 var customValid = rule.validator({
                   cellValue: cellValue,
                   rule: rule,
@@ -291,7 +291,7 @@ var _default = {
                   $table: _this3
                 });
                 if (customValid) {
-                  if (_xeUtils.default.isError(customValid)) {
+                  if (_xeUtils["default"].isError(customValid)) {
                     _this3.validRuleErr = true;
                     errorRules.push(new Rule({
                       type: 'custom',
@@ -299,9 +299,9 @@ var _default = {
                       content: customValid.message,
                       rule: new Rule(rule)
                     }));
-                  } else if (customValid.catch) {
+                  } else if (customValid["catch"]) {
                     // 如果为异步校验（注：异步校验是并发无序的）
-                    syncVailds.push(customValid.catch(function (e) {
+                    syncVailds.push(customValid["catch"](function (e) {
                       _this3.validRuleErr = true;
                       errorRules.push(new Rule({
                         type: 'custom',
@@ -314,7 +314,7 @@ var _default = {
                 }
               } else {
                 var isArrType = type === 'array';
-                var hasEmpty = isArrType || _xeUtils.default.isArray(cellValue) ? !_xeUtils.default.isArray(cellValue) || !cellValue.length : (0, _utils.eqEmptyValue)(cellValue);
+                var hasEmpty = isArrType || _xeUtils["default"].isArray(cellValue) ? !_xeUtils["default"].isArray(cellValue) || !cellValue.length : (0, _utils.eqEmptyValue)(cellValue);
                 if (required ? hasEmpty || validErrorRuleValue(rule, cellValue) : !hasEmpty && validErrorRuleValue(rule, cellValue)) {
                   _this3.validRuleErr = true;
                   errorRules.push(new Rule(rule));
@@ -370,7 +370,7 @@ var _default = {
                 _this4.clearValidate();
               }
             }
-          }).catch(function (_ref2) {
+          })["catch"](function (_ref2) {
             var rule = _ref2.rule;
             // 如果校验不通过与触发方式一致，则聚焦提示错误，否则跳过并不作任何处理
             if (!rule.trigger || type === rule.trigger) {
@@ -420,4 +420,4 @@ var _default = {
     }
   }
 };
-exports.default = _default;
+exports["default"] = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vxe-table",
-  "version": "3.6.11",
+  "version": "3.6.12-beta.1",
   "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
   "scripts": {
     "update": "npm install --legacy-peer-deps",
@@ -99,9 +99,5 @@
   "bugs": {
     "url": "https://github.com/x-extends/vxe-table/issues"
   },
-  "homepage": "https://vxetable.cn/",
-  "browserslist": [
-    "> 1%",
-    "last 2 versions"
-  ]
+  "homepage": "https://vxetable.cn/"
 }

package/packages/table/src/methods.js

@@ -2727,9 +2727,12 @@ const Methods = {
    * 获取复选框半选状态的行数据
    */
   getCheckboxIndeterminateRecords (isFull) {
-    const { treeConfig, treeIndeterminates, afterFullData } = this
+    const { treeConfig, treeIndeterminates, fullDataRowIdData } = this
     if (treeConfig) {
-      return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(row => this.findRowIndexOf(afterFullData, row) > -1)
+      return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(row => {
+        const rowid = getRowid(this, row)
+        return fullDataRowIdData[rowid]
+      })
     }
     return []
   },
@@ -4595,8 +4598,9 @@ const Methods = {
   },
   updateCellAreas () {
     if (this.mouseConfig && this.mouseOpts.area && this.handleUpdateCellAreas) {
-      this.handleUpdateCellAreas()
+      return this.handleUpdateCellAreas()
     }
+    return this.$nextTick()
   },
   emitEvent (type, params, evnt) {
     this.$emit(type, Object.assign({ $table: this, $grid: this.$xegrid, $event: evnt }, params))

package/types/table.d.ts

@@ -246,6 +246,7 @@ export declare class Table extends VXETableComponent {
     oSize?: number;
     [key: string]: any;
   };
+
   /**
    * 纵向虚拟滚动配置
    */
@@ -260,6 +261,7 @@ export declare class Table extends VXETableComponent {
     oSize?: number;
     [key: string]: any;
   };
+
   // 额外的参数
   params?: any;
 
@@ -318,6 +320,7 @@ export declare class Table extends VXETableComponent {
     index: number;
     parent?: RowInfo;
   };
+
   /**
    * 根据 th/td 元素获取对应的 column 信息
    * @param cell 单元格节点元素
@@ -329,6 +332,7 @@ export declare class Table extends VXETableComponent {
     index: number;
     parent?: ColumnInfo;
   };
+
   /**
    * 根据 row 获取相对于 data 中的索引
    * @param row 行对象
@@ -418,6 +422,7 @@ export declare class Table extends VXETableComponent {
     visibleColumn: ColumnInfo[];
     tableColumn: ColumnInfo[];
   };
+
   /**
    * 获取数据，和 data 的行为一致，也可以指定索引获取数据
    */
@@ -441,6 +446,7 @@ export declare class Table extends VXETableComponent {
     tableData: RowInfo[];
     footerData: any[][];
   };
+
   /**
    * 隐藏指定列
    * @param column 列对象
@@ -608,7 +614,7 @@ export declare class Table extends VXETableComponent {
   /**
    * 手动清空排序条件，数据会恢复成未排序的状态
    */
-   clearSort(fieldOrColumn?: string | ColumnInfo | null): Promise<any>;
+  clearSort(fieldOrColumn?: string | ColumnInfo | null): Promise<any>;
   /**
    * 获取当前排序的 column 信息
    */
@@ -719,6 +725,7 @@ export declare class Table extends VXETableComponent {
     scrollTop: number;
     scrollLeft: number;
   };
+
   /**
    * 如果有滚动条，则滚动到对应的位置
    * @param scrollLeft 左边距离
@@ -754,6 +761,7 @@ export declare class Table extends VXETableComponent {
       column: ColumnInfo;
     }
   ): Promise<any>;
+
   /**
    * 用于 filters，修改筛选列表
    * 在筛选条件更新之后可以调用 updateData 函数处理表格数据
@@ -778,6 +786,7 @@ export declare class Table extends VXETableComponent {
     row: RowInfo;
     column: ColumnInfo;
   };
+
   /**
    * 用于 mouse-config.area，用于获取鼠标选择的区域
    */
@@ -846,6 +855,7 @@ export declare class Table extends VXETableComponent {
     removeRecords: RowInfo[];
     updateRecords: RowInfo[];
   };
+
   /**
    * 用于 edit-config，获取新增的临时数据
    */
@@ -863,7 +873,7 @@ export declare class Table extends VXETableComponent {
    * @deprecated
    */
   clearActived(evnt?: Event): Promise<any>
-   /**
+  /**
     * 手动清除单元格激活状态
     */
   clearEdit(evnt?: Event): Promise<any>
@@ -884,6 +894,7 @@ export declare class Table extends VXETableComponent {
     $columnIndex: number
     cell: HTMLElement
   }
+
   /**
    * 用于 edit-config，获取已激活的行数据
    */
@@ -896,12 +907,13 @@ export declare class Table extends VXETableComponent {
     $columnIndex: number
     cell: HTMLElement
   }
+
   /**
    * 请使用 isEditByRow
    * @deprecated
    */
   isActiveByRow(row: any): boolean
-   /**
+  /**
     * 用于 edit-config，判断行是否为激活编辑状态
     * @param row 指定行
     */
@@ -916,17 +928,17 @@ export declare class Table extends VXETableComponent {
    * @deprecated
    */
   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 字段名
@@ -947,6 +959,7 @@ export declare class Table extends VXETableComponent {
     column?: number | ColumnInfo;
     row?: number | RowInfo;
   }): Promise<any>;
+
   /**
    * 用于 mouse-config.area，设置活动的区域的单元格
    * @param activeArea
@@ -956,6 +969,7 @@ export declare class Table extends VXETableComponent {
     column: number | ColumnInfo;
     row: number | RowInfo;
   }): Promise<any>;
+
   /**
    * 临时合并单元格，如果为数组则合并多个
    */
@@ -1002,7 +1016,7 @@ export declare class Table extends VXETableComponent {
   importData(options?: TableImportConfig): Promise<any>;
   /**
    * 保存文件到本地
-   * @param options 
+   * @param options
    */
   saveFile(options: SaveFileOptions): Promise<any>;
   /**
@@ -1032,6 +1046,10 @@ export declare class Table extends VXETableComponent {
    * 手动关闭查找与替换窗口
    */
   closeFNR(): Promise<any>;
+  /**
+   * 用于 mouse-config.area，更新已选区域的单元格样式
+   */
+  updateCellAreas(): Promise<void>;
   /**
    * 连接工具栏
    * @param toolbar 工具栏组件实例
@@ -1059,10 +1077,10 @@ export interface TableFooterMethodParams {
 }
 export function TableFooterMethod(params: TableFooterMethodParams): Array<string | number | null>[];
 
-export interface TableSpanMethodParams extends ColumnCellRenderParams {}
+export type TableSpanMethodParams = ColumnCellRenderParams
 export function TableSpanMethod(params: TableSpanMethodParams): { rowspan: number, colspan: number }
 
-export interface TableFooterSpanMethodParams extends ColumnFooterRenderParams {}
+export type TableFooterSpanMethodParams = ColumnFooterRenderParams
 export function TableFooterSpanMethod(params: TableFooterSpanMethodParams): { rowspan: number, colspan: number }
 
 export interface TableOptions {
@@ -1160,7 +1178,7 @@ export interface TableColumnConfig {
   width?: number;
   minWidth?: number;
 }
-export interface ColumnDefaultConfig extends TableColumnConfig {}
+export type ColumnDefaultConfig = TableColumnConfig
 
 /**
  * 自定义列配置项
@@ -1172,7 +1190,7 @@ export interface TableCustomConfig {
   };
   checkMethod?(params: { column: ColumnInfo }): boolean;
 }
-export interface CustomConfig extends TableCustomConfig {}
+export type CustomConfig = TableCustomConfig
 
 /**
  * 序号配置项
@@ -1181,7 +1199,7 @@ export interface TableSeqConfig {
   startIndex?: number;
   seqMethod?(params: ColumnCellRenderParams): number;
 }
-export interface SeqConfig extends TableSeqConfig {}
+export type SeqConfig = TableSeqConfig
 
 export interface TableSortConfs {
   field: string;
@@ -1206,7 +1224,7 @@ export interface TableSortConfig {
   iconAsc?: string;
   iconDesc?: string;
 }
-export interface SortConfig extends TableSortConfig {}
+export type SortConfig = TableSortConfig
 
 /**
  * 筛选配置项
@@ -1217,7 +1235,7 @@ export interface TableFilterConfig {
   iconNone?: string;
   iconMatch?: string;
 }
-export interface FilterConfig extends TableFilterConfig {}
+export type FilterConfig = TableFilterConfig
 
 /**
  * 单选框配置
@@ -1230,7 +1248,7 @@ export interface TableRadioConfig {
   trigger?: 'default' | 'cell' | 'row';
   highlight?: boolean;
 }
-export interface RadioConfig extends TableRadioConfig {}
+export type RadioConfig = TableRadioConfig
 
 /**
  * 复选框配置项
@@ -1250,7 +1268,7 @@ export interface TableCheckboxConfig {
   highlight?: boolean;
   range?: boolean;
 }
-export interface CheckboxConfig extends TableCheckboxConfig {}
+export type CheckboxConfig = TableCheckboxConfig
 
 /**
  * 提示信息配置项
@@ -1262,7 +1280,7 @@ export interface TableTooltipConfig {
   leaveDelay?: number;
   contentMethod?(params: { items: any[], row: RowInfo, rowIndex: number, $rowIndex: number, column: ColumnInfo, columnIndex: number, $columnIndex: number, type: 'header' | 'body' | 'footer', cell: HTMLElement, $event: any }): string | null | void;
 }
-export interface TooltipConfig extends TableTooltipConfig {}
+export type TooltipConfig = TableTooltipConfig
 
 /**
  * 展开行配置项
@@ -1283,7 +1301,7 @@ export interface TableExpandConfig {
   iconClose?: string;
   iconLoaded?: string;
 }
-export interface ExpandConfig extends TableExpandConfig {}
+export type ExpandConfig = TableExpandConfig
 
 /**
  * 树形结构配置项
@@ -1305,7 +1323,7 @@ export interface TableTreeConfig {
   iconClose?: string;
   iconLoaded?: string;
 }
-export interface TreeConfig extends TableTreeConfig {}
+export type TreeConfig = TableTreeConfig
 
 export interface TreeOpts {
   children: string;
@@ -1336,8 +1354,8 @@ export interface TableMenuConfig {
   visibleMethod?(params: { type: string, options: MenuFirstOption[], columns: ColumnInfo[], row?: RowInfo, rowIndex?: number, column?: ColumnInfo, columnIndex?: number }): boolean;
   className?: string;
 }
-export interface TableContextMenu extends TableMenuConfig {}
-export interface ContextMenuConfig extends TableContextMenu {}
+export type TableContextMenu = TableMenuConfig
+export type ContextMenuConfig = TableContextMenu
 
 /**
  * 鼠标配置项
@@ -1349,7 +1367,7 @@ export interface TableMouseConfig {
    */
   area?: boolean;
 }
-export interface MouseConfig extends TableMouseConfig {}
+export type MouseConfig = TableMouseConfig
 
 export interface MouseCellArea {
   main: boolean;
@@ -1377,7 +1395,7 @@ export interface TableMergeConfig {
   rowspan: number;
   colspan: number;
 }
-export interface MergeOptions extends TableMergeConfig {}
+export type MergeOptions = TableMergeConfig
 
 export interface MergeItem {
   row: number;
@@ -1428,7 +1446,7 @@ export interface TableKeyboardConfig {
    */
   editMethod?(params: { row: RowInfo, rowIndex: number, column: ColumnInfo, columnIndex: number, cell: HTMLElement }): boolean;
 }
-export interface KeyboardConfig extends TableKeyboardConfig {}
+export type KeyboardConfig = TableKeyboardConfig
 
 /**
  * 复制粘贴配置项
@@ -1472,7 +1490,7 @@ export interface TableEditConfig {
    */
   activeMethod?(params: { row: RowInfo, rowIndex: number, column: ColumnInfo, columnIndex: number }): boolean;
 }
-export interface EditConfig extends TableEditConfig {}
+export type EditConfig = TableEditConfig
 
 /**
  * 校验配置项
@@ -1482,7 +1500,7 @@ export interface TableValidConfig {
   message?: string;
   maxWidth?: number;
 }
-export interface ValidConfig extends TableValidConfig {}
+export type ValidConfig = TableValidConfig
 
 /**
  * 校验规则配置项
@@ -1490,4 +1508,4 @@ export interface ValidConfig extends TableValidConfig {}
 export interface EditVaildRules {
   [field: string]: ColumnEditRule[];
 }
-export interface VaildRules extends EditVaildRules {}
+export type VaildRules = EditVaildRules