vxe-table 4.12.0 → 4.12.1

package/lib/table/src/table.js

@@ -198,9 +198,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         focused: {
           row: null,
           column: null
-        },
-        insertMaps: {},
-        removeMaps: {}
+        }
       },
       // 存放 tooltip 相关信息
       tooltipStore: {
@@ -262,6 +260,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       treeExpandedFlag: 1,
       updateCheckboxFlag: 1,
       pendingRowFlag: 1,
+      insertRowFlag: 1,
+      removeRowFlag: 1,
       rowHeightStore: {
         default: 48,
         medium: 44,
@@ -361,7 +361,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
       fullDataRowIdData: {},
       fullColumnIdData: {},
       fullColumnFieldData: {},
-      // prevDragRow: null,
       // 已展开的行集合
       rowExpandedMaps: {},
       // 懒加载中的展开行的集合
@@ -374,6 +373,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       selectCheckboxMaps: {},
       // 已标记的对象集
       pendingRowMaps: {},
+      // 已新增的临时行
+      insertRowMaps: {},
+      // 已删除行
+      removeRowMaps: {},
       inited: false,
       tooltipTimeout: null,
       initStatus: false,
@@ -449,10 +452,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return virtualXOpts;
     });
     const computeScrollXThreshold = (0, _vue.computed)(() => {
-      const sXOpts = computeSXOpts.value;
+      const virtualXOpts = computeVirtualXOpts.value;
       const {
         threshold
-      } = sXOpts;
+      } = virtualXOpts;
       if (threshold) {
         return _xeUtils.default.toNumber(threshold);
       }
@@ -483,10 +486,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
       return !!(scrollbarOpts.y && scrollbarOpts.y.position === 'left');
     });
     const computeScrollYThreshold = (0, _vue.computed)(() => {
-      const sYOpts = computeSYOpts.value;
+      const virtualYOpts = computeVirtualYOpts.value;
       const {
         threshold
-      } = sYOpts;
+      } = virtualYOpts;
       if (threshold) {
         return _xeUtils.default.toNumber(threshold);
       }
@@ -1149,18 +1152,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const setMerges = (merges, mList, rowList) => {
       if (merges) {
-        const {
-          treeConfig
-        } = props;
+        // const { treeConfig } = props
         const {
           visibleColumn
         } = internalData;
         if (!_xeUtils.default.isArray(merges)) {
           merges = [merges];
         }
-        if (treeConfig && merges.length) {
-          (0, _log.errLog)('vxe.error.noTree', ['merge-cells | merge-footer-items']);
-        }
+        // if (treeConfig && merges.length) {
+        //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
+        // }
         merges.forEach(item => {
           let {
             row,
@@ -1207,18 +1208,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const removeMerges = (merges, mList, rowList) => {
       const rest = [];
       if (merges) {
-        const {
-          treeConfig
-        } = props;
+        // const { treeConfig } = props
         const {
           visibleColumn
         } = internalData;
         if (!_xeUtils.default.isArray(merges)) {
           merges = [merges];
         }
-        if (treeConfig && merges.length) {
-          (0, _log.errLog)('vxe.error.noTree', ['merge-cells | merge-footer-items']);
-        }
+        // if (treeConfig && merges.length) {
+        //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
+        // }
         merges.forEach(item => {
           let {
             row,
@@ -2113,7 +2112,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const updateStyle = () => {
       const {
-        border,
         showHeaderOverflow: allColumnHeaderOverflow,
         showFooterOverflow: allColumnFooterOverflow,
         mouseConfig,
@@ -2292,36 +2290,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
             if (tableElem) {
               tableElem.style.width = tWidth ? `${tWidth}px` : '';
             }
-            const listElem = (0, _util.getRefElem)(elemStore[`${name}-${layout}-list`]);
-            if (isGroup && listElem) {
-              _xeUtils.default.arrayEach(listElem.querySelectorAll('.col--group'), thElem => {
-                const colNode = $xeTable.getColumnNode(thElem);
-                if (colNode) {
-                  const column = colNode.item;
-                  const {
-                    showHeaderOverflow
-                  } = column;
-                  const cellOverflow = _xeUtils.default.isBoolean(showHeaderOverflow) ? showHeaderOverflow : allColumnHeaderOverflow;
-                  const showEllipsis = cellOverflow === 'ellipsis';
-                  const showTitle = cellOverflow === 'title';
-                  const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-                  const hasEllipsis = showTitle || showTooltip || showEllipsis;
-                  let childWidth = 0;
-                  let countChild = 0;
-                  if (hasEllipsis) {
-                    _xeUtils.default.eachTree(column.children, item => {
-                      if (!item.children || !column.children.length) {
-                        countChild++;
-                      }
-                      childWidth += item.renderWidth;
-                    }, {
-                      children: 'children'
-                    });
-                  }
-                  thElem.style.width = hasEllipsis ? `${childWidth - countChild - (border ? 2 : 0)}px` : '';
-                }
-              });
-            }
           } else if (layout === 'body') {
             if (currScrollElem) {
               currScrollElem.style.maxHeight = customMaxHeight ? `${bodyMaxHeight}px` : '';
@@ -2460,7 +2428,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 order
               } = item;
               if (field && order) {
-                const column = tableMethods.getColumnByField(field);
+                const column = $xeTable.getColumnByField(field);
                 if (column && column.sortable) {
                   column.order = order;
                   column.sortTime = Date.now() + index;
@@ -2468,7 +2436,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               }
             });
             if (!sortOpts.remote) {
-              tablePrivateMethods.handleTableData(true).then(updateStyle);
+              $xeTable.handleTableData(true).then(updateStyle);
             }
           }
         }
@@ -2549,7 +2517,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           expandRowKeys
         } = expandOpts;
         if (expandAll) {
-          tableMethods.setAllRowExpand(true);
+          $xeTable.setAllRowExpand(true);
         } else if (expandRowKeys) {
           const defExpandeds = [];
           expandRowKeys.forEach(rowid => {
@@ -2557,7 +2525,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
               defExpandeds.push(fullDataRowIdData[rowid].row);
             }
           });
-          tableMethods.setRowExpand(defExpandeds, true);
+          $xeTable.setRowExpand(defExpandeds, true);
         }
       }
     };
@@ -2993,7 +2961,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         mergeCells
       } = props;
       if (mergeCells) {
-        tableMethods.setMergeCells(mergeCells);
+        $xeTable.setMergeCells(mergeCells);
       }
     };
     const handleDefaultMergeFooterItems = () => {
@@ -3001,7 +2969,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         mergeFooterItems
       } = props;
       if (mergeFooterItems) {
-        tableMethods.setMergeFooterItems(mergeFooterItems);
+        $xeTable.setMergeFooterItems(mergeFooterItems);
       }
     };
     // 计算可视渲染相关数据
@@ -3105,7 +3073,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         treeConfig
       } = props;
       const {
-        editStore,
         scrollYLoad: oldScrollYLoad
       } = reactData;
       const {
@@ -3164,8 +3131,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
       scrollXStore.endIndex = 1;
       reactData.isRowLoading = true;
       reactData.scrollVMLoading = false;
-      editStore.insertMaps = {};
-      editStore.removeMaps = {};
+      internalData.insertRowMaps = {};
+      internalData.removeRowMaps = {};
       const sYLoad = updateScrollYStatus(fullData);
       reactData.isDragColMove = false;
       reactData.isDragRowMove = false;
@@ -3187,10 +3154,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         $xeTable.clearCellAreas();
         $xeTable.clearCopyCellArea();
       }
-      tableMethods.clearMergeCells();
-      tableMethods.clearMergeFooterItems();
-      tablePrivateMethods.handleTableData(true);
-      tableMethods.updateFooter();
+      $xeTable.clearMergeCells();
+      $xeTable.clearMergeFooterItems();
+      $xeTable.handleTableData(true);
+      $xeTable.updateFooter();
       return (0, _vue.nextTick)().then(() => {
         updateHeight();
         updateStyle();
@@ -3221,18 +3188,18 @@ var _default = exports.default = (0, _vue.defineComponent)({
           }
         }
         handleReserveStatus();
-        tablePrivateMethods.checkSelectionStatus();
+        $xeTable.checkSelectionStatus();
         return new Promise(resolve => {
-          (0, _vue.nextTick)().then(() => tableMethods.recalculate()).then(() => {
+          (0, _vue.nextTick)().then(() => $xeTable.recalculate()).then(() => {
             let targetScrollLeft = lastScrollLeft;
             let targetScrollTop = lastScrollTop;
-            const sXOpts = computeSXOpts.value;
-            const sYOpts = computeSYOpts.value;
+            const virtualXOpts = computeVirtualXOpts.value;
+            const virtualYOpts = computeVirtualYOpts.value;
             // 是否在更新数据之后自动滚动重置滚动条
-            if (sXOpts.scrollToLeftOnChange) {
+            if (virtualXOpts.scrollToLeftOnChange) {
               targetScrollLeft = 0;
             }
-            if (sYOpts.scrollToTopOnChange) {
+            if (virtualYOpts.scrollToTopOnChange) {
               targetScrollTop = 0;
             }
             reactData.isRowLoading = false;
@@ -3265,7 +3232,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       handleDefaultTreeExpand();
       handleDefaultMergeCells();
       handleDefaultMergeFooterItems();
-      (0, _vue.nextTick)(() => setTimeout(() => tableMethods.recalculate()));
+      (0, _vue.nextTick)(() => setTimeout(() => $xeTable.recalculate()));
     };
     /**
      * 处理初始化的默认行为
@@ -3357,7 +3324,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         isGroup,
         columnStore
       } = reactData;
-      const sXOpts = computeSXOpts.value;
+      const virtualXOpts = computeVirtualXOpts.value;
       const {
         collectColumn,
         tableFullColumn,
@@ -3418,7 +3385,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       }
       const visibleColumn = leftList.concat(centerList).concat(rightList);
       // 如果gt为0，则总是启用
-      const scrollXLoad = !!sXOpts.enabled && sXOpts.gt > -1 && (sXOpts.gt === 0 || sXOpts.gt < tableFullColumn.length);
+      const scrollXLoad = !!virtualXOpts.enabled && virtualXOpts.gt > -1 && (virtualXOpts.gt === 0 || virtualXOpts.gt < tableFullColumn.length);
       reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
       Object.assign(columnStore, {
         leftList,
@@ -3541,14 +3508,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const {
         treeConfig
       } = props;
-      const sYOpts = computeSYOpts.value;
+      const virtualYOpts = computeVirtualYOpts.value;
       const treeOpts = computeTreeOpts.value;
       const {
         transform
       } = treeOpts;
       const allList = fullData || internalData.tableFullData;
       // 如果gt为0，则总是启用
-      const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && (sYOpts.gt === 0 || sYOpts.gt < allList.length);
+      const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
       reactData.scrollYLoad = scrollYLoad;
       return scrollYLoad;
     };
@@ -4376,18 +4343,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
           keepSource,
           treeConfig
         } = props;
-        const {
-          editStore
-        } = reactData;
         const {
           fullAllDataRowIdData,
           fullDataRowIdData,
           tableSourceData,
           sourceDataRowIdData,
           tableFullData,
-          afterFullData
+          afterFullData,
+          removeRowMaps
         } = internalData;
-        const removeTempMaps = Object.assign({}, editStore.removeMaps);
         const treeOpts = computeTreeOpts.value;
         const {
           transform
@@ -4425,7 +4389,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
                     _xeUtils.default.destructuring(row, _xeUtils.default.clone(oRow, true));
                   }
                   if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
-                    delete removeTempMaps[rowid];
+                    if (removeRowMaps[rowid]) {
+                      delete removeRowMaps[rowid];
+                    }
                     tableFullData.unshift(row);
                     afterFullData.unshift(row);
                     reDelFlag = true;
@@ -4437,7 +4403,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         if (rows) {
           if (reDelFlag) {
-            editStore.removeMaps = removeTempMaps;
+            reactData.removeRowFlag++;
             $xeTable.updateFooter();
             $xeTable.cacheRowMap(false);
             $xeTable.handleTableData(treeConfig && transform);
@@ -4581,28 +4547,19 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * @param {Row} row 行对象
        */
       isInsertByRow(row) {
-        const {
-          editStore
-        } = reactData;
         const rowid = (0, _util.getRowid)($xeTable, row);
-        return !!editStore.insertMaps[rowid];
+        return !!reactData.insertRowFlag && !!internalData.insertRowMaps[rowid];
       },
       isRemoveByRow(row) {
-        const {
-          editStore
-        } = reactData;
         const rowid = (0, _util.getRowid)($xeTable, row);
-        return !!editStore.removeMaps[rowid];
+        return !!reactData.removeRowFlag && !!internalData.removeRowMaps[rowid];
       },
       /**
        * 删除所有新增的临时数据
        * @returns
        */
       removeInsertRow() {
-        const {
-          editStore
-        } = reactData;
-        editStore.insertMaps = {};
+        internalData.insertRowMaps = {};
         return $xeTable.remove($xeTable.getInsertRecords());
       },
       /**
@@ -4647,8 +4604,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * @param {Number} columnIndex 索引
        */
       getColumns(columnIndex) {
-        const columns = internalData.visibleColumn;
-        return _xeUtils.default.isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex];
+        const {
+          visibleColumn
+        } = internalData;
+        return _xeUtils.default.isUndefined(columnIndex) ? visibleColumn.slice(0) : visibleColumn[columnIndex];
       },
       /**
        * 根据列获取列的唯一主键
@@ -4662,7 +4621,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * @param {String} colid 列主键
        */
       getColumnById(colid) {
-        const fullColumnIdData = internalData.fullColumnIdData;
+        const {
+          fullColumnIdData
+        } = internalData;
         return colid && fullColumnIdData[colid] ? fullColumnIdData[colid].column : null;
       },
       /**
@@ -4674,7 +4635,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         return field && fullColumnFieldData[field] ? fullColumnFieldData[field].column : null;
       },
       getParentColumn(fieldOrColumn) {
-        const fullColumnIdData = internalData.fullColumnIdData;
+        const {
+          fullColumnIdData
+        } = internalData;
         const column = (0, _util.handleFieldOrColumn)($xeTable, fieldOrColumn);
         return column && column.parentId && fullColumnIdData[column.parentId] ? fullColumnIdData[column.parentId].column : null;
       },
@@ -10356,8 +10319,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 横向 X 可视渲染事件处理
        */
       triggerScrollXEvent() {
-        const sXOpts = computeSXOpts.value;
-        if (sXOpts.immediate) {
+        const virtualXOpts = computeVirtualXOpts.value;
+        if (virtualXOpts.immediate) {
           loadScrollXData();
         } else {
           lazyScrollXData();
@@ -10367,8 +10330,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
        * 纵向 Y 可视渲染事件处理
        */
       triggerScrollYEvent() {
-        const sYOpts = computeSYOpts.value;
-        if (sYOpts.immediate) {
+        const virtualYOpts = computeVirtualYOpts.value;
+        if (virtualYOpts.immediate) {
           loadScrollYData();
         } else {
           lazyScrollYData();
@@ -10606,8 +10569,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           return;
         }
         const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
-        const deltaTop = Math.ceil((shiftKey ? deltaX : deltaY) * wheelSpeed);
-        const deltaLeft = Math.ceil((shiftKey ? deltaY : deltaX) * wheelSpeed);
+        const deltaTop = shiftKey ? 0 : Math.ceil(deltaY * wheelSpeed);
+        const deltaLeft = shiftKey ? Math.ceil((shiftKey ? deltaY || deltaX : deltaX) * wheelSpeed) : 0;
         const isTopWheel = deltaTop < 0;
         const currScrollTop = bodyScrollElem.scrollTop;
         // 如果滚动位置已经是顶部或底部，则不需要触发
@@ -10626,6 +10589,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           evnt.preventDefault();
           internalData.inWheelScroll = true;
           wheelScrollLeftTo(scrollLeft, offsetLeft => {
+            internalData.inWheelScroll = true;
             const currLeftNum = offsetLeft;
             (0, _dom.setScrollLeft)(xHandleEl, currLeftNum);
             (0, _dom.setScrollLeft)(bodyScrollElem, currLeftNum);
@@ -10642,9 +10606,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         if (isRollY) {
           evnt.preventDefault();
+          internalData.inWheelScroll = true;
           wheelScrollTopTo(scrollTop - currScrollTop, offsetTop => {
-            const currTopNum = bodyScrollElem.scrollTop + offsetTop;
             internalData.inWheelScroll = true;
+            const currTopNum = bodyScrollElem.scrollTop + offsetTop;
             (0, _dom.setScrollTop)(yHandleEl, currTopNum);
             (0, _dom.setScrollTop)(bodyScrollElem, currTopNum);
             (0, _dom.setScrollTop)(leftScrollElem, currTopNum);
@@ -11849,7 +11814,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
           scrollXStore,
           scrollYStore
         } = internalData;
-        const sYOpts = computeSYOpts.value;
         const editOpts = computeEditOpts.value;
         const treeOpts = computeTreeOpts.value;
         const radioOpts = computeRadioOpts.value;
@@ -11975,8 +11939,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         Object.assign(scrollYStore, {
           startIndex: 0,
           endIndex: 0,
-          visibleSize: 0,
-          adaptive: sYOpts.adaptive !== false
+          visibleSize: 0
         });
         Object.assign(scrollXStore, {
           startIndex: 0,