vxe-table 4.10.6-beta.26 → 4.10.6-beta.28

package/lib/table/src/table.js

@@ -997,8 +997,8 @@ var _default = exports.default = (0, _vue.defineComponent)({
           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,19 +1571,15 @@ 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 {
@@ -1598,13 +1594,15 @@ var _default = exports.default = (0, _vue.defineComponent)({
       const defaultRowHeight = computeDefaultRowHeight.value;
       const el = refElem.value;
       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++;
       }
@@ -4816,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;
             }
           }
@@ -4867,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;
       },
       /**
        * 刷新滚动操作，手动同步滚动相关位置（对于某些特殊的操作，比如滚动条错位、固定列不同步）
@@ -7760,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');
@@ -7769,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,
@@ -7805,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;
@@ -7890,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;
@@ -7932,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');
@@ -7941,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,
@@ -7967,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;
@@ -7978,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();
           }
         }
       },
@@ -8477,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) {
@@ -8526,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;
@@ -8637,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
@@ -9166,7 +9199,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
                       // 根到根
                     }
                     const fullList = _xeUtils.default.toTreeArray(internalData.afterTreeFullData, {
-                      children: childrenField
+                      key: rowField,
+                      parentKey: parentField,
+                      children: mapChildrenField
                     });
                     // 移出
                     const otfIndex = $xeTable.findRowIndexOf(fullList, dragRow);
@@ -9183,10 +9218,10 @@ var _default = exports.default = (0, _vue.defineComponent)({
                     }
                     dragRow[parentField] = isDragToChildFlag ? prevDragRow[rowField] : prevDragRow[parentField];
                     internalData.tableFullTreeData = _xeUtils.default.toArrayTree(fullList, {
-                      key: treeOpts.rowField,
-                      parentKey: treeOpts.parentField,
+                      key: rowField,
+                      parentKey: parentField,
                       children: childrenField,
-                      mapChildren: treeOpts.mapChildrenField
+                      mapChildren: mapChildrenField
                     });
                   }
                 }
@@ -9974,9 +10009,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;
@@ -10240,14 +10279,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
             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 {