vxe-table 3.11.17 → 3.11.18

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.17";
+const version = "3.11.18";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2778,7 +2778,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.17"}`;
+const log_version = `table v${"3.11.18"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8751,9 +8751,14 @@ const Methods = {
    * 全局键盘事件
    */
   handleGlobalKeydownEvent(evnt) {
+    const $xeTable = this;
+    const internalData = $xeTable;
     // 该行为只对当前激活的表格有效
     if (this.isActivated) {
       this.preventEvent(evnt, 'event.keydown', null, () => {
+        const {
+          afterFullData
+        } = internalData;
         const {
           filterStore,
           isCtxMenu,
@@ -8841,6 +8846,11 @@ const Methods = {
             this._keyCtx = false;
           }, 1000);
         } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
+          const {
+            isLastEnterAppendRow,
+            beforeEnterMethod,
+            enterMethod
+          } = keyboardOpts;
           // 退出选中
           if (hasCtrlKey) {
             // 如果是激活编辑状态，则取消编辑
@@ -8866,7 +8876,37 @@ const Methods = {
                 if (keyboardOpts.enterToTab) {
                   this.moveTabSelected(targetArgs, hasShiftKey, evnt);
                 } else {
-                  this.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                  const _rowIndex = $xeTable.getVTRowIndex(selected.row);
+                  const etrParams = {
+                    row: selected.row,
+                    rowIndex: $xeTable.getRowIndex(selected.row),
+                    $rowIndex: $xeTable.getVMRowIndex(selected.row),
+                    _rowIndex,
+                    column: selected.column,
+                    columnIndex: $xeTable.getColumnIndex(selected.column),
+                    $columnIndex: $xeTable.getVMColumnIndex(selected.column),
+                    _columnIndex: $xeTable.getVTColumnIndex(selected.column),
+                    $table: $xeTable
+                  };
+                  if (!beforeEnterMethod || beforeEnterMethod(etrParams) !== false) {
+                    // 最后一行按下回车键，自动追加一行
+                    if (isLastEnterAppendRow) {
+                      if (_rowIndex >= afterFullData.length - 1) {
+                        $xeTable.insertAt({}, -1).then(({
+                          row: newRow
+                        }) => {
+                          $xeTable.scrollToRow(newRow, selected.column);
+                          $xeTable.setSelectCell(newRow, selected.column);
+                        });
+                        $xeTable.dispatchEvent('enter-append-row', etrParams, evnt);
+                        return;
+                      }
+                    }
+                    this.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                    if (enterMethod) {
+                      enterMethod(etrParams);
+                    }
+                  }
                 }
               }
             } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -8929,6 +8969,7 @@ const Methods = {
         } else if (hasBackspaceKey && keyboardConfig && keyboardOpts.isBack && isEnableConf(editConfig) && (selected.row || selected.column)) {
           if (!isEditStatus) {
             const {
+              editMode,
               backMethod
             } = keyboardOpts;
             // 如果是删除键
@@ -8946,7 +8987,10 @@ const Methods = {
                 if (backMethod) {
                   backMethod(params);
                 } else {
-                  setCellValue(selected.row, selected.column, null);
+                  // 追加方式与覆盖式
+                  if (editMode !== 'insert') {
+                    setCellValue(selected.row, selected.column, null);
+                  }
                   this.handleEdit(selected.args, evnt);
                 }
                 this.emitEvent('cell-backspace-value', params, evnt);