vxe-pc-ui 4.11.0 → 4.11.2

package/packages/tree/src/tree.ts

@@ -3,6 +3,7 @@ import { defineVxeComponent } from '../../ui/src/comp'
 import { VxeUI, getI18n, createEvent, getIcon, getConfig, useSize, globalEvents, globalResize, renderEmptyElement } from '../../ui'
 import { calcTreeLine, enNodeValue, deNodeValue } from './util'
 import { errLog } from '../../ui/src/log'
+import { getCrossTreeDragNodeInfo } from './store'
 import XEUtils from 'xe-utils'
 import { getSlotVNs } from '../../ui/src/vn'
 import { toCssUnit, isScale, getPaddingTopBottomSize, addClass, removeClass, getTpImg, hasControlKey, getEventTargetNode } from '../../ui/src/dom'
@@ -50,6 +51,11 @@ function createInternalData (): TreeInternalData {
   }
 }
 
+// let crossTreeDragNodeObj: {
+//   $oldTree: VxeTreeConstructor & VxeTreePrivateMethods
+//   $newTree: (VxeTreeConstructor & VxeTreePrivateMethods) | null
+// } | null = null
+
 export default defineVxeComponent({
   name: 'VxeTree',
   props: {
@@ -200,6 +206,8 @@ export default defineVxeComponent({
     const refDragNodeLineElem = ref<HTMLDivElement>()
     const refDragTipElem = ref<HTMLDivElement>()
 
+    const crossTreeDragNodeInfo = getCrossTreeDragNodeInfo()
+
     const reactData = reactive<TreeReactData>({
       parentHeight: 0,
       customHeight: 0,
@@ -1749,11 +1757,17 @@ export default defineVxeComponent({
       }
     }
 
+    const clearCrossTreeDragStatus = () => {
+      // crossTreeDragNodeObj = null
+      crossTreeDragNodeInfo.node = null
+    }
+
     const clearDragStatus = () => {
       const { dragNode } = reactData
       if (dragNode) {
-        clearNodeDropOrigin()
         hideDropTip()
+        clearNodeDropOrigin()
+        clearCrossTreeDragStatus()
         reactData.dragNode = null
       }
     }
@@ -1858,84 +1872,55 @@ export default defineVxeComponent({
           dragToChild: !!prevDragToChild,
           offsetIndex: dragOffsetIndex as 0 | 1
         }
-        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<HTMLElement>(`.vxe-tree--node-wrapper[nodeid="${prevDragNode}"]`)
-            const oldItemEl = el.querySelector<HTMLElement>(`.vxe-tree--node-wrapper[nodeid="${dragNodeid}"]`)
-            const targetItemEl = prevItemEl || oldItemEl
-            if (targetItemEl) {
-              dragNodeHeight = targetItemEl.offsetHeight
-            }
-            if (oldItemEl) {
-              dragOffsetTop = oldItemEl.offsetTop
-            }
+        const dragNodeid = getNodeId(dragNode)
+        const dragNodeRest = nodeMaps[dragNodeid] || {}
+        const _dragNodeIndex = dragNodeRest._index
+        let dragNodeHeight = 0
+        let dragOffsetTop = -1
+        if (animation) {
+          const prevItemEl = el.querySelector<HTMLElement>(`.vxe-tree--node-wrapper[nodeid="${prevDragNode}"]`)
+          const oldItemEl = el.querySelector<HTMLElement>(`.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: Record<string, any> = {}
-              XEUtils.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 (VxeUI.modal) {
-                        VxeUI.modal.message({
-                          status: 'error',
-                          content: getI18n('vxe.error.treeDragChild')
-                        })
-                      }
-                      return errRest
-                    }
-                  }
-                }
-              } else if (oldLevel) {
-                // 子到根
+        let oafIndex = -1
+        let nafIndex = -1
+        const oldAllMaps: Record<string, any> = {}
+        let isSelfToChildStatus = false
 
-                if (!isCrossDrag) {
+        const oldRest = dragNodeRest
+        const newNodeid = getNodeId(prevDragNode)
+        const newRest = nodeMaps[newNodeid]
+        if (transform) {
+          if (oldRest && newRest) {
+            const { level: oldLevel } = oldRest
+            const { level: newLevel } = newRest
+
+            XEUtils.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]) {
@@ -1947,13 +1932,57 @@ export default defineVxeComponent({
                         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 (VxeUI.modal) {
+                    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 = XEUtils.toTreeArray(internalData.afterTreeList, {
                 key: keyField,
                 parentKey: parentField,
@@ -2093,10 +2122,12 @@ export default defineVxeComponent({
           return errRest
         }).then((rest) => {
           clearNodeDragData()
+          clearCrossTreeDragStatus()
           return rest
         })
       }
       clearNodeDragData()
+      clearCrossTreeDragStatus()
       return Promise.resolve(errRest)
     }
 
@@ -2183,6 +2214,28 @@ export default defineVxeComponent({
           return getNodeId(node1) === getNodeId(node2)
         }
         return false
+      },
+      handleCrossTreeNodeDragCancelEvent () {
+        clearNodeDragData()
+        clearCrossTreeDragStatus()
+      },
+      /**
+       * 处理跨树拖拽完成
+       */
+      handleCrossTreeNodeDragFinishEvent () {
+      },
+      /**
+       * 处理跨树拖至新的空树
+       */
+      handleCrossTreeNodeDragInsertEvent () {
+      },
+      /**
+       * 处理跨树拖插入
+       */
+      handleCrossTreeNodeDragoverEmptyEvent () {
+      },
+      hideCrossTreeNodeDropClearStatus () {
+        hideDropTip()
       }
     }
 
@@ -2614,6 +2667,10 @@ export default defineVxeComponent({
     })
 
     onMounted(() => {
+      const dragOpts = computeDragOpts.value
+      if (dragOpts.isCrossTreeDrag) {
+        errLog('vxe.error.notProp', ['drag-config.isCrossTreeDrag'])
+      }
       if (props.autoResize) {
         const el = refElem.value
         const parentEl = getParentElem()

package/types/components/gantt-plugins/extend-gantt-chart.d.ts

@@ -1,3 +1,5 @@
+import { VNode } from 'vue'
+import { VxeComponentStyleType } from '@vxe-ui/core'
 import { VxeGanttConstructor, VxeGanttDefines } from '../gantt'
 
 /* eslint-disable @typescript-eslint/no-empty-interface,no-use-before-define,@typescript-eslint/no-unused-vars */
@@ -14,6 +16,23 @@ export interface VxeGanttExtendChartPrivateMethods<D = any> {
     row: D
     scaleType: VxeGanttDefines.ColumnScaleType
   }): void
+  /**
+   * @private
+   */
+  renderGanttTaskBarContent(params: {
+    $gantt: VxeGanttConstructor<D>
+    source: string
+    type: string
+    scaleType: VxeGanttDefines.ColumnScaleType
+    row: D
+    rowIndex: number
+    $rowIndex: number
+    _rowIndex: number
+  }, renderParams: {
+    title: string
+    vbStyle: VxeComponentStyleType
+    vpStyle: VxeComponentStyleType
+  }): VNode[]
 }
 
 declare module '../gantt' {

package/types/components/tree.d.ts

@@ -153,6 +153,10 @@ export namespace VxeTreePropTypes {
      * 需要 isCrossDrag，是否允许将自己拖拽到子级行中
      */
     isSelfToChildDrag?: boolean
+    /**
+     * 是否允许在不同树之间进行拖拽
+     */
+    isCrossTreeDrag?: boolean
     /**
      * 是否显示拖拽辅助状态显示
      */
@@ -592,6 +596,26 @@ export interface TreePrivateMethods {
    * @private
    */
   eqNode(node1: any, node2: any): boolean
+  /**
+   * @private
+   */
+  handleCrossTreeNodeDragInsertEvent(evnt: DragEvent): void
+  /**
+   * @private
+   */
+  handleCrossTreeNodeDragCancelEvent(evnt: DragEvent): void
+  /**
+   * @private
+   */
+  handleCrossTreeNodeDragFinishEvent(evnt: DragEvent): void
+  /**
+   * @private
+   */
+  handleCrossTreeNodeDragoverEmptyEvent(evnt: DragEvent): void
+  /**
+   * @private
+   */
+  hideCrossTreeNodeDropClearStatus(): void
 }
 export interface VxeTreePrivateMethods extends TreePrivateMethods { }