vxe-table 4.7.66 → 4.7.67

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.66";
+const version = "4.7.67";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.66";
+core_.VxeUI.tableVersion = "4.7.67";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2334,7 +2334,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.66"}`;
+const log_version = `table v${"4.7.67"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -13931,6 +13931,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const operArrow = isLeftArrow || isUpArrow || isRightArrow || isDwArrow;
           const operCtxMenu = isMenu && ctxMenuStore.visible && (isEnter || isSpacebar || operArrow);
           const isEditStatus = isEnableConf(editConfig) && actived.column && actived.row;
+          const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
           let params;
           if (operCtxMenu) {
             // 如果配置了右键菜单; 支持方向键操作、回车
@@ -14057,19 +14058,21 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 columnIndex: tableMethods.getColumnIndex(selected.column),
                 $table: $xeTable
               };
-              if (delMethod) {
-                delMethod(delPaqrams);
-              } else {
-                setCellValue(selected.row, selected.column, null);
+              // 是否被禁用
+              if (!beforeEditMethod || beforeEditMethod(params)) {
+                if (delMethod) {
+                  delMethod(delPaqrams);
+                } else {
+                  setCellValue(selected.row, selected.column, null);
+                }
+                // 如果按下 del 键，更新表尾数据
+                tableMethods.updateFooter();
+                $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
               }
-              // 如果按下 del 键，更新表尾数据
-              tableMethods.updateFooter();
-              $xeTable.dispatchEvent('cell-delete-value', delPaqrams, evnt);
             }
           } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
             if (!isEditStatus) {
               const {
-                delMethod,
                 backMethod
               } = keyboardOpts;
               // 如果是删除键
@@ -14081,23 +14084,22 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                   columnIndex: tableMethods.getColumnIndex(selected.column),
                   $table: $xeTable
                 };
-                if (delMethod) {
-                  delMethod(delPaqrams);
-                } else {
-                  setCellValue(selected.row, selected.column, null);
-                }
-                if (backMethod) {
-                  backMethod({
-                    row: selected.row,
-                    rowIndex: tableMethods.getRowIndex(selected.row),
-                    column: selected.column,
-                    columnIndex: tableMethods.getColumnIndex(selected.column),
-                    $table: $xeTable
-                  });
-                } else {
-                  $xeTable.handleActived(selected.args, evnt);
+                // 是否被禁用
+                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
+                    });
+                  } else {
+                    setCellValue(selected.row, selected.column, null);
+                    $xeTable.handleActived(selected.args, evnt);
+                  }
+                  $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt);
                 }
-                $xeTable.dispatchEvent('cell-backspace-value', delPaqrams, evnt);
               }
             }
           } else if (hasBackspaceKey && keyboardConfig && treeConfig && keyboardOpts.isBack && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {