vxe-table 3.13.0-beta.10 → 3.13.0-beta.2

package/packages/table/src/footer.ts

@@ -309,7 +309,7 @@ export default {
     const { fixedType, fixedColumn, tableColumn } = props
     const { spanMethod, footerSpanMethod, showFooterOverflow: allColumnFooterOverflow } = tableProps
     const { visibleColumn, fullColumnIdData } = tableInternalData
-    const { isGroup, overflowX, scrollXLoad, scrollYLoad, dragCol } = tableReactData
+    const { isGroup, scrollXLoad, scrollYLoad, dragCol } = tableReactData
 
     let renderColumnList = tableColumn as VxeTableDefines.ColumnInfo[]
     let isOptimizeMode = false
@@ -322,11 +322,8 @@ export default {
       }
     }
 
-    if (fixedType || !overflowX) {
-      renderColumnList = visibleColumn
-    }
-
     if (fixedType) {
+      renderColumnList = visibleColumn
       if (isOptimizeMode) {
         renderColumnList = fixedColumn || []
       }

package/packages/table/src/header.ts

@@ -116,8 +116,8 @@ const renderRows = (h: CreateElement, _vm: any, isGroup: boolean, isOptimizeMode
         'is--sortable': column.sortable,
         'col--filter': !!filters,
         'is--filter-active': hasFilter,
-        'is--drag-active': columnOpts.drag && !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
-        'is--drag-disabled': columnOpts.drag && isDisabledDrag,
+        'is--drag-active': !column.fixed && !isDisabledDrag && (isCrossDrag || isPeerDrag || !column.parentId),
+        'is--drag-disabled': isDisabledDrag,
         'col--current': currentColumn === column
       }, getClass(headerClassName, cellParams), getClass(headerCellClassName, cellParams)],
       attrs: thAttrs,
@@ -272,7 +272,7 @@ export default {
     const { headerColumn } = this
 
     const { mouseConfig, showHeaderOverflow: allColumnHeaderOverflow, spanMethod, footerSpanMethod } = tableProps
-    const { isGroup, overflowX, scrollXLoad, scrollYLoad, dragCol } = tableReactData
+    const { isGroup, scrollXLoad, scrollYLoad, dragCol } = tableReactData
     const { visibleColumn, fullColumnIdData } = tableInternalData
 
     const mouseOpts = $xeTable.computeMouseOpts
@@ -292,11 +292,8 @@ export default {
         }
       }
 
-      if (fixedType || !overflowX) {
-        renderColumnList = visibleColumn
-      }
-
       if (fixedType) {
+        renderColumnList = visibleColumn
         // 如果是使用优化模式
         if (isOptimizeMode) {
           renderColumnList = fixedColumn || []

package/packages/table/src/methods.ts

@@ -190,7 +190,6 @@ function cacheColumnMap ($xeTable: VxeTableConstructor) {
   const fullColumnIdData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnIdData = {}
   const fullColumnFieldData: Record<string, VxeTableDefines.ColumnCacheItem> = internalData.fullColumnFieldData = {}
   const mouseOpts = $xeTable.computeMouseOpts
-  const expandOpts = $xeTable.computeExpandOpts
   const columnOpts = $xeTable.computeColumnOpts
   const columnDragOpts = $xeTable.computeColumnDragOpts
   const { isCrossDrag, isSelfToChildDrag } = columnDragOpts
@@ -278,8 +277,10 @@ function cacheColumnMap ($xeTable: VxeTableConstructor) {
     tableFullColumn.forEach(handleFunc)
   }
 
-  if ((expandColumn && expandOpts.mode !== 'fixed') && mouseOpts.area) {
-    errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
+  if (process.env.VUE_APP_VXE_ENV === 'development') {
+    if (expandColumn && mouseOpts.area) {
+      errLog('vxe.error.errConflicts', ['mouse-config.area', 'column.type=expand'])
+    }
   }
 
   if (process.env.VUE_APP_VXE_ENV === 'developmeznt') {
@@ -1711,7 +1712,6 @@ function handleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
   const reactData = $xeTable as unknown as TableReactData
   const internalData = $xeTable as unknown as TableInternalData
 
-  const expandOpts = $xeTable.computeExpandOpts
   internalData.collectColumn = collectColumn
   const tableFullColumn = getColumnList(collectColumn)
   internalData.tableFullColumn = tableFullColumn
@@ -1721,7 +1721,6 @@ function handleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
   return Promise.resolve(
     restoreCustomStorage($xeTable)
   ).then(() => {
-    const { scrollXLoad, scrollYLoad, expandColumn } = reactData
     cacheColumnMap($xeTable)
     parseColumns($xeTable, true).then(() => {
       if (reactData.scrollXLoad) {
@@ -1731,11 +1730,11 @@ function handleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
     $xeTable.clearMergeCells()
     $xeTable.clearMergeFooterItems()
     $xeTable.handleTableData(true)
-
-    if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
-      warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+    if (process.env.VUE_APP_VXE_ENV === 'development') {
+      if ((reactData.scrollXLoad || reactData.scrollYLoad) && reactData.expandColumn) {
+        warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+      }
     }
-
     return $xeTable.$nextTick().then(() => {
       if ($xeToolbar) {
         $xeToolbar.syncUpdate({
@@ -2021,17 +2020,6 @@ function updateRowExpandStyle ($xeTable: VxeTableConstructor & VxeTablePrivateMe
   }
 }
 
-function handleRowExpandScroll ($xeTable: VxeTableConstructor & VxeTablePrivateMethods) {
-  const internalData = $xeTable as unknown as TableInternalData
-
-  const { elemStore } = internalData
-  const rowExpandEl = $xeTable.$refs.refRowExpandElem as HTMLDivElement
-  const bodyScrollElem = getRefElem(elemStore['main-body-scroll'])
-  if (rowExpandEl && bodyScrollElem) {
-    rowExpandEl.scrollTop = bodyScrollElem.scrollTop
-  }
-}
-
 const Methods = {
   callSlot (slotFunc: any, params: any, h: any, vNodes: any) {
     if (slotFunc) {
@@ -5619,7 +5607,7 @@ const Methods = {
         vLen++
       })
 
-    const isSelected = rootList.length > 0 ? (vLen > 0 ? (sLen >= vLen) : (sLen >= rootList.length)) : false
+    const isSelected = vLen > 0 ? sLen >= vLen : sLen >= rootList.length
     const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1)
 
     reactData.isAllSelected = isSelected
@@ -7424,10 +7412,7 @@ const Methods = {
             delete rExpandLazyLoadedMaps[rowid]
           }
           reactData.rowExpandLazyLoadedMaps = rExpandLazyLoadedMaps
-          $xeTable.$nextTick()
-            .then(() => $xeTable.recalculate())
-            .then(() => $xeTable.updateCellAreas())
-            .then(() => resolve())
+          $xeTable.$nextTick().then(() => $xeTable.recalculate()).then(() => resolve())
         })
       } else {
         resolve()
@@ -7442,14 +7427,12 @@ const Methods = {
    * @param {Boolean} expanded 是否展开
    */
   setRowExpand (rows: any, expanded: any) {
-    const $xeTable = this
-
-    const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn } = this
+    const { rowExpandedMaps, fullAllDataRowIdData, rowExpandLazyLoadedMaps, expandOpts, expandColumn: column } = this
     let rExpandedMaps = { ...rowExpandedMaps }
     const { reserve, lazy, accordion, toggleMethod } = expandOpts
     const lazyRests: any[] = []
-    const columnIndex = $xeTable.getColumnIndex(expandColumn)
-    const $columnIndex = $xeTable.getVMColumnIndex(expandColumn)
+    const columnIndex = this.getColumnIndex(column)
+    const $columnIndex = this.getVMColumnIndex(column)
     if (rows) {
       if (!XEUtils.isArray(rows)) {
         rows = [rows]
@@ -7459,7 +7442,7 @@ const Methods = {
         rExpandedMaps = {}
         rows = rows.slice(rows.length - 1, rows.length)
       }
-      const validRows: any[] = toggleMethod ? rows.filter((row: any) => toggleMethod({ expanded, column: expandColumn, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows
+      const validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ expanded, column, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows
       if (expanded) {
         validRows.forEach((row: any) => {
           const rowid = getRowid(this, row)
@@ -7474,7 +7457,7 @@ const Methods = {
           }
         })
       } else {
-        validRows.forEach((item) => {
+        validRows.forEach((item: any) => {
           const rowid = getRowid(this, item)
           if (rExpandedMaps[rowid]) {
             delete rExpandedMaps[rowid]
@@ -7482,19 +7465,11 @@ const Methods = {
         })
       }
       if (reserve) {
-        validRows.forEach((row) => this.handleRowExpandReserve(row, expanded))
+        validRows.forEach((row: any) => this.handleRowExpandReserve(row, expanded))
       }
     }
     this.rowExpandedMaps = rExpandedMaps
-    return Promise.all(lazyRests)
-      .then(() => $xeTable.recalculate())
-      .then(() => {
-        if (expandColumn) {
-          updateRowExpandStyle($xeTable)
-          handleRowExpandScroll($xeTable)
-        }
-        return $xeTable.updateCellAreas()
-      })
+    return Promise.all(lazyRests).then(this.recalculate)
   },
   /**
    * 判断行是否为展开状态
@@ -7516,8 +7491,6 @@ const Methods = {
    * 手动清空展开行状态，数据会恢复成未展开的状态
    */
   clearRowExpand () {
-    const $xeTable = this
-
     const { expandOpts, tableFullData } = this
     const { reserve } = expandOpts
     const expList = this.getRowExpandRecords()
@@ -7529,7 +7502,7 @@ const Methods = {
       if (expList.length) {
         this.recalculate()
       }
-    }).then(() => $xeTable.updateCellAreas())
+    })
   },
   clearRowExpandReserve () {
     this.rowExpandedReserveRowMap = {}
@@ -8837,15 +8810,10 @@ const Methods = {
     }
   },
   updateCellAreas () {
-    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
-    const props = $xeTable
-
-    const { mouseConfig } = props
-    const mouseOpts = $xeTable.computeMouseOpts
-    if (mouseConfig && mouseOpts.area && $xeTable.handleRecalculateCellAreaEvent) {
-      return $xeTable.handleRecalculateCellAreaEvent()
+    if (this.mouseConfig && this.mouseOpts.area && this.handleRecalculateCellAreas) {
+      return this.handleRecalculateCellAreas()
     }
-    return $xeTable.$nextTick()
+    return this.$nextTick()
   },
   dispatchEvent (type: ValueOf<VxeTableEmits>, params: Record<string, any>, evnt: Event | null) {
     const $xeTable = this

package/packages/table/src/table.ts

@@ -1180,16 +1180,11 @@ export default {
   } as any,
   watch: {
     data (value: any) {
-      const $xeTable = this
-      const reactData = $xeTable
-
       const { initStatus } = this
       if (value && value.length >= 50000) {
         warnLog('vxe.error.errLargeData', ['loadData(data), reloadData(data)'])
       }
       this.loadTableData(value || [], true).then(() => {
-        const { scrollXLoad, scrollYLoad, expandColumn } = reactData
-        const expandOpts = $xeTable.computeExpandOpts
         this.inited = true
         this.initStatus = true
         if (!initStatus) {
@@ -1199,9 +1194,9 @@ export default {
         // if (checkboxColumn && this.tableFullData.length > 300 && !this.checkboxOpts.checkField) {
         //   warnLog('vxe.error.checkProp', ['checkbox-config.checkField'])
         // }
-        if ((scrollXLoad || scrollYLoad) && (expandColumn && expandOpts.mode !== 'fixed')) {
-          warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
-        }
+        // if ((this.scrollXLoad || this.scrollYLoad) && this.expandColumn) {
+        //   warnLog('vxe.error.scrollErrProp', ['column.type=expand'])
+        // }
         this.recalculate()
       })
     },
@@ -1227,12 +1222,6 @@ export default {
     showFooter () {
       this.reScrollFlag++
     },
-    overflowX () {
-      this.reScrollFlag++
-    },
-    overflowY () {
-      this.reScrollFlag++
-    },
     reScrollFlag () {
       const $xeTable = this
 

package/styles/components/table.scss

@@ -271,7 +271,7 @@
   display: none;
   position: absolute;
   pointer-events: none;
-  z-index: 6;
+  z-index: 1;
 }
 
 .vxe-table--header-wrapper {