vxe-table 3.8.4 → 3.8.5-beta.0

package/lib/index.umd.js

@@ -11346,7 +11346,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.4", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.5-beta.0", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13067,7 +13067,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.4",
+  version: "3.8.5-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -16547,6 +16547,8 @@ var Cell = {
 
 
 
+
+
 
 
 
@@ -19248,6 +19250,7 @@ var Methods = {
     // 兼容老版本
     if (!evntList.length && type === 'event.clearEdit') {
       evntList = v_x_e_table.interceptor.get('event.clearActived');
+      if (false) {}
     }
     // 兼容老版本
 
@@ -21020,11 +21023,13 @@ var Methods = {
       radioOpts = this.radioOpts,
       expandOpts = this.expandOpts,
       treeOpts = this.treeOpts,
+      keyboardOpts = this.keyboardOpts,
       editConfig = this.editConfig,
       editOpts = this.editOpts,
       checkboxOpts = this.checkboxOpts,
       rowOpts = this.rowOpts;
-    var actived = editStore.actived;
+    var actived = editStore.actived,
+      focused = editStore.focused;
     var _params = params,
       row = _params.row,
       column = _params.column;
@@ -21075,6 +21080,11 @@ var Methods = {
       }
       // 如果设置了单元格选中功能，则不会使用点击事件去处理（只能支持双击模式）
       if (isEnableConf(editConfig)) {
+        // 记录点击输入框聚焦状态
+        if (keyboardOpts.arrowCursorLock && evnt && editOpts.mode === 'cell' && evnt.target && /^input|textarea$/i.test(evnt.target.tagName)) {
+          focused.column = column;
+          focused.row = row;
+        }
         if (editOpts.trigger === 'manual') {
           if (actived.args && actived.row === row && column !== actived.column) {
             this.handleChangeCell(evnt, params);
@@ -25630,94 +25640,100 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         editConfig = this.editConfig,
         mouseConfig = this.mouseConfig;
       var mode = editOpts.mode;
-      var actived = editStore.actived;
+      var actived = editStore.actived,
+        focused = editStore.focused;
       var row = params.row,
         column = params.column;
       var editRender = column.editRender;
       var cell = params.cell = params.cell || this.getCell(row, column);
       var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
-      if (isEnableConf(editConfig) && isEnableConf(editRender) && !this.hasPendingByRow(row) && cell) {
-        if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
-          // 判断是否禁用编辑
-          var type = 'edit-disabled';
-          if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
-            $table: this,
-            $grid: this.$xegrid
-          }))) {
+      if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
+        // 激活编辑
+        if (!this.hasPendingByRow(row)) {
+          if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
+            // 判断是否禁用编辑
+            var type = 'edit-disabled';
+            if (!beforeEditMethod || beforeEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
+              $table: this,
+              $grid: this.$xegrid
+            }))) {
+              if (mouseConfig) {
+                this.clearSelected(evnt);
+                this.clearCellAreas(evnt);
+                this.clearCopyCellArea(evnt);
+              }
+              this.closeTooltip();
+              if (actived.column) {
+                this.clearEdit(evnt);
+              }
+              type = 'edit-activated';
+              column.renderHeight = cell.offsetHeight;
+              actived.args = params;
+              actived.row = row;
+              actived.column = column;
+              if (mode === 'row') {
+                tableColumn.forEach(function (column) {
+                  return _this6._getColumnModel(row, column);
+                });
+              } else {
+                this._getColumnModel(row, column);
+              }
+              var afterEditMethod = editOpts.afterEditMethod;
+              this.$nextTick(function () {
+                _this6.handleFocus(params, evnt);
+                if (afterEditMethod) {
+                  afterEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
+                    $table: _this6,
+                    $grid: _this6.$xegrid
+                  }));
+                }
+              });
+            }
+            this.emitEvent(type, {
+              row: row,
+              rowIndex: this.getRowIndex(row),
+              $rowIndex: this.getVMRowIndex(row),
+              column: column,
+              columnIndex: this.getColumnIndex(column),
+              $columnIndex: this.getVMColumnIndex(column)
+            }, evnt);
+
+            // v4已废弃
+            if (type === 'edit-activated') {
+              this.emitEvent('edit-actived', {
+                row: row,
+                rowIndex: this.getRowIndex(row),
+                $rowIndex: this.getVMRowIndex(row),
+                column: column,
+                columnIndex: this.getColumnIndex(column),
+                $columnIndex: this.getVMColumnIndex(column)
+              }, evnt);
+            }
+          } else {
+            var oldColumn = actived.column;
             if (mouseConfig) {
               this.clearSelected(evnt);
               this.clearCellAreas(evnt);
               this.clearCopyCellArea(evnt);
             }
-            this.closeTooltip();
-            if (actived.column) {
-              this.clearEdit(evnt);
+            if (oldColumn !== column) {
+              var oldModel = oldColumn.model;
+              if (oldModel.update) {
+                utils.setCellValue(row, oldColumn, oldModel.value);
+              }
+              this.clearValidate();
             }
-            type = 'edit-activated';
             column.renderHeight = cell.offsetHeight;
             actived.args = params;
-            actived.row = row;
             actived.column = column;
-            if (mode === 'row') {
-              tableColumn.forEach(function (column) {
-                return _this6._getColumnModel(row, column);
-              });
-            } else {
-              this._getColumnModel(row, column);
-            }
-            var afterEditMethod = editOpts.afterEditMethod;
-            this.$nextTick(function () {
+            setTimeout(function () {
               _this6.handleFocus(params, evnt);
-              if (afterEditMethod) {
-                afterEditMethod(_objectSpread2(_objectSpread2({}, params), {}, {
-                  $table: _this6,
-                  $grid: _this6.$xegrid
-                }));
-              }
             });
           }
-          this.emitEvent(type, {
-            row: row,
-            rowIndex: this.getRowIndex(row),
-            $rowIndex: this.getVMRowIndex(row),
-            column: column,
-            columnIndex: this.getColumnIndex(column),
-            $columnIndex: this.getVMColumnIndex(column)
-          }, evnt);
-
-          // v4已废弃
-          if (type === 'edit-activated') {
-            this.emitEvent('edit-actived', {
-              row: row,
-              rowIndex: this.getRowIndex(row),
-              $rowIndex: this.getVMRowIndex(row),
-              column: column,
-              columnIndex: this.getColumnIndex(column),
-              $columnIndex: this.getVMColumnIndex(column)
-            }, evnt);
-          }
-        } else {
-          var oldColumn = actived.column;
-          if (mouseConfig) {
-            this.clearSelected(evnt);
-            this.clearCellAreas(evnt);
-            this.clearCopyCellArea(evnt);
-          }
-          if (oldColumn !== column) {
-            var oldModel = oldColumn.model;
-            if (oldModel.update) {
-              utils.setCellValue(row, oldColumn, oldModel.value);
-            }
-            this.clearValidate();
-          }
-          column.renderHeight = cell.offsetHeight;
-          actived.args = params;
-          actived.column = column;
-          setTimeout(function () {
-            _this6.handleFocus(params, evnt);
-          });
+          focused.column = null;
+          focused.row = null;
+          this.focus();
         }
-        this.focus();
       }
       return this.$nextTick();
     },
@@ -25795,9 +25811,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       return this.$nextTick();
     },
     _getActiveRecord: function _getActiveRecord() {
-      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['getActiveRecord', 'getEditRecord'])
-      // }
+      if (false) {}
       // 即将废弃
       return this.getEditRecord();
     },
@@ -25814,9 +25828,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       return null;
     },
     _isActiveByRow: function _isActiveByRow(row) {
-      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['isActiveByRow', 'isEditByRow'])
-      // }
+      if (false) {}
       // 即将废弃
       return this.isEditByRow(row);
     },
@@ -25873,9 +25885,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       }
     },
     _setActiveRow: function _setActiveRow(row) {
-      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['setActiveRow', 'setEditRow'])
-      // }
+      if (false) {}
       // 即将废弃
       return this.setEditRow(row);
     },
@@ -25892,9 +25902,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       return this.setEditCell(row, column);
     },
     _setActiveCell: function _setActiveCell(row) {
-      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['setActiveCell', 'setEditCell'])
-      // }
+      if (false) {}
       // 即将废弃
       return this.setEditCell(row);
     },