vxe-table 3.8.4-beta.0 → 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-beta.0", "] ").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) {
@@ -11368,7 +11368,7 @@ var errLog = outLog('error');
 function toType(type) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(type).replace('_', '').toLowerCase();
 }
-var eventTypes = 'created,mounted,activated,beforeDestroy,destroyed,event.clearActived,event.clearFilter,event.clearAreas,event.showMenu,event.keydown,event.export,event.import'.split(',').map(toType);
+var eventTypes = 'created,mounted,activated,beforeDestroy,destroyed,event.clearEdit,event.clearActived,event.clearFilter,event.clearAreas,event.showMenu,event.keydown,event.export,event.import'.split(',').map(toType);
 var storeMap = {};
 var interceptor = {
   mixin: function mixin(map) {
@@ -13067,7 +13067,7 @@ var setup = config;
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.4-beta.0",
+  version: "3.8.5-beta.0",
   reg: reg,
   use: use,
   setup: setup,
@@ -13099,6 +13099,8 @@ var es_map = __webpack_require__(6033);
 var es_object_assign = __webpack_require__(9085);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.fixed.js
 var es_string_fixed = __webpack_require__(4298);
+// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
+var es_promise = __webpack_require__(3362);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.js
 
 
@@ -13458,6 +13460,7 @@ var DomTools = {
 
 
 
+
 var getAllConvertColumns = function getAllConvertColumns(columns, parentColumn) {
   var result = [];
   columns.forEach(function (column) {
@@ -13737,8 +13740,8 @@ function clearTableDefaultStatus(_vm) {
   _vm.clearRowExpand();
   _vm.clearTreeExpand();
   _vm.clearTreeExpandReserve();
-  if (_vm.clearActived && v_x_e_table._edit) {
-    _vm.clearActived();
+  if (_vm.clearEdit && v_x_e_table._edit) {
+    _vm.clearEdit();
   }
   if (_vm.clearSelected && (_vm.keyboardConfig || _vm.mouseConfig)) {
     _vm.clearSelected();
@@ -15650,8 +15653,6 @@ function _slicedToArray(arr, i) {
 }
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.sort.js
 var es_array_sort = __webpack_require__(6910);
-// EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.js
-var es_promise = __webpack_require__(3362);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.promise.finally.js
 var es_promise_finally = __webpack_require__(9391);
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.trim.js
@@ -16546,6 +16547,8 @@ var Cell = {
 
 
 
+
+
 
 
 
@@ -19243,6 +19246,14 @@ var Methods = {
   preventEvent: function preventEvent(evnt, type, args, next, end) {
     var _this26 = this;
     var evntList = v_x_e_table.interceptor.get(type);
+
+    // 兼容老版本
+    if (!evntList.length && type === 'event.clearEdit') {
+      evntList = v_x_e_table.interceptor.get('event.clearActived');
+      if (false) {}
+    }
+    // 兼容老版本
+
     var rest;
     if (!evntList.some(function (func) {
       return func(Object.assign({
@@ -19321,32 +19332,32 @@ var Methods = {
           } else if (!this.lastCallTime || this.lastCallTime + 50 < Date.now()) {
             if (!getEventTargetNode(evnt, document.body, 'vxe-table--ignore-clear').flag) {
               // 如果手动调用了激活单元格，避免触发源被移除后导致重复关闭
-              this.preventEvent(evnt, 'event.clearActived', actived.args, function () {
-                var isClearActived;
+              this.preventEvent(evnt, 'event.clearEdit', actived.args, function () {
+                var isClear;
                 if (editOpts.mode === 'row') {
                   var rowNode = getEventTargetNode(evnt, $el, 'vxe-body--row');
                   // row 方式，如果点击了不同行
-                  isClearActived = rowNode.flag ? getRowNode(rowNode.targetElem).item !== actived.args.row : false;
+                  isClear = rowNode.flag ? getRowNode(rowNode.targetElem).item !== actived.args.row : false;
                 } else {
                   // cell 方式，如果是非编辑列
-                  isClearActived = !getEventTargetNode(evnt, $el, 'col--edit').flag;
+                  isClear = !getEventTargetNode(evnt, $el, 'col--edit').flag;
                 }
                 // 如果点击表头行，则清除激活状态
-                if (!isClearActived) {
-                  isClearActived = getEventTargetNode(evnt, $el, 'vxe-header--row').flag;
+                if (!isClear) {
+                  isClear = getEventTargetNode(evnt, $el, 'vxe-header--row').flag;
                 }
                 // 如果点击表尾行，则清除激活状态
-                if (!isClearActived) {
-                  isClearActived = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag;
+                if (!isClear) {
+                  isClear = getEventTargetNode(evnt, $el, 'vxe-footer--row').flag;
                 }
                 // 如果固定了高度且点击了行之外的空白处，则清除激活状态
-                if (!isClearActived && _this27.height && !_this27.overflowY) {
+                if (!isClear && _this27.height && !_this27.overflowY) {
                   var bodyWrapperElem = evnt.target;
                   if (methods_hasClass(bodyWrapperElem, 'vxe-table--body-wrapper')) {
-                    isClearActived = evnt.offsetY < bodyWrapperElem.clientHeight;
+                    isClear = evnt.offsetY < bodyWrapperElem.clientHeight;
                   }
                 }
-                if (isClearActived ||
+                if (isClear ||
                 // 如果点击了当前表格之外
                 !getEventTargetNode(evnt, $el).flag) {
                   setTimeout(function () {
@@ -21012,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;
@@ -21067,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);
@@ -23341,6 +23359,11 @@ function handleUupdateResize(_vm) {
           row: null,
           column: null
         },
+        // 当前被强制聚焦单元格，只会在鼠标点击后算聚焦
+        focused: {
+          row: null,
+          column: null
+        },
         insertList: [],
         insertMaps: {},
         removeList: [],
@@ -24754,6 +24777,7 @@ var Filter = VxeTableFilterModule;
 
 
 
+
 /* harmony default export */ var src_mixin = ({
   methods: {
     /**
@@ -24837,7 +24861,7 @@ var Filter = VxeTableFilterModule;
             if (activeArea && activeArea.row && activeArea.column) {
               params.row = activeArea.row;
               params.column = activeArea.column;
-              this.openContextMenu(evnt, type, params);
+              this.handleOpenMenuEvent(evnt, type, params);
               return;
             }
           } else if (mouseConfig && mouseOpts.selected) {
@@ -24845,7 +24869,7 @@ var Filter = VxeTableFilterModule;
             if (selected.row && selected.column) {
               params.row = selected.row;
               params.column = selected.column;
-              this.openContextMenu(evnt, type, params);
+              this.handleOpenMenuEvent(evnt, type, params);
               return;
             }
           }
@@ -24879,7 +24903,7 @@ var Filter = VxeTableFilterModule;
               _params.row = row;
               _params.rowIndex = this.getRowIndex(row);
             }
-            this.openContextMenu(evnt, layout, _params);
+            this.handleOpenMenuEvent(evnt, layout, _params);
             // 在 v4 中废弃事件 cell-context-menu、header-cell-context-menu、footer-cell-context-menu
             if (this.$listeners["".concat(typePrefix, "cell-context-menu")]) {
               if (false) {}
@@ -24894,7 +24918,7 @@ var Filter = VxeTableFilterModule;
             if (ctxMenuOpts.trigger === 'cell') {
               evnt.preventDefault();
             } else {
-              this.openContextMenu(evnt, layout, _params);
+              this.handleOpenMenuEvent(evnt, layout, _params);
             }
             return;
           }
@@ -24908,7 +24932,7 @@ var Filter = VxeTableFilterModule;
     /**
      * 显示快捷菜单
      */
-    openContextMenu: function openContextMenu(evnt, type, params) {
+    handleOpenMenuEvent: function handleOpenMenuEvent(evnt, type, params) {
       var _this = this;
       var isCtxMenu = this.isCtxMenu,
         ctxMenuStore = this.ctxMenuStore,
@@ -25103,6 +25127,7 @@ var Menu = VxeTableMenuModule;
 
 
 
+
 
 
 function insertTreeRow(_vm, newRecords, isAppend) {
@@ -25478,7 +25503,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       }
       // 如果当前行被激活编辑，则清除激活状态
       if (actived.row && this.findRowIndexOf(rows, actived.row) > -1) {
-        this.clearActived();
+        this.clearEdit();
       }
       // 从新增中移除已删除的数据
       rows.forEach(function (row) {
@@ -25615,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.clearActived(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();
     },
@@ -25742,9 +25773,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       }
     },
     _clearActived: function _clearActived(evnt) {
-      // if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-      //   warnLog('vxe.error.delFunc', ['clearActived', 'clearEdit'])
-      // }
+      if (false) {}
       // 即将废弃
       return this.clearEdit(evnt);
     },
@@ -25753,7 +25782,8 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
      */
     _clearEdit: function _clearEdit(evnt) {
       var editStore = this.editStore;
-      var actived = editStore.actived;
+      var actived = editStore.actived,
+        focused = editStore.focused;
       var row = actived.row,
         column = actived.column;
       if (row || column) {
@@ -25771,6 +25801,8 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
           $columnIndex: this.getVMColumnIndex(column)
         }, evnt);
       }
+      focused.row = null;
+      focused.column = null;
       if (conf.cellVaildMode === 'obsolete') {
         if (this.clearValidate) {
           return this.clearValidate();
@@ -25779,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();
     },
@@ -25798,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);
     },
@@ -25857,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);
     },
@@ -25876,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);
     },
@@ -25948,7 +25972,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       var selectMethod = function selectMethod() {
         if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
           if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
-            _this9.clearActived(evnt);
+            _this9.clearEdit(evnt);
             _this9.clearSelected(evnt);
             _this9.clearCellAreas(evnt);
             _this9.clearCopyCellArea(evnt);
@@ -34627,6 +34651,7 @@ function renderPopupPanel(h, _vm) {
     customStore = _vm.customStore;
   var customOpts = $xetable.customOpts,
     customColumnList = $xetable.customColumnList,
+    columnOpts = $xetable.columnOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
   var checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod;
@@ -34728,7 +34753,7 @@ function renderPopupPanel(h, _vm) {
       title: conf.i18n('vxe.custom.cstmTitle'),
       className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
       width: '40vw',
-      minWidth: 500,
+      minWidth: 520,
       height: '50vh',
       minHeight: 300,
       mask: true,
@@ -34752,7 +34777,7 @@ function renderPopupPanel(h, _vm) {
           class: 'vxe-table-custom-popup--table-wrapper'
         }, [h('table', {}, [h('colgroup', {}, [h('col', {
           style: {
-            width: '60px'
+            width: '80px'
           }
         }), h('col'), h('col', {
           style: {
@@ -34762,7 +34787,21 @@ function renderPopupPanel(h, _vm) {
           style: {
             width: '200px'
           }
-        })]), h('thead', {}, [h('tr', {}, [h('th', {}, conf.i18n('vxe.custom.setting.colSort')), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), h('th', {}, conf.i18n('vxe.custom.setting.colVisible')), h('th', {}, conf.i18n('vxe.custom.setting.colFixed'))])]), h('transition-group', {
+        })]), h('thead', {}, [h('tr', {}, [h('th', {}, [h('span', {
+          class: 'vxe-table-custom-popup--table-sort-help-title'
+        }, conf.i18n('vxe.custom.setting.colSort')), h('vxe-tooltip', {
+          props: {
+            enterable: true,
+            content: '点击并拖动图标可以调整列的排序'
+          },
+          scopedSlots: {
+            default: function _default() {
+              return h('i', {
+                class: 'vxe-table-custom-popup--table-sort-help-icon vxe-icon-question-circle-fill'
+              });
+            }
+          }
+        })]), h('th', {}, conf.i18n('vxe.custom.setting.colTitle')), h('th', {}, conf.i18n('vxe.custom.setting.colVisible')), h('th', {}, conf.i18n('vxe.custom.setting.colFixed', [columnOpts.maxFixedSize || 0]))])]), h('transition-group', {
           class: 'vxe-table-custom--body',
           props: {
             tag: 'tbody',
@@ -41718,9 +41757,10 @@ var Pulldown = VxePulldown;
       cstmDragTarget: '移动目标：{0}',
       setting: {
         colSort: '排序',
+        sortHelpTip: '点击并拖动图标可以调整列的排序',
         colTitle: '标题',
         colVisible: '是否显示',
-        colFixed: '冻结列',
+        colFixed: '冻结列（最多 {0} 列）',
         fixedLeft: '左侧',
         fixedUnset: '不设置',
         fixedRight: '右侧'