vxe-table 4.7.68 → 4.7.70

package/lib/table/src/table.js

@@ -1566,7 +1566,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               } = column;
               const compConf = (0, _utils.isEnableConf)(filterRender) ? renderer.get(filterRender.name) : null;
               const compFilterMethod = compConf ? compConf.tableFilterMethod || compConf.filterMethod : null;
-              const tdFilterMethod = compConf ? compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
+              const tdFilterMethod = compConf ? compConf.tableFilterDefaultMethod || compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
               const cellValue = (0, _util.getCellValue)(row, column);
               if (filterMethod) {
                 return itemList.some(item => filterMethod({
@@ -5734,7 +5734,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
           const operCtxMenu = isMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
           const isEditStatus = (0, _utils.isEnableConf)(editConfig) && actived.column && actived.row;
           const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-          let params;
           if (operCtxMenu) {
             // 如果配置了右键菜单; 支持方向键操作、回车
             evnt.preventDefault();
@@ -5790,7 +5789,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             if (hasCtrlKey) {
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
-                params = actived.args;
+                const params = actived.args;
                 $xeTable.clearEdit(evnt);
                 // 如果配置了选中功能，则为选中状态
                 if (mouseOpts.selected) {
@@ -5820,7 +5819,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 if (childrens && childrens.length) {
                   evnt.preventDefault();
                   const targetRow = childrens[0];
-                  params = {
+                  const params = {
                     $table: $xeTable,
                     row: targetRow,
                     rowIndex: tableMethods.getRowIndex(targetRow),
@@ -5853,23 +5852,24 @@ var _default = exports.default = (0, _vue.defineComponent)({
               const {
                 delMethod
               } = keyboardOpts;
-              const delPaqrams = {
+              const params = {
                 row: selected.row,
                 rowIndex: tableMethods.getRowIndex(selected.row),
                 column: selected.column,
                 columnIndex: tableMethods.getColumnIndex(selected.column),
-                $table: $xeTable
+                $table: $xeTable,
+                $grid: $xeGrid
               };
               // 是否被禁用
               if (!beforeEditMethod || beforeEditMethod(params)) {
                 if (delMethod) {
-                  delMethod(delPaqrams);
+                  delMethod(params);
                 } else {
                   (0, _util.setCellValue)(selected.row, selected.column, null);
                 }
                 // 如果按下 del 键，更新表尾数据
                 tableMethods.updateFooter();
-                $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
+                $xeTable.dispatchEvent('cell-delete-value', params, evnt);
               }
             }
           } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
@@ -5879,28 +5879,23 @@ var _default = exports.default = (0, _vue.defineComponent)({
               } = keyboardOpts;
               // 如果是删除键
               if (keyboardOpts.isDel && (0, _utils.isEnableConf)(editConfig) && (selected.row || selected.column)) {
-                const delPaqrams = {
+                const params = {
                   row: selected.row,
                   rowIndex: tableMethods.getRowIndex(selected.row),
                   column: selected.column,
                   columnIndex: tableMethods.getColumnIndex(selected.column),
-                  $table: $xeTable
+                  $table: $xeTable,
+                  $grid: $xeGrid
                 };
                 // 是否被禁用
                 if (!beforeEditMethod || beforeEditMethod(params)) {
                   if (backMethod) {
-                    backMethod({
-                      row: selected.row,
-                      rowIndex: tableMethods.getRowIndex(selected.row),
-                      column: selected.column,
-                      columnIndex: tableMethods.getColumnIndex(selected.column),
-                      $table: $xeTable
-                    });
+                    backMethod(params);
                   } else {
                     (0, _util.setCellValue)(selected.row, selected.column, null);
                     $xeTable.handleActived(selected.args, evnt);
                   }
-                  $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt);
+                  $xeTable.dispatchEvent('cell-backspace-value', params, evnt);
                 }
               }
             }
@@ -5913,11 +5908,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
             });
             if (parentRow) {
               evnt.preventDefault();
-              params = {
-                $table: $xeTable,
+              const params = {
                 row: parentRow,
                 rowIndex: tableMethods.getRowIndex(parentRow),
-                $rowIndex: tableMethods.getVMRowIndex(parentRow)
+                $rowIndex: tableMethods.getVMRowIndex(parentRow),
+                $table: $xeTable,
+                $grid: $xeGrid
               };
               tableMethods.setTreeExpand(parentRow, false).then(() => tableMethods.scrollToRow(parentRow)).then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
             }
@@ -5932,19 +5928,20 @@ var _default = exports.default = (0, _vue.defineComponent)({
             // 如果是按下非功能键之外允许直接编辑
             if (selected.column && selected.row && (0, _utils.isEnableConf)(selected.column.editRender)) {
               const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
+              const params = {
+                row: selected.row,
+                rowIndex: tableMethods.getRowIndex(selected.row),
+                column: selected.column,
+                columnIndex: tableMethods.getColumnIndex(selected.column),
+                $table: $xeTable,
+                $grid: $xeGrid
+              };
               if (!beforeEditMethod || beforeEditMethod(Object.assign(Object.assign({}, selected.args), {
                 $table: $xeTable,
                 $grid: $xeGrid
               }))) {
                 if (editMethod) {
-                  editMethod({
-                    row: selected.row,
-                    rowIndex: tableMethods.getRowIndex(selected.row),
-                    column: selected.column,
-                    columnIndex: tableMethods.getColumnIndex(selected.column),
-                    $table: $xeTable,
-                    $grid: $xeGrid
-                  });
+                  editMethod(params);
                 } else {
                   (0, _util.setCellValue)(selected.row, selected.column, null);
                   $xeTable.handleActived(selected.args, evnt);
@@ -5952,14 +5949,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 const afterEditMethod = editOpts.afterEditMethod;
                 if (afterEditMethod) {
                   (0, _vue.nextTick)(() => {
-                    afterEditMethod({
-                      row: selected.row,
-                      rowIndex: tableMethods.getRowIndex(selected.row),
-                      column: selected.column,
-                      columnIndex: tableMethods.getColumnIndex(selected.column),
-                      $table: $xeTable,
-                      $grid: $xeGrid
-                    });
+                    afterEditMethod(params);
                   });
                 }
               }