vxe-table 3.25.0-beta.2 → 3.25.0-beta.3

package/packages/ui/src/dom.ts

@@ -266,6 +266,7 @@ interface PanelPlacementOptions {
   defaultLeft?: number
   placement?: '' | 'top' | 'bottom' | null
   defaultPlacement?: '' | 'top' | 'bottom' | null
+  appendTo?: string | HTMLElement | ((params: any) => string | HTMLElement)
   teleportTo?: boolean
   marginSize?: number
   isMinWidth?: boolean
@@ -275,7 +276,8 @@ interface PanelPlacementOptions {
  * 通用定位计算
  */
 export function updatePanelPlacement (targetElem: HTMLElement | null | undefined, panelElem: HTMLElement | null | undefined, options: PanelPlacementOptions) {
-  const { defaultTop, defaultLeft, placement, defaultPlacement, teleportTo, marginSize, isMinWidth } = Object.assign({
+  const { defaultTop, defaultLeft, placement, defaultPlacement, appendTo, teleportTo, marginSize, isMinWidth } = Object.assign({
+    appendTo: '',
     teleportTo: false,
     marginSize: 18,
     isMinWidth: true
@@ -289,7 +291,7 @@ export function updatePanelPlacement (targetElem: HTMLElement | null | undefined
   const stys: Record<string, string> = {}
   if (panelElem && targetElem) {
     const bodyEl = document.body
-    const parentWrapperEl = getPopupWrapperElement(panelElem)
+    const parentWrapperEl = getPopupWrapperElement(teleportTo ? getPopupAppendElement(appendTo) : panelElem)
     if (parentWrapperEl) {
       const targetWidth = targetElem.offsetWidth
       const targetHeight = targetElem.offsetHeight
@@ -302,16 +304,18 @@ export function updatePanelPlacement (targetElem: HTMLElement | null | undefined
       const visibleHeight = bodyEl.clientHeight
       const visibleWidth = bodyEl.clientWidth
 
-      const offsetLeft = parentWrapperRect.left
-      const offsetTop = parentWrapperRect.top
+      const parentWrapperScrollLeft = parentWrapperEl.scrollLeft
+      const parentWrapperScrollTop = parentWrapperEl.scrollTop
+      const parentWrapperOffsetLeft = parentWrapperRect.left
+      const parentWrapperOffsetTop = parentWrapperRect.top
       const targetLeft = targetRect.left
       const targetTop = targetRect.top
 
       minWidth = targetElem.offsetWidth
 
       if (teleportTo) {
-        left = defaultLeft || (targetLeft - (panelWidth - targetWidth) / 2)
-        top = defaultTop || (targetTop + targetHeight)
+        left = (defaultLeft || (targetLeft - (panelWidth - targetWidth) / 2)) - parentWrapperScrollLeft
+        top = (defaultTop || (targetTop + targetHeight)) - parentWrapperScrollTop
         if (placement === 'top') {
           panelPlacement = 'top'
           top = targetTop - panelHeight
@@ -354,8 +358,8 @@ export function updatePanelPlacement (targetElem: HTMLElement | null | undefined
         }
 
         // 偏移
-        top -= offsetTop
-        left -= offsetLeft
+        top -= parentWrapperOffsetTop
+        left -= parentWrapperOffsetLeft
       } else {
         if (placement === 'top') {
           panelPlacement = 'top'

package/es/table/src/scrollbar.js

@@ -1,54 +0,0 @@
-/**
- * 计算滚动条滑块的长度
- */
-export function getThumbSize(viewportSize, contentSize, trackSize) {
-    if (contentSize <= viewportSize) {
-        return 0;
-    }
-    const ratio = viewportSize / contentSize;
-    const ideal = trackSize * ratio;
-    return Math.max(20, Math.min(ideal, trackSize));
-}
-/**
- * 计算滚动条滑块的偏移位置
- */
-export function getThumbOffsetSize(offsetSize, viewportSize, contentSize, trackSize, thumbSize) {
-    const maxScroll = contentSize - viewportSize;
-    if (maxScroll <= 0) {
-        return 0;
-    }
-    const maxThumbOffset = trackSize - thumbSize;
-    if (maxThumbOffset <= 0) {
-        return 0;
-    }
-    const clamped = Math.min(Math.max(offsetSize, 0), maxScroll);
-    const ratio = clamped / maxScroll;
-    return ratio * maxThumbOffset;
-}
-/**
- * 根据点击轨道的位置，计算滑块的偏移位置
- */
-export function getScrollFromClick(clickPosition, viewportSize, contentSize, trackSize, thumbSize) {
-    const maxThumbOffset = trackSize - thumbSize;
-    const maxScroll = contentSize - viewportSize;
-    if (maxScroll <= 0 || maxThumbOffset <= 0) {
-        return 0;
-    }
-    let thumbOffset = clickPosition - thumbSize / 2;
-    thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
-    const scrollOffset = (thumbOffset / maxThumbOffset) * maxScroll;
-    return scrollOffset;
-}
-/**
- * 拖拽 thumb 时，根据鼠标位置计算滑块的偏移位置
- */
-export function getScrollFromDrag(pointerPosition, dragOffset, viewportSize, contentSize, trackSize, thumbSize) {
-    const maxScroll = contentSize - viewportSize;
-    const maxThumbOffset = trackSize - thumbSize;
-    if (maxScroll <= 0 || maxThumbOffset <= 0) {
-        return 0;
-    }
-    let thumbOffset = pointerPosition - dragOffset;
-    thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
-    return (thumbOffset / maxThumbOffset) * maxScroll;
-}

package/lib/table/src/scrollbar.js

@@ -1,63 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getScrollFromClick = getScrollFromClick;
-exports.getScrollFromDrag = getScrollFromDrag;
-exports.getThumbOffsetSize = getThumbOffsetSize;
-exports.getThumbSize = getThumbSize;
-/**
- * 计算滚动条滑块的长度
- */
-function getThumbSize(viewportSize, contentSize, trackSize) {
-  if (contentSize <= viewportSize) {
-    return 0;
-  }
-  const ratio = viewportSize / contentSize;
-  const ideal = trackSize * ratio;
-  return Math.max(20, Math.min(ideal, trackSize));
-}
-/**
- * 计算滚动条滑块的偏移位置
- */
-function getThumbOffsetSize(offsetSize, viewportSize, contentSize, trackSize, thumbSize) {
-  const maxScroll = contentSize - viewportSize;
-  if (maxScroll <= 0) {
-    return 0;
-  }
-  const maxThumbOffset = trackSize - thumbSize;
-  if (maxThumbOffset <= 0) {
-    return 0;
-  }
-  const clamped = Math.min(Math.max(offsetSize, 0), maxScroll);
-  const ratio = clamped / maxScroll;
-  return ratio * maxThumbOffset;
-}
-/**
- * 根据点击轨道的位置，计算滑块的偏移位置
- */
-function getScrollFromClick(clickPosition, viewportSize, contentSize, trackSize, thumbSize) {
-  const maxThumbOffset = trackSize - thumbSize;
-  const maxScroll = contentSize - viewportSize;
-  if (maxScroll <= 0 || maxThumbOffset <= 0) {
-    return 0;
-  }
-  let thumbOffset = clickPosition - thumbSize / 2;
-  thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
-  const scrollOffset = thumbOffset / maxThumbOffset * maxScroll;
-  return scrollOffset;
-}
-/**
- * 拖拽 thumb 时，根据鼠标位置计算滑块的偏移位置
- */
-function getScrollFromDrag(pointerPosition, dragOffset, viewportSize, contentSize, trackSize, thumbSize) {
-  const maxScroll = contentSize - viewportSize;
-  const maxThumbOffset = trackSize - thumbSize;
-  if (maxScroll <= 0 || maxThumbOffset <= 0) {
-    return 0;
-  }
-  let thumbOffset = pointerPosition - dragOffset;
-  thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset);
-  return thumbOffset / maxThumbOffset * maxScroll;
-}

package/lib/table/src/scrollbar.min.js

@@ -1 +0,0 @@
-function getThumbSize(t,e,r){return e<=t?0:Math.max(20,Math.min(r*(t/e),r))}function getThumbOffsetSize(t,e,r,o,m){r-=e;return r<=0||(e=o-m)<=0?0:Math.min(Math.max(t,0),r)/r*e}function getScrollFromClick(t,e,r,o,m){o-=m,r-=e;return r<=0||o<=0?0:(e=t-m/2,(e=Math.min(Math.max(e,0),o))/o*r)}function getScrollFromDrag(t,e,r,o,m,i){o-=r,r=m-i;return o<=0||r<=0?0:(m=t-e,(m=Math.min(Math.max(m,0),r))/r*o)}Object.defineProperty(exports,"__esModule",{value:!0}),exports.getScrollFromClick=getScrollFromClick,exports.getScrollFromDrag=getScrollFromDrag,exports.getThumbOffsetSize=getThumbOffsetSize,exports.getThumbSize=getThumbSize;

package/packages/table/src/scrollbar.ts

@@ -1,57 +0,0 @@
-/**
- * 计算滚动条滑块的长度
- */
-export function getThumbSize (viewportSize: number, contentSize: number, trackSize: number) {
-  if (contentSize <= viewportSize) {
-    return 0
-  }
-  const ratio = viewportSize / contentSize
-  const ideal = trackSize * ratio
-  return Math.max(20, Math.min(ideal, trackSize))
-}
-
-/**
- * 计算滚动条滑块的偏移位置
- */
-export function getThumbOffsetSize (offsetSize: number, viewportSize: number, contentSize: number, trackSize: number, thumbSize: number) {
-  const maxScroll = contentSize - viewportSize
-  if (maxScroll <= 0) {
-    return 0
-  }
-  const maxThumbOffset = trackSize - thumbSize
-  if (maxThumbOffset <= 0) {
-    return 0
-  }
-  const clamped = Math.min(Math.max(offsetSize, 0), maxScroll)
-  const ratio = clamped / maxScroll
-  return ratio * maxThumbOffset
-}
-
-/**
- * 根据点击轨道的位置，计算滑块的偏移位置
- */
-export function getScrollFromClick (clickPosition: number, viewportSize: number, contentSize: number, trackSize: number, thumbSize: number) {
-  const maxThumbOffset = trackSize - thumbSize
-  const maxScroll = contentSize - viewportSize
-  if (maxScroll <= 0 || maxThumbOffset <= 0) {
-    return 0
-  }
-  let thumbOffset = clickPosition - thumbSize / 2
-  thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset)
-  const scrollOffset = (thumbOffset / maxThumbOffset) * maxScroll
-  return scrollOffset
-}
-
-/**
- * 拖拽 thumb 时，根据鼠标位置计算滑块的偏移位置
- */
-export function getScrollFromDrag (pointerPosition: number, dragOffset: number, viewportSize: number, contentSize: number, trackSize: number, thumbSize: number) {
-  const maxScroll = contentSize - viewportSize
-  const maxThumbOffset = trackSize - thumbSize
-  if (maxScroll <= 0 || maxThumbOffset <= 0) {
-    return 0
-  }
-  let thumbOffset = pointerPosition - dragOffset
-  thumbOffset = Math.min(Math.max(thumbOffset, 0), maxThumbOffset)
-  return (thumbOffset / maxThumbOffset) * maxScroll
-}