vxe-table 4.9.13 → 4.9.15

package/lib/table/src/table.js

@@ -6266,6 +6266,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
             editStore,
             currentRow
           } = reactData;
+          const {
+            afterFullData
+          } = internalData;
           const isMenu = computeIsMenu.value;
           const bodyMenu = computeBodyMenu.value;
           const keyboardOpts = computeKeyboardOpts.value;
@@ -6351,6 +6354,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
               internalData._keyCtx = false;
             }, 1000);
           } else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
+            const {
+              isLastEnterAppendRow,
+              beforeEnterMethod,
+              enterMethod
+            } = keyboardOpts;
             // 退出选中
             if (hasCtrlKey) {
               // 如果是激活编辑状态，则取消编辑
@@ -6376,7 +6384,37 @@ var _default = exports.default = (0, _vue.defineComponent)({
                   if (keyboardOpts.enterToTab) {
                     $xeTable.moveTabSelected(targetArgs, hasShiftKey, evnt);
                   } else {
-                    $xeTable.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;
+                        }
+                      }
+                      $xeTable.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
+                      if (enterMethod) {
+                        enterMethod(etrParams);
+                      }
+                    }
                   }
                 }
               } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
@@ -6485,6 +6523,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             }
           } else if (keyboardConfig && (0, _utils.isEnableConf)(editConfig) && 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)) {
             const {
+              editMode,
               editMethod
             } = keyboardOpts;
             // 启用编辑后，空格键功能将失效
@@ -6509,7 +6548,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 if (editMethod) {
                   editMethod(params);
                 } else {
-                  (0, _util.setCellValue)(selected.row, selected.column, null);
+                  // 追加方式与覆盖式
+                  if (editMode !== 'insert') {
+                    (0, _util.setCellValue)(selected.row, selected.column, null);
+                  }
                   $xeTable.handleEdit(selected.args, evnt);
                 }
               }
@@ -6664,8 +6706,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const updateColDropOrigin = column => {
       const el = refElem.value;
       if (el) {
+        const colQuerys = [];
+        _xeUtils.default.eachTree([column], item => {
+          colQuerys.push(`[colid="${item.id}"]`);
+        });
         const clss = 'col--drag-origin';
-        _xeUtils.default.arrayEach(el.querySelectorAll(`[colid="${column.id}"]`), elem => {
+        _xeUtils.default.arrayEach(el.querySelectorAll(colQuerys.join(',')), elem => {
           (0, _dom.addClass)(elem, clss);
         });
       }