vxe-table 3.10.7 → 3.10.9

package/packages/table/src/body.ts

@@ -692,11 +692,9 @@ export default {
           setScrollTop(leftElem, scrollTop)
           setScrollTop(rightElem, scrollTop)
         }
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         })
       }
       if (xHandleEl) {
@@ -706,11 +704,9 @@ export default {
         $xeTable.lastScrollLeft = scrollLeft
         setScrollLeft(headerElem, scrollLeft)
         setScrollLeft(footerElem, scrollLeft)
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         })
       }
     },

package/packages/table/src/cell.ts

@@ -74,16 +74,20 @@ function renderCellDragIcon (h: CreateElement, params: any) {
 }
 
 function renderCellBaseVNs (h: CreateElement, params: any, content: any) {
-  const { $table, column, row } = params
+  const { $table, column, row, level } = params
   const { dragSort } = column
-  const vns: any[] = XEUtils.isArray(content) ? content : [content]
+  const tableProps = $table
+  const { treeConfig } = tableProps
   const rowOpts = $table.computeRowOpts
   const dragOpts = $table.computeDragOpts
   const { showRowIcon, rowVisibleMethod } = dragOpts
+  const vns: any[] = XEUtils.isArray(content) ? content : [content]
   if (dragSort && rowOpts.drag && (showRowIcon && (!rowVisibleMethod || rowVisibleMethod({ row, column })))) {
-    vns.unshift(
-      renderCellDragIcon(h, params)
-    )
+    if (!treeConfig || !level) {
+      vns.unshift(
+        renderCellDragIcon(h, params)
+      )
+    }
   }
   return vns
 }

package/packages/table/src/footer.ts

@@ -295,11 +295,9 @@ export default {
         $xeTable.lastScrollTime = Date.now()
         setScrollLeft(headerElem, scrollLeft)
         setScrollLeft(bodyElem, scrollLeft)
-        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+        $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
           type: renderType,
-          fixed: fixedType,
-          scrollTop,
-          scrollLeft
+          fixed: fixedType
         })
       }
     }

package/packages/table/src/header.ts

@@ -56,7 +56,7 @@ export default {
   },
   render (h: CreateElement) {
     const { _e, $parent: $xetable, fixedType, headerColumn, tableColumn, fixedColumn } = this
-    const { $listeners: tableListeners, tId, isGroup, visibleColumn, resizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, highlightCurrentColumn, currentColumn, scrollXLoad, overflowX, scrollbarWidth, sortOpts, mouseConfig, columnOpts } = $xetable
+    const { $listeners: tableListeners, tId, isGroup, visibleColumn, resizable: allResizable, border, columnKey, headerRowClassName, headerCellClassName, headerRowStyle, headerCellStyle, showHeaderOverflow: allColumnHeaderOverflow, headerAlign: allHeaderAlign, align: allAlign, highlightCurrentColumn, currentColumn, scrollXLoad, overflowX, scrollbarWidth, sortOpts, mouseConfig, columnOpts } = $xetable
     let headerGroups = headerColumn
     let renderColumnList = tableColumn
     if (isGroup) {
@@ -188,7 +188,7 @@ export default {
               /**
                * 列宽拖动
                */
-              !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || resizable))
+              !fixedHiddenColumn && !isColGroup && (XEUtils.isBoolean(column.resizable) ? column.resizable : (columnOpts.resizable || allResizable))
                 ? h('div', {
                   class: ['vxe-resizable', {
                     'is--line': !border || border === 'none'

package/packages/table/src/methods.ts

@@ -339,6 +339,17 @@ function clearRowDropOrigin ($xeTable: any) {
   }
 }
 
+function updateRowDropOrigin ($xeTable: any, row: any) {
+  const el = $xeTable.$el
+  if (el) {
+    const clss = 'row--drag-origin'
+    const rowid = getRowid($xeTable, row)
+    XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem) => {
+      addClass(elem, clss)
+    })
+  }
+}
+
 function clearRowDropTarget ($xeTable: any) {
   const el = $xeTable.$el
   if (el) {
@@ -349,6 +360,18 @@ function clearRowDropTarget ($xeTable: any) {
   }
 }
 
+function updateRowDropTarget ($xeTable: any, row: any, dragPos: string) {
+  const el = $xeTable.$el
+  if (el) {
+    const clss = 'row--drag-active-target'
+    const rowid = getRowid($xeTable, row)
+    XEUtils.arrayEach(el.querySelectorAll(`[rowid="${rowid}"]`), (elem: any) => {
+      addClass(elem, clss)
+      elem.setAttribute('drag-pos', dragPos)
+    })
+  }
+}
+
 function showRowDropTip (evnt: DragEvent | MouseEvent, $xeTable: any) {
   const rdTipEl = $xeTable.$refs.refRowDragTipElem as HTMLDivElement
   if (!rdTipEl) {
@@ -1785,80 +1808,137 @@ const Methods = {
    * 设置为固定列
    */
   setColumnFixed (fieldOrColumn: any, fixed: any) {
-    const { isMaxFixedColumn, columnOpts } = this
-    const column = handleFieldOrColumn(this, fieldOrColumn)
-    const targetColumn = getRootColumn(this, column)
-    if (targetColumn && targetColumn.fixed !== fixed) {
-      // 是否超过最大固定列数量
-      if (!targetColumn.fixed && isMaxFixedColumn) {
-        if (VxeUI.modal) {
-          VxeUI.modal.message({
-            status: 'error',
-            content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
-          })
+    const $xeTable = this
+
+    let status = false
+    const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+    const columnOpts = $xeTable.computeColumnOpts
+    const isMaxFixedColumn = $xeTable.computeIsMaxFixedColumn
+    for (let i = 0; i < cols.length; i++) {
+      const item = cols[i]
+      const column = handleFieldOrColumn($xeTable, item)
+      const targetColumn = getRootColumn($xeTable, column as any)
+      if (targetColumn && targetColumn.fixed !== fixed) {
+        // 是否超过最大固定列数量
+        if (!targetColumn.fixed && isMaxFixedColumn) {
+          if (VxeUI.modal) {
+            VxeUI.modal.message({
+              status: 'error',
+              content: getI18n('vxe.table.maxFixedCol', [columnOpts.maxFixedSize])
+            })
+          }
+          return $xeTable.$nextTick()
+        }
+        XEUtils.eachTree([targetColumn], (column) => {
+          column.fixed = fixed
+        })
+        $xeTable.saveCustomStore('update:fixed')
+        if (!status) {
+          status = true
         }
-        return this.$nextTick()
       }
-      XEUtils.eachTree([targetColumn], (column) => {
-        column.fixed = fixed
-      })
-      this.saveCustomStore('update:fixed')
-      return this.refreshColumn()
     }
-    return this.$nextTick()
+    if (status) {
+      return $xeTable.refreshColumn()
+    }
+    return $xeTable.$nextTick()
   },
   /**
    * 取消指定固定列
    */
   clearColumnFixed (fieldOrColumn: any) {
-    const column = handleFieldOrColumn(this, fieldOrColumn)
-    const targetColumn = getRootColumn(this, column)
-    if (targetColumn && targetColumn.fixed) {
-      XEUtils.eachTree([targetColumn], (column) => {
-        column.fixed = null
-      })
-      this.saveCustomStore('update:fixed')
-      return this.refreshColumn()
+    const $xeTable = this
+
+    let status = false
+    const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+    cols.forEach(item => {
+      const column = handleFieldOrColumn($xeTable, item)
+      const targetColumn = getRootColumn($xeTable, column as any)
+      if (targetColumn && targetColumn.fixed) {
+        XEUtils.eachTree([targetColumn], (column) => {
+          column.fixed = null
+        })
+        $xeTable.saveCustomStore('update:fixed')
+        if (!status) {
+          status = true
+        }
+      }
+    })
+    if (status) {
+      return $xeTable.refreshColumn()
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   /**
    * 隐藏指定列
    */
   hideColumn (fieldOrColumn: any) {
-    const column = handleFieldOrColumn(this, fieldOrColumn)
-    if (column && column.visible) {
-      column.visible = false
-      return this.handleCustom()
+    const $xeTable = this
+
+    let status = false
+    const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+    cols.forEach(item => {
+      const column = handleFieldOrColumn($xeTable, item)
+      if (column && column.visible) {
+        column.visible = false
+        if (!status) {
+          status = true
+        }
+      }
+    })
+    if (status) {
+      return $xeTable.handleCustom()
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   /**
    * 显示指定列
    */
   showColumn (fieldOrColumn: any) {
-    const column = handleFieldOrColumn(this, fieldOrColumn)
-    if (column && !column.visible) {
-      column.visible = true
-      return this.handleCustom()
+    const $xeTable = this
+
+    let status = false
+    const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+    cols.forEach(item => {
+      const column = handleFieldOrColumn($xeTable, item)
+      if (column && !column.visible) {
+        column.visible = true
+        if (!status) {
+          status = true
+        }
+      }
+    })
+    if (status) {
+      return $xeTable.handleCustom()
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   setColumnWidth (fieldOrColumn: any, width: any) {
-    const column = handleFieldOrColumn(this, fieldOrColumn)
-    if (column) {
-      const colWidth = XEUtils.toInteger(width)
-      let rdWidth = colWidth
-      if (isScale(width)) {
-        const { tableBody } = this.$refs
-        const tableBodyElem = tableBody ? tableBody.$el : null
-        const bodyWidth = tableBodyElem ? tableBodyElem.clientWidth - 1 : 0
-        rdWidth = Math.floor(colWidth * bodyWidth)
+    const $xeTable = this
+
+    let status = false
+    const cols = XEUtils.isArray(fieldOrColumn) ? fieldOrColumn : [fieldOrColumn]
+    cols.forEach(item => {
+      const column = handleFieldOrColumn($xeTable, item)
+      if (column) {
+        const colWidth = XEUtils.toInteger(width)
+        let rdWidth = colWidth
+        if (isScale(width)) {
+          const tableBody = $xeTable.$refs.tableBody
+          const bodyElem = tableBody ? tableBody.$el as HTMLDivElement : null
+          const bodyWidth = bodyElem ? bodyElem.clientWidth - 1 : 0
+          rdWidth = Math.floor(colWidth * bodyWidth)
+        }
+        column.resizeWidth = rdWidth
+        if (!status) {
+          status = true
+        }
       }
-      column.resizeWidth = rdWidth
-      return this.refreshColumn()
+    })
+    if (status) {
+      return $xeTable.refreshColumn()
     }
-    return this.$nextTick()
+    return $xeTable.$nextTick()
   },
   getColumnWidth (fieldOrColumn: any) {
     const column = handleFieldOrColumn(this, fieldOrColumn)
@@ -4588,7 +4668,7 @@ const Methods = {
     const treeOpts = $xeTable.computeTreeOpts
     const { transform } = treeOpts
     const { dragRow } = reactData
-    const { afterFullData, tableFullData, prevDragRow, prevDragPos } = internalData
+    const { afterFullData, afterTreeFullData, tableFullData, tableFullTreeData, prevDragRow, prevDragPos } = internalData
     if (prevDragRow && dragRow) {
       // 判断是否有拖动
       if (prevDragRow !== dragRow) {
@@ -4605,18 +4685,36 @@ const Methods = {
           }
           const dragOffsetIndex = prevDragPos === 'bottom' ? 1 : 0
 
-          // 移出源位置
-          const oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow)
-          const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow)
-          afterFullData.splice(oafIndex, 1)
-          tableFullData.splice(otfIndex, 1)
-          // 插新位置
-          const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow)
-          const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow)
-          const nafIndex = pafIndex + dragOffsetIndex
-          const ntfIndex = ptfIndex + dragOffsetIndex
-          afterFullData.splice(nafIndex, 0, dragRow)
-          tableFullData.splice(ntfIndex, 0, dragRow)
+          let oafIndex = -1
+          let nafIndex = -1
+          if (treeConfig) {
+            // 移出源位置
+            oafIndex = $xeTable.findRowIndexOf(afterTreeFullData, dragRow)
+            const otfIndex = $xeTable.findRowIndexOf(tableFullTreeData, dragRow)
+            afterTreeFullData.splice(oafIndex, 1)
+            tableFullTreeData.splice(otfIndex, 1)
+
+            // 插新位置
+            const pafIndex = $xeTable.findRowIndexOf(afterTreeFullData, prevDragRow)
+            const ptfIndex = $xeTable.findRowIndexOf(tableFullTreeData, prevDragRow)
+            nafIndex = pafIndex + dragOffsetIndex
+            const ntfIndex = ptfIndex + dragOffsetIndex
+            afterTreeFullData.splice(nafIndex, 0, dragRow)
+            tableFullTreeData.splice(ntfIndex, 0, dragRow)
+          } else {
+            // 移出源位置
+            oafIndex = $xeTable.findRowIndexOf(afterFullData, dragRow)
+            const otfIndex = $xeTable.findRowIndexOf(tableFullData, dragRow)
+            afterFullData.splice(oafIndex, 1)
+            tableFullData.splice(otfIndex, 1)
+            // 插新位置
+            const pafIndex = $xeTable.findRowIndexOf(afterFullData, prevDragRow)
+            const ptfIndex = $xeTable.findRowIndexOf(tableFullData, prevDragRow)
+            nafIndex = pafIndex + dragOffsetIndex
+            const ntfIndex = ptfIndex + dragOffsetIndex
+            afterFullData.splice(nafIndex, 0, dragRow)
+            tableFullData.splice(ntfIndex, 0, dragRow)
+          }
 
           reactData.isDragRowMove = true
           $xeTable.cacheRowMap()
@@ -4670,8 +4768,7 @@ const Methods = {
       const { dragRow } = reactData
       const offsetY = evnt.clientY - trEl.getBoundingClientRect().y
       const dragPos = offsetY < trEl.clientHeight / 2 ? 'top' : 'bottom'
-      addClass(trEl, 'row--drag-active-target')
-      trEl.setAttribute('drag-pos', dragPos)
+      updateRowDropTarget($xeTable, row, dragPos)
       internalData.prevDragRow = row
       internalData.prevDragPos = dragPos
       $xeTable.dispatchEvent('row-dragover', {
@@ -4703,7 +4800,7 @@ const Methods = {
     }
     reactData.dragRow = row
     trEl.draggable = true
-    addClass(trEl, 'row--drag-origin')
+    updateRowDropOrigin($xeTable, row)
     showRowDropTip(evnt, $xeTable)
     updateRowDropTipContent($xeTable, tdEl)
     $xeTable.dispatchEvent('row-dragstart', params, evnt)
@@ -5554,7 +5651,7 @@ const Methods = {
     }
     this.closeTooltip()
   },
-  handleScrollEvent (evnt: Event, isRollY: boolean, isRollX: boolean, params: any) {
+  handleScrollEvent (evnt: Event, isRollY: boolean, isRollX: boolean, scrollTop: number, scrollLeft: number, params: any) {
     const $xeTable = this
     const props = $xeTable
 
@@ -5580,13 +5677,35 @@ const Methods = {
     const bodyWidth = bodyElem ? bodyElem.clientWidth : 0
     const scrollHeight = bodyElem ? bodyElem.scrollHeight : 0
     const scrollWidth = bodyElem ? bodyElem.scrollWidth : 0
+    let isTop = false
+    let isBottom = false
+    let isLeft = false
+    let isRight = false
+    if (isRollX) {
+      isLeft = scrollLeft <= 0
+      if (!isTop) {
+        isRight = scrollLeft + bodyWidth >= scrollWidth
+      }
+      $xeTable.checkScrolling()
+    } else {
+      isTop = scrollTop <= 0
+      if (!isTop) {
+        isBottom = scrollTop + bodyHeight >= scrollHeight
+      }
+    }
     const evntParams = {
+      scrollTop,
+      scrollLeft,
       bodyHeight,
       bodyWidth,
       scrollHeight,
       scrollWidth,
       isX: isRollX,
       isY: isRollY,
+      isTop,
+      isBottom,
+      isLeft,
+      isRight,
       ...params
     }
     $xeTable.dispatchEvent('scroll', evntParams, evnt)
@@ -5634,11 +5753,9 @@ const Methods = {
     $xeTable.lastScrollTime = Date.now()
     $xeTable.handleSyncScrollX(scrollLeft)
     $xeTable.triggerScrollXEvent(evnt)
-    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
       type: 'table',
-      fixed: '',
-      scrollTop,
-      scrollLeft
+      fixed: ''
     })
   },
   debounceScrollYCalculate: XEUtils.debounce(function () {
@@ -5670,11 +5787,9 @@ const Methods = {
     $xeTable.lastScrollTime = Date.now()
     $xeTable.handleSyncScrollY(scrollTop)
     $xeTable.triggerScrollYEvent(evnt)
-    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, {
+    $xeTable.handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, {
       type: 'table',
-      fixed: '',
-      scrollTop,
-      scrollLeft
+      fixed: ''
     })
   },
   /**
@@ -5871,16 +5986,34 @@ const Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo (scrollLeft: any, scrollTop: any) {
+    const $xeTable = this
+
     const { $refs } = this
-    const { tableBody, rightBody, tableFooter } = $refs
+    const { tableBody, tableHeader, leftBody, rightBody, tableFooter } = $refs
     const tableBodyElem = tableBody ? tableBody.$el : null
+    const leftBodyElem = leftBody ? leftBody.$el : null
     const rightBodyElem = rightBody ? rightBody.$el : null
+    const tableHeaderElem = tableHeader ? tableHeader.$el : null
     const tableFooterElem = tableFooter ? tableFooter.$el : null
     if (XEUtils.isNumber(scrollLeft)) {
-      setScrollLeft(tableFooterElem || tableBodyElem, scrollLeft)
+      const xHandleEl = $xeTable.$refs.refScrollXHandleElem
+      if (xHandleEl) {
+        setScrollLeft(xHandleEl, scrollLeft)
+      } else {
+        setScrollLeft(tableBodyElem, scrollLeft)
+        setScrollLeft(tableHeaderElem, scrollLeft)
+        setScrollLeft(tableFooterElem, scrollLeft)
+      }
     }
     if (XEUtils.isNumber(scrollTop)) {
-      setScrollTop(rightBodyElem || tableBodyElem, scrollTop)
+      const yHandleEl = $xeTable.$refs.refScrollYHandleElem
+      if (yHandleEl) {
+        setScrollTop(yHandleEl, scrollTop)
+      } else {
+        setScrollTop(tableBodyElem, scrollTop)
+        setScrollTop(leftBodyElem, scrollTop)
+        setScrollTop(rightBodyElem, scrollTop)
+      }
     }
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(resolve => setTimeout(() => resolve(this.$nextTick()), 50))