vxe-table 3.19.27 → 3.19.28

package/lib/table/src/methods.js

@@ -11,7 +11,7 @@ var _ui = require("../../ui");
 var _cell = _interopRequireDefault(require("./cell"));
 var _util = require("./util");
 var _vn = require("../../ui/src/vn");
-var _anime = require("./anime");
+var _anime = require("../../ui/src/anime");
 var _log = require("../../ui/src/log");
 var _store = require("./store");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -5934,7 +5934,7 @@ const tableMethods = {
           cellLabel = formatter(formatParams);
         }
       } else if (renderOpts && tcFormatter) {
-        cellLabel = `${tcFormatter(renderOpts, formatParams)}`;
+        cellLabel = tcFormatter(renderOpts, formatParams);
       }
       if (formatData) {
         formatData[colid] = {
@@ -10242,8 +10242,6 @@ const tableMethods = {
       const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
       return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
         if (!status) {
-          clearRowDragData($xeTable);
-          clearCrossTableDragStatus($xeTable);
           return errRest;
         }
         const dragRowid = (0, _util.getRowid)($xeTable, dragRow);
@@ -10371,8 +10369,6 @@ const tableMethods = {
           afterFullData.splice(nafIndex, 0, dragRow);
           tableFullData.splice(ntfIndex, 0, dragRow);
         }
-        clearRowDragData($xeTable);
-        clearCrossTableDragStatus($xeTable);
         $xeTable.handleTableData(treeConfig && transform);
         $xeTable.cacheRowMap(false);
         updateScrollYStatus($xeTable);
@@ -10402,6 +10398,9 @@ const tableMethods = {
             const {
               tableData
             } = reactData;
+            const {
+              fullAllDataRowIdData
+            } = internalData;
             const dragRowRest = fullAllDataRowIdData[dragRowid];
             const _newRowIndex = dragRowRest._index;
             const firstRow = tableData[0];
@@ -10476,6 +10475,10 @@ const tableMethods = {
         });
       }).catch(() => {
         return errRest;
+      }).then(rest => {
+        clearRowDragData($xeTable);
+        clearCrossTableDragStatus($xeTable);
+        return rest;
       });
     }
     clearRowDragData($xeTable);
@@ -10857,12 +10860,10 @@ const tableMethods = {
     const isControlKey = (0, _dom.hasControlKey)(evnt);
     const trEl = evnt.currentTarget;
     const rowid = trEl.getAttribute('rowid') || '';
-    const rest = fullAllDataRowIdData[rowid];
-    if (rest) {
+    const rowRest = fullAllDataRowIdData[rowid];
+    if (rowRest) {
       evnt.preventDefault();
-      const row = rest.row;
-      const rowid = (0, _util.getRowid)($xeTable, row);
-      const rowRest = fullAllDataRowIdData[rowid];
+      const row = rowRest.row;
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
       internalData.prevDragToChild = !!(treeConfig && transform && isCrossDrag && isToChildDrag && isControlKey);
@@ -10896,7 +10897,7 @@ const tableMethods = {
           }
         }
       }
-      if ($xeTable.eqRow(dragRow, row) || isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
+      if ($xeTable.eqRow(dragRow, row) || isControlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rowRest.level)) {
         showDropTip($xeTable, evnt, trEl, null, false, dragPos);
         return;
       }
@@ -11020,8 +11021,6 @@ const tableMethods = {
       const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
       return Promise.resolve(dragEndMethod ? dragEndMethod(dragParams) : true).then(status => {
         if (!status) {
-          clearColDragData($xeTable);
-          clearCrossTableDragStatus($xeTable);
           return errRest;
         }
         let dragTargetColumn = null;
@@ -11166,8 +11165,6 @@ const tableMethods = {
             $xeTable.clearCopyCellArea();
           }
         }
-        clearColDragData($xeTable);
-        clearCrossTableDragStatus($xeTable);
         if (evnt) {
           $xeTable.dispatchEvent('column-dragend', {
             oldColumn: dragColumn,
@@ -11274,6 +11271,10 @@ const tableMethods = {
         });
       }).catch(() => {
         return errRest;
+      }).then(rest => {
+        clearColDragData($xeTable);
+        clearCrossTableDragStatus($xeTable);
+        return rest;
       });
     }
     clearColDragData($xeTable);
@@ -13472,12 +13473,15 @@ const tableMethods = {
           const lastRow = afterFullData[afterFullData.length - 1];
           rowid = (0, _util.getRowid)($xeTable, lastRow);
           rowRest = fullAllDataRowIdData[rowid] || {};
-          // 如果为空时还没计算完数据，保持原高度不变
-          if (rowRest.oTop) {
-            sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight);
-            // 是否展开行
-            if (expandColumn && rowExpandedMaps[rowid]) {
-              sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+          if (rowRest) {
+            const rHeight = (0, _util.getCellRestHeight)(rowRest, cellOpts, rowOpts, defaultRowHeight);
+            // 如果为空时还没计算完数据，保持原高度不变
+            if (rHeight) {
+              sYHeight = (rowRest.oTop || 0) + rHeight;
+              // 是否展开行
+              if (expandColumn && rowExpandedMaps[rowid]) {
+                sYHeight += rowRest.expandHeight || expandOpts.height || 0;
+              }
             }
           }
           if (sYHeight > maxYHeight) {