vxe-pc-ui 4.10.50 → 4.11.1

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
       }
     }
@@ -2093,10 +2107,12 @@ export default defineVxeComponent({
           return errRest
         }).then((rest) => {
           clearNodeDragData()
+          clearCrossTreeDragStatus()
           return rest
         })
       }
       clearNodeDragData()
+      clearCrossTreeDragStatus()
       return Promise.resolve(errRest)
     }
 
@@ -2183,6 +2199,28 @@ export default defineVxeComponent({
           return getNodeId(node1) === getNodeId(node2)
         }
         return false
+      },
+      handleCrossTreeNodeDragCancelEvent () {
+        clearNodeDragData()
+        clearCrossTreeDragStatus()
+      },
+      /**
+       * 处理跨树拖拽完成
+       */
+      handleCrossTreeNodeDragFinishEvent () {
+      },
+      /**
+       * 处理跨树拖至新的空树
+       */
+      handleCrossTreeNodeDragInsertEvent () {
+      },
+      /**
+       * 处理跨树拖插入
+       */
+      handleCrossTreeNodeDragoverEmptyEvent () {
+      },
+      hideCrossTreeNodeDropClearStatus () {
+        hideDropTip()
       }
     }
 
@@ -2614,6 +2652,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/styles/components/select.scss

@@ -56,6 +56,7 @@
 
 .vxe-select--panel-search {
   display: block;
+  flex-shrink: 0;
   padding: var(--vxe-ui-layout-padding-default);
   .vxe-select-search--input {
     width: 100%;
@@ -63,13 +64,23 @@
 }
 
 .vxe-select--panel-wrapper {
+  display: flex;
+  flex-direction: column;
   position: relative;
+  max-height: 18em;
   border-radius: var(--vxe-ui-base-border-radius);
   border: 1px solid var(--vxe-ui-base-popup-border-color);
   box-shadow: var(--vxe-ui-base-popup-box-shadow);
   background-color: var(--vxe-ui-layout-background-color);
 }
 
+.vxe-select--panel-body {
+  display: flex;
+  flex-direction: row;
+  flex-grow: 1;
+  overflow: hidden;
+}
+
 .vxe-select--header-button {
   display: flex;
   flex-direction: row;
@@ -99,10 +110,12 @@
 
 .vxe-select--panel-header,
 .vxe-select--panel-footer {
+  flex-shrink: 0;
   padding: 4px 0;
 }
 
 .vxe-select-option--wrapper {
+  flex-grow: 1;
   position: relative;
   overflow-x: hidden;
   overflow-y: auto;
@@ -118,9 +131,6 @@
   border: 0;
   outline: 0;
 }
-.vxe-select-option--wrapper {
-  max-height: 18em;
-}
 .vxe-select-option {
   position: relative;
   padding: 0 0.6em;

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/select.d.ts

@@ -104,6 +104,11 @@ export namespace VxeSelectPropTypes {
   export type OptionId = string
   export type OptionKey = boolean
   export type Transfer = boolean
+  export interface PopupConfig {
+    width?: number | string
+    height?: number | string
+    className?: string | ((params: { $select: VxeSelectConstructor }) => string)
+  }
 
   export interface VirtualYConfig {
     /**
@@ -165,6 +170,7 @@ export interface VxeSelectProps {
   remoteConfig?: VxeSelectPropTypes.RemoteConfig
   max?: VxeSelectPropTypes.Max
   transfer?: VxeSelectPropTypes.Transfer
+  popupConfig?: VxeSelectPropTypes.PopupConfig
   virtualYConfig?: VxeSelectPropTypes.VirtualYConfig
 
   /**

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 { }