vxe-table 3.19.47 → 3.19.49

package/lib/table/src/methods.js

@@ -455,14 +455,19 @@ function cacheColumnMap($xeTable) {
   } else {
     tableFullColumn.forEach(handleFunc);
   }
-  if (expandColumn && expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
-    (0, _log.warnLog)('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
-  }
-  if (expandColumn && expandOpts.mode !== 'fixed' && mouseOpts.area) {
-    (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
-  }
-  if (expandColumn && expandOpts.mode !== 'inside' && treeConfig && !treeOpts.transform) {
-    (0, _log.errLog)('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed']);
+  if (expandColumn) {
+    if (expandOpts.mode !== 'fixed' && virtualYOpts.enabled) {
+      (0, _log.warnLog)('vxe.error.notConflictProp', ['column.type="expand', 'virtual-y-config.enabled=false']);
+    }
+    if (expandOpts.mode !== 'fixed' && mouseOpts.area) {
+      (0, _log.errLog)('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand']);
+    }
+    if (expandOpts.mode !== 'inside' && treeConfig && !treeOpts.transform) {
+      (0, _log.errLog)('vxe.error.notConflictProp', ['tree-config.transform=false', 'expand-config.mode=fixed']);
+    }
+    if (props.spanMethod) {
+      (0, _log.warnLog)('vxe.error.notSupportProp', ['column.type=expand', 'span-method', 'span-method=null']);
+    }
   }
   if (htmlColumn) {
     if (!columnOpts.useKey) {
@@ -10309,11 +10314,13 @@ const tableMethods = {
               if (isPeerDrag && !isCrossDrag) {
                 if (oldRest.row[parentField] !== newRest.row[parentField]) {
                   // 非同级
-                  return errRest;
+                  handleRowDragEndClearStatus($xeTable);
+                  return Promise.resolve(errRest);
                 }
               } else {
                 if (!isCrossDrag) {
-                  return errRest;
+                  handleRowDragEndClearStatus($xeTable);
+                  return Promise.resolve(errRest);
                 }
                 if (oldAllMaps[newRowid]) {
                   isSelfToChildStatus = true;
@@ -10324,19 +10331,22 @@ const tableMethods = {
                         content: getI18n('vxe.error.treeDragChild')
                       });
                     }
-                    return errRest;
+                    handleRowDragEndClearStatus($xeTable);
+                    return Promise.resolve(errRest);
                   }
                 }
               }
             } else if (oldLevel) {
               // 子到根
               if (!isCrossDrag) {
-                return errRest;
+                handleRowDragEndClearStatus($xeTable);
+                return Promise.resolve(errRest);
               }
             } else if (newLevel) {
               // 根到子
               if (!isCrossDrag) {
-                return errRest;
+                handleRowDragEndClearStatus($xeTable);
+                return Promise.resolve(errRest);
               }
               if (oldAllMaps[newRowid]) {
                 isSelfToChildStatus = true;
@@ -10347,7 +10357,8 @@ const tableMethods = {
                       content: getI18n('vxe.error.treeDragChild')
                     });
                   }
-                  return errRest;
+                  handleRowDragEndClearStatus($xeTable);
+                  return Promise.resolve(errRest);
                 }
               }
             } else {
@@ -10367,6 +10378,7 @@ const tableMethods = {
             // 移出源位置
             if (oldRest && newRest) {
               const fullList = _xeUtils.default.toTreeArray(internalData.afterTreeFullData, {
+                updated: false,
                 key: rowField,
                 parentKey: parentField,
                 children: mapChildrenField