vxe-table 4.1.2 → 4.1.5

package/lib/table/src/table.js

@@ -2231,12 +2231,12 @@ var _default = (0, _vue.defineComponent)({
         if (transform) {
           // 树结构自动转换
           if (process.env.NODE_ENV === 'development') {
-            if (!treeOpts.rowtKey) {
-              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.rowtKey']);
+            if (!treeOpts.rowField) {
+              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.rowField']);
             }
 
-            if (!treeOpts.parentKey) {
-              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.parentKey']);
+            if (!treeOpts.parentField) {
+              (0, _utils.errLog)('vxe.error.reqProp', ['tree-config.parentField']);
             }
 
             if (!treeOpts.children) {
@@ -2251,8 +2251,8 @@ var _default = (0, _vue.defineComponent)({
           }
 
           treeData = _xeUtils.default.toArrayTree(fullData, {
-            key: treeOpts.rowtKey,
-            parentKey: treeOpts.parentKey,
+            key: treeOpts.rowField,
+            parentKey: treeOpts.parentField,
             children: treeOpts.children
           });
           fullData = treeData.slice(0);
@@ -2610,9 +2610,11 @@ var _default = (0, _vue.defineComponent)({
       var treeFullData = internalData.treeFullData;
       var treeOpts = computeTreeOpts.value;
       var fullData = [];
+      var expandMaps = new Map();
 
       _xeUtils.default.eachTree(treeFullData, function (row, index, items, path, parent) {
-        if (!parent || $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
+        if (!parent || expandMaps.has(parent) && $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
+          expandMaps.set(row, 1);
           fullData.push(row);
         }
       }, treeOpts);
@@ -2864,18 +2866,15 @@ var _default = (0, _vue.defineComponent)({
 
           if (oRow && row) {
             if (field) {
-              _xeUtils.default.set(oRow, field, _xeUtils.default.get(record || row, field));
-            } else {
-              if (record) {
-                tableSourceData[rowIndex] = record;
+              var newValue = _xeUtils.default.get(record || row, field);
 
-                _xeUtils.default.clear(row, undefined);
+              _xeUtils.default.set(row, field, newValue);
 
-                Object.assign(row, tablePrivateMethods.defineField(Object.assign({}, record)));
-                tablePrivateMethods.cacheRowMap(true);
-              } else {
-                _xeUtils.default.destructuring(oRow, _xeUtils.default.clone(row, true));
-              }
+              _xeUtils.default.set(oRow, field, newValue);
+            } else {
+              var newRecord = _xeUtils.default.clone(__assign({}, record), true);
+
+              _xeUtils.default.destructuring(oRow, Object.assign(row, newRecord));
             }
           }
 
@@ -2899,8 +2898,8 @@ var _default = (0, _vue.defineComponent)({
             fullAllDataRowIdData = internalData.fullAllDataRowIdData;
         var treeOpts = computeTreeOpts.value;
         var children = treeOpts.children;
-        var rest = fullAllDataRowIdData[(0, _util.getRowid)($xetable, row)];
-        var parentLevel = rest ? rest.level : 0;
+        var parentRest = fullAllDataRowIdData[(0, _util.getRowid)($xetable, row)];
+        var parentLevel = parentRest ? parentRest.level : 0;
         return tableMethods.createData(childRecords).then(function (rows) {
           if (keepSource) {
             var rowid_1 = (0, _util.getRowid)($xetable, row);
@@ -3961,12 +3960,13 @@ var _default = (0, _vue.defineComponent)({
        * @param {Row} row 行对象
        */
       setCurrentRow: function setCurrentRow(row) {
+        var rowOpts = computeRowOpts.value;
         var el = refElem.value;
         tableMethods.clearCurrentRow();
         tableMethods.clearCurrentColumn();
         reactData.currentRow = row;
 
-        if (props.highlightCurrentRow) {
+        if (rowOpts.isCurrent || props.highlightCurrentRow) {
           if (el) {
             _xeUtils.default.arrayEach(el.querySelectorAll("[rowid=\"" + (0, _util.getRowid)($xetable, row) + "\"]"), function (elem) {
               return (0, _dom.addClass)(elem, 'row--current');
@@ -4027,7 +4027,8 @@ var _default = (0, _vue.defineComponent)({
        * 用于当前行，获取当前行的数据
        */
       getCurrentRecord: function getCurrentRecord() {
-        return props.highlightCurrentRow ? reactData.currentRow : null;
+        var rowOpts = computeRowOpts.value;
+        return rowOpts.isCurrent || props.highlightCurrentRow ? reactData.currentRow : null;
       },
 
       /**
@@ -4069,7 +4070,8 @@ var _default = (0, _vue.defineComponent)({
         return null;
       },
       getCurrentColumn: function getCurrentColumn() {
-        return props.highlightCurrentColumn ? reactData.currentColumn : null;
+        var columnOpts = computeColumnOpts.value;
+        return columnOpts.isCurrent || props.highlightCurrentColumn ? reactData.currentColumn : null;
       },
 
       /**
@@ -5081,6 +5083,7 @@ var _default = (0, _vue.defineComponent)({
           var editOpts = computeEditOpts.value;
           var treeOpts = computeTreeOpts.value;
           var menuList = computeMenuList.value;
+          var rowOpts = computeRowOpts.value;
           var selected = editStore.selected,
               actived = editStore.actived;
           var keyCode = evnt.keyCode;
@@ -5161,7 +5164,7 @@ var _default = (0, _vue.defineComponent)({
             keyCtxTimeout = setTimeout(function () {
               internalData._keyCtx = false;
             }, 1000);
-          } else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && highlightCurrentRow && currentRow)) {
+          } else if (isEnter && !isAltKey && keyboardConfig && keyboardOpts.isEnter && (selected.row || actived.row || treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow)) {
             // 退出选中
             if (hasCtrlKey) {
               // 如果是激活编辑状态，则取消编辑
@@ -5193,7 +5196,7 @@ var _default = (0, _vue.defineComponent)({
                     $xetable.moveSelected(targetArgs, isLeftArrow, false, isRightArrow, true, evnt);
                   }
                 }
-              } else if (treeConfig && highlightCurrentRow && currentRow) {
+              } else if (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                 // 如果是树形表格当前行回车移动到子节点
                 var childrens = currentRow[treeOpts.children];
 
@@ -5219,7 +5222,7 @@ var _default = (0, _vue.defineComponent)({
               // 如果按下了方向键
               if (selected.row && selected.column) {
                 $xetable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-              } else if ((isUpArrow || isDwArrow) && highlightCurrentRow) {
+              } else if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
                 // 当前行按键上下移动
                 $xetable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
               }
@@ -5231,7 +5234,7 @@ var _default = (0, _vue.defineComponent)({
             } else if (actived.row || actived.column) {
               $xetable.moveTabSelected(actived.args, hasShiftKey, evnt);
             }
-          } else if (keyboardConfig && (0, _utils.isEnableConf)(editConfig) && (isDel || (treeConfig && highlightCurrentRow && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+          } else if (keyboardConfig && (0, _utils.isEnableConf)(editConfig) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
             if (!isEditStatus) {
               var delMethod = keyboardOpts.delMethod,
                   backMethod = keyboardOpts.backMethod; // 如果是删除键
@@ -5265,7 +5268,7 @@ var _default = (0, _vue.defineComponent)({
                   // 如果按下 del 键，更新表尾数据
                   tableMethods.updateFooter();
                 }
-              } else if (isBack && keyboardOpts.isArrow && treeConfig && highlightCurrentRow && currentRow) {
+              } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
                 // 如果树形表格回退键关闭当前行返回父节点
                 var parentRow_1 = _xeUtils.default.findTree(internalData.afterFullData, function (item) {
                   return item === currentRow;
@@ -6110,6 +6113,7 @@ var _default = (0, _vue.defineComponent)({
       triggerHeaderCellClickEvent: function triggerHeaderCellClickEvent(evnt, params) {
         var _lastResizeTime = internalData._lastResizeTime;
         var sortOpts = computeSortOpts.value;
+        var columnOpts = computeColumnOpts.value;
         var column = params.column;
         var cell = evnt.currentTarget;
 
@@ -6129,7 +6133,7 @@ var _default = (0, _vue.defineComponent)({
           cell: cell
         }, params), evnt);
 
-        if (props.highlightCurrentColumn) {
+        if (columnOpts.isCurrent || props.highlightCurrentColumn) {
           tableMethods.setCurrentColumn(column);
         }
       },
@@ -6153,6 +6157,7 @@ var _default = (0, _vue.defineComponent)({
         var treeOpts = computeTreeOpts.value;
         var radioOpts = computeRadioOpts.value;
         var checkboxOpts = computeCheckboxOpts.value;
+        var rowOpts = computeRowOpts.value;
         var actived = editStore.actived;
         var row = params.row,
             column = params.column;
@@ -6190,7 +6195,7 @@ var _default = (0, _vue.defineComponent)({
         if (!triggerTreeNode) {
           if (!triggerExpandNode) {
             // 如果是高亮行
-            if (highlightCurrentRow) {
+            if (rowOpts.isCurrent || highlightCurrentRow) {
               if (!triggerCheckbox && !triggerRadio) {
                 tablePrivateMethods.triggerCurrentRowEvent(evnt, params);
               }
@@ -6584,6 +6589,7 @@ var _default = (0, _vue.defineComponent)({
         tablePrivateMethods.handleTableData();
         tablePrivateMethods.updateScrollYSpace();
       },
+      updateVirtualTreeData: updateVirtualTreeData,
 
       /**
        * 处理固定列的显示状态
@@ -7234,6 +7240,8 @@ var _default = (0, _vue.defineComponent)({
           rightList = columnStore.rightList;
       var tooltipOpts = computeTooltipOpts.value;
       var treeOpts = computeTreeOpts.value;
+      var rowOpts = computeRowOpts.value;
+      var columnOpts = computeColumnOpts.value;
       var vSize = computeSize.value;
       var tableBorder = computeTableBorder.value;
       var mouseOpts = computeMouseOpts.value;
@@ -7242,7 +7250,7 @@ var _default = (0, _vue.defineComponent)({
       var isMenu = computeIsMenu.value;
       return (0, _vue.h)('div', {
         ref: refElem,
-        class: ['vxe-table', 'vxe-table--render-default', "tid_" + xID, "border--" + tableBorder, (_a = {}, _a["size--" + vSize] = vSize, _a['vxe-editable'] = !!editConfig, _a['cell--highlight'] = highlightCell, _a['cell--selected'] = mouseConfig && mouseOpts.selected, _a['cell--area'] = mouseConfig && mouseOpts.area, _a['row--highlight'] = highlightHoverRow, _a['column--highlight'] = highlightHoverColumn, _a['is--header'] = showHeader, _a['is--footer'] = showFooter, _a['is--group'] = isGroup, _a['is--tree-line'] = treeConfig && treeOpts.line, _a['is--fixed-left'] = leftList.length, _a['is--fixed-right'] = rightList.length, _a['is--animat'] = !!props.animat, _a['is--round'] = props.round, _a['is--stripe'] = !treeConfig && stripe, _a['is--loading'] = loading, _a['is--empty'] = !loading && !tableData.length, _a['is--scroll-y'] = overflowY, _a['is--scroll-x'] = overflowX, _a['is--virtual-x'] = scrollXLoad, _a['is--virtual-y'] = scrollYLoad, _a)],
+        class: ['vxe-table', 'vxe-table--render-default', "tid_" + xID, "border--" + tableBorder, (_a = {}, _a["size--" + vSize] = vSize, _a['vxe-editable'] = !!editConfig, _a['cell--highlight'] = highlightCell, _a['cell--selected'] = mouseConfig && mouseOpts.selected, _a['cell--area'] = mouseConfig && mouseOpts.area, _a['row--highlight'] = rowOpts.isHover || highlightHoverRow, _a['column--highlight'] = columnOpts.isHover || highlightHoverColumn, _a['is--header'] = showHeader, _a['is--footer'] = showFooter, _a['is--group'] = isGroup, _a['is--tree-line'] = treeConfig && treeOpts.line, _a['is--fixed-left'] = leftList.length, _a['is--fixed-right'] = rightList.length, _a['is--animat'] = !!props.animat, _a['is--round'] = props.round, _a['is--stripe'] = !treeConfig && stripe, _a['is--loading'] = loading, _a['is--empty'] = !loading && !tableData.length, _a['is--scroll-y'] = overflowY, _a['is--scroll-x'] = overflowX, _a['is--virtual-x'] = scrollXLoad, _a['is--virtual-y'] = scrollYLoad, _a)],
         onKeydown: keydownEvent
       }, [
       /**