vxe-table 4.13.11 → 4.13.13

package/packages/table/module/menu/panel.ts

@@ -54,6 +54,7 @@ export default defineComponent({
               const hasChildMenus = item.children && item.children.some((child: any) => child.visible !== false)
               const prefixOpts = Object.assign({}, item.prefixConfig)
               const suffixOpts = Object.assign({}, item.suffixConfig)
+              const menuContent = getFuncText(item.name)
               return item.visible === false
                 ? null
                 : h('li', {
@@ -84,8 +85,9 @@ export default defineComponent({
                       prefixOpts.content ? h('span', {}, `${prefixOpts.content}`) : createCommentVNode()
                     ]),
                     h('div', {
-                      class: 'vxe-context-menu--link-content'
-                    }, getFuncText(item.name)),
+                      class: 'vxe-context-menu--link-content',
+                      title: menuContent
+                    }, menuContent),
                     h('div', {
                       class: ['vxe-context-menu--link-suffix', suffixOpts.className || '']
                     }, [
@@ -103,6 +105,7 @@ export default defineComponent({
                     }, item.children.map((child: any, cIndex: any) => {
                       const childPrefixOpts = Object.assign({}, child.prefixConfig)
                       const childSuffixOpts = Object.assign({}, child.suffixConfig)
+                      const childMenuContent = getFuncText(child.name)
                       return child.visible === false
                         ? null
                         : h('li', {
@@ -133,8 +136,9 @@ export default defineComponent({
                               childPrefixOpts.content ? h('span', `${childPrefixOpts.content}`) : createCommentVNode()
                             ]),
                             h('div', {
-                              class: 'vxe-context-menu--link-content'
-                            }, getFuncText(child.name)),
+                              class: 'vxe-context-menu--link-content',
+                              title: childMenuContent
+                            }, childMenuContent),
                             h('div', {
                               class: ['vxe-context-menu--link-suffix', childSuffixOpts.className || '']
                             }, [

package/packages/table/src/cell.ts

@@ -15,7 +15,7 @@ function renderTitlePrefixIcon (params: VxeTableDefines.CellRenderHeaderParams &
   const titlePrefix = column.titlePrefix || column.titleHelp
   if (titlePrefix) {
     return h('i', {
-      class: ['vxe-cell-title-prefix-icon', titlePrefix.icon || getIcon().TABLE_TITLE_PREFIX],
+      class: ['vxe-cell-title-prefix-icon', titlePrefix.iconStatus ? `theme--${titlePrefix.iconStatus}` : '', titlePrefix.icon || getIcon().TABLE_TITLE_PREFIX],
       onMouseenter (evnt: MouseEvent) {
         $table.triggerHeaderTitleEvent(evnt, titlePrefix, params)
       },
@@ -32,7 +32,7 @@ function renderTitleSuffixIcon (params: VxeTableDefines.CellRenderHeaderParams &
   const titleSuffix = column.titleSuffix
   if (titleSuffix) {
     return h('i', {
-      class: ['vxe-cell-title-suffix-icon', titleSuffix.icon || getIcon().TABLE_TITLE_SUFFIX],
+      class: ['vxe-cell-title-suffix-icon', titleSuffix.iconStatus ? `theme--${titleSuffix.iconStatus}` : '', titleSuffix.icon || getIcon().TABLE_TITLE_SUFFIX],
       onMouseenter (evnt: MouseEvent) {
         $table.triggerHeaderTitleEvent(evnt, titleSuffix, params)
       },

package/packages/table/src/table.ts

@@ -400,6 +400,8 @@ export default defineComponent({
       // 已删除行
       removeRowMaps: {},
 
+      cvCacheMaps: {},
+
       inited: false,
       tooltipTimeout: null,
       initStatus: false,
@@ -2931,13 +2933,13 @@ export default defineComponent({
       if (bodyWrapperElem) {
         overflowY = scrollYHeight > bodyWrapperElem.clientHeight
         if (yHandleEl) {
-          reactData.scrollbarWidth = Math.max(scrollbarOpts.width || 0, yHandleEl.offsetWidth - yHandleEl.clientWidth)
+          reactData.scrollbarWidth = scrollbarOpts.width || (yHandleEl.offsetWidth - yHandleEl.clientWidth) || 14
         }
         reactData.overflowY = overflowY
 
         overflowX = scrollXWidth > bodyWrapperElem.clientWidth
         if (xHandleEl) {
-          reactData.scrollbarHeight = Math.max(scrollbarOpts.height || 0, xHandleEl.offsetHeight - xHandleEl.clientHeight)
+          reactData.scrollbarHeight = scrollbarOpts.height || (xHandleEl.offsetHeight - xHandleEl.clientHeight) || 14
         }
 
         const headerHeight = headerTableElem ? headerTableElem.clientHeight : 0
@@ -3134,6 +3136,7 @@ export default defineComponent({
       scrollYStore.endIndex = 1
       scrollXStore.startIndex = 0
       scrollXStore.endIndex = 1
+      internalData.cvCacheMaps = {}
       reactData.isRowLoading = true
       reactData.scrollVMLoading = false
       internalData.treeExpandedMaps = {}
@@ -3741,41 +3744,41 @@ export default defineComponent({
       }
     }
 
-    const lazyScrollXData = () => {
-      const { lxTimeout, lxRunTime, scrollXStore } = internalData
-      const { visibleSize } = scrollXStore
-      const fpsTime = Math.max(5, Math.min(10, Math.floor(visibleSize / 3)))
-      if (lxTimeout) {
-        clearTimeout(lxTimeout)
-      }
-      if (!lxRunTime || lxRunTime + fpsTime < Date.now()) {
-        internalData.lxRunTime = Date.now()
-        loadScrollXData()
-      }
-      internalData.lxTimeout = setTimeout(() => {
-        internalData.lxTimeout = undefined
-        internalData.lxRunTime = undefined
-        loadScrollXData()
-      }, fpsTime)
-    }
-
-    const lazyScrollYData = () => {
-      const { lyTimeout, lyRunTime, scrollYStore } = internalData
-      const { visibleSize } = scrollYStore
-      const fpsTime = Math.floor(Math.max(4, Math.min(10, visibleSize / 3)))
-      if (lyTimeout) {
-        clearTimeout(lyTimeout)
-      }
-      if (!lyRunTime || lyRunTime + fpsTime < Date.now()) {
-        internalData.lyRunTime = Date.now()
-        loadScrollYData()
-      }
-      internalData.lyTimeout = setTimeout(() => {
-        internalData.lyTimeout = undefined
-        internalData.lyRunTime = undefined
-        loadScrollYData()
-      }, fpsTime)
-    }
+    // const lazyScrollXData = () => {
+    //   const { lxTimeout, lxRunTime, scrollXStore } = internalData
+    //   const { visibleSize } = scrollXStore
+    //   const fpsTime = Math.max(5, Math.min(10, Math.floor(visibleSize / 3)))
+    //   if (lxTimeout) {
+    //     clearTimeout(lxTimeout)
+    //   }
+    //   if (!lxRunTime || lxRunTime + fpsTime < Date.now()) {
+    //     internalData.lxRunTime = Date.now()
+    //     loadScrollXData()
+    //   }
+    //   internalData.lxTimeout = setTimeout(() => {
+    //     internalData.lxTimeout = undefined
+    //     internalData.lxRunTime = undefined
+    //     loadScrollXData()
+    //   }, fpsTime)
+    // }
+
+    // const lazyScrollYData = () => {
+    //   const { lyTimeout, lyRunTime, scrollYStore } = internalData
+    //   const { visibleSize } = scrollYStore
+    //   const fpsTime = Math.floor(Math.max(4, Math.min(10, visibleSize / 3)))
+    //   if (lyTimeout) {
+    //     clearTimeout(lyTimeout)
+    //   }
+    //   if (!lyRunTime || lyRunTime + fpsTime < Date.now()) {
+    //     internalData.lyRunTime = Date.now()
+    //     loadScrollYData()
+    //   }
+    //   internalData.lyTimeout = setTimeout(() => {
+    //     internalData.lyTimeout = undefined
+    //     internalData.lyRunTime = undefined
+    //     loadScrollYData()
+    //   }, fpsTime)
+    // }
 
     const checkLastSyncScroll = (isRollX: boolean, isRollY: boolean) => {
       const { scrollXLoad, scrollYLoad } = reactData
@@ -6227,12 +6230,14 @@ export default defineComponent({
           setScrollLeft(bodyScrollElem, scrollLeft)
           setScrollLeft(headerScrollElem, scrollLeft)
           setScrollLeft(footerScrollElem, scrollLeft)
+          loadScrollXData()
         }
         if (XEUtils.isNumber(scrollTop)) {
           setScrollTop(yHandleEl, scrollTop)
           setScrollTop(bodyScrollElem, scrollTop)
           setScrollTop(leftScrollElem, scrollTop)
           setScrollTop(rightScrollElem, scrollTop)
+          loadScrollYData()
         }
         if (reactData.scrollXLoad || reactData.scrollYLoad) {
           return new Promise<void>(resolve => {
@@ -6256,7 +6261,7 @@ export default defineComponent({
         const rest = []
         if (row) {
           if (props.treeConfig) {
-            rest.push(tablePrivateMethods.scrollToTreeRow(row))
+            rest.push($xeTable.scrollToTreeRow(row))
           } else {
             rest.push(rowToVisible($xeTable, row))
           }
@@ -9643,23 +9648,23 @@ export default defineComponent({
        * 横向 X 可视渲染事件处理
        */
       triggerScrollXEvent () {
-        const virtualXOpts = computeVirtualXOpts.value
-        if (virtualXOpts.immediate) {
-          loadScrollXData()
-        } else {
-          lazyScrollXData()
-        }
+        // const virtualXOpts = computeVirtualXOpts.value
+        // if (virtualXOpts.immediate) {
+        loadScrollXData()
+        // } else {
+        //   lazyScrollXData()
+        // }
       },
       /**
        * 纵向 Y 可视渲染事件处理
        */
       triggerScrollYEvent () {
-        const virtualYOpts = computeVirtualYOpts.value
-        if (virtualYOpts.immediate) {
-          loadScrollYData()
-        } else {
-          lazyScrollYData()
-        }
+        // const virtualYOpts = computeVirtualYOpts.value
+        // if (virtualYOpts.immediate) {
+        loadScrollYData()
+        // } else {
+        //   lazyScrollYData()
+        // }
       },
       triggerBodyScrollEvent (evnt, fixedType) {
         const { scrollYLoad, scrollXLoad } = reactData
@@ -9848,12 +9853,14 @@ export default defineComponent({
         if (!bodyScrollElem) {
           return
         }
+
         const wheelSpeed = getWheelSpeed(reactData.lastScrollTime)
         const deltaTop = shiftKey ? 0 : Math.ceil(deltaY * wheelSpeed)
         const deltaLeft = shiftKey ? Math.ceil((shiftKey ? (deltaY || deltaX) : deltaX) * wheelSpeed) : 0
 
         const isTopWheel = deltaTop < 0
         const currScrollTop = bodyScrollElem.scrollTop
+
         // 如果滚动位置已经是顶部或底部，则不需要触发
         if (isTopWheel ? currScrollTop <= 0 : currScrollTop >= bodyScrollElem.scrollHeight - bodyScrollElem.clientHeight) {
           return
@@ -11356,6 +11363,9 @@ export default defineComponent({
       if (tableViewportEl) {
         tableViewportEl.removeEventListener('wheel', $xeTable.triggerBodyWheelEvent)
       }
+      internalData.cvCacheMaps = {}
+      internalData.prevDragRow = null
+      internalData.prevDragCol = null
       if (resizeObserver) {
         resizeObserver.disconnect()
       }

package/packages/table/src/util.ts

@@ -1,4 +1,4 @@
-import { watch, reactive } from 'vue'
+import { watch, reactive, nextTick } from 'vue'
 import XEUtils from 'xe-utils'
 import { ColumnInfo } from './columnInfo'
 import { isPx, isScale } from '../../ui/src/dom'
@@ -72,23 +72,18 @@ export const convertHeaderColumnToRows = (originColumns: any): any[][] => {
 export function restoreScrollLocation ($xeTable: VxeTableConstructor, scrollLeft: number, scrollTop: number) {
   const internalData = $xeTable.internalData
 
-  return $xeTable.clearScroll().then(() => {
-    if (scrollLeft || scrollTop) {
-      // 重置最后滚动状态
-      internalData.lastScrollLeft = 0
-      internalData.lastScrollTop = 0
-
-      internalData.intoRunScroll = false
-      internalData.inVirtualScroll = false
-      internalData.inWheelScroll = false
-      internalData.inHeaderScroll = false
-      internalData.inBodyScroll = false
-      internalData.inFooterScroll = false
-      internalData.scrollRenderType = ''
-      // 还原滚动状态
-      return $xeTable.scrollTo(scrollLeft, scrollTop)
-    }
-  })
+  if (scrollLeft || scrollTop) {
+    internalData.intoRunScroll = false
+    internalData.inVirtualScroll = false
+    internalData.inWheelScroll = false
+    internalData.inHeaderScroll = false
+    internalData.inBodyScroll = false
+    internalData.inFooterScroll = false
+    internalData.scrollRenderType = ''
+    // 还原滚动状态
+    return $xeTable.scrollTo(scrollLeft, scrollTop)
+  }
+  return nextTick()
 }
 
 /**

package/packages/ui/index.ts

@@ -208,7 +208,7 @@ VxeUI.setConfig({
     },
     virtualXConfig: {
       enabled: true,
-      gt: 28,
+      gt: 24,
       preSize: 1,
       oSize: 0
     },
@@ -219,8 +219,8 @@ VxeUI.setConfig({
       oSize: 0
     },
     scrollbarConfig: {
-      width: 14,
-      height: 14
+      // width: 14,
+      // height: 14
     }
   },
   // export: {

package/styles/components/table.scss

@@ -1,7 +1,36 @@
+@use "sass:map";
+@use "sass:list";
 @use '../helpers/baseMixin.scss';
 @use './icon.scss';
 @use './table-module/all.scss';
 
+$btnThemeList: (
+  (
+    name: "primary",
+    textColor: var(--vxe-ui-font-primary-color),
+  ),
+  (
+    name: "success",
+    textColor: var(--vxe-ui-status-success-color),
+  ),
+  (
+    name: "info",
+    textColor: var(--vxe-ui-status-info-color),
+  ),
+  (
+    name: "warning",
+    textColor: var(--vxe-ui-status-warning-color),
+  ),
+  (
+    name: "danger",
+    textColor: var(--vxe-ui-status-danger-color),
+  ),
+  (
+    name: "error",
+    textColor: var(--vxe-ui-status-error-color),
+  )
+);
+
 .vxe-table-slots,
 .vxe-table--file-form {
   display: none;
@@ -792,6 +821,12 @@
   .vxe-cell-title-prefix-icon,
   .vxe-cell-title-suffix-icon {
     cursor: help;
+    @for $index from 0 to list.length($btnThemeList) {
+      $item: list.nth($btnThemeList, $index + 1);
+      &.theme--#{map.get($item, name)} {
+        color: map.get($item, textColor);
+      }
+    }
   }
 }