vxe-table 3.8.8-beta.7 → 3.8.8-beta.8

package/lib/index.umd.js

@@ -11485,7 +11485,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.8-beta.7", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.8-beta.8", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13165,7 +13165,7 @@ function setIcon(options) {
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.8-beta.7",
+  version: "3.8.8-beta.8",
   reg: reg,
   use: use,
   setConfig: setConfig,
@@ -16048,7 +16048,6 @@ var Cell = {
     }
     if (!trigger || trigger === 'default') {
       on.click = function (evnt) {
-        evnt.stopPropagation();
         $table.triggerTreeExpandEvent(evnt, params);
       };
     }
@@ -16129,7 +16128,6 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
-            evnt.stopPropagation();
             $table.triggerRadioRowEvent(evnt, params);
           }
         }
@@ -16190,7 +16188,6 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isAllCheckboxDisabled) {
-            evnt.stopPropagation();
             $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
           }
         }
@@ -16253,7 +16250,6 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
-            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -16329,7 +16325,6 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
-            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -16414,7 +16409,6 @@ var Cell = {
       }],
       on: {
         click: function click(evnt) {
-          evnt.stopPropagation();
           $table.triggerRowExpandEvent(evnt, params);
         }
       }
@@ -17817,6 +17811,72 @@ var Methods = {
     }
     return this.$nextTick();
   },
+  getCellElement: function getCellElement(row, fieldOrColumn) {
+    var column = handleFieldOrColumn(this, fieldOrColumn);
+    if (!column) {
+      return null;
+    }
+    var $refs = this.$refs;
+    var rowid = getRowid(this, row);
+    var bodyElem = null;
+    if (column) {
+      bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
+    }
+    if (bodyElem && bodyElem.$el) {
+      return bodyElem.$el.querySelector(".vxe-body--row[rowid=\"".concat(rowid, "\"] .").concat(column.id));
+    }
+    return null;
+  },
+  getCellLabel: function getCellLabel(row, fieldOrColumn) {
+    var column = handleFieldOrColumn(this, fieldOrColumn);
+    if (!column) {
+      return null;
+    }
+    var formatter = column.formatter;
+    var cellValue = utils.getCellValue(row, column);
+    var cellLabel = cellValue;
+    if (formatter) {
+      var rest, formatData;
+      var fullAllDataRowMap = this.fullAllDataRowMap;
+      var colid = column.id;
+      var cacheFormat = fullAllDataRowMap.has(row);
+      if (cacheFormat) {
+        rest = fullAllDataRowMap.get(row);
+        formatData = rest.formatData;
+        if (!formatData) {
+          formatData = fullAllDataRowMap.get(row).formatData = {};
+        }
+        if (rest && formatData[colid]) {
+          if (formatData[colid].value === cellValue) {
+            return formatData[colid].label;
+          }
+        }
+      }
+      var formatParams = {
+        cellValue: cellValue,
+        row: row,
+        rowIndex: this.getRowIndex(row),
+        column: column,
+        columnIndex: this.getColumnIndex(column)
+      };
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+        var gFormatOpts = formats.get(formatter);
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
+      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
+        var _gFormatOpts = formats.get(formatter[0]);
+        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+      } else {
+        cellLabel = formatter(formatParams);
+      }
+      if (formatData) {
+        formatData[colid] = {
+          value: cellValue,
+          label: cellLabel
+        };
+      }
+    }
+    return cellLabel;
+  },
   /**
    * 检查是否为临时行数据
    * @param {Row} row 行对象
@@ -17873,6 +17933,13 @@ var Methods = {
     var columns = this.visibleColumn;
     return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex];
   },
+  /**
+   * 根据列获取列的唯一主键
+   */
+  getColid: function getColid(fieldOrColumn) {
+    var column = handleFieldOrColumn(this, fieldOrColumn);
+    return column ? column.id : null;
+  },
   /**
    * 根据列的唯一主键获取列
    * @param {String} colid 列主键
@@ -19732,7 +19799,7 @@ var Methods = {
         var selected = editStore.selected,
           actived = editStore.actived;
         var keyCode = evnt.keyCode;
-        var isBack = keyCode === 8;
+        var hasBackspaceKey = keyCode === 8;
         var isTab = keyCode === 9;
         var isEnter = keyCode === 13;
         var isEsc = keyCode === 27;
@@ -19859,12 +19926,12 @@ var Methods = {
           } else if (actived.row || actived.column) {
             _this29.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
-        } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+        } else if (keyboardConfig && (treeConfig || isEnableConf(editConfig)) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? hasBackspaceKey && keyboardOpts.isArrow : hasBackspaceKey))) {
           if (!isEditStatus) {
             var delMethod = keyboardOpts.delMethod,
               backMethod = keyboardOpts.backMethod;
             // 如果是删除键
-            if (keyboardOpts.isDel && (selected.row || selected.column)) {
+            if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
               var delPaqrams = {
                 row: selected.row,
                 rowIndex: _this29.getRowIndex(selected.row),
@@ -19877,7 +19944,7 @@ var Methods = {
               } else {
                 setCellValue(selected.row, selected.column, null);
               }
-              if (isBack) {
+              if (hasBackspaceKey) {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
@@ -19894,7 +19961,7 @@ var Methods = {
                 _this29.updateFooter();
               }
               _this29.emitEvent('cell-delete-value', delPaqrams, evnt);
-            } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+            } else if (hasBackspaceKey && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
               var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(_this29.afterFullData, function (item) {
                   return item === currentRow;
@@ -20530,6 +20597,7 @@ var Methods = {
     if (trigger === 'manual') {
       return;
     }
+    evnt.stopPropagation();
     if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
       var checkboxRecords = this.getCheckboxRecords();
       if (checkboxRecords.length) {
@@ -20994,6 +21062,9 @@ var Methods = {
     if (trigger === 'manual') {
       return;
     }
+    if (evnt) {
+      evnt.stopPropagation();
+    }
     this.handleCheckAllEvent(evnt, value);
   },
   /**
@@ -21072,6 +21143,7 @@ var Methods = {
     if (trigger === 'manual') {
       return;
     }
+    evnt.stopPropagation();
     var newValue = row;
     var isChange = oldValue !== newValue;
     if (isChange) {
@@ -21756,6 +21828,7 @@ var Methods = {
     if (trigger === 'manual') {
       return;
     }
+    evnt.stopPropagation();
     var rowid = getRowid(this, row);
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isRowExpandByRow(row);
@@ -22086,6 +22159,7 @@ var Methods = {
     if (trigger === 'manual') {
       return;
     }
+    evnt.stopPropagation();
     var rowid = getRowid(this, row);
     if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isTreeExpandByRow(row);
@@ -22795,7 +22869,7 @@ var Methods = {
         var type = 'change';
         if (_this57.hasCellRules) {
           if (_this57.hasCellRules(type, row, column)) {
-            var cell = _this57.getCell(row, column);
+            var cell = _this57.getCellElement(row, column);
             if (cell) {
               return _this57.validCellRules(type, row, column, cellValue).then(function () {
                 if (customVal && validStore.visible) {
@@ -22956,63 +23030,12 @@ var Methods = {
   /*************************
    * Publish methods
    *************************/
+  /**
+   * 已废弃，被 getCellElement 替换
+   * @deprecated
+   */
   getCell: function getCell(row, column) {
-    var $refs = this.$refs;
-    var rowid = getRowid(this, row);
-    var bodyElem = null;
-    if (column) {
-      bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
-    }
-    if (bodyElem && bodyElem.$el) {
-      return bodyElem.$el.querySelector(".vxe-body--row[rowid=\"".concat(rowid, "\"] .").concat(column.id));
-    }
-    return null;
-  },
-  getCellLabel: function getCellLabel(row, column) {
-    var formatter = column.formatter;
-    var cellValue = utils.getCellValue(row, column);
-    var cellLabel = cellValue;
-    if (formatter) {
-      var rest, formatData;
-      var fullAllDataRowMap = this.fullAllDataRowMap;
-      var colid = column.id;
-      var cacheFormat = fullAllDataRowMap.has(row);
-      if (cacheFormat) {
-        rest = fullAllDataRowMap.get(row);
-        formatData = rest.formatData;
-        if (!formatData) {
-          formatData = fullAllDataRowMap.get(row).formatData = {};
-        }
-        if (rest && formatData[colid]) {
-          if (formatData[colid].value === cellValue) {
-            return formatData[colid].label;
-          }
-        }
-      }
-      var formatParams = {
-        cellValue: cellValue,
-        row: row,
-        rowIndex: this.getRowIndex(row),
-        column: column,
-        columnIndex: this.getColumnIndex(column)
-      };
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
-        var gFormatOpts = formats.get(formatter);
-        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
-      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
-        var _gFormatOpts = formats.get(formatter[0]);
-        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
-      } else {
-        cellLabel = formatter(formatParams);
-      }
-      if (formatData) {
-        formatData[colid] = {
-          value: cellValue,
-          label: cellLabel
-        };
-      }
-    }
-    return cellLabel;
+    return this.getCellElement(row, column);
   },
   findRowIndexOf: function findRowIndexOf(list, row) {
     var _this64 = this;
@@ -25295,7 +25318,7 @@ var Filter = VxeTableFilterModule;
                 column = params.column;
               if (keyboard && row && column) {
                 _this.scrollToRow(row, column).then(function () {
-                  var cell = _this.getCell(row, column);
+                  var cell = _this.getCellElement(row, column);
                   var _DomTools$getAbsolute2 = dom.getAbsolutePos(cell),
                     boundingTop = _DomTools$getAbsolute2.boundingTop,
                     boundingLeft = _DomTools$getAbsolute2.boundingLeft;
@@ -25947,7 +25970,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       var row = params.row,
         column = params.column;
       var editRender = column.editRender;
-      var cell = params.cell = params.cell || this.getCell(row, column);
+      var cell = params.cell = params.cell || this.getCellElement(row, column);
       var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
       if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
         // 激活编辑
@@ -26217,7 +26240,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
       if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
         return this.scrollToRow(row, true).then(function () {
-          var cell = _this8.getCell(row, column);
+          var cell = _this8.getCellElement(row, column);
           if (cell) {
             _this8.handleActived({
               row: row,
@@ -26244,7 +26267,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       if (row && column && editOpts.trigger !== 'manual') {
         var rowIndex = this.findRowIndexOf(tableData, row);
         if (rowIndex > -1) {
-          var cell = this.getCell(row, column);
+          var cell = this.getCellElement(row, column);
           var params = {
             row: row,
             rowIndex: rowIndex,
@@ -26337,7 +26360,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         column = selected.column;
       this.reColSdCls();
       if (row && column) {
-        var cell = this.getCell(row, column);
+        var cell = this.getCellElement(row, column);
         if (cell) {
           dom.addClass(cell, 'col--selected');
         }
@@ -32229,7 +32252,7 @@ function getLabelData($xetable, opts, columns, datas) {
                     htmlCellElem.innerHTML = cellValue;
                     cellValue = htmlCellElem.innerText.trim();
                   } else {
-                    var cell = $xetable.getCell(row, column);
+                    var cell = $xetable.getCellElement(row, column);
                     if (cell) {
                       cellValue = cell.innerText.trim();
                     }
@@ -32296,7 +32319,7 @@ function getLabelData($xetable, opts, columns, datas) {
                 htmlCellElem.innerHTML = cellValue;
                 cellValue = htmlCellElem.innerText.trim();
               } else {
-                var cell = $xetable.getCell(row, column);
+                var cell = $xetable.getCellElement(row, column);
                 if (cell) {
                   cellValue = cell.innerText.trim();
                 }
@@ -32335,7 +32358,7 @@ function getHeaderTitle($xetable, opts, column) {
     $table: $xetable
   }) : (opts.original ? column.property : column.getTitle()) || '';
 }
-function getFooterCellValue($xetable, opts, items, column) {
+function getFooterCellValue($xetable, opts, row, column) {
   var columnOpts = $xetable.columnOpts;
   var renderOpts = column.editRender || column.cellRender;
   var footLabelMethod = column.footerExportMethod;
@@ -32349,16 +32372,22 @@ function getFooterCellValue($xetable, opts, items, column) {
     footLabelMethod = columnOpts.footerExportMethod;
   }
   var _columnIndex = $xetable.getVTColumnIndex(column);
-  var cellValue = footLabelMethod ? footLabelMethod({
-    $table: $xetable,
-    items: items,
-    itemIndex: _columnIndex,
-    row: items,
-    _columnIndex: _columnIndex,
-    column: column,
-    options: opts
-  }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(items[_columnIndex]);
-  return cellValue;
+  if (footLabelMethod) {
+    return footLabelMethod({
+      $table: $xetable,
+      items: row,
+      itemIndex: _columnIndex,
+      row: row,
+      _columnIndex: _columnIndex,
+      column: column,
+      options: opts
+    });
+  }
+  // 兼容老模式
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row)) {
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(row[_columnIndex]);
+  }
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
 }
 function getFooterData(opts, footerTableData) {
   var footerFilterMethod = opts.footerFilterMethod;
@@ -32412,9 +32441,9 @@ function toCsv($xetable, opts, columns, datas) {
   if (opts.isFooter) {
     var footerTableData = $xetable.footerTableData;
     var footers = getFooterData(opts, footerTableData);
-    footers.forEach(function (rows) {
+    footers.forEach(function (row) {
       content += columns.map(function (column) {
-        return toTxtCellLabel(getFooterCellValue($xetable, opts, rows, column));
+        return toTxtCellLabel(getFooterCellValue($xetable, opts, row, column));
       }).join(',') + enterSymbol;
     });
   }
@@ -32435,9 +32464,9 @@ function toTxt($xetable, opts, columns, datas) {
   if (opts.isFooter) {
     var footerTableData = $xetable.footerTableData;
     var footers = getFooterData(opts, footerTableData);
-    footers.forEach(function (rows) {
+    footers.forEach(function (row) {
       content += columns.map(function (column) {
-        return toTxtCellLabel(getFooterCellValue($xetable, opts, rows, column));
+        return toTxtCellLabel(getFooterCellValue($xetable, opts, row, column));
       }).join(',') + enterSymbol;
     });
   }
@@ -32608,11 +32637,11 @@ function toHtml($xetable, opts, columns, datas) {
     var footers = getFooterData(opts, footerTableData);
     if (footers.length) {
       tables.push('<tfoot>');
-      footers.forEach(function (rows) {
+      footers.forEach(function (row) {
         tables.push("<tr>".concat(columns.map(function (column) {
           var footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
           var classNames = hasEllipsis($xetable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
-          var cellValue = getFooterCellValue($xetable, opts, rows, column);
+          var cellValue = getFooterCellValue($xetable, opts, row, column);
           if (footAlign) {
             classNames.push("col--".concat(footAlign));
           }
@@ -32644,9 +32673,9 @@ function toXML($xetable, opts, columns, datas) {
   if (opts.isFooter) {
     var footerTableData = $xetable.footerTableData;
     var footers = getFooterData(opts, footerTableData);
-    footers.forEach(function (rows) {
+    footers.forEach(function (row) {
       xml += "<Row>".concat(columns.map(function (column) {
-        return "<Cell><Data ss:Type=\"String\">".concat(getFooterCellValue($xetable, opts, rows, column), "</Data></Cell>");
+        return "<Cell><Data ss:Type=\"String\">".concat(getFooterCellValue($xetable, opts, row, column), "</Data></Cell>");
       }).join(''), "</Row>");
     });
   }
@@ -33872,7 +33901,7 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
         }
         params.columnIndex = targetColumnIndex;
         params.column = targetColumn;
-        params.cell = this.getCell(params.row, params.column);
+        params.cell = this.getCellElement(params.row, params.column);
         if (editConfig) {
           if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
             if (editOpts.mode === 'row') {
@@ -33962,7 +33991,7 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
         params.column = visibleColumn[params.columnIndex];
       }
       this.scrollToRow(params.row, params.column).then(function () {
-        params.cell = _this3.getCell(params.row, params.column);
+        params.cell = _this3.getCellElement(params.row, params.column);
         _this3.handleSelected(params, evnt);
       });
     },
@@ -34441,7 +34470,7 @@ function validErrorRuleValue(rule, val) {
               });
             };
             var posAndFinish = function posAndFinish() {
-              firstErrParams.cell = _this2.getCell(firstErrParams.row, firstErrParams.column);
+              firstErrParams.cell = _this2.getCellElement(firstErrParams.row, firstErrParams.column);
               dom.scrollToView(firstErrParams.cell);
               _this2.handleValidError(firstErrParams).then(finish);
             };