vxe-table 3.8.20 → 3.8.21

package/lib/index.umd.js

@@ -11521,7 +11521,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.20", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.21", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -12511,25 +12511,25 @@ function oldFormItemRadioAndCheckboxRender(h, renderOpts, params) {
  */
 var renderMap = {
   input: {
-    autoFocus: 'input',
-    renderEdit: nativeEditRender,
-    renderDefault: nativeEditRender,
-    renderFilter: nativeFilterRender,
-    defaultFilterMethod: handleInputFilterMethod,
-    renderItemContent: nativeItemRender
+    tableAutofocus: 'input',
+    renderTableEdit: nativeEditRender,
+    renderTableDefault: nativeEditRender,
+    renderTableFilter: nativeFilterRender,
+    defaultTableFilterMethod: handleInputFilterMethod,
+    renderFormItemContent: nativeItemRender
   },
   textarea: {
-    autoFocus: 'textarea',
-    renderEdit: nativeEditRender,
-    renderItemContent: nativeItemRender
+    tableAutofocus: 'textarea',
+    renderTableEdit: nativeEditRender,
+    renderFormItemContent: nativeItemRender
   },
   select: {
-    renderEdit: nativeSelectEditRender,
-    renderDefault: nativeSelectEditRender,
-    renderCell: function renderCell(h, renderOpts, params) {
+    renderTableEdit: nativeSelectEditRender,
+    renderTableDefault: nativeSelectEditRender,
+    renderTableCell: function renderTableCell(h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
     },
-    renderFilter: function renderFilter(h, renderOpts, params) {
+    renderTableFilter: function renderTableFilter(h, renderOpts, params) {
       var column = params.column;
       return column.filters.map(function (option, oIndex) {
         return h('select', {
@@ -12540,20 +12540,20 @@ var renderMap = {
         }, renderOpts.optionGroups ? renderNativeOptgroups(h, renderOpts, params, renderNativeOptions) : renderNativeOptions(h, renderOpts.options, renderOpts, params));
       });
     },
-    defaultFilterMethod: handleFilterMethod,
-    renderItemContent: function renderItemContent(h, renderOpts, params) {
+    defaultTableFilterMethod: handleFilterMethod,
+    renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
       return [h('select', {
         class: 'vxe-default-select',
         attrs: getNativeAttrs(renderOpts),
         on: getNativeItemOns(renderOpts, params)
       }, renderOpts.optionGroups ? renderNativeOptgroups(h, renderOpts, params, renderNativeFormOptions) : renderNativeFormOptions(h, renderOpts.options, renderOpts, params))];
     },
-    cellExportMethod: handleExportSelectMethod
+    tableExportMethod: handleExportSelectMethod
   },
   VxeInput: {
-    autoFocus: '.vxe-input--inner',
-    renderEdit: defaultEditRender,
-    renderCell: function renderCell(h, renderOpts, params) {
+    tableAutofocus: '.vxe-input--inner',
+    renderTableEdit: defaultEditRender,
+    renderTableCell: function renderTableCell(h, renderOpts, params) {
       var _renderOpts$props2 = renderOpts.props,
         props = _renderOpts$props2 === void 0 ? {} : _renderOpts$props2;
       var row = params.row,
@@ -12576,22 +12576,22 @@ var renderMap = {
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue);
     },
-    renderDefault: defaultEditRender,
-    renderFilter: defaultFilterRender,
-    defaultFilterMethod: handleInputFilterMethod,
-    renderItemContent: defaultItemRender
+    renderTableDefault: defaultEditRender,
+    renderTableFilter: defaultFilterRender,
+    defaultTableFilterMethod: handleInputFilterMethod,
+    renderFormItemContent: defaultItemRender
   },
   VxeTextarea: {
-    autoFocus: '.vxe-textarea--inner',
-    renderItemContent: defaultItemRender
+    tableAutofocus: '.vxe-textarea--inner',
+    renderFormItemContent: defaultItemRender
   },
   VxeButton: {
-    renderDefault: defaultCellRender,
-    renderItemContent: defaultFormItemRender
+    renderTableDefault: defaultCellRender,
+    renderFormItemContent: defaultFormItemRender
   },
   VxeButtonGroup: {
-    renderDefault: defaultCellRender,
-    renderItemContent: function renderItemContent(h, renderOpts, params) {
+    renderTableDefault: defaultCellRender,
+    renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
       var options = renderOpts.options;
       var data = params.data,
         property = params.property;
@@ -12606,13 +12606,13 @@ var renderMap = {
     }
   },
   VxeSelect: {
-    autoFocus: '.vxe-input--inner',
-    renderEdit: defaultSelectEditRender,
-    renderDefault: defaultSelectEditRender,
-    renderCell: function renderCell(h, renderOpts, params) {
+    tableAutofocus: '.vxe-input--inner',
+    renderTableEdit: defaultSelectEditRender,
+    renderTableDefault: defaultSelectEditRender,
+    renderTableCell: function renderTableCell(h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
     },
-    renderFilter: function renderFilter(h, renderOpts, params) {
+    renderTableFilter: function renderTableFilter(h, renderOpts, params) {
       var column = params.column;
       var options = renderOpts.options,
         optionProps = renderOpts.optionProps,
@@ -12634,8 +12634,8 @@ var renderMap = {
         });
       });
     },
-    defaultFilterMethod: handleFilterMethod,
-    renderItemContent: function renderItemContent(h, renderOpts, params) {
+    defaultTableFilterMethod: handleFilterMethod,
+    renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
       var data = params.data,
         property = params.property;
       var options = renderOpts.options,
@@ -12654,35 +12654,35 @@ var renderMap = {
         nativeOn: getNativeOns(renderOpts, params)
       })];
     },
-    cellExportMethod: handleExportSelectMethod
+    tableExportMethod: handleExportSelectMethod
   },
   VxeRadio: {
-    autoFocus: '.vxe-radio--input',
-    renderItemContent: defaultFormItemRender
+    tableAutofocus: '.vxe-radio--input',
+    renderFormItemContent: defaultFormItemRender
   },
   VxeRadioGroup: {
-    autoFocus: '.vxe-radio--input',
-    renderItemContent: formItemRadioAndCheckboxRender
+    tableAutofocus: '.vxe-radio--input',
+    renderFormItemContent: formItemRadioAndCheckboxRender
   },
   VxeCheckbox: {
-    autoFocus: '.vxe-checkbox--input',
-    renderItemContent: defaultFormItemRender
+    tableAutofocus: '.vxe-checkbox--input',
+    renderFormItemContent: defaultFormItemRender
   },
   VxeCheckboxGroup: {
-    autoFocus: '.vxe-checkbox--input',
-    renderItemContent: formItemRadioAndCheckboxRender
+    tableAutofocus: '.vxe-checkbox--input',
+    renderFormItemContent: formItemRadioAndCheckboxRender
   },
   VxeSwitch: {
-    autoFocus: '.vxe-switch--button',
-    renderEdit: defaultEditRender,
-    renderDefault: defaultEditRender,
-    renderItemContent: defaultItemRender
+    tableAutofocus: '.vxe-switch--button',
+    renderTableEdit: defaultEditRender,
+    renderTableDefault: defaultEditRender,
+    renderFormItemContent: defaultItemRender
   },
   // 以下已废弃
   $input: {
-    autoFocus: '.vxe-input--inner',
-    renderEdit: oldEditRender,
-    renderCell: function renderCell(h, renderOpts, params) {
+    tableAutofocus: '.vxe-input--inner',
+    renderTableEdit: oldEditRender,
+    renderTableCell: function renderTableCell(h, renderOpts, params) {
       var _renderOpts$props3 = renderOpts.props,
         props = _renderOpts$props3 === void 0 ? {} : _renderOpts$props3;
       var row = params.row,
@@ -12704,31 +12704,31 @@ var renderMap = {
       }
       return getCellLabelVNs(h, renderOpts, params, cellValue);
     },
-    renderDefault: oldEditRender,
-    renderFilter: oldFilterRender,
-    defaultFilterMethod: handleInputFilterMethod,
-    renderItemContent: oldItemRender
+    renderTableDefault: oldEditRender,
+    renderTableFilter: oldFilterRender,
+    defaultTableFilterMethod: handleInputFilterMethod,
+    renderFormItemContent: oldItemRender
   },
   $textarea: {
-    autoFocus: '.vxe-textarea--inner',
-    renderItemContent: oldItemRender
+    tableAutofocus: '.vxe-textarea--inner',
+    renderFormItemContent: oldItemRender
   },
   $button: {
-    renderDefault: oldButtonEditRender,
-    renderItemContent: oldButtonItemRender
+    renderTableDefault: oldButtonEditRender,
+    renderFormItemContent: oldButtonItemRender
   },
   $buttons: {
-    renderDefault: oldButtonsEditRender,
-    renderItemContent: oldButtonsItemRender
+    renderTableDefault: oldButtonsEditRender,
+    renderFormItemContent: oldButtonsItemRender
   },
   $select: {
-    autoFocus: '.vxe-input--inner',
-    renderEdit: oldSelectEditRender,
-    renderDefault: oldSelectEditRender,
-    renderCell: function renderCell(h, renderOpts, params) {
+    tableAutofocus: '.vxe-input--inner',
+    renderTableEdit: oldSelectEditRender,
+    renderTableDefault: oldSelectEditRender,
+    renderTableCell: function renderTableCell(h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params));
     },
-    renderFilter: function renderFilter(h, renderOpts, params) {
+    renderTableFilter: function renderTableFilter(h, renderOpts, params) {
       var column = params.column;
       var options = renderOpts.options,
         optionProps = renderOpts.optionProps,
@@ -12750,8 +12750,8 @@ var renderMap = {
         });
       });
     },
-    defaultFilterMethod: handleFilterMethod,
-    renderItemContent: function renderItemContent(h, renderOpts, params) {
+    defaultTableFilterMethod: handleFilterMethod,
+    renderFormItemContent: function renderFormItemContent(h, renderOpts, params) {
       var data = params.data,
         property = params.property;
       var options = renderOpts.options,
@@ -12770,21 +12770,21 @@ var renderMap = {
         nativeOn: getNativeOns(renderOpts, params)
       })];
     },
-    cellExportMethod: handleExportSelectMethod
+    tableExportMethod: handleExportSelectMethod
   },
   $radio: {
-    autoFocus: '.vxe-radio--input',
-    renderItemContent: oldFormItemRadioAndCheckboxRender
+    tableAutofocus: '.vxe-radio--input',
+    renderFormItemContent: oldFormItemRadioAndCheckboxRender
   },
   $checkbox: {
-    autoFocus: '.vxe-checkbox--input',
-    renderItemContent: oldFormItemRadioAndCheckboxRender
+    tableAutofocus: '.vxe-checkbox--input',
+    renderFormItemContent: oldFormItemRadioAndCheckboxRender
   },
   $switch: {
-    autoFocus: '.vxe-switch--button',
-    renderEdit: oldEditRender,
-    renderDefault: oldEditRender,
-    renderItemContent: oldItemRender
+    tableAutofocus: '.vxe-switch--button',
+    renderTableEdit: oldEditRender,
+    renderTableDefault: oldEditRender,
+    renderFormItemContent: oldItemRender
   }
   // 以上已废弃
 };
@@ -13225,7 +13225,7 @@ function component(comp) {
     components[comp.name] = comp;
   }
 }
-var version = "3.8.20";
+var version = "3.8.21";
 var tableVersion = version;
 var VxeUI = {
   v: v,
@@ -19797,7 +19797,7 @@ var Methods = {
         var isUpArrow = keyCode === 38;
         var isRightArrow = keyCode === 39;
         var isDwArrow = keyCode === 40;
-        var isDel = keyCode === 46;
+        var hasDeleteKey = keyCode === 46;
         var isF2 = keyCode === 113;
         var isContextMenu = keyCode === 93;
         var hasMetaKey = evnt.metaKey;
@@ -19808,6 +19808,7 @@ var Methods = {
         var operCtxMenu = isCtxMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
         var isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
         var childrenField = treeOpts.children || treeOpts.childrenField;
+        var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
         var params;
         if (filterStore.visible) {
           if (isEsc) {
@@ -19915,25 +19916,43 @@ var Methods = {
           } else if (actived.row || actived.column) {
             _this31.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
-        } else if (keyboardConfig && (treeConfig || isEnableConf(editConfig)) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? hasBackspaceKey && keyboardOpts.isArrow : hasBackspaceKey))) {
+        } else if (keyboardConfig && keyboardOpts.isDel && hasDeleteKey && isEnableConf(editConfig) && (selected.row || selected.column)) {
+          // 如果是删除键
+          if (!isEditStatus) {
+            var delMethod = keyboardOpts.delMethod;
+            var delPaqrams = {
+              row: selected.row,
+              rowIndex: _this31.getRowIndex(selected.row),
+              column: selected.column,
+              columnIndex: _this31.getColumnIndex(selected.column),
+              $table: _this31
+            };
+            // 是否被禁用
+            if (!beforeEditMethod || beforeEditMethod(params)) {
+              if (delMethod) {
+                delMethod(delPaqrams);
+              } else {
+                setCellValue(selected.row, selected.column, null);
+              }
+              // 如果按下 del 键，更新表尾数据
+              _this31.updateFooter();
+              _this31.emitEvent('cell-delete-value', delPaqrams, evnt);
+            }
+          }
+        } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
           if (!isEditStatus) {
-            var delMethod = keyboardOpts.delMethod,
-              backMethod = keyboardOpts.backMethod;
+            var backMethod = keyboardOpts.backMethod;
             // 如果是删除键
             if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
-              var delPaqrams = {
+              var _delPaqrams = {
                 row: selected.row,
                 rowIndex: _this31.getRowIndex(selected.row),
                 column: selected.column,
                 columnIndex: _this31.getColumnIndex(selected.column),
                 $table: _this31
               };
-              if (delMethod) {
-                delMethod(delPaqrams);
-              } else {
-                setCellValue(selected.row, selected.column, null);
-              }
-              if (hasBackspaceKey) {
+              // 是否被禁用
+              if (!beforeEditMethod || beforeEditMethod(params)) {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
@@ -19943,35 +19962,35 @@ var Methods = {
                     $table: _this31
                   });
                 } else {
+                  setCellValue(selected.row, selected.column, null);
                   _this31.handleActived(selected.args, evnt);
                 }
-              } else if (isDel) {
-                // 如果按下 del 键，更新表尾数据
-                _this31.updateFooter();
-              }
-              _this31.emitEvent('cell-delete-value', delPaqrams, evnt);
-            } 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(_this31.afterFullData, function (item) {
-                  return item === currentRow;
-                }, {
-                  children: childrenField
-                }),
-                parentRow = _XEUtils$findTree.parent;
-              if (parentRow) {
-                evnt.preventDefault();
-                params = {
-                  $table: _this31,
-                  row: parentRow
-                };
-                _this31.setTreeExpand(parentRow, false).then(function () {
-                  return _this31.scrollToRow(parentRow);
-                }).then(function () {
-                  return _this31.triggerCurrentRowEvent(evnt, params);
-                });
+                _this31.emitEvent('cell-backspace-value', _delPaqrams, evnt);
               }
             }
           }
+        } else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+          // 如果树形表格回退键关闭当前行返回父节点
+          var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(_this31.afterTreeFullData, function (item) {
+              return item === currentRow;
+            }, {
+              children: childrenField
+            }),
+            parentRow = _XEUtils$findTree.parent;
+          if (parentRow) {
+            evnt.preventDefault();
+            params = {
+              $table: _this31,
+              row: parentRow,
+              rowIndex: _this31.getRowIndex(parentRow),
+              $rowIndex: _this31.getVMRowIndex(parentRow)
+            };
+            _this31.setTreeExpand(parentRow, false).then(function () {
+              return _this31.scrollToRow(parentRow);
+            }).then(function () {
+              return _this31.triggerCurrentRowEvent(evnt, params);
+            });
+          }
         } else if (keyboardConfig && keyboardOpts.isEdit && !hasCtrlKey && !hasMetaKey && (isSpacebar || keyCode >= 48 && keyCode <= 57 || keyCode >= 65 && keyCode <= 90 || keyCode >= 96 && keyCode <= 111 || keyCode >= 186 && keyCode <= 192 || keyCode >= 219 && keyCode <= 222)) {
           var editMethod = keyboardOpts.editMethod;
           // 启用编辑后，空格键功能将失效
@@ -19980,8 +19999,8 @@ var Methods = {
           // }
           // 如果是按下非功能键之外允许直接编辑
           if (selected.column && selected.row && isEnableConf(selected.column.editRender)) {
-            var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-            if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
+            var _beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+            if (!_beforeEditMethod || _beforeEditMethod(_objectSpread2(_objectSpread2({}, selected.args), {}, {
               $table: _this31,
               $grid: _this31.$xegrid
             }))) {
@@ -26224,10 +26243,10 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         var autoSelect = editRender.autoSelect || editRender.autoselect;
         var inputElem;
         if (!autoFocus && compRender) {
-          autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autofocus;
+          autoFocus = compRender.tableAutoFocus || compRender.tableAutofocus || compRender.autoFocus || compRender.autofocus;
         }
         if (!autoSelect && compRender) {
-          autoSelect = compRender.tableAutoSelect || compRender.autoselect;
+          autoSelect = compRender.tableAutoSelect || compRender.autoSelect || compRender.autoselect;
         }
         // 如果指定了聚焦 class
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autoFocus)) {
@@ -32371,7 +32390,7 @@ function getLabelData($xetable, opts, columns, datas) {
       if (!exportLabelMethod && renderOpts && renderOpts.name) {
         var compConf = v_x_e_table.renderer.get(renderOpts.name);
         if (compConf) {
-          exportLabelMethod = compConf.exportMethod || compConf.cellExportMethod;
+          exportLabelMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
         }
       }
       if (exportLabelMethod) {