vxe-table 3.12.4 → 3.12.6

package/lib/table/src/methods.js

@@ -145,6 +145,10 @@ function cacheColumnMap($xeTable) {
     isCrossDrag,
     isSelfToChildDrag
   } = columnDragOpts;
+  const customOpts = $xeTable.computeCustomOpts;
+  const {
+    storage
+  } = customOpts;
   const rowOpts = $xeTable.computeRowOpts;
   const isGroup = collectColumn.some(_utils.hasChildrenList);
   let isAllOverflow = !!props.showOverflow;
@@ -178,8 +182,8 @@ function cacheColumnMap($xeTable) {
       }
       fullColumnFieldData[field] = rest;
     } else {
-      if (isCrossDrag || isSelfToChildDrag) {
-        (0, _log.errLog)('vxe.error.emptyProp', ['column.field']);
+      if (storage || isCrossDrag || isSelfToChildDrag) {
+        (0, _log.errLog)('vxe.error.reqProp', [`${column.getTitle() || type || ''} -> column.field`]);
       }
     }
     if (!hasFixed && fixed) {
@@ -758,8 +762,9 @@ const calcCellHeight = $xeTable => {
         rowRest.height = scrollXLoad ? Math.max(rowRest.height, height) : height;
       }
     });
+    reactData.isCalcCellHeight++;
   }
-  // updateCellOffset($xeTable)
+  // updateCellOffset()
 };
 function getOrderField(_vm, column) {
   const {
@@ -1127,14 +1132,14 @@ function loadScrollYData($xeTable) {
     endIndex,
     offsetSize
   } = scrollYStore;
-  const offsetYSize = showOverflow ? offsetSize : offsetSize + Math.min(8, Math.ceil(tableHeight / 200));
+  const autoOffsetYSize = showOverflow ? offsetSize : offsetSize + Math.min(8, Math.ceil(tableHeight / 200));
   const {
     toVisibleIndex,
     visibleSize
   } = handleVirtualYVisible($xeTable);
   const offsetItem = {
-    startIndex: Math.max(0, toVisibleIndex - 1 - offsetYSize),
-    endIndex: toVisibleIndex + visibleSize + offsetYSize
+    startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
+    endIndex: toVisibleIndex + visibleSize + autoOffsetYSize
   };
   calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
   const {
@@ -1163,11 +1168,12 @@ function checkLastSyncScroll($xeTable, isRollX, isRollY) {
     clearTimeout(lcsTimeout);
   }
   internalData.lcsTimeout = setTimeout(() => {
+    internalData.lcsRunTime = Date.now();
     internalData.lcsTimeout = undefined;
     internalData.inVirtualScroll = false;
     internalData.inBodyScroll = false;
-    internalData.bodyScrollType = '';
     internalData.inFooterScroll = false;
+    internalData.bodyScrollType = '';
     if (isRollX && scrollXLoad) {
       $xeTable.updateScrollXData().then(() => {
         loadScrollXData($xeTable);
@@ -6404,7 +6410,7 @@ const Methods = {
       evnt.dataTransfer.setDragImage((0, _dom.getTpImg)(), 0, 0);
     }
   },
-  handleRowDragDragendEvent(evnt) {
+  handleRowDragSwapEvent(evnt, isSyncRow, dragRow, prevDragRow, prevDragPos, prevDragToChild) {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
@@ -6415,8 +6421,7 @@ const Methods = {
     } = props;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
-      fullAllDataRowIdData,
-      prevDragToChild
+      fullAllDataRowIdData
     } = internalData;
     const {
       isPeerDrag,
@@ -6432,21 +6437,16 @@ const Methods = {
       parentField
     } = treeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
-    const {
-      dragRow
-    } = reactData;
     const {
       afterFullData,
-      tableFullData,
-      prevDragRow,
-      prevDragPos
+      tableFullData
     } = internalData;
     const dEndMethod = dragEndMethod || (dragConfig ? dragConfig.dragEndMethod : null);
     const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0;
     if (prevDragRow && dragRow) {
       // 判断是否有拖动
       if (prevDragRow !== dragRow) {
-        Promise.resolve(dEndMethod ? dEndMethod({
+        return Promise.resolve(dEndMethod ? dEndMethod({
           oldRow: dragRow,
           newRow: prevDragRow,
           dragPos: prevDragPos,
@@ -6597,6 +6597,48 @@ const Methods = {
         }).catch(() => {});
       }
     }
+    return Promise.resolve();
+  },
+  handleRowDragDragendEvent(evnt) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      fullAllDataRowIdData,
+      prevDragToChild
+    } = internalData;
+    const {
+      dragRow
+    } = reactData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      lazy
+    } = treeOpts;
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
+    const {
+      prevDragRow,
+      prevDragPos
+    } = internalData;
+    if (treeConfig && prevDragToChild) {
+      // 懒加载
+      if (lazy) {
+        const newRowid = (0, _util.getRowid)($xeTable, prevDragRow);
+        const rowRest = fullAllDataRowIdData[newRowid];
+        if (prevDragRow[hasChildField]) {
+          if (rowRest && rowRest.treeLoaded) {
+            $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+          }
+        } else {
+          $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+        }
+      }
+    } else {
+      $xeTable.handleRowDragSwapEvent(evnt, true, dragRow, prevDragRow, prevDragPos, prevDragToChild);
+    }
     hideDropTip($xeTable);
     clearRowDropOrigin($xeTable);
     internalData.prevDragToChild = false;
@@ -6622,9 +6664,11 @@ const Methods = {
     } = reactData;
     const treeOpts = $xeTable.computeTreeOpts;
     const {
+      lazy,
       transform,
       parentField
     } = treeOpts;
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     const rowDragOpts = $xeTable.computeRowDragOpts;
     const {
       isPeerDrag,
@@ -6641,19 +6685,21 @@ const Methods = {
     const rest = fullAllDataRowIdData[rowid];
     if (rest) {
       const row = rest.row;
+      const rowid = (0, _util.getRowid)($xeTable, row);
+      const rowRest = fullAllDataRowIdData[rowid];
       evnt.preventDefault();
       const {
         dragRow
       } = reactData;
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y;
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom';
-      if ($xeTable.eqRow(dragRow, row) || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
-        showDropTip($xeTable, evnt, trEl, null, false, dragPos);
-        return;
-      }
       internalData.prevDragToChild = !!(treeConfig && transform && isToChildDrag && hasCtrlKey);
       internalData.prevDragRow = row;
       internalData.prevDragPos = dragPos;
+      if ($xeTable.eqRow(dragRow, row) || hasCtrlKey && treeConfig && lazy && row[hasChildField] && rowRest && !rowRest.treeLoaded || !isCrossDrag && treeConfig && transform && (isPeerDrag ? dragRow[parentField] !== row[parentField] : rest.level)) {
+        showDropTip($xeTable, evnt, trEl, null, false, dragPos);
+        return;
+      }
       showDropTip($xeTable, evnt, trEl, null, true, dragPos);
       $xeTable.dispatchEvent('row-dragover', {
         oldRow: dragRow,
@@ -6945,13 +6991,13 @@ const Methods = {
       } = evnt;
       const offsetX = clientX - thEl.getBoundingClientRect().x;
       const dragPos = offsetX < thEl.clientWidth / 2 ? 'left' : 'right';
+      internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey);
+      internalData.prevDragCol = column;
+      internalData.prevDragPos = dragPos;
       if (column.fixed || dragCol && dragCol.id === column.id || !isCrossDrag && (isPeerDrag ? dragCol.parentId !== column.parentId : column.parentId)) {
         showDropTip($xeTable, evnt, null, thEl, false, dragPos);
         return;
       }
-      internalData.prevDragToChild = !!(isCrossDrag && isToChildDrag && hasCtrlKey);
-      internalData.prevDragCol = column;
-      internalData.prevDragPos = dragPos;
       showDropTip($xeTable, evnt, null, thEl, true, dragPos);
       $xeTable.dispatchEvent('column-dragover', {
         oldColumn: dragCol,