vxe-table 3.8.22 → 3.8.23

package/lib/table/src/methods.js

@@ -1609,7 +1609,7 @@ var Methods = {
               field = column.field;
             var compConf = (0, _utils.isEnableConf)(filterRender) ? _vXETable.default.renderer.get(filterRender.name) : null;
             var compFilterMethod = compConf && compConf.renderFilter ? compConf.tableFilterMethod || compConf.filterMethod : null;
-            var defaultFilterMethod = compConf ? compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
+            var defaultFilterMethod = compConf ? compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
             var cellValue = _utils.default.getCellValue(row, column);
             if (filterMethod) {
               return itemList.some(function (item) {
@@ -3236,7 +3236,6 @@ var Methods = {
         var isEditStatus = (0, _utils.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) {
             _this31.closeFilter();
@@ -3282,7 +3281,7 @@ var Methods = {
           if (hasCtrlKey) {
             // 如果是激活编辑状态，则取消编辑
             if (actived.row) {
-              params = actived.args;
+              var params = actived.args;
               _this31.clearEdit(evnt);
               // 如果配置了选中功能，则为选中状态
               if (mouseConfig && mouseOpts.selected) {
@@ -3314,14 +3313,14 @@ var Methods = {
               if (childrens && childrens.length) {
                 evnt.preventDefault();
                 var targetRow = childrens[0];
-                params = {
+                var _params = {
                   $table: _this31,
                   row: targetRow
                 };
                 _this31.setTreeExpand(currentRow, true).then(function () {
                   return _this31.scrollToRow(targetRow);
                 }).then(function () {
-                  return _this31.triggerCurrentRowEvent(evnt, params);
+                  return _this31.triggerCurrentRowEvent(evnt, _params);
                 });
               }
             }
@@ -3347,23 +3346,24 @@ var Methods = {
           // 如果是删除键
           if (!isEditStatus) {
             var delMethod = keyboardOpts.delMethod;
-            var delPaqrams = {
+            var _params2 = {
               row: selected.row,
               rowIndex: _this31.getRowIndex(selected.row),
               column: selected.column,
               columnIndex: _this31.getColumnIndex(selected.column),
-              $table: _this31
+              $table: _this31,
+              $grid: _this31.$xegrid
             };
             // 是否被禁用
-            if (!beforeEditMethod || beforeEditMethod(params)) {
+            if (!beforeEditMethod || beforeEditMethod(_params2)) {
               if (delMethod) {
-                delMethod(delPaqrams);
+                delMethod(_params2);
               } else {
                 setCellValue(selected.row, selected.column, null);
               }
               // 如果按下 del 键，更新表尾数据
               _this31.updateFooter();
-              _this31.emitEvent('cell-delete-value', delPaqrams, evnt);
+              _this31.emitEvent('cell-delete-value', _params2, evnt);
             }
           }
         } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
@@ -3371,28 +3371,23 @@ var Methods = {
             var backMethod = keyboardOpts.backMethod;
             // 如果是删除键
             if (keyboardOpts.isDel && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
-              var _delPaqrams = {
+              var _params3 = {
                 row: selected.row,
                 rowIndex: _this31.getRowIndex(selected.row),
                 column: selected.column,
                 columnIndex: _this31.getColumnIndex(selected.column),
-                $table: _this31
+                $table: _this31,
+                $grid: _this31.$xegrid
               };
               // 是否被禁用
-              if (!beforeEditMethod || beforeEditMethod(params)) {
+              if (!beforeEditMethod || beforeEditMethod(_params3)) {
                 if (backMethod) {
-                  backMethod({
-                    row: selected.row,
-                    rowIndex: _this31.getRowIndex(selected.row),
-                    column: selected.column,
-                    columnIndex: _this31.getColumnIndex(selected.column),
-                    $table: _this31
-                  });
+                  backMethod(_params3);
                 } else {
                   setCellValue(selected.row, selected.column, null);
                   _this31.handleActived(selected.args, evnt);
                 }
-                _this31.emitEvent('cell-backspace-value', _delPaqrams, evnt);
+                _this31.emitEvent('cell-backspace-value', _params3, evnt);
               }
             }
           }
@@ -3406,16 +3401,17 @@ var Methods = {
             parentRow = _XEUtils$findTree.parent;
           if (parentRow) {
             evnt.preventDefault();
-            params = {
-              $table: _this31,
+            var _params4 = {
               row: parentRow,
               rowIndex: _this31.getRowIndex(parentRow),
-              $rowIndex: _this31.getVMRowIndex(parentRow)
+              $rowIndex: _this31.getVMRowIndex(parentRow),
+              $table: _this31,
+              $grid: _this31.$xegrid
             };
             _this31.setTreeExpand(parentRow, false).then(function () {
               return _this31.scrollToRow(parentRow);
             }).then(function () {
-              return _this31.triggerCurrentRowEvent(evnt, params);
+              return _this31.triggerCurrentRowEvent(evnt, _params4);
             });
           }
         } 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)) {
@@ -3427,19 +3423,17 @@ var Methods = {
           // 如果是按下非功能键之外允许直接编辑
           if (selected.column && selected.row && (0, _utils.isEnableConf)(selected.column.editRender)) {
             var _beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-            if (!_beforeEditMethod || _beforeEditMethod(_objectSpread(_objectSpread({}, selected.args), {}, {
+            var _params5 = {
+              row: selected.row,
+              rowIndex: _this31.getRowIndex(selected.row),
+              column: selected.column,
+              columnIndex: _this31.getColumnIndex(selected.column),
               $table: _this31,
               $grid: _this31.$xegrid
-            }))) {
+            };
+            if (!_beforeEditMethod || _beforeEditMethod(_params5)) {
               if (editMethod) {
-                editMethod({
-                  row: selected.row,
-                  rowIndex: _this31.getRowIndex(selected.row),
-                  column: selected.column,
-                  columnIndex: _this31.getColumnIndex(selected.column),
-                  $table: _this31,
-                  $grid: _this31.$xegrid
-                });
+                editMethod(_params5);
               } else {
                 setCellValue(selected.row, selected.column, null);
                 _this31.handleActived(selected.args, evnt);
@@ -3447,14 +3441,7 @@ var Methods = {
               var afterEditMethod = editOpts.afterEditMethod;
               if (afterEditMethod) {
                 _this31.$nextTick(function () {
-                  afterEditMethod({
-                    row: selected.row,
-                    rowIndex: _this31.getRowIndex(selected.row),
-                    column: selected.column,
-                    columnIndex: _this31.getColumnIndex(selected.column),
-                    $table: _this31,
-                    $grid: _this31.$xegrid
-                  });
+                  afterEditMethod(_params5);
                 });
               }
             }
@@ -4816,9 +4803,9 @@ var Methods = {
       rowOpts = this.rowOpts;
     var actived = editStore.actived,
       focused = editStore.focused;
-    var _params = params,
-      row = _params.row,
-      column = _params.column;
+    var _params6 = params,
+      row = _params6.row,
+      column = _params6.column;
     var type = column.type,
       treeNode = column.treeNode;
     var isRadioType = type === 'radio';