vxe-pc-ui 4.11.1 → 4.11.3

package/lib/index.umd.js

@@ -3599,14 +3599,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.11.1"}`;
+const log_version = `ui v${"4.11.3"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.11.1";
+const ui_version = "4.11.3";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -41554,80 +41554,55 @@ function tree_createInternalData() {
           dragToChild: !!prevDragToChild,
           offsetIndex: dragOffsetIndex
         };
-        const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
-        return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
-          if (!status) {
-            return errRest;
-          }
-          const dragNodeid = getNodeId(dragNode);
-          const dragNodeRest = nodeMaps[dragNodeid] || {};
-          const _dragNodeIndex = dragNodeRest._index;
-          let dragNodeHeight = 0;
-          let dragOffsetTop = -1;
-          if (animation) {
-            const prevItemEl = el.querySelector(`.vxe-tree--node-wrapper[nodeid="${prevDragNode}"]`);
-            const oldItemEl = el.querySelector(`.vxe-tree--node-wrapper[nodeid="${dragNodeid}"]`);
-            const targetItemEl = prevItemEl || oldItemEl;
-            if (targetItemEl) {
-              dragNodeHeight = targetItemEl.offsetHeight;
-            }
-            if (oldItemEl) {
-              dragOffsetTop = oldItemEl.offsetTop;
-            }
-          }
-          let oafIndex = -1;
-          let nafIndex = -1;
-          if (transform) {
-            // 移出源位置
-            const oldRest = dragNodeRest;
-            const newNodeid = getNodeId(prevDragNode);
-            const newRest = nodeMaps[newNodeid];
-            if (oldRest && newRest) {
-              const {
-                level: oldLevel
-              } = oldRest;
-              const {
-                level: newLevel
-              } = newRest;
-              const oldAllMaps = {};
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([dragNode], item => {
-                oldAllMaps[getNodeId(item)] = item;
-              }, {
-                children: mapChildrenField
-              });
-              let isSelfToChildStatus = false;
-              if (oldLevel && newLevel) {
-                // 子到子
-                if (isPeerDrag && !isCrossDrag) {
-                  if (oldRest.item[parentField] !== newRest.item[parentField]) {
-                    // 非同级
-                    return errRest;
-                  }
-                } else {
-                  if (!isCrossDrag) {
-                    return errRest;
-                  }
-                  if (oldAllMaps[newNodeid]) {
-                    isSelfToChildStatus = true;
-                    if (!(isCrossDrag && isSelfToChildDrag)) {
-                      if (index_esm_VxeUI.modal) {
-                        index_esm_VxeUI.modal.message({
-                          status: 'error',
-                          content: getI18n('vxe.error.treeDragChild')
-                        });
-                      }
-                      return errRest;
-                    }
-                  }
-                }
-              } else if (oldLevel) {
-                // 子到根
-                if (!isCrossDrag) {
+        const dragNodeid = getNodeId(dragNode);
+        const dragNodeRest = nodeMaps[dragNodeid] || {};
+        const _dragNodeIndex = dragNodeRest._index;
+        let dragNodeHeight = 0;
+        let dragOffsetTop = -1;
+        if (animation) {
+          const prevItemEl = el.querySelector(`.vxe-tree--node-wrapper[nodeid="${prevDragNode}"]`);
+          const oldItemEl = el.querySelector(`.vxe-tree--node-wrapper[nodeid="${dragNodeid}"]`);
+          const targetItemEl = prevItemEl || oldItemEl;
+          if (targetItemEl) {
+            dragNodeHeight = targetItemEl.offsetHeight;
+          }
+          if (oldItemEl) {
+            dragOffsetTop = oldItemEl.offsetTop;
+          }
+        }
+        let oafIndex = -1;
+        let nafIndex = -1;
+        const oldAllMaps = {};
+        let isSelfToChildStatus = false;
+        const oldRest = dragNodeRest;
+        const newNodeid = getNodeId(prevDragNode);
+        const newRest = nodeMaps[newNodeid];
+        if (transform) {
+          if (oldRest && newRest) {
+            const {
+              level: oldLevel
+            } = oldRest;
+            const {
+              level: newLevel
+            } = newRest;
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([dragNode], item => {
+              oldAllMaps[getNodeId(item)] = item;
+            }, {
+              children: mapChildrenField
+            });
+            if (oldLevel && newLevel) {
+              // 子到子
+              if (isPeerDrag && !isCrossDrag) {
+                if (oldRest.item[parentField] !== newRest.item[parentField]) {
+                  // 非同级
+                  clearNodeDragData();
+                  clearCrossTreeDragStatus();
                   return errRest;
                 }
-              } else if (newLevel) {
-                // 根到子
+              } else {
                 if (!isCrossDrag) {
+                  clearNodeDragData();
+                  clearCrossTreeDragStatus();
                   return errRest;
                 }
                 if (oldAllMaps[newNodeid]) {
@@ -41639,12 +41614,53 @@ function tree_createInternalData() {
                         content: getI18n('vxe.error.treeDragChild')
                       });
                     }
+                    clearNodeDragData();
+                    clearCrossTreeDragStatus();
                     return errRest;
                   }
                 }
-              } else {
-                // 根到根
               }
+            } else if (oldLevel) {
+              // 子到根
+              if (!isCrossDrag) {
+                clearNodeDragData();
+                clearCrossTreeDragStatus();
+                return errRest;
+              }
+            } else if (newLevel) {
+              // 根到子
+              if (!isCrossDrag) {
+                clearNodeDragData();
+                clearCrossTreeDragStatus();
+                return errRest;
+              }
+              if (oldAllMaps[newNodeid]) {
+                isSelfToChildStatus = true;
+                if (!(isCrossDrag && isSelfToChildDrag)) {
+                  if (index_esm_VxeUI.modal) {
+                    index_esm_VxeUI.modal.message({
+                      status: 'error',
+                      content: getI18n('vxe.error.treeDragChild')
+                    });
+                  }
+                  clearNodeDragData();
+                  clearCrossTreeDragStatus();
+                  return errRest;
+                }
+              }
+            } else {
+              // 根到根
+            }
+          }
+        }
+        const isDragToChildFlag = isSelfToChildDrag && dragToChildMethod ? dragToChildMethod(dragParams) : prevDragToChild;
+        return Promise.resolve(dEndMethod ? dEndMethod(dragParams) : true).then(status => {
+          if (!status) {
+            return errRest;
+          }
+          if (transform) {
+            // 移出源位置
+            if (oldRest && newRest) {
               const fullList = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toTreeArray(internalData.afterTreeList, {
                 key: keyField,
                 parentKey: parentField,