vxe-table 4.10.6-beta.25 → 4.10.6-beta.27

package/lib/table/src/table.js

@@ -940,14 +940,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const computeRowHeight = () => {
       const {
-        showOverflow
-      } = props;
+        isAllOverflow
+      } = reactData;
       const tableHeader = refTableHeader.value;
       const tableBody = refTableBody.value;
       const tableBodyElem = tableBody ? tableBody.$el : null;
       const defaultRowHeight = computeDefaultRowHeight.value;
       let rowHeight = 0;
-      if (showOverflow) {
+      if (isAllOverflow) {
         if (tableBodyElem) {
           const tableHeaderElem = tableHeader ? tableHeader.$el : null;
           let firstTrElem;
@@ -970,8 +970,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const handleVirtualYVisible = currScrollTop => {
       const {
-        showOverflow
-      } = props;
+        isAllOverflow
+      } = reactData;
       const {
         elemStore,
         isResizeCellHeight,
@@ -990,15 +990,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
         let offsetTop = 0;
         let visibleSize = 0;
         const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-        if (!isCustomCellHeight && showOverflow) {
+        if (!isCustomCellHeight && isAllOverflow) {
           toVisibleIndex = Math.floor(scrollTop / defaultRowHeight);
           visibleSize = Math.ceil(clientHeight / defaultRowHeight) + 1;
         } else {
           for (let rIndex = 0, rLen = afterFullData.length; rIndex < rLen; rIndex++) {
             const row = afterFullData[rIndex];
             const rowid = (0, _util.getRowid)($xeTable, row);
-            const rowRest = fullAllDataRowIdData[rowid];
-            offsetTop += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
+            const rowRest = fullAllDataRowIdData[rowid] || {};
+            offsetTop += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
             if (toVisibleIndex === -1 && scrollTop < offsetTop) {
               toVisibleIndex = rIndex;
             }
@@ -1571,26 +1571,20 @@ var _default = exports.default = (0, _vue.defineComponent)({
     };
     const calcCellAutoHeight = (rowRest, wrapperEl) => {
       const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[rowid="${rowRest.rowid}"]`);
-      let topBottomPadding = 0;
-      const firstCellEl = cellElemList[0];
-      if (firstCellEl && firstCellEl.parentElement) {
-        const cellStyle = getComputedStyle(firstCellEl.parentElement);
-        topBottomPadding = Math.ceil(_xeUtils.default.toNumber(cellStyle.paddingTop) + _xeUtils.default.toNumber(cellStyle.paddingBottom));
-      }
-      let colHeight = rowRest.height - topBottomPadding;
+      let colHeight = rowRest.height;
       for (let i = 0; i < cellElemList.length; i++) {
         const cellElem = cellElemList[i];
+        const tdEl = cellElem.parentElement;
+        const topBottomPadding = Math.ceil(_xeUtils.default.toNumber(tdEl.style.paddingTop) + _xeUtils.default.toNumber(tdEl.style.paddingBottom));
         const cellHeight = cellElem ? cellElem.clientHeight : 0;
-        colHeight = Math.max(colHeight, Math.ceil(cellHeight));
+        colHeight = Math.max(colHeight - topBottomPadding, Math.ceil(cellHeight));
       }
-      return colHeight + topBottomPadding;
+      return colHeight;
     };
     const calcCellHeight = () => {
-      const {
-        showOverflow
-      } = props;
       const {
         tableData,
+        isAllOverflow,
         scrollYLoad,
         scrollXLoad
       } = reactData;
@@ -1599,14 +1593,16 @@ var _default = exports.default = (0, _vue.defineComponent)({
       } = internalData;
       const defaultRowHeight = computeDefaultRowHeight.value;
       const el = refElem.value;
-      if (!showOverflow && scrollYLoad && el) {
+      if (!isAllOverflow && scrollYLoad && el) {
+        el.setAttribute('data-calc-row', 'Y');
         tableData.forEach(row => {
           const rowid = (0, _util.getRowid)($xeTable, row);
           const rowRest = fullAllDataRowIdData[rowid];
           if (rowRest) {
-            const height = calcCellAutoHeight(rowRest, el);
-            rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, height) : height);
+            const reHeight = calcCellAutoHeight(rowRest, el);
+            rowRest.height = Math.max(defaultRowHeight, scrollXLoad ? Math.max(rowRest.height, reHeight) : reHeight);
           }
+          el.removeAttribute('data-calc-row');
         });
         reactData.calcCellHeightFlag++;
       }
@@ -1983,7 +1979,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const updateStyle = () => {
       const {
         border,
-        showOverflow: allColumnOverflow,
         showHeaderOverflow: allColumnHeaderOverflow,
         showFooterOverflow: allColumnFooterOverflow,
         mouseConfig,
@@ -2204,7 +2199,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             let renderColumnList = tableColumn;
             let isOptimizeMode = false;
             // 如果是使用优化模式
-            if (scrollXLoad || scrollYLoad || allColumnOverflow && isAllOverflow) {
+            if (scrollXLoad || scrollYLoad || isAllOverflow) {
               if (expandColumn || spanMethod || footerSpanMethod) {
                 // 如果不支持优化模式
               } else {
@@ -2288,7 +2283,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
                 } else if (layout === 'footer') {
                   cellOverflow = _xeUtils.default.isUndefined(showFooterOverflow) || _xeUtils.default.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
                 } else {
-                  cellOverflow = _xeUtils.default.isUndefined(showOverflow) || _xeUtils.default.isNull(showOverflow) ? allColumnOverflow : showOverflow;
+                  cellOverflow = _xeUtils.default.isUndefined(showOverflow) || _xeUtils.default.isNull(showOverflow) ? isAllOverflow : showOverflow;
                 }
                 const showEllipsis = cellOverflow === 'ellipsis';
                 const showTitle = cellOverflow === 'title';
@@ -2985,8 +2980,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
     const loadTableData = (datas, isReset) => {
       const {
         keepSource,
-        treeConfig,
-        showOverflow
+        treeConfig
       } = props;
       const {
         editStore,
@@ -2999,7 +2993,6 @@ var _default = exports.default = (0, _vue.defineComponent)({
         lastScrollTop
       } = internalData;
       const treeOpts = computeTreeOpts.value;
-      const rowOpts = computeRowOpts.value;
       const {
         transform
       } = treeOpts;
@@ -3060,32 +3053,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
       internalData.tableSynchData = datas;
       if (isReset) {
         internalData.isResizeCellHeight = false;
+        reactData.rowExpandedMaps = {};
+        reactData.rowExpandLazyLoadedMaps = {};
+        reactData.treeExpandedMaps = {};
+        reactData.treeExpandLazyLoadedMaps = {};
       }
       // 克隆原数据，用于显示编辑状态，与编辑值做对比
       if (keepSource) {
         tablePrivateMethods.cacheSourceMap(fullData);
       }
-      if (sYLoad) {
-        if (showOverflow) {
-          if (!rowOpts.height) {
-            const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-            if (errColumn) {
-              (0, _log.errLog)('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-            }
-          }
-        }
-        if (process.env.NODE_ENV === 'development') {
-          if (!(props.height || props.maxHeight)) {
-            (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
-          }
-          // if (!props.showOverflow) {
-          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-          // }
-          if (props.spanMethod) {
-            (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
-          }
-        }
-      }
       if ($xeTable.clearCellAreas && props.mouseConfig) {
         $xeTable.clearCellAreas();
         $xeTable.clearCopyCellArea();
@@ -3104,6 +3080,27 @@ var _default = exports.default = (0, _vue.defineComponent)({
         if (sYLoad) {
           scrollYStore.endIndex = scrollYStore.visibleSize;
         }
+        if (sYLoad) {
+          // if (showOverflow) {
+          //   if (!rowOpts.height) {
+          //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+          //     if (errColumn) {
+          //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+          //     }
+          //   }
+          // }
+          if (process.env.NODE_ENV === 'development') {
+            if (!(props.height || props.maxHeight)) {
+              (0, _log.errLog)('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}']);
+            }
+            // if (!props.showOverflow) {
+            //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+            // }
+            if (props.spanMethod) {
+              (0, _log.warnLog)('vxe.error.scrollErrProp', ['table.span-method']);
+            }
+          }
+        }
         handleReserveStatus();
         tablePrivateMethods.checkSelectionStatus();
         return new Promise(resolve => {
@@ -3552,10 +3549,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
      */
     const loadScrollYData = scrollTop => {
       const {
-        showOverflow
-      } = props;
-      const {
-        mergeList
+        mergeList,
+        isAllOverflow
       } = reactData;
       const {
         scrollYStore
@@ -3566,7 +3561,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         endIndex,
         offsetSize
       } = scrollYStore;
-      const autoOffsetYSize = showOverflow ? offsetSize : offsetSize + 1;
+      const autoOffsetYSize = isAllOverflow ? offsetSize : offsetSize + 1;
       const {
         toVisibleIndex,
         visibleSize
@@ -4819,7 +4814,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           if (rowRest) {
             const resizeHeight = rowRest.resizeHeight;
             if (resizeHeight || isFull) {
-              const currCellHeight = resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+              const currCellHeight = resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
               rest[rowid] = currCellHeight;
             }
           }
@@ -4870,8 +4865,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const defaultRowHeight = computeDefaultRowHeight.value;
         const rowid = _xeUtils.default.isString(rowOrId) || _xeUtils.default.isNumber(rowOrId) ? rowOrId : (0, _util.getRowid)($xeTable, rowOrId);
         const rowRest = fullAllDataRowIdData[rowid];
-        const currCellHeight = rowRest ? rowRest.resizeHeight : cellOpts.height || rowOpts.height || defaultRowHeight;
-        return currCellHeight;
+        if (rowRest) {
+          return rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
+        }
+        return 0;
       },
       /**
        * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
@@ -6136,9 +6133,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
        */
       scrollToRow(row, fieldOrColumn) {
         const {
-          showOverflow
-        } = props;
-        const {
+          isAllOverflow,
           scrollYLoad,
           scrollXLoad
         } = reactData;
@@ -6155,7 +6150,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         }
         return Promise.all(rest).then(() => {
           if (row) {
-            if (!showOverflow && (scrollYLoad || scrollXLoad)) {
+            if (!isAllOverflow && (scrollYLoad || scrollXLoad)) {
               calcCellHeight();
               calcCellWidth();
             }
@@ -7765,6 +7760,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             resizeTipElem.style.left = `${resizeTipLeft}px`;
             resizeTipElem.style.top = `${Math.min(tableHeight - resizeTipHeight, Math.max(0, evnt.clientY - wrapperRect.y - resizeTipHeight / 2))}px`;
           }
+          reactData.isDragResize = true;
         };
         reactData.isDragResize = true;
         (0, _dom.addClass)(tableEl, 'col-drag--resize');
@@ -7774,8 +7770,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
           document.onmousemove = null;
           document.onmouseup = null;
           resizeBarElem.style.display = 'none';
-          reactData.isDragResize = false;
           internalData._lastResizeTime = Date.now();
+          setTimeout(() => {
+            reactData.isDragResize = false;
+          }, 50);
           const resizeWidth = resizeColumn.renderWidth + (isRightFixed ? dragPosLeft - dragLeft : dragLeft - dragPosLeft);
           const resizeParams = Object.assign(Object.assign({}, params), {
             resizeWidth,
@@ -7810,6 +7808,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = resizableOpts;
         const el = refElem.value;
         if (isDblclickAutoWidth && el) {
+          evnt.stopPropagation();
+          evnt.preventDefault();
           const {
             fullColumnIdData
           } = internalData;
@@ -7895,7 +7895,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           return;
         }
         const defaultRowHeight = computeDefaultRowHeight.value;
-        const currCellHeight = rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight;
+        const currCellHeight = rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
         const tableRect = tableEl.getBoundingClientRect();
         const trRect = trEl.getBoundingClientRect();
         const targetOffsetY = dragClientY - trRect.y - trEl.clientHeight;
@@ -7937,6 +7937,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             resizeTipElem.style.left = `${resizeBarLeft}px`;
             resizeTipElem.style.top = `${resizeBarTop}px`;
           }
+          reactData.isDragResize = true;
         };
         reactData.isDragResize = true;
         (0, _dom.addClass)(tableEl, 'row-drag--resize');
@@ -7946,8 +7947,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
           document.onmousemove = null;
           document.onmouseup = null;
           resizeBarElem.style.display = 'none';
-          reactData.isDragResize = false;
           internalData._lastResizeTime = Date.now();
+          setTimeout(() => {
+            reactData.isDragResize = false;
+          }, 50);
           if (resizeHeight !== currCellHeight) {
             const resizeParams = Object.assign(Object.assign({}, params), {
               resizeHeight,
@@ -7972,9 +7975,17 @@ var _default = exports.default = (0, _vue.defineComponent)({
         } = resizableOpts;
         const el = refElem.value;
         if (isDblclickAutoHeight && el) {
+          evnt.stopPropagation();
+          evnt.preventDefault();
+          const {
+            editStore
+          } = reactData;
           const {
             fullAllDataRowIdData
           } = internalData;
+          const {
+            actived
+          } = editStore;
           const {
             row
           } = params;
@@ -7983,18 +7994,27 @@ var _default = exports.default = (0, _vue.defineComponent)({
           if (!rowRest) {
             return;
           }
-          const resizeHeight = calcCellAutoHeight(rowRest, el);
-          const resizeParams = Object.assign(Object.assign({}, params), {
-            resizeHeight,
-            resizeRow: row
-          });
-          reactData.isDragResize = false;
-          internalData._lastResizeTime = Date.now();
-          if ($xeTable.handleRowResizeDblclickCellAreaEvent) {
-            $xeTable.handleRowResizeDblclickCellAreaEvent(evnt, resizeParams);
+          const handleRsHeight = () => {
+            el.setAttribute('data-calc-row', 'Y');
+            const resizeHeight = calcCellAutoHeight(rowRest, el);
+            el.removeAttribute('data-calc-row');
+            const resizeParams = Object.assign(Object.assign({}, params), {
+              resizeHeight,
+              resizeRow: row
+            });
+            reactData.isDragResize = false;
+            internalData._lastResizeTime = Date.now();
+            if ($xeTable.handleRowResizeDblclickCellAreaEvent) {
+              $xeTable.handleRowResizeDblclickCellAreaEvent(evnt, resizeParams);
+            } else {
+              rowRest.resizeHeight = resizeHeight;
+              handleUpdateRowResize(evnt, resizeParams);
+            }
+          };
+          if (actived.row || actived.column) {
+            $xeTable.clearEdit().then(handleRsHeight);
           } else {
-            rowRest.resizeHeight = resizeHeight;
-            handleUpdateRowResize(evnt, resizeParams);
+            handleRsHeight();
           }
         }
       },
@@ -8482,11 +8502,11 @@ var _default = exports.default = (0, _vue.defineComponent)({
           internalData.tooltipTimeout = setTimeout(() => {
             $tooltip = refTooltip.value;
             if ($tooltip && $tooltip.isActived && !$tooltip.isActived()) {
-              tableMethods.closeTooltip();
+              $xeTable.closeTooltip();
             }
           }, tooltipOpts.leaveDelay);
         } else {
-          tableMethods.closeTooltip();
+          $xeTable.closeTooltip();
         }
       },
       triggerHeaderCellClickEvent(evnt, params) {
@@ -8531,8 +8551,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
           editConfig
         } = props;
         const {
-          editStore
+          editStore,
+          isDragResize
         } = reactData;
+        if (isDragResize) {
+          return;
+        }
         const expandOpts = computeExpandOpts.value;
         const editOpts = computeEditOpts.value;
         const treeOpts = computeTreeOpts.value;
@@ -8642,8 +8666,12 @@ var _default = exports.default = (0, _vue.defineComponent)({
           editConfig
         } = props;
         const {
-          editStore
+          editStore,
+          isDragResize
         } = reactData;
+        if (isDragResize) {
+          return;
+        }
         const editOpts = computeEditOpts.value;
         const {
           actived
@@ -9979,9 +10007,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       triggerBodyWheelEvent(evnt) {
         const {
+          target,
           deltaY,
           deltaX
         } = evnt;
+        if (target && /^textarea$/i.test(target.tagName)) {
+          return;
+        }
         const {
           highlightHoverRow
         } = _props.default;
@@ -10216,9 +10248,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       // 更新纵向 Y 可视渲染上下剩余空间大小
       updateScrollYSpace() {
         const {
-          showOverflow
-        } = props;
-        const {
+          isAllOverflow,
           scrollYLoad
         } = reactData;
         const {
@@ -10240,21 +10270,21 @@ var _default = exports.default = (0, _vue.defineComponent)({
         let ySpaceHeight = 0;
         if (scrollYLoad) {
           const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height;
-          if (!isCustomCellHeight && showOverflow) {
+          if (!isCustomCellHeight && isAllOverflow) {
             ySpaceHeight = afterFullData.length * defaultRowHeight;
             topSpaceHeight = Math.max(0, startIndex * defaultRowHeight);
           } else {
             for (let i = 0; i < afterFullData.length; i++) {
               const row = afterFullData[i];
               const rowid = (0, _util.getRowid)($xeTable, row);
-              const rowRest = fullAllDataRowIdData[rowid];
-              ySpaceHeight += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
+              const rowRest = fullAllDataRowIdData[rowid] || {};
+              ySpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
             }
             for (let i = 0; i < startIndex; i++) {
               const row = afterFullData[i];
               const rowid = (0, _util.getRowid)($xeTable, row);
-              const rowRest = fullAllDataRowIdData[rowid];
-              topSpaceHeight += rowRest ? rowRest.resizeHeight || cellOpts.height || rowOpts.height || defaultRowHeight : defaultRowHeight;
+              const rowRest = fullAllDataRowIdData[rowid] || {};
+              topSpaceHeight += rowRest.resizeHeight || rowRest.height || cellOpts.height || rowOpts.height || defaultRowHeight;
             }
           }
         } else {
@@ -10285,13 +10315,13 @@ var _default = exports.default = (0, _vue.defineComponent)({
       },
       updateScrollXData() {
         const {
-          showOverflow
-        } = props;
+          isAllOverflow
+        } = reactData;
         handleTableColumn();
         return (0, _vue.nextTick)().then(() => {
           handleTableColumn();
           $xeTable.updateScrollXSpace();
-          if (!showOverflow) {
+          if (!isAllOverflow) {
             $xeTable.updateScrollYSpace();
           }
         });
@@ -10880,7 +10910,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
       if (value && value.length >= 50000) {
         (0, _log.warnLog)('vxe.error.errLargeData', ['loadData(data), reloadData(data)']);
       }
-      loadTableData(value, false).then(() => {
+      loadTableData(value, true).then(() => {
         const {
           scrollXLoad,
           scrollYLoad,