vxe-table 3.19.5 → 3.19.7

package/packages/table/src/cell.ts

@@ -185,7 +185,8 @@ function renderTitleContent (h: CreateElement, params: VxeTableDefines.CellRende
   const tableReactData = $table as unknown as TableReactData
   const { showHeaderOverflow: allColumnHeaderOverflow } = tableProps
   const { isRowGroupStatus } = tableReactData
-  const { showHeaderOverflow } = column
+  const { showHeaderOverflow, slots } = column
+  const titleSlot = slots ? slots.title : null
   const headerTooltipOpts = $table.computeHeaderTooltipOpts
   const showAllTip = headerTooltipOpts.showAll
   const headOverflow = XEUtils.eqNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow
@@ -221,9 +222,11 @@ function renderTitleContent (h: CreateElement, params: VxeTableDefines.CellRende
       on: ons
     }, isRowGroupStatus && column.aggFunc && $table.getPivotTableAggregateRenderColTitles
       ? $table.getPivotTableAggregateRenderColTitles(h, column, titleVN)
-      : [
-          titleVN
-        ])
+      : titleSlot
+        ? $table.callSlot(titleSlot, params, h)
+        : [
+            titleVN
+          ])
   ]
 }
 
@@ -633,9 +636,9 @@ export const Cell = {
       return renderCellBaseVNs(h, params, $table.callSlot(slots.default, params, h))
     }
     const { seq } = params
-    const seqMethod = seqOpts.seqMethod
+    const seqMd = seqOpts.seqMethod
     return renderCellBaseVNs(h, params, [
-      h('span', `${formatText(seqMethod ? seqMethod(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + (seq as number), 1)}`)
+      h('span', `${formatText(seqMd ? seqMd(params) : treeConfig ? seq : (seqOpts.startIndex || 0) + (seq as number), 1)}`)
     ])
   },
   renderDeepIndexCell (h: CreateElement, params: VxeTableDefines.CellRenderBodyParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {
@@ -1049,45 +1052,49 @@ export const Cell = {
     const { $table, column } = params
     const sortOpts = $table.computeSortOpts
     const { showIcon, allowBtn, ascTitle, descTitle, iconLayout, iconAsc, iconDesc, iconVisibleMethod } = sortOpts
+    const { order, slots } = column
     if (showIcon && (!iconVisibleMethod || iconVisibleMethod(params))) {
-      return [
-        h('span', {
-          class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
-        }, [
-          h('i', {
-            class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
-              'sort--active': column.order === 'asc'
-            }],
-            attrs: {
-              title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
-            },
-            on: allowBtn
-              ? {
-                  click (evnt: any) {
-                    evnt.stopPropagation()
-                    $table.triggerSortEvent(evnt, column, 'asc')
-                  }
-                }
-              : undefined
-          }),
-          h('i', {
-            class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
-              'sort--active': column.order === 'desc'
-            }],
-            attrs: {
-              title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
-            },
-            on: allowBtn
-              ? {
-                  click (evnt: any) {
-                    evnt.stopPropagation()
-                    $table.triggerSortEvent(evnt, column, 'desc')
-                  }
-                }
-              : undefined
-          })
-        ])
-      ]
+      const sortSlot = slots ? slots.sort : null
+      return sortSlot
+        ? getSlotVNs($table.callSlot(sortSlot, params, h)) as VNode[]
+        : [
+            h('span', {
+              class: ['vxe-cell--sort', `vxe-cell--sort-${iconLayout}-layout`]
+            }, [
+              h('i', {
+                class: ['vxe-sort--asc-btn', iconAsc || getIcon().TABLE_SORT_ASC, {
+                  'sort--active': order === 'asc'
+                }],
+                attrs: {
+                  title: XEUtils.eqNull(ascTitle) ? getI18n('vxe.table.sortAsc') : `${ascTitle || ''}`
+                },
+                on: allowBtn
+                  ? {
+                      click (evnt: any) {
+                        evnt.stopPropagation()
+                        $table.triggerSortEvent(evnt, column, 'asc')
+                      }
+                    }
+                  : undefined
+              }),
+              h('i', {
+                class: ['vxe-sort--desc-btn', iconDesc || getIcon().TABLE_SORT_DESC, {
+                  'sort--active': order === 'desc'
+                }],
+                attrs: {
+                  title: XEUtils.eqNull(descTitle) ? getI18n('vxe.table.sortDesc') : `${descTitle || ''}`
+                },
+                on: allowBtn
+                  ? {
+                      click (evnt: any) {
+                        evnt.stopPropagation()
+                        $table.triggerSortEvent(evnt, column, 'desc')
+                      }
+                    }
+                  : undefined
+              })
+            ])
+          ]
     }
     return []
   },

package/packages/table/src/footer.ts

@@ -278,27 +278,18 @@ export default {
     const _vm = this as any
     const props = _vm
     const $xeTable = _vm.$parent as VxeTableConstructor & VxeTablePrivateMethods
-    const tableProps = $xeTable
     const tableReactData = $xeTable as unknown as TableReactData
     const tableInternalData = $xeTable as unknown as TableInternalData
 
     const { xID } = $xeTable
 
     const { fixedType, fixedColumn, tableColumn } = props
-    const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps
     const { visibleColumn, fullColumnIdData } = tableInternalData
     const { isGroup, isColLoading, overflowX, scrollXLoad, dragCol } = tableReactData
+    const isFooterRenderOptimize = $xeTable.computeIsFooterRenderOptimize
 
     let renderColumnList = tableColumn as VxeTableDefines.ColumnInfo[]
-    let isOptimizeMode = false
-    // 如果是使用优化模式
-    if (scrollXLoad && allColumnFooterOverflow) {
-      if (spanMethod || footerSpanMethod) {
-        // 如果不支持优化模式
-      } else {
-        isOptimizeMode = true
-      }
-    }
+    const isOptimizeMode = isFooterRenderOptimize
 
     if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
       renderColumnList = visibleColumn

package/packages/table/src/header.ts

@@ -462,27 +462,19 @@ export default {
     const { fixedType, fixedColumn, tableColumn } = props
     const { headerColumn } = _vm
 
-    const { mouseConfig, showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps
+    const { mouseConfig } = tableProps
     const { isGroup, isColLoading, overflowX, scrollXLoad, dragCol } = tableReactData
     const { visibleColumn, fullColumnIdData } = tableInternalData
 
     const mouseOpts = $xeTable.computeMouseOpts
+    const isHeaderRenderOptimize = $xeTable.computeIsHeaderRenderOptimize
     let renderHeaderList = headerColumn as VxeTableDefines.ColumnInfo[][]
     let renderColumnList = tableColumn as VxeTableDefines.ColumnInfo[]
-    let isOptimizeMode = false
+    const isOptimizeMode = isHeaderRenderOptimize
 
     if (isGroup) {
       renderColumnList = visibleColumn
     } else {
-      // 如果是使用优化模式
-      if (scrollXLoad && allColumnHeaderOverflow) {
-        if (spanMethod || footerSpanMethod) {
-          // 如果不支持优化模式
-        } else {
-          isOptimizeMode = true
-        }
-      }
-
       if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
         renderColumnList = visibleColumn
       }

package/packages/table/src/methods.ts

@@ -530,8 +530,7 @@ function handleVirtualTreeExpand ($xeTable: VxeTableConstructor & VxeTablePrivat
     updateAfterDataIndex($xeTable)
     return $xeTable.$nextTick()
   }).then(() => {
-    updateTreeLineStyle($xeTable)
-    return handleLazyRecalculate($xeTable, true, true, true)
+    return handleRecalculateStyle($xeTable, true, true, true)
   }).then(() => {
     updateTreeLineStyle($xeTable)
     setTimeout(() => {
@@ -998,8 +997,8 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
   const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
-  const { showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props
-  const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn, isColLoading } = reactData
+  const { mouseConfig } = props
+  const { isGroup, currentRow, tableColumn, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isColLoading } = reactData
   const { visibleColumn, tableHeight, elemStore, customHeight, customMinHeight, customMaxHeight, tHeaderHeight, tFooterHeight } = internalData
   const $xeGanttView = internalData.xeGanttView
   const el = $xeTable.$refs.refElem as HTMLDivElement
@@ -1007,12 +1006,15 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
     return
   }
   const containerList = ['main', 'left', 'right']
+  const { leftList, rightList } = columnStore
   let osbWidth = overflowY ? scrollbarWidth : 0
   let osbHeight = overflowX ? scrollbarHeight : 0
   const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder as HTMLDivElement
+  const isHeaderRenderOptimize = $xeTable.computeIsHeaderRenderOptimize
+  const isBodyRenderOptimize = $xeTable.computeIsBodyRenderOptimize
+  const isFooterRenderOptimize = $xeTable.computeIsFooterRenderOptimize
   const scrollbarOpts = $xeTable.computeScrollbarOpts
   const mouseOpts = $xeTable.computeMouseOpts
-  const expandOpts = $xeTable.computeExpandOpts
   const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper'])
   const bodyTableElem = getRefElem(elemStore['main-body-table'])
   if (emptyPlaceholderElem) {
@@ -1134,7 +1136,7 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
     let fixedColumn: VxeTableDefines.ColumnInfo[] = []
     let fixedWrapperElem: HTMLDivElement
     if (fixedType) {
-      fixedColumn = isFixedLeft ? columnStore.leftList : columnStore.rightList
+      fixedColumn = isFixedLeft ? leftList : rightList
       fixedWrapperElem = (isFixedLeft ? $xeTable.$refs.refLeftContainer : $xeTable.$refs.refRightContainer) as HTMLDivElement
     }
     layoutList.forEach(layout => {
@@ -1145,20 +1147,11 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
         // 表头体样式处理
         // 横向滚动渲染
         let renderColumnList = tableColumn
-        let isOptimizeMode = false
+        const isOptimizeMode = isHeaderRenderOptimize
 
         if (isGroup) {
           renderColumnList = visibleColumn
         } else {
-          // 如果是使用优化模式
-          if (scrollXLoad && allColumnHeaderOverflow) {
-            if (spanMethod || footerSpanMethod) {
-              // 如果不支持优化模式
-            } else {
-              isOptimizeMode = true
-            }
-          }
-
           if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
             renderColumnList = visibleColumn
           }
@@ -1215,16 +1208,7 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
         }
 
         let renderColumnList = tableColumn
-
-        let isOptimizeMode = false
-        // 如果是使用优化模式
-        if (scrollXLoad || scrollYLoad || isAllOverflow) {
-          if ((expandColumn && expandOpts.mode !== 'fixed') || spanMethod || footerSpanMethod) {
-            // 如果不支持优化模式
-          } else {
-            isOptimizeMode = true
-          }
-        }
+        const isOptimizeMode = isBodyRenderOptimize
 
         if (fixedType) {
           renderColumnList = visibleColumn
@@ -1258,15 +1242,7 @@ function updateStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
         }
       } else if (layout === 'footer') {
         let renderColumnList = tableColumn
-        let isOptimizeMode = false
-        // 如果是使用优化模式
-        if (scrollXLoad && allColumnFooterOverflow) {
-          if (spanMethod || footerSpanMethod) {
-            // 如果不支持优化模式
-          } else {
-            isOptimizeMode = true
-          }
-        }
+        const isOptimizeMode = isFooterRenderOptimize
 
         if (!isOptimizeMode || (!isColLoading && (fixedType || !overflowX))) {
           renderColumnList = visibleColumn
@@ -11648,7 +11624,7 @@ const Methods = {
     const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
-    const { isAllOverflow, scrollYLoad, expandColumn } = reactData
+    const { isAllOverflow, overflowY, scrollYLoad, scrollYHeight, expandColumn } = reactData
     const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData
     const $xeGanttView = internalData.xeGanttView
     const { startIndex } = scrollYStore
@@ -11663,13 +11639,13 @@ const Methods = {
     const rightbodyTableElem = getRefElem(elemStore['right-body-table'])
     const containerList = ['main', 'left', 'right']
     let ySpaceTop = 0
-    let scrollYHeight = 0
+    let sYHeight = scrollYHeight
     let isScrollYBig = false
     if (scrollYLoad) {
       const isCustomCellHeight = isResizeCellHeight || cellOpts.height || rowOpts.height
       if (!isCustomCellHeight && !expandColumn && isAllOverflow) {
-        scrollYHeight = afterFullData.length * defaultRowHeight
-        if (scrollYHeight > maxYHeight) {
+        sYHeight = afterFullData.length * defaultRowHeight
+        if (sYHeight > maxYHeight) {
           isScrollYBig = true
         }
         ySpaceTop = Math.max(0, startIndex * defaultRowHeight)
@@ -11682,18 +11658,21 @@ const Methods = {
         const lastRow = afterFullData[afterFullData.length - 1]
         rowid = getRowid($xeTable, lastRow)
         rowRest = fullAllDataRowIdData[rowid] || {}
-        scrollYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight)
-        // 是否展开行
-        if (expandColumn && rowExpandedMaps[rowid]) {
-          scrollYHeight += rowRest.expandHeight || expandOpts.height || 0
+        // 如果为空时还没计算完数据，保持原高度不变
+        if (rowRest.oTop) {
+          sYHeight = (rowRest.oTop || 0) + (rowRest.resizeHeight || cellOpts.height || rowOpts.height || rowRest.height || defaultRowHeight)
+          // 是否展开行
+          if (expandColumn && rowExpandedMaps[rowid]) {
+            sYHeight += rowRest.expandHeight || expandOpts.height || 0
+          }
         }
-        if (scrollYHeight > maxYHeight) {
+        if (sYHeight > maxYHeight) {
           isScrollYBig = true
         }
       }
     } else {
       if (bodyTableElem) {
-        scrollYHeight = bodyTableElem.clientHeight
+        sYHeight = bodyTableElem.clientHeight
       }
     }
     let clientHeight = 0
@@ -11701,7 +11680,7 @@ const Methods = {
       clientHeight = bodyScrollElem.clientHeight
     }
     // 虚拟渲染
-    let ySpaceHeight = scrollYHeight
+    let ySpaceHeight = sYHeight
     let scrollYTop = ySpaceTop
     if (isScrollYBig) {
       // 触底
@@ -11712,6 +11691,9 @@ const Methods = {
       }
       ySpaceHeight = maxYHeight
     }
+    if (!(scrollYLoad && overflowY)) {
+      scrollYTop = 0
+    }
 
     if (leftBodyTableElem) {
       leftBodyTableElem.style.transform = `translate(0px, ${scrollYTop}px)`
@@ -11742,7 +11724,7 @@ const Methods = {
       rowExpandYSpaceEl.style.height = ySpaceHeight ? `${ySpaceHeight}px` : ''
     }
     reactData.scrollYTop = scrollYTop
-    reactData.scrollYHeight = scrollYHeight
+    reactData.scrollYHeight = ySpaceHeight
     reactData.isScrollYBig = isScrollYBig
 
     calcScrollbar($xeTable)

package/packages/table/src/table.ts

@@ -1299,6 +1299,89 @@ export default {
       }
       return leftWidth
     },
+    computeBodyMergeCoverFixed () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const reactData = $xeTable as unknown as TableReactData
+      const internalData = $xeTable as unknown as TableInternalData
+
+      const { columnStore, mergeBodyFlag } = reactData
+      const { mergeBodyList, visibleColumn } = internalData
+      const { leftList, rightList } = columnStore
+      const rscIndex = visibleColumn.length - rightList.length
+      if (mergeBodyFlag && (leftList.length || rightList.length)) {
+        const lecIndex = leftList.length
+        for (let i = 0; i < mergeBodyList.length; i++) {
+          const { col, colspan } = mergeBodyList[i]
+          if (col < lecIndex || (col + colspan) > rscIndex) {
+            return true
+          }
+        }
+      }
+      return false
+    },
+    computeIsHeaderRenderOptimize () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
+      const reactData = $xeTable as unknown as TableReactData
+
+      const { spanMethod, footerSpanMethod, showHeaderOverflow: allColumnHeaderOverflow } = props
+      const { isGroup, scrollXLoad } = reactData
+      let isOptimizeMode = false
+      if (isGroup) {
+        // 分组表头
+      } else {
+        // 如果是使用优化模式
+        if (scrollXLoad && allColumnHeaderOverflow) {
+          if (spanMethod || footerSpanMethod) {
+            // 如果不支持优化模式
+          } else {
+            isOptimizeMode = true
+          }
+        }
+      }
+      return isOptimizeMode
+    },
+    computeIsBodyRenderOptimize () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
+      const reactData = $xeTable as unknown as TableReactData
+
+      const { spanMethod, footerSpanMethod } = props
+      const { scrollXLoad, scrollYLoad, isAllOverflow, expandColumn } = reactData
+      const bodyMergeCoverFixed = $xeTable.computeBodyMergeCoverFixed
+      const expandOpts = $xeTable.computeExpandOpts
+      let isOptimizeMode = false
+      // 如果是使用优化模式
+      if (scrollXLoad || scrollYLoad || isAllOverflow) {
+        // 如果是展开行，内联模式，不支持优化
+        // 如果是方法合并，不支持优化
+        // 如果固定列且配置式合并，不支持优化
+        if ((expandColumn && expandOpts.mode !== 'fixed') || bodyMergeCoverFixed || spanMethod || footerSpanMethod) {
+          // 如果不支持优化模式
+        } else {
+          isOptimizeMode = true
+        }
+      }
+      return isOptimizeMode
+    },
+    computeIsFooterRenderOptimize () {
+      const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+      const props = $xeTable
+      const reactData = $xeTable as unknown as TableReactData
+
+      const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = props
+      const { scrollXLoad } = reactData
+      let isOptimizeMode = false
+      // 如果是使用优化模式
+      if (scrollXLoad && allColumnFooterOverflow) {
+        if (spanMethod || footerSpanMethod) {
+          // 如果不支持优化模式
+        } else {
+          isOptimizeMode = true
+        }
+      }
+      return isOptimizeMode
+    },
     exportOpts () {
       return this.computeExportOpts
     },
@@ -1709,12 +1792,12 @@ export default {
     if (props.resizable) {
       warnLog('vxe.error.delProp', ['resizable', 'column-config.resizable'])
     }
-    if (props.virtualXConfig && props.scrollX) {
-      warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null'])
-    }
-    if (props.virtualYConfig && props.scrollY) {
-      warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null'])
-    }
+    // if (props.virtualXConfig && props.scrollX) {
+    //   warnLog('vxe.error.notSupportProp', ['virtual-x-config', 'scroll-x', 'scroll-x=null'])
+    // }
+    // if (props.virtualYConfig && props.scrollY) {
+    //   warnLog('vxe.error.notSupportProp', ['virtual-y-config', 'scroll-y', 'scroll-y=null'])
+    // }
     if (props.aggregateConfig && props.rowGroupConfig) {
       warnLog('vxe.error.notSupportProp', ['aggregate-config', 'row-group-config', 'row-group-config=null'])
     }

package/packages/toolbar/src/toolbar.ts

@@ -443,7 +443,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
             ? h(VxeUIButtonComponent, {
               key: index,
               props: Object.assign({}, child, {
-                content: child.name,
+                content: child.content || child.name,
                 options: undefined
               }),
               on: {
@@ -496,7 +496,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
                 btnVNs.push(
                   h(VxeUIButtonComponent, {
                     props: Object.assign({}, item, {
-                      content: item.name,
+                      content: item.content || item.name,
                       options: undefined
                     }),
                     on: {
@@ -563,7 +563,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
                   h(VxeUIButtonComponent, {
                     key: tIndex,
                     props: Object.assign({}, item, {
-                      content: item.name,
+                      content: item.content || item.name,
                       options: undefined
                     }),
                     on: {

package/packages/ui/index.ts

@@ -18,7 +18,7 @@ VxeUI.setConfig({
     delayHover: 250,
     autoResize: true,
     padding: true,
-    minHeight: 144,
+    // minHeight: null,
     // keepSource: false,
     // showOverflow: null,
     // showHeaderOverflow: null,