vxe-table 3.4.2 → 3.4.3-beta.0

package/README.en.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-A [vue](https://www.npmjs.com/package/vue) based PC form component, support add, delete, change, virtual scroll, lazy load, shortcut menu, data validation, tree structure, print export, form rendering, data paging, virtual list, modal window, custom template, renderer, flexible configuration items, extension interface, etc...
+A [vue](https://www.npmjs.com/package/vue) based PC form component, support add, delete, change, virtual list, virtual tree, lazy load, shortcut menu, data validation, print export, form rendering, data paging, modal window, custom template, renderer, flexible configuration items, extension interface, etc...
 
 * Design concept
   * Efficient and concise API design for modern browsers
@@ -60,9 +60,9 @@ A [vue](https://www.npmjs.com/package/vue) based PC form component, support add,
 * [x] Form
 * [x] Toolbar
 * [x] Pulldown
-* [x] List
+* [x] Virtual list
+* [x] Virtual tree
 * [x] Editable CRUD
-* [x] Tree table
 * [x] Validate
 * [x] Data Proxy
 * [x] Keyboard navigation

package/README.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-一个基于 [vue](https://www.npmjs.com/package/vue) 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...  
+一个基于 [vue](https://www.npmjs.com/package/vue) 的 PC 端表格组件，支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...  
 
 * 设计理念
   * 面向现代浏览器，高效的简洁 API 设计
@@ -65,8 +65,8 @@
 * [x] 工具栏
 * [x] 下拉容器
 * [x] 虚拟列表
+* [x] 虚拟树
 * [x] 增删改查
-* [x] 树表格
 * [x] 数据校验
 * [x] 数据代理
 * [x] 键盘导航

package/README.zh-TW.md

@@ -12,7 +12,7 @@
 [![pull requests closed](https://img.shields.io/github/issues-pr-closed/x-extends/vxe-table.svg)](https://github.com/x-extends/vxe-table/pulls?q=is%3Apr+is%3Aclosed)
 [![npm license](https://img.shields.io/github/license/mashape/apistatus.svg)](LICENSE)
 
-一個基於 [vue](https://www.npmjs.com/package/vue) 的PC端表格組件，支持增删改查、虛擬滾動、懶加載、快捷選單、數據校驗、樹形結構、列印匯出、表單渲染、數據分頁、虛擬清單、彈窗、自定義範本、渲染器、賊靈活的配寘項、擴展接口等…
+一個基於 [vue](https://www.npmjs.com/package/vue) 的PC端表格組件，支持增删改查、虛擬清單、虛擬樹、懶加載、快捷選單、數據校驗、列印匯出、表單渲染、數據分頁、彈窗、自定義範本、渲染器、賊靈活的配寘項、擴展接口等…
 
 * 設計理念
   * 面向現代瀏覽器，高效的簡潔 API 設計
@@ -65,8 +65,8 @@
 * [x] 工具列
 * [x] 下拉容器
 * [x] 虛擬清單
+* [x] 虛擬樹
 * [x] 增删改查
-* [x] 樹表格
 * [x] 數據校驗
 * [x] 數據代理
 * [x] 鍵盤導航

package/lib/edit/src/mixin.js

@@ -27,6 +27,7 @@ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToAr
 
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
 
+var getRowid = _tools.UtilTools.getRowid;
 var _default = {
   methods: {
     /**
@@ -50,13 +51,17 @@ var _default = {
       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 (!_xeUtils.default.isArray(records)) {
         records = [records];
@@ -67,16 +72,60 @@ var _default = {
       });
 
       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 = getRowid(_this, item);
+
+            if (parentRowId) {
+              var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+                return parentRowId === item[treeOpts.rowField];
+              }, treeOpts);
+
+              if (matchObj) {
+                var parentRow = matchObj.item;
+                var parentRest = fullAllDataRowIdData[getRowid(_this, parentRow)];
+                var parentLevel = parentRest ? parentRest.level : 0;
+                var parentChilds = parentRow[treeOpts.children];
+
+                if (!_xeUtils.default.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;
+          mergeList.forEach(function (mergeItem) {
+            var mergeRowIndex = mergeItem.row;
 
-          if (mergeRowIndex > 0) {
-            mergeItem.row = mergeRowIndex + newRecords.length;
-          }
-        });
+            if (mergeRowIndex > 0) {
+              mergeItem.row = mergeRowIndex + newRecords.length;
+            }
+          });
+        }
       } else {
         if (row === -1) {
           afterFullData.push.apply(afterFullData, _toConsumableArray(newRecords));
@@ -152,6 +201,7 @@ var _default = {
 
       var afterFullData = this.afterFullData,
           tableFullData = this.tableFullData,
+          treeFullData = this.treeFullData,
           treeConfig = this.treeConfig,
           mergeList = this.mergeList,
           editStore = this.editStore,
@@ -159,7 +209,8 @@ var _default = {
           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;
@@ -196,31 +247,55 @@ var _default = {
         this.afterFullData = [];
         this.clearMergeCells();
       } else {
-        rows.forEach(function (row) {
-          var tfIndex = tableFullData.indexOf(row);
+        // 如果为虚拟树
+        if (treeConfig && treeOpts.transform) {
+          rows.forEach(function (row) {
+            var rowid = getRowid(_this2, row);
+
+            var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+              return rowid === getRowid(_this2, item);
+            }, treeOpts);
+
+            if (matchObj) {
+              var rItems = matchObj.items.splice(matchObj.index, 1);
+              rest.push(rItems[0]);
+            }
 
-          if (tfIndex > -1) {
-            var rItems = tableFullData.splice(tfIndex, 1);
-            rest.push(rItems[0]);
-          }
+            var afIndex = afterFullData.indexOf(row);
 
-          var afIndex = afterFullData.indexOf(row);
+            if (afIndex > -1) {
+              afterFullData.splice(afIndex, 1);
+            }
 
-          if (afIndex > -1) {
-            // 刷新单元格合并
-            mergeList.forEach(function (mergeItem) {
-              var mergeRowIndex = mergeItem.row,
-                  mergeRowspan = mergeItem.rowspan;
+            _this2.updateVirtualTreeData();
+          });
+        } else {
+          rows.forEach(function (row) {
+            var tfIndex = tableFullData.indexOf(row);
 
-              if (mergeRowIndex > afIndex) {
-                mergeItem.row = mergeRowIndex - 1;
-              } else if (mergeRowIndex + mergeRowspan > afIndex) {
-                mergeItem.rowspan = mergeRowspan - 1;
-              }
-            });
-            afterFullData.splice(afIndex, 1);
-          }
-        });
+            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);
+            }
+          });
+        }
       } // 如果当前行被激活编辑，则清除激活状态
 
 
@@ -314,15 +389,36 @@ var _default = {
      * 获取新增的临时数据
      */
     _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 = getRowid(_this6, row);
+
+            var matchObj = _xeUtils.default.findTree(treeFullData, function (item) {
+              return rowid === getRowid(_this6, item);
+            }, treeOpts);
+
+            if (matchObj) {
+              insertRecords.push(row);
+            }
+          });
+        } else {
+          insertList.forEach(function (row) {
+            if (tableFullData.indexOf(row) > -1) {
+              insertRecords.push(row);
+            }
+          });
+        }
       }
 
       return insertRecords;
@@ -375,7 +471,7 @@ var _default = {
      * 处理激活编辑
      */
     handleActived: function handleActived(params, evnt) {
-      var _this6 = this;
+      var _this7 = this;
 
       var editStore = this.editStore,
           editOpts = this.editOpts,
@@ -412,14 +508,14 @@ var _default = {
 
             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);
             });
           }
 
@@ -454,7 +550,7 @@ var _default = {
           actived.args = params;
           actived.column = column;
           setTimeout(function () {
-            _this6.handleFocus(params, evnt);
+            _this7.handleFocus(params, evnt);
           });
         }
 
@@ -484,7 +580,7 @@ var _default = {
       }
     },
     _syncActivedCell: function _syncActivedCell() {
-      var _this7 = this;
+      var _this8 = this;
 
       var tableColumn = this.tableColumn,
           editStore = this.editStore,
@@ -496,7 +592,7 @@ var _default = {
       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);
@@ -613,26 +709,26 @@ var _default = {
      * 激活单元格编辑
      */
     _setActiveCell: function _setActiveCell(row, fieldOrColumn) {
-      var _this8 = this;
+      var _this9 = this;
 
       var editConfig = this.editConfig;
       var column = _xeUtils.default.isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
 
       if (row && column && (0, _tools.isEnableConf)(editConfig) && (0, _tools.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();
           }
         });
       }
@@ -672,7 +768,7 @@ var _default = {
      * 处理选中源
      */
     handleSelected: function handleSelected(params, evnt) {
-      var _this9 = this;
+      var _this10 = this;
 
       var mouseConfig = this.mouseConfig,
           mouseOpts = this.mouseOpts,
@@ -687,31 +783,31 @@ var _default = {
       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();

package/lib/edit/src/mixin.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_tools=require("../../tools"),_dom=require("../../tools/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(r="Object"===r&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,o=new Array(t);r<t;r++)o[r]=e[r];return o}var _default={methods:{_insert:function(e){return this.insertAt(e)},_insertAt:function(e,t){var r=this,o=this.mergeList,l=this.afterFullData,i=this.editStore,n=this.sYOpts,s=this.scrollYLoad,a=this.tableFullData,c=this.treeConfig,u=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return r.defineField(Object.assign({},e))});if(t)if(-1===t)l.push.apply(l,_toConsumableArray(u)),a.push.apply(a,_toConsumableArray(u)),o.forEach(function(e){var t=e.row,r=e.rowspan;t+r>l.length&&(e.rowspan=r+u.length)});else{if(c)throw new Error(_tools.UtilTools.getLog("vxe.error.noTree",["insert"]));var d=l.indexOf(t);if(-1===d)throw new Error(_tools.UtilTools.error("vxe.error.unableInsert"));l.splice.apply(l,[d,0].concat(_toConsumableArray(u))),a.splice.apply(a,[a.indexOf(t),0].concat(_toConsumableArray(u))),o.forEach(function(e){var t=e.row,r=e.rowspan;d<t?e.row=t+u.length:d<t+r&&(e.rowspan=r+u.length)})}else l.unshift.apply(l,_toConsumableArray(u)),a.unshift.apply(a,_toConsumableArray(u)),o.forEach(function(e){var t=e.row;0<t&&(e.row=t+u.length)});return(i=i.insertList).unshift.apply(i,_toConsumableArray(u)),this.scrollYLoad=!c&&-1<n.gt&&n.gt<a.length,this.handleTableData(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),s&&this.updateScrollYSpace(),this.$nextTick().then(function(){return r.updateCellAreas(),r.recalculate()}).then(function(){return{row:u.length?u[u.length-1]:null,rows:u}})},_remove:function(e){var t=this,r=this.afterFullData,l=this.tableFullData,o=this.treeConfig,i=this.mergeList,n=this.editStore,s=this.checkboxOpts,a=this.selection,c=this.isInsertByRow,u=this.sYOpts,d=this.scrollYLoad,h=n.actived,f=n.removeList,m=n.insertList,s=s.checkField,v=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=l,e.forEach(function(e){c(e)||f.push(e)}),s||e.forEach(function(e){e=a.indexOf(e);-1<e&&a.splice(e,1)}),l===e?(e=v=l.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):e.forEach(function(e){var t=l.indexOf(e);-1<t&&(t=l.splice(t,1),v.push(t[0]));var o=r.indexOf(e);-1<o&&(i.forEach(function(e){var t=e.row,r=e.rowspan;o<t?e.row=t-1:o<t+r&&(e.rowspan=r-1)}),r.splice(o,1))}),h.row&&-1<e.indexOf(h.row)&&this.clearActived(),e.forEach(function(e){e=m.indexOf(e);-1<e&&m.splice(e,1)}),this.scrollYLoad=!o&&-1<u.gt&&u.gt<l.length,this.handleTableData(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),d&&this.updateScrollYSpace(),this.$nextTick().then(function(){return t.updateCellAreas(),t.recalculate()}).then(function(){return{row:v.length?v[v.length-1]:null,rows:v}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords()}},_getInsertRecords:function(){var t=this.editStore.insertList,r=[];return t.length&&this.tableFullData.forEach(function(e){-1<t.indexOf(e)&&r.push(e)}),r},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,o=this.treeConfig,l=this.treeOpts,i=this.editStore;if(e){e=i.actived,i=e.row,e=e.column;return(i||e)&&this._syncActivedCell(),o?_xeUtils.default.filterTree(t,function(e){return r(e)},l):t.filter(function(e){return r(e)})}return[]},handleActived:function(e,t){var r,o=this,l=this.editStore,i=this.editOpts,n=this.tableColumn,s=this.editConfig,a=this.mouseConfig,c=i.mode,u=i.activeMethod,d=l.actived,h=e.row,f=e.column,i=f.editRender,l=e.cell=e.cell||this.getCell(h,f);return(0,_tools.isEnableConf)(s)&&(0,_tools.isEnableConf)(i)&&l&&(d.row!==h||"cell"===c&&d.column!==f?(r="edit-disabled",u&&!u(e)||(a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),this.clearActived(t),r="edit-actived",f.renderHeight=l.offsetHeight,d.args=e,d.row=h,d.column=f,"row"===c?n.forEach(function(e){return o._getColumnModel(h,e)}):this._getColumnModel(h,f),this.$nextTick(function(){o.handleFocus(e,t)})),this.emitEvent(r,{row:h,rowIndex:this.getRowIndex(h),$rowIndex:this.getVMRowIndex(h),column:f,columnIndex:this.getColumnIndex(f),$columnIndex:this.getVMColumnIndex(f)},t)):(r=d.column,a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==f&&((a=r.model).update&&_tools.UtilTools.setCellValue(h,r,a.value),this.clearValidate()),f.renderHeight=l.offsetHeight,d.args=e,d.column=f,setTimeout(function(){o.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_tools.UtilTools.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_tools.UtilTools.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,o=this.editOpts,r=r.actived,l=r.row,r=r.column;(l||r)&&("row"===o.mode?e.forEach(function(e){return t._setColumnModel(l,e)}):this._setColumnModel(l,r))},_clearActived:function(e){var t=this.editStore.actived,r=t.row,o=t.column;return(r||o)&&(this._syncActivedCell(),t.args=null,t.row=null,t.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:r,rowIndex:this.getRowIndex(r),$rowIndex:this.getVMRowIndex(r),column:o,columnIndex:this.getColumnIndex(o),$columnIndex:this.getVMColumnIndex(o)},e)),(_vXETable.default._valid?this.clearValidate():this.$nextTick()).then(this.recalculate)},_getActiveRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,o=t.actived,t=o.args,o=o.row;return t&&-1<r.indexOf(o)&&e.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},t):null},_isActiveByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,o=e.row,l=e.column,i=e.cell,n=l.editRender;(0,_tools.isEnableConf)(n)&&(t=_vXETable.default.renderer.get(n.name),e=n.autofocus,n=n.autoselect,(r=!(r=e?i.querySelector(e):r)&&t&&t.autofocus?i.querySelector(t.autofocus):r)?(r.focus(),n?r.select():_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select())):this.scrollToRow(o,l))},_setActiveRow:function(e){return this.setActiveCell(e,_xeUtils.default.find(this.visibleColumn,function(e){return(0,_tools.isEnableConf)(e.editRender)}))},_setActiveCell:function(t,e){var r=this,o=this.editConfig,l=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&l&&(0,_tools.isEnableConf)(o)&&(0,_tools.isEnableConf)(l.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,l);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:l,columnIndex:r.getColumnIndex(l),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,o=this.editOpts,l=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==o.trigger&&(-1<(o=r.indexOf(e))&&(r=this.getCell(e,t),r={row:e,rowIndex:o,column:t,columnIndex:l.indexOf(t),cell:r},this.handleSelected(r,{}))),this.$nextTick()},handleSelected:function(e,t){var r=this,o=this.mouseConfig,l=this.mouseOpts,i=this.editOpts,n=this.editStore,s=n.actived,a=n.selected,c=e.row,u=e.column,d=o&&l.selected;return!d||a.row===c&&a.column===u||(s.row!==c||"cell"===i.mode&&s.column!==u)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),a.args=e,a.row=c,a.column=u,d&&r.addColSdCls(),r.focus(),t&&r.emitEvent("cell-selected",e,t)),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _tools.DomTools.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_tools.DomTools.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&((e=this.getCell(t,e))&&_tools.DomTools.addClass(e,"col--selected"))}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_vXETable=_interopRequireDefault(require("../../v-x-e-table")),_tools=require("../../tools"),_dom=require("../../tools/src/dom");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){if(e){if("string"==typeof e)return _arrayLikeToArray(e,t);var r=Object.prototype.toString.call(e).slice(8,-1);return"Map"===(r="Object"===r&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,o=new Array(t);r<t;r++)o[r]=e[r];return o}var getRowid=_tools.UtilTools.getRowid,_default={methods:{_insert:function(e){return this.insertAt(e)},_insertAt:function(e,t){var n=this,s=this.treeFullData,r=this.mergeList,a=this.afterFullData,o=this.editStore,l=this.sYOpts,i=this.scrollYLoad,u=this.tableFullData,c=this.treeConfig,d=this.fullDataRowIdData,h=this.fullAllDataRowIdData,f=this.treeOpts,m=(e=!_xeUtils.default.isArray(e)?[e]:e).map(function(e){return n.defineField(Object.assign({},e))});if(t)if(-1===t)a.push.apply(a,_toConsumableArray(m)),u.push.apply(u,_toConsumableArray(m)),r.forEach(function(e){var t=e.row,r=e.rowspan;t+r>a.length&&(e.rowspan=r+m.length)});else{if(c)throw new Error(_tools.UtilTools.getLog("vxe.error.noTree",["insert"]));var p=a.indexOf(t);if(-1===p)throw new Error(_tools.UtilTools.error("vxe.error.unableInsert"));a.splice.apply(a,[p,0].concat(_toConsumableArray(m))),u.splice.apply(u,[u.indexOf(t),0].concat(_toConsumableArray(m))),r.forEach(function(e){var t=e.row,r=e.rowspan;p<t?e.row=t+m.length:p<t+r&&(e.rowspan=r+m.length)})}else c&&f.transform?(m.forEach(function(e){var t,r,o,l=e[f.parentField],i=getRowid(n,e);l?(o=_xeUtils.default.findTree(s,function(e){return l===e[f.rowField]},f))&&(t=o.item,o=(r=h[getRowid(n,t)])?r.level:0,r=t[f.children],(r=!_xeUtils.default.isArray(r)?t[f.children]=[]:r).push(e),o={row:e,rowid:i,index:-1,_index:-1,$index:-1,items:r,parent:parent,level:o+1},d[i]=o,h[i]=o):(a.unshift(e),s.unshift(e))}),this.updateVirtualTreeData()):(a.unshift.apply(a,_toConsumableArray(m)),u.unshift.apply(u,_toConsumableArray(m)),r.forEach(function(e){var t=e.row;0<t&&(e.row=t+m.length)}));return(o=o.insertList).unshift.apply(o,_toConsumableArray(m)),this.scrollYLoad=!c&&-1<l.gt&&l.gt<u.length,this.handleTableData(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),i&&this.updateScrollYSpace(),this.$nextTick().then(function(){return n.updateCellAreas(),n.recalculate()}).then(function(){return{row:m.length?m[m.length-1]:null,rows:m}})},_remove:function(e){var o=this,l=this.afterFullData,r=this.tableFullData,i=this.treeFullData,t=this.treeConfig,n=this.mergeList,s=this.editStore,a=this.checkboxOpts,u=this.selection,c=this.isInsertByRow,d=this.sYOpts,h=this.scrollYLoad,f=this.treeOpts,m=s.actived,p=s.removeList,v=s.insertList,a=a.checkField,g=[];return e?_xeUtils.default.isArray(e)||(e=[e]):e=r,e.forEach(function(e){c(e)||p.push(e)}),a||e.forEach(function(e){e=u.indexOf(e);-1<e&&u.splice(e,1)}),r===e?(e=g=r.slice(0),this.tableFullData=[],this.afterFullData=[],this.clearMergeCells()):t&&f.transform?e.forEach(function(e){var t=getRowid(o,e),r=_xeUtils.default.findTree(i,function(e){return t===getRowid(o,e)},f);r&&(r=r.items.splice(r.index,1),g.push(r[0]));e=l.indexOf(e);-1<e&&l.splice(e,1),o.updateVirtualTreeData()}):e.forEach(function(e){var t=r.indexOf(e);-1<t&&(t=r.splice(t,1),g.push(t[0]));var o=l.indexOf(e);-1<o&&(n.forEach(function(e){var t=e.row,r=e.rowspan;o<t?e.row=t-1:o<t+r&&(e.rowspan=r-1)}),l.splice(o,1))}),m.row&&-1<e.indexOf(m.row)&&this.clearActived(),e.forEach(function(e){e=v.indexOf(e);-1<e&&v.splice(e,1)}),this.scrollYLoad=!t&&-1<d.gt&&d.gt<r.length,this.handleTableData(),this.updateFooter(),this.cacheRowMap(),this.checkSelectionStatus(),h&&this.updateScrollYSpace(),this.$nextTick().then(function(){return o.updateCellAreas(),o.recalculate()}).then(function(){return{row:g.length?g[g.length-1]:null,rows:g}})},_removeCheckboxRow:function(){var t=this;return this.remove(this.getCheckboxRecords()).then(function(e){return t.clearCheckboxRow(),e})},_removeRadioRow:function(){var t=this,e=this.getRadioRecord();return this.remove(e||[]).then(function(e){return t.clearRadioRow(),e})},_removeCurrentRow:function(){var t=this,e=this.getCurrentRecord();return this.remove(e||[]).then(function(e){return t.clearCurrentRow(),e})},_getRecordset:function(){return{insertRecords:this.getInsertRecords(),removeRecords:this.getRemoveRecords(),updateRecords:this.getUpdateRecords()}},_getInsertRecords:function(){var r=this,e=this.treeConfig,o=this.treeFullData,t=this.tableFullData,l=this.treeOpts,i=this.editStore.insertList,n=[];return i.length&&(e&&l.transform?i.forEach(function(e){var t=getRowid(r,e);_xeUtils.default.findTree(o,function(e){return t===getRowid(r,e)},l)&&n.push(e)}):i.forEach(function(e){-1<t.indexOf(e)&&n.push(e)})),n},_getRemoveRecords:function(){return this.editStore.removeList},_getUpdateRecords:function(){var e=this.keepSource,t=this.tableFullData,r=this.isUpdateByRow,o=this.treeConfig,l=this.treeOpts,i=this.editStore;if(e){e=i.actived,i=e.row,e=e.column;return(i||e)&&this._syncActivedCell(),o?_xeUtils.default.filterTree(t,function(e){return r(e)},l):t.filter(function(e){return r(e)})}return[]},handleActived:function(e,t){var r,o=this,l=this.editStore,i=this.editOpts,n=this.tableColumn,s=this.editConfig,a=this.mouseConfig,u=i.mode,c=i.activeMethod,d=l.actived,h=e.row,f=e.column,i=f.editRender,l=e.cell=e.cell||this.getCell(h,f);return(0,_tools.isEnableConf)(s)&&(0,_tools.isEnableConf)(i)&&l&&(d.row!==h||"cell"===u&&d.column!==f?(r="edit-disabled",c&&!c(e)||(a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),this.closeTooltip(),this.clearActived(t),r="edit-actived",f.renderHeight=l.offsetHeight,d.args=e,d.row=h,d.column=f,"row"===u?n.forEach(function(e){return o._getColumnModel(h,e)}):this._getColumnModel(h,f),this.$nextTick(function(){o.handleFocus(e,t)})),this.emitEvent(r,{row:h,rowIndex:this.getRowIndex(h),$rowIndex:this.getVMRowIndex(h),column:f,columnIndex:this.getColumnIndex(f),$columnIndex:this.getVMColumnIndex(f)},t)):(r=d.column,a&&(this.clearSelected(t),this.clearCellAreas(t),this.clearCopyCellArea(t)),r!==f&&((a=r.model).update&&_tools.UtilTools.setCellValue(h,r,a.value),this.clearValidate()),f.renderHeight=l.offsetHeight,d.args=e,d.column=f,setTimeout(function(){o.handleFocus(e,t)})),this.focus()),this.$nextTick()},_getColumnModel:function(e,t){var r=t.model;t.editRender&&(r.value=_tools.UtilTools.getCellValue(e,t),r.update=!1)},_setColumnModel:function(e,t){var r=t.model;t.editRender&&r.update&&(_tools.UtilTools.setCellValue(e,t,r.value),r.update=!1,r.value=null)},_syncActivedCell:function(){var t=this,e=this.tableColumn,r=this.editStore,o=this.editOpts,r=r.actived,l=r.row,r=r.column;(l||r)&&("row"===o.mode?e.forEach(function(e){return t._setColumnModel(l,e)}):this._setColumnModel(l,r))},_clearActived:function(e){var t=this.editStore.actived,r=t.row,o=t.column;return(r||o)&&(this._syncActivedCell(),t.args=null,t.row=null,t.column=null,this.updateFooter(),this.emitEvent("edit-closed",{row:r,rowIndex:this.getRowIndex(r),$rowIndex:this.getVMRowIndex(r),column:o,columnIndex:this.getColumnIndex(o),$columnIndex:this.getVMColumnIndex(o)},e)),(_vXETable.default._valid?this.clearValidate():this.$nextTick()).then(this.recalculate)},_getActiveRecord:function(){var e=this.$el,t=this.editStore,r=this.afterFullData,o=t.actived,t=o.args,o=o.row;return t&&-1<r.indexOf(o)&&e.querySelectorAll(".vxe-body--column.col--actived").length?Object.assign({},t):null},_isActiveByRow:function(e){return this.editStore.actived.row===e},handleFocus:function(e){var t,r,o=e.row,l=e.column,i=e.cell,n=l.editRender;(0,_tools.isEnableConf)(n)&&(t=_vXETable.default.renderer.get(n.name),e=n.autofocus,n=n.autoselect,(r=!(r=e?i.querySelector(e):r)&&t&&t.autofocus?i.querySelector(t.autofocus):r)?(r.focus(),n?r.select():_dom.browse.msie&&((r=r.createTextRange()).collapse(!1),r.select())):this.scrollToRow(o,l))},_setActiveRow:function(e){return this.setActiveCell(e,_xeUtils.default.find(this.visibleColumn,function(e){return(0,_tools.isEnableConf)(e.editRender)}))},_setActiveCell:function(t,e){var r=this,o=this.editConfig,l=_xeUtils.default.isString(e)?this.getColumnByField(e):e;return t&&l&&(0,_tools.isEnableConf)(o)&&(0,_tools.isEnableConf)(l.editRender)?this.scrollToRow(t,!0).then(function(){var e=r.getCell(t,l);e&&(r.handleActived({row:t,rowIndex:r.getRowIndex(t),column:l,columnIndex:r.getColumnIndex(l),cell:e,$table:r}),r.lastCallTime=Date.now())}):this.$nextTick()},_setSelectCell:function(e,t){var r=this.tableData,o=this.editOpts,l=this.visibleColumn,t=_xeUtils.default.isString(t)?this.getColumnByField(t):t;return e&&t&&"manual"!==o.trigger&&(-1<(o=r.indexOf(e))&&(r=this.getCell(e,t),r={row:e,rowIndex:o,column:t,columnIndex:l.indexOf(t),cell:r},this.handleSelected(r,{}))),this.$nextTick()},handleSelected:function(e,t){var r=this,o=this.mouseConfig,l=this.mouseOpts,i=this.editOpts,n=this.editStore,s=n.actived,a=n.selected,u=e.row,c=e.column,d=o&&l.selected;return!d||a.row===u&&a.column===c||(s.row!==u||"cell"===i.mode&&s.column!==c)&&(r.clearActived(t),r.clearSelected(t),r.clearCellAreas(t),r.clearCopyCellArea(t),a.args=e,a.row=u,a.column=c,d&&r.addColSdCls(),r.focus(),t&&r.emitEvent("cell-selected",e,t)),r.$nextTick()},_getSelectedCell:function(){var e=this.editStore.selected,t=e.args,e=e.column;return t&&e?Object.assign({},t):null},_clearSelected:function(){var e=this.editStore.selected;return e.row=null,e.column=null,this.reColTitleSdCls(),this.reColSdCls(),this.$nextTick()},reColTitleSdCls:function(){var e=this.elemStore["main-header-list"];e&&_xeUtils.default.arrayEach(e.querySelectorAll(".col--title-selected"),function(e){return _tools.DomTools.removeClass(e,"col--title-selected")})},reColSdCls:function(){var e=this.$el.querySelector(".col--selected");e&&_tools.DomTools.removeClass(e,"col--selected")},addColSdCls:function(){var e=this.editStore.selected,t=e.row,e=e.column;this.reColSdCls(),t&&e&&((e=this.getCell(t,e))&&_tools.DomTools.addClass(e,"col--selected"))}}};exports.default=_default;

package/lib/header/src/header.js

@@ -193,7 +193,7 @@ var _default = {
           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);
           };

package/lib/header/src/header.min.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools"),_util=require("./util"),_util2=require("../../table/src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,l){return t in e?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l,e}var cellType="header",_default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data:function(){return{headerColumn:[]}},watch:{tableColumn:function(){this.uploadColumn()}},created:function(){this.uploadColumn()},mounted:function(){var e=this.$parent,t=this.$el,l=this.$refs,o=this.fixedType,e=e.elemStore,o="".concat(o||"main","-header-");e["".concat(o,"wrapper")]=t,e["".concat(o,"table")]=l.table,e["".concat(o,"colgroup")]=l.colgroup,e["".concat(o,"list")]=l.thead,e["".concat(o,"xSpace")]=l.xSpace,e["".concat(o,"repair")]=l.repair},render:function(y){var b=this,e=this._e,_=this.$parent,v=this.fixedType,t=this.headerColumn,l=this.fixedColumn,C=_.$listeners,o=_.tId,r=_.isGroup,w=_.resizable,T=_.border,$=_.columnKey,i=_.headerRowClassName,z=_.headerCellClassName,n=_.headerRowStyle,P=_.headerCellStyle,S=_.showHeaderOverflow,M=_.headerAlign,D=_.align,W=_.highlightCurrentColumn,k=_.currentColumn,U=_.scrollXLoad,I=_.overflowX,a=_.scrollbarWidth,R=_.sortOpts,H=_.mouseConfig,A=_.columnOpts,s=this.tableColumn,t=t;return r||(t=[s=v&&(U||S)?l:s]),y("div",{class:["vxe-table--header-wrapper",v?"fixed-".concat(v,"--wrapper"):"body--wrapper"],attrs:{xid:o}},[v?e():y("div",{class:"vxe-body--x-space",ref:"xSpace"}),y("table",{class:"vxe-table--header",attrs:{xid:o,cellspacing:0,cellpadding:0,border:0},ref:"table"},[y("colgroup",{ref:"colgroup"},s.map(function(e,t){return y("col",{attrs:{name:e.id},key:t})}).concat(a?[y("col",{attrs:{name:"col_gutter"}})]:[])),y("thead",{ref:"thead"},t.map(function(x,g){return y("tr",{class:["vxe-header--row",i?_xeUtils.default.isFunction(i)?i({$table:_,$rowIndex:g,fixed:v,type:cellType}):i:""],style:n?_xeUtils.default.isFunction(n)?n({$table:_,$rowIndex:g,fixed:v,type:cellType}):n:null},x.map(function(e,t){var l=e.type,o=e.showHeaderOverflow,r=e.headerAlign,i=e.align,n=e.headerClassName,a=e.children&&e.children.length,s=v?e.fixed!==v&&!a:e.fixed&&I,d=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?S:o,c=r||i||M||D,u="ellipsis"===d,f="title"===d,p=!0===d||"tooltip"===d,h=f||p||u,o={},r=e.filters&&e.filters.some(function(e){return e.checked}),i=_.getColumnIndex(e),d=_.getVTColumnIndex(e),m={$table:_,$rowIndex:g,column:e,columnIndex:i,$columnIndex:t,_columnIndex:d,fixed:v,type:cellType,isHidden:s,hasFilter:r};return U&&!h&&(u=h=!0),(W||C["header-cell-click"]||"cell"===R.trigger)&&(o.click=function(e){return _.triggerHeaderCellClickEvent(e,m)}),C["header-cell-dblclick"]&&(o.dblclick=function(e){return _.triggerHeaderCellDblclickEvent(e,m)}),H&&(o.mousedown=function(e){return _.triggerHeaderCellMousedownEvent(e,m)}),y("th",{class:["vxe-header--column",e.id,(_defineProperty(d={},"col--".concat(c),c),_defineProperty(d,"col--".concat(l),l),_defineProperty(d,"col--last",t===x.length-1),_defineProperty(d,"col--fixed",e.fixed),_defineProperty(d,"col--group",a),_defineProperty(d,"col--ellipsis",h),_defineProperty(d,"fixed--hidden",s),_defineProperty(d,"is--sortable",e.sortable),_defineProperty(d,"col--filter",!!e.filters),_defineProperty(d,"is--filter-active",r),_defineProperty(d,"col--current",k===e),d),_tools.UtilTools.getClass(n,m),_tools.UtilTools.getClass(z,m)],attrs:{colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},style:P?_xeUtils.default.isFunction(P)?P(m):P:null,on:o,key:$||a?e.id:t},[y("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":u}]},e.renderHeader(y,m)),s||a||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:A.resizable||w)?null:y("div",{class:["vxe-resizable",{"is--line":!T||"none"===T}],on:{mousedown:function(e){return b.resizeMousedown(e,m)}}})])}).concat(a?[y("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),y("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn:function(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertToRows)(this.tableGroupColumn):[]},resizeMousedown:function(e,t){var l=t.column,o=this.$parent,r=this.$el,i=this.fixedType,n=o.$refs,a=n.tableBody,s=n.leftContainer,d=n.rightContainer,c=n.resizeBar,n=e.target,u=e.clientX,f=t.cell=n.parentNode,p=0,h=a.$el,a=_tools.DomTools.getOffsetPos(n,r),r=n.clientWidth,n=Math.floor(r/2),m=(0,_util2.getColMinWidth)(t)-n,x=a.left-f.clientWidth+r+m,g=a.left+n,y=document.onmousemove,b=document.onmouseup,_="left"===i,v="right"===i,C=0;if(_||v){for(var w=_?"nextElementSibling":"previousElementSibling",T=f[w];T&&!_tools.DomTools.hasClass(T,"fixed--hidden");)_tools.DomTools.hasClass(T,"col--group")||(C+=T.offsetWidth),T=T[w];v&&d&&(g=d.offsetLeft+C)}n=function(e){e.stopPropagation(),e.preventDefault();var t=e.clientX-u,e=g+t,t=i?0:h.scrollLeft;_?e=Math.min(e,(d?d.offsetLeft:h.clientWidth)-C-m):v?(x=(s?s.clientWidth:0)+C+m,e=Math.min(e,g+f.clientWidth-m)):x=Math.max(h.scrollLeft,x),p=Math.max(e,x),c.style.left="".concat(p-t,"px")};o._isResize=!0,_tools.DomTools.addClass(o.$el,"drag--resize"),c.style.display="block",document.onmousemove=n,document.onmouseup=function(e){document.onmousemove=y,document.onmouseup=b,l.resizeWidth=l.renderWidth+(v?g-p:p-g),c.style.display="none",o._isResize=!1,o._lastResizeTime=Date.now(),o.analyColumnWidth(),o.recalculate(!0).then(function(){o.saveCustomResizable(),o.updateCellAreas(),o.emitEvent("resizable-change",t,e)}),_tools.DomTools.removeClass(o.$el,"drag--resize")},n(e),o.closeMenu()}}};exports.default=_default;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=void 0;var _xeUtils=_interopRequireDefault(require("xe-utils")),_tools=require("../../tools"),_util=require("./util"),_util2=require("../../table/src/util");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _defineProperty(e,t,l){return t in e?Object.defineProperty(e,t,{value:l,enumerable:!0,configurable:!0,writable:!0}):e[t]=l,e}var cellType="header",_default={name:"VxeTableHeader",props:{tableData:Array,tableColumn:Array,tableGroupColumn:Array,fixedColumn:Array,size:String,fixedType:String},data:function(){return{headerColumn:[]}},watch:{tableColumn:function(){this.uploadColumn()}},created:function(){this.uploadColumn()},mounted:function(){var e=this.$parent,t=this.$el,l=this.$refs,o=this.fixedType,e=e.elemStore,o="".concat(o||"main","-header-");e["".concat(o,"wrapper")]=t,e["".concat(o,"table")]=l.table,e["".concat(o,"colgroup")]=l.colgroup,e["".concat(o,"list")]=l.thead,e["".concat(o,"xSpace")]=l.xSpace,e["".concat(o,"repair")]=l.repair},render:function(y){var b=this,e=this._e,_=this.$parent,v=this.fixedType,t=this.headerColumn,l=this.fixedColumn,C=_.$listeners,o=_.tId,r=_.isGroup,w=_.resizable,T=_.border,$=_.columnKey,i=_.headerRowClassName,z=_.headerCellClassName,n=_.headerRowStyle,P=_.headerCellStyle,S=_.showHeaderOverflow,M=_.headerAlign,D=_.align,W=_.highlightCurrentColumn,k=_.currentColumn,U=_.scrollXLoad,I=_.overflowX,a=_.scrollbarWidth,R=_.sortOpts,H=_.mouseConfig,A=_.columnOpts,s=this.tableColumn,t=t;return r||(t=[s=v&&(U||S)?l:s]),y("div",{class:["vxe-table--header-wrapper",v?"fixed-".concat(v,"--wrapper"):"body--wrapper"],attrs:{xid:o}},[v?e():y("div",{class:"vxe-body--x-space",ref:"xSpace"}),y("table",{class:"vxe-table--header",attrs:{xid:o,cellspacing:0,cellpadding:0,border:0},ref:"table"},[y("colgroup",{ref:"colgroup"},s.map(function(e,t){return y("col",{attrs:{name:e.id},key:t})}).concat(a?[y("col",{attrs:{name:"col_gutter"}})]:[])),y("thead",{ref:"thead"},t.map(function(x,g){return y("tr",{class:["vxe-header--row",i?_xeUtils.default.isFunction(i)?i({$table:_,$rowIndex:g,fixed:v,type:cellType}):i:""],style:n?_xeUtils.default.isFunction(n)?n({$table:_,$rowIndex:g,fixed:v,type:cellType}):n:null},x.map(function(e,t){var l=e.type,o=e.showHeaderOverflow,r=e.headerAlign,i=e.align,n=e.headerClassName,a=e.children&&e.children.length,s=v?e.fixed!==v&&!a:e.fixed&&I,d=_xeUtils.default.isUndefined(o)||_xeUtils.default.isNull(o)?S:o,c=r||i||M||D,u="ellipsis"===d,f="title"===d,p=!0===d||"tooltip"===d,h=f||p||u,o={},r=e.filters&&e.filters.some(function(e){return e.checked}),i=_.getColumnIndex(e),d=_.getVTColumnIndex(e),m={$table:_,$rowIndex:g,column:e,columnIndex:i,$columnIndex:t,_columnIndex:d,fixed:v,type:cellType,isHidden:s,hasFilter:r};return U&&!h&&(u=h=!0),(A.isCurrent||W||C["header-cell-click"]||"cell"===R.trigger)&&(o.click=function(e){return _.triggerHeaderCellClickEvent(e,m)}),C["header-cell-dblclick"]&&(o.dblclick=function(e){return _.triggerHeaderCellDblclickEvent(e,m)}),H&&(o.mousedown=function(e){return _.triggerHeaderCellMousedownEvent(e,m)}),y("th",{class:["vxe-header--column",e.id,(_defineProperty(d={},"col--".concat(c),c),_defineProperty(d,"col--".concat(l),l),_defineProperty(d,"col--last",t===x.length-1),_defineProperty(d,"col--fixed",e.fixed),_defineProperty(d,"col--group",a),_defineProperty(d,"col--ellipsis",h),_defineProperty(d,"fixed--hidden",s),_defineProperty(d,"is--sortable",e.sortable),_defineProperty(d,"col--filter",!!e.filters),_defineProperty(d,"is--filter-active",r),_defineProperty(d,"col--current",k===e),d),_tools.UtilTools.getClass(n,m),_tools.UtilTools.getClass(z,m)],attrs:{colid:e.id,colspan:1<e.colSpan?e.colSpan:null,rowspan:1<e.rowSpan?e.rowSpan:null},style:P?_xeUtils.default.isFunction(P)?P(m):P:null,on:o,key:$||a?e.id:t},[y("div",{class:["vxe-cell",{"c--title":f,"c--tooltip":p,"c--ellipsis":u}]},e.renderHeader(y,m)),s||a||!(_xeUtils.default.isBoolean(e.resizable)?e.resizable:A.resizable||w)?null:y("div",{class:["vxe-resizable",{"is--line":!T||"none"===T}],on:{mousedown:function(e){return b.resizeMousedown(e,m)}}})])}).concat(a?[y("th",{class:"vxe-header--gutter col--gutter"})]:[]))}))]),y("div",{class:"vxe-table--header-border-line",ref:"repair"})])},methods:{uploadColumn:function(){var e=this.$parent;this.headerColumn=e.isGroup?(0,_util.convertToRows)(this.tableGroupColumn):[]},resizeMousedown:function(e,t){var l=t.column,o=this.$parent,r=this.$el,i=this.fixedType,n=o.$refs,a=n.tableBody,s=n.leftContainer,d=n.rightContainer,c=n.resizeBar,n=e.target,u=e.clientX,f=t.cell=n.parentNode,p=0,h=a.$el,a=_tools.DomTools.getOffsetPos(n,r),r=n.clientWidth,n=Math.floor(r/2),m=(0,_util2.getColMinWidth)(t)-n,x=a.left-f.clientWidth+r+m,g=a.left+n,y=document.onmousemove,b=document.onmouseup,_="left"===i,v="right"===i,C=0;if(_||v){for(var w=_?"nextElementSibling":"previousElementSibling",T=f[w];T&&!_tools.DomTools.hasClass(T,"fixed--hidden");)_tools.DomTools.hasClass(T,"col--group")||(C+=T.offsetWidth),T=T[w];v&&d&&(g=d.offsetLeft+C)}n=function(e){e.stopPropagation(),e.preventDefault();var t=e.clientX-u,e=g+t,t=i?0:h.scrollLeft;_?e=Math.min(e,(d?d.offsetLeft:h.clientWidth)-C-m):v?(x=(s?s.clientWidth:0)+C+m,e=Math.min(e,g+f.clientWidth-m)):x=Math.max(h.scrollLeft,x),p=Math.max(e,x),c.style.left="".concat(p-t,"px")};o._isResize=!0,_tools.DomTools.addClass(o.$el,"drag--resize"),c.style.display="block",document.onmousemove=n,document.onmouseup=function(e){document.onmousemove=y,document.onmouseup=b,l.resizeWidth=l.renderWidth+(v?g-p:p-g),c.style.display="none",o._isResize=!1,o._lastResizeTime=Date.now(),o.analyColumnWidth(),o.recalculate(!0).then(function(){o.saveCustomResizable(),o.updateCellAreas(),o.emitEvent("resizable-change",t,e)}),_tools.DomTools.removeClass(o.$el,"drag--resize")},n(e),o.closeMenu()}}};exports.default=_default;