vxe-table 3.4.2 → 3.4.3-beta.0

package/lib/index.umd.js

@@ -10367,7 +10367,7 @@ function renderColumn(h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel, r
   } // 点击事件处理
 
 
-  if (highlightCurrentRow || tableListeners['cell-click'] || editRender && editConfig || expandOpts.trigger === 'row' || expandOpts.trigger === 'cell' || radioOpts.trigger === 'row' || column.type === 'radio' && radioOpts.trigger === 'cell' || checkboxOpts.trigger === 'row' || column.type === 'checkbox' && checkboxOpts.trigger === 'cell' || treeOpts.trigger === 'row' || column.treeNode && treeOpts.trigger === 'cell') {
+  if (rowOpts.isCurrent || highlightCurrentRow || tableListeners['cell-click'] || editRender && editConfig || expandOpts.trigger === 'row' || expandOpts.trigger === 'cell' || radioOpts.trigger === 'row' || column.type === 'radio' && radioOpts.trigger === 'cell' || checkboxOpts.trigger === 'row' || column.type === 'checkbox' && checkboxOpts.trigger === 'cell' || treeOpts.trigger === 'row' || column.treeNode && treeOpts.trigger === 'cell') {
     tdOns.click = function (evnt) {
       $xetable.triggerCellClickEvent(evnt, params);
     };
@@ -10505,7 +10505,8 @@ function renderRows(h, _vm, $xetable, $seq, fixedType, tableData, tableColumn) {
       checkboxOpts = $xetable.checkboxOpts,
       expandColumn = $xetable.expandColumn,
       hasFixedColumn = $xetable.hasFixedColumn,
-      fullAllDataRowIdData = $xetable.fullAllDataRowIdData;
+      fullAllDataRowIdData = $xetable.fullAllDataRowIdData,
+      rowOpts = $xetable.rowOpts;
   var rows = [];
   tableData.forEach(function (row, $rowIndex) {
     var trOn = {};
@@ -10521,7 +10522,7 @@ function renderRows(h, _vm, $xetable, $seq, fixedType, tableData, tableColumn) {
 
     rowIndex = $xetable.getRowIndex(row); // 事件绑定
 
-    if (highlightHoverRow) {
+    if (rowOpts.isHover || highlightHoverRow) {
       trOn.mouseenter = function (evnt) {
         if (isOperateMouse($xetable)) {
           return;
@@ -10851,7 +10852,8 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
           scrollXLoad = $xetable.scrollXLoad,
           scrollYLoad = $xetable.scrollYLoad,
           lastScrollTop = $xetable.lastScrollTop,
-          lastScrollLeft = $xetable.lastScrollLeft;
+          lastScrollLeft = $xetable.lastScrollLeft,
+          rowOpts = $xetable.rowOpts;
       var tableHeader = $refs.tableHeader,
           tableBody = $refs.tableBody,
           leftBody = $refs.leftBody,
@@ -10875,7 +10877,7 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
       $xetable.lastScrollLeft = scrollLeft;
       $xetable.lastScrollTime = Date.now();
 
-      if (highlightHoverRow) {
+      if (rowOpts.isHover || highlightHoverRow) {
         $xetable.clearHoverRow();
       }
 
@@ -11013,7 +11015,8 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
           highlightHoverRow = $xetable.highlightHoverRow,
           scrollYLoad = $xetable.scrollYLoad,
           lastScrollTop = $xetable.lastScrollTop,
-          lastScrollLeft = $xetable.lastScrollLeft;
+          lastScrollLeft = $xetable.lastScrollLeft,
+          rowOpts = $xetable.rowOpts;
       var tableBody = $refs.tableBody;
       var bodyElem = tableBody.$el;
       var deltaTop = browse.firefox ? deltaY * 40 : deltaY;
@@ -11035,7 +11038,7 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
         $xetable.lastScrollLeft = scrollLeft;
         $xetable.lastScrollTime = Date.now();
 
-        if (highlightHoverRow) {
+        if (rowOpts.isHover || highlightHoverRow) {
           $xetable.clearHoverRow();
         }
 
@@ -12071,6 +12074,7 @@ var Cell = {
 
 
 
+
 
 
 var methods_getRowid = UtilTools.getRowid,
@@ -14811,7 +14815,8 @@ var Methods = {
             treeOpts = _this24.treeOpts,
             highlightCurrentRow = _this24.highlightCurrentRow,
             currentRow = _this24.currentRow,
-            bodyCtxMenu = _this24.bodyCtxMenu;
+            bodyCtxMenu = _this24.bodyCtxMenu,
+            rowOpts = _this24.rowOpts;
         var selected = editStore.selected,
             actived = editStore.actived;
         var keyCode = evnt.keyCode;
@@ -14881,7 +14886,7 @@ var Methods = {
           _this24.keyCtxTimeout = setTimeout(function () {
             _this24._keyCtx = false;
           }, 1000);
-        } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && highlightCurrentRow && currentRow)) {
+        } else if (isEnter && !hasAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
           // 退出选中
           if (hasCtrlKey) {
             // 如果是激活编辑状态，则取消编辑
@@ -14915,7 +14920,7 @@ var Methods = {
                   _this24.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                 }
               }
-            } else if (treeConfig && highlightCurrentRow && currentRow) {
+            } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果是树形表格当前行回车移动到子节点
               var childrens = currentRow[treeOpts.children];
 
@@ -14940,7 +14945,7 @@ var Methods = {
             // 如果按下了方向键
             if (selected.row && selected.column) {
               _this24.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-            } else if ((isUpArrow || isDwArrow) && highlightCurrentRow) {
+            } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
               // 当前行按键上下移动
               _this24.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
@@ -14952,7 +14957,7 @@ var Methods = {
           } else if (actived.row || actived.column) {
             _this24.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
-        } else if (keyboardConfig && (isDel || (treeConfig && highlightCurrentRow && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+        } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
           if (!isEditStatus) {
             var delMethod = keyboardOpts.delMethod,
                 backMethod = keyboardOpts.backMethod; // 如果是删除键
@@ -14986,7 +14991,7 @@ var Methods = {
                 // 如果按下 del 键，更新表尾数据
                 _this24.updateFooter();
               }
-            } else if (isBack && keyboardOpts.isArrow && treeConfig && highlightCurrentRow && currentRow) {
+            } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
               var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(_this24.afterFullData, function (item) {
                 return item === currentRow;
@@ -16096,12 +16101,13 @@ var Methods = {
    * @param {Row} row 行对象
    */
   setCurrentRow: function setCurrentRow(row) {
-    var $el = this.$el;
+    var $el = this.$el,
+        rowOpts = this.rowOpts;
     this.clearCurrentRow();
     this.clearCurrentColumn();
     this.currentRow = row;
 
-    if (this.highlightCurrentRow) {
+    if (rowOpts.isCurrent || this.highlightCurrentRow) {
       if ($el) {
         external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.arrayEach($el.querySelectorAll("[rowid=\"".concat(methods_getRowid(this, row), "\"]")), function (elem) {
           return addClass(elem, 'row--current');
@@ -16162,7 +16168,7 @@ var Methods = {
    * 用于当前行，获取当前行的数据
    */
   getCurrentRecord: function getCurrentRecord() {
-    return this.highlightCurrentRow ? this.currentRow : null;
+    return this.rowOpts.isCurrent || this.highlightCurrentRow ? this.currentRow : null;
   },
 
   /**
@@ -16256,7 +16262,7 @@ var Methods = {
       cell: cell
     }, params), evnt);
 
-    if (this.highlightCurrentColumn) {
+    if (this.columnOpts.isCurrent || this.highlightCurrentColumn) {
       return this.setCurrentColumn(column);
     }
 
@@ -16268,7 +16274,7 @@ var Methods = {
     }, params), evnt);
   },
   getCurrentColumn: function getCurrentColumn() {
-    return this.highlightCurrentColumn ? this.currentColumn : null;
+    return this.columnOpts.isCurrent || this.highlightCurrentColumn ? this.currentColumn : null;
   },
 
   /**
@@ -16333,7 +16339,8 @@ var Methods = {
         treeOpts = this.treeOpts,
         editConfig = this.editConfig,
         editOpts = this.editOpts,
-        checkboxOpts = this.checkboxOpts;
+        checkboxOpts = this.checkboxOpts,
+        rowOpts = this.rowOpts;
     var actived = editStore.actived;
     var _params = params,
         row = _params.row,
@@ -16372,7 +16379,7 @@ var Methods = {
     if (!triggerTreeNode) {
       if (!triggerExpandNode) {
         // 如果是高亮行
-        if (highlightCurrentRow) {
+        if (rowOpts.isCurrent || highlightCurrentRow) {
           if (!triggerCheckbox && !triggerRadio) {
             this.triggerCurrentRowEvent(evnt, params);
           }
@@ -17230,8 +17237,10 @@ var Methods = {
         treeOpts = this.treeOpts,
         treeFullData = this.treeFullData;
     var fullData = [];
+    var expandMaps = new Map();
     external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(treeFullData, function (row, index, items, path, parent) {
-      if (!parent || treeExpandeds.indexOf(parent) > -1) {
+      if (!parent || expandMaps.has(parent) && treeExpandeds.indexOf(parent) > -1) {
+        expandMaps.set(row, 1);
         fullData.push(row);
       }
     }, treeOpts);
@@ -19124,7 +19133,9 @@ function handleUupdateResize(_vm) {
         ctxMenuStore = this.ctxMenuStore,
         ctxMenuOpts = this.ctxMenuOpts,
         footerTableData = this.footerTableData,
-        hasTip = this.hasTip;
+        hasTip = this.hasTip,
+        columnOpts = this.columnOpts,
+        rowOpts = this.rowOpts;
     var leftList = columnStore.leftList,
         rightList = columnStore.rightList;
     return h('div', {
@@ -19133,8 +19144,8 @@ function handleUupdateResize(_vm) {
         'cell--highlight': highlightCell,
         'cell--selected': mouseConfig && mouseOpts.selected,
         'cell--area': mouseConfig && mouseOpts.area,
-        'row--highlight': highlightHoverRow,
-        'column--highlight': highlightHoverColumn,
+        'row--highlight': rowOpts.isHover || highlightHoverRow,
+        'column--highlight': columnOpts.isHover || highlightHoverColumn,
         'is--header': showHeader,
         'is--footer': showFooter,
         'is--group': isGroup,
@@ -20373,6 +20384,7 @@ var Menu = {
 
 
 
+var mixin_getRowid = UtilTools.getRowid;
 /* harmony default export */ var edit_src_mixin = ({
   methods: {
     /**
@@ -20396,13 +20408,17 @@ var Menu = {
       var _this = this,
           _editStore$insertList;
 
-      var mergeList = this.mergeList,
+      var treeFullData = this.treeFullData,
+          mergeList = this.mergeList,
           afterFullData = this.afterFullData,
           editStore = this.editStore,
           sYOpts = this.sYOpts,
           scrollYLoad = this.scrollYLoad,
           tableFullData = this.tableFullData,
-          treeConfig = this.treeConfig;
+          treeConfig = this.treeConfig,
+          fullDataRowIdData = this.fullDataRowIdData,
+          fullAllDataRowIdData = this.fullAllDataRowIdData,
+          treeOpts = this.treeOpts;
 
       if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(records)) {
         records = [records];
@@ -20413,16 +20429,60 @@ var Menu = {
       });
 
       if (!row) {
-        afterFullData.unshift.apply(afterFullData, _toConsumableArray(newRecords));
-        tableFullData.unshift.apply(tableFullData, _toConsumableArray(newRecords)); // 刷新单元格合并
+        // 如果为虚拟树
+        if (treeConfig && treeOpts.transform) {
+          newRecords.forEach(function (item) {
+            var parentRowId = item[treeOpts.parentField];
+            var rowid = mixin_getRowid(_this, item);
+
+            if (parentRowId) {
+              var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+                return parentRowId === item[treeOpts.rowField];
+              }, treeOpts);
 
-        mergeList.forEach(function (mergeItem) {
-          var mergeRowIndex = mergeItem.row;
+              if (matchObj) {
+                var parentRow = matchObj.item;
+                var parentRest = fullAllDataRowIdData[mixin_getRowid(_this, parentRow)];
+                var parentLevel = parentRest ? parentRest.level : 0;
+                var parentChilds = parentRow[treeOpts.children];
 
-          if (mergeRowIndex > 0) {
-            mergeItem.row = mergeRowIndex + newRecords.length;
-          }
-        });
+                if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(parentChilds)) {
+                  parentChilds = parentRow[treeOpts.children] = [];
+                }
+
+                parentChilds.push(item);
+                var rest = {
+                  row: item,
+                  rowid: rowid,
+                  index: -1,
+                  _index: -1,
+                  $index: -1,
+                  items: parentChilds,
+                  parent: parent,
+                  level: parentLevel + 1
+                };
+                fullDataRowIdData[rowid] = rest;
+                fullAllDataRowIdData[rowid] = rest;
+              } else {// 父节点不存在
+              }
+            } else {
+              afterFullData.unshift(item);
+              treeFullData.unshift(item);
+            }
+          });
+          this.updateVirtualTreeData();
+        } else {
+          afterFullData.unshift.apply(afterFullData, _toConsumableArray(newRecords));
+          tableFullData.unshift.apply(tableFullData, _toConsumableArray(newRecords)); // 刷新单元格合并
+
+          mergeList.forEach(function (mergeItem) {
+            var mergeRowIndex = mergeItem.row;
+
+            if (mergeRowIndex > 0) {
+              mergeItem.row = mergeRowIndex + newRecords.length;
+            }
+          });
+        }
       } else {
         if (row === -1) {
           afterFullData.push.apply(afterFullData, _toConsumableArray(newRecords));
@@ -20498,6 +20558,7 @@ var Menu = {
 
       var afterFullData = this.afterFullData,
           tableFullData = this.tableFullData,
+          treeFullData = this.treeFullData,
           treeConfig = this.treeConfig,
           mergeList = this.mergeList,
           editStore = this.editStore,
@@ -20505,7 +20566,8 @@ var Menu = {
           selection = this.selection,
           isInsertByRow = this.isInsertByRow,
           sYOpts = this.sYOpts,
-          scrollYLoad = this.scrollYLoad;
+          scrollYLoad = this.scrollYLoad,
+          treeOpts = this.treeOpts;
       var actived = editStore.actived,
           removeList = editStore.removeList,
           insertList = editStore.insertList;
@@ -20542,31 +20604,54 @@ var Menu = {
         this.afterFullData = [];
         this.clearMergeCells();
       } else {
-        rows.forEach(function (row) {
-          var tfIndex = tableFullData.indexOf(row);
+        // 如果为虚拟树
+        if (treeConfig && treeOpts.transform) {
+          rows.forEach(function (row) {
+            var rowid = mixin_getRowid(_this2, row);
+            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+              return rowid === mixin_getRowid(_this2, item);
+            }, treeOpts);
 
-          if (tfIndex > -1) {
-            var rItems = tableFullData.splice(tfIndex, 1);
-            rest.push(rItems[0]);
-          }
+            if (matchObj) {
+              var rItems = matchObj.items.splice(matchObj.index, 1);
+              rest.push(rItems[0]);
+            }
 
-          var afIndex = afterFullData.indexOf(row);
+            var afIndex = afterFullData.indexOf(row);
 
-          if (afIndex > -1) {
-            // 刷新单元格合并
-            mergeList.forEach(function (mergeItem) {
-              var mergeRowIndex = mergeItem.row,
-                  mergeRowspan = mergeItem.rowspan;
+            if (afIndex > -1) {
+              afterFullData.splice(afIndex, 1);
+            }
 
-              if (mergeRowIndex > afIndex) {
-                mergeItem.row = mergeRowIndex - 1;
-              } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                mergeItem.rowspan = mergeRowspan - 1;
-              }
-            });
-            afterFullData.splice(afIndex, 1);
-          }
-        });
+            _this2.updateVirtualTreeData();
+          });
+        } else {
+          rows.forEach(function (row) {
+            var tfIndex = tableFullData.indexOf(row);
+
+            if (tfIndex > -1) {
+              var rItems = tableFullData.splice(tfIndex, 1);
+              rest.push(rItems[0]);
+            }
+
+            var afIndex = afterFullData.indexOf(row);
+
+            if (afIndex > -1) {
+              // 刷新单元格合并
+              mergeList.forEach(function (mergeItem) {
+                var mergeRowIndex = mergeItem.row,
+                    mergeRowspan = mergeItem.rowspan;
+
+                if (mergeRowIndex > afIndex) {
+                  mergeItem.row = mergeRowIndex - 1;
+                } else if (mergeRowIndex + mergeRowspan > afIndex) {
+                  mergeItem.rowspan = mergeRowspan - 1;
+                }
+              });
+              afterFullData.splice(afIndex, 1);
+            }
+          });
+        }
       } // 如果当前行被激活编辑，则清除激活状态
 
 
@@ -20660,15 +20745,35 @@ var Menu = {
      * 获取新增的临时数据
      */
     _getInsertRecords: function _getInsertRecords() {
+      var _this6 = this;
+
+      var treeConfig = this.treeConfig,
+          treeFullData = this.treeFullData,
+          tableFullData = this.tableFullData,
+          treeOpts = this.treeOpts;
       var insertList = this.editStore.insertList;
       var insertRecords = [];
 
       if (insertList.length) {
-        this.tableFullData.forEach(function (row) {
-          if (insertList.indexOf(row) > -1) {
-            insertRecords.push(row);
-          }
-        });
+        // 如果为虚拟树
+        if (treeConfig && treeOpts.transform) {
+          insertList.forEach(function (row) {
+            var rowid = mixin_getRowid(_this6, row);
+            var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(treeFullData, function (item) {
+              return rowid === mixin_getRowid(_this6, item);
+            }, treeOpts);
+
+            if (matchObj) {
+              insertRecords.push(row);
+            }
+          });
+        } else {
+          insertList.forEach(function (row) {
+            if (tableFullData.indexOf(row) > -1) {
+              insertRecords.push(row);
+            }
+          });
+        }
       }
 
       return insertRecords;
@@ -20721,7 +20826,7 @@ var Menu = {
      * 处理激活编辑
      */
     handleActived: function handleActived(params, evnt) {
-      var _this6 = this;
+      var _this7 = this;
 
       var editStore = this.editStore,
           editOpts = this.editOpts,
@@ -20758,14 +20863,14 @@ var Menu = {
 
             if (mode === 'row') {
               tableColumn.forEach(function (column) {
-                return _this6._getColumnModel(row, column);
+                return _this7._getColumnModel(row, column);
               });
             } else {
               this._getColumnModel(row, column);
             }
 
             this.$nextTick(function () {
-              _this6.handleFocus(params, evnt);
+              _this7.handleFocus(params, evnt);
             });
           }
 
@@ -20800,7 +20905,7 @@ var Menu = {
           actived.args = params;
           actived.column = column;
           setTimeout(function () {
-            _this6.handleFocus(params, evnt);
+            _this7.handleFocus(params, evnt);
           });
         }
 
@@ -20829,7 +20934,7 @@ var Menu = {
       }
     },
     _syncActivedCell: function _syncActivedCell() {
-      var _this7 = this;
+      var _this8 = this;
 
       var tableColumn = this.tableColumn,
           editStore = this.editStore,
@@ -20841,7 +20946,7 @@ var Menu = {
       if (row || column) {
         if (editOpts.mode === 'row') {
           tableColumn.forEach(function (column) {
-            return _this7._setColumnModel(row, column);
+            return _this8._setColumnModel(row, column);
           });
         } else {
           this._setColumnModel(row, column);
@@ -20957,26 +21062,26 @@ var Menu = {
      * 激活单元格编辑
      */
     _setActiveCell: function _setActiveCell(row, fieldOrColumn) {
-      var _this8 = this;
+      var _this9 = this;
 
       var editConfig = this.editConfig;
       var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
 
       if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
         return this.scrollToRow(row, true).then(function () {
-          var cell = _this8.getCell(row, column);
+          var cell = _this9.getCell(row, column);
 
           if (cell) {
-            _this8.handleActived({
+            _this9.handleActived({
               row: row,
-              rowIndex: _this8.getRowIndex(row),
+              rowIndex: _this9.getRowIndex(row),
               column: column,
-              columnIndex: _this8.getColumnIndex(column),
+              columnIndex: _this9.getColumnIndex(column),
               cell: cell,
-              $table: _this8
+              $table: _this9
             });
 
-            _this8.lastCallTime = Date.now();
+            _this9.lastCallTime = Date.now();
           }
         });
       }
@@ -21016,7 +21121,7 @@ var Menu = {
      * 处理选中源
      */
     handleSelected: function handleSelected(params, evnt) {
-      var _this9 = this;
+      var _this10 = this;
 
       var mouseConfig = this.mouseConfig,
           mouseOpts = this.mouseOpts,
@@ -21031,31 +21136,31 @@ var Menu = {
       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);
+            _this10.clearActived(evnt);
 
-            _this9.clearSelected(evnt);
+            _this10.clearSelected(evnt);
 
-            _this9.clearCellAreas(evnt);
+            _this10.clearCellAreas(evnt);
 
-            _this9.clearCopyCellArea(evnt);
+            _this10.clearCopyCellArea(evnt);
 
             selected.args = params;
             selected.row = row;
             selected.column = column;
 
             if (isMouseSelected) {
-              _this9.addColSdCls();
+              _this10.addColSdCls();
             }
 
-            _this9.focus();
+            _this10.focus();
 
             if (evnt) {
-              _this9.emitEvent('cell-selected', params, evnt);
+              _this10.emitEvent('cell-selected', params, evnt);
             }
           }
         }
 
-        return _this9.$nextTick();
+        return _this10.$nextTick();
       };
 
       return selectMethod();
@@ -29796,7 +29901,7 @@ var cellType = 'header';
           showEllipsis = hasEllipsis = true;
         }
 
-        if (highlightCurrentColumn || tableListeners['header-cell-click'] || sortOpts.trigger === 'cell') {
+        if (columnOpts.isCurrent || highlightCurrentColumn || tableListeners['header-cell-click'] || sortOpts.trigger === 'cell') {
           thOns.click = function (evnt) {
             return $xetable.triggerHeaderCellClickEvent(evnt, params);
           };