vxe-table 3.4.14-beta.0 → 3.4.14

package/packages/table/src/cell.js

@@ -352,25 +352,23 @@ export const Cell = {
    */
   renderCheckboxHeader (h, params) {
     const { $table, column, isHidden } = params
-    const { isIndeterminate: isAllCheckboxIndeterminate, isAllCheckboxDisabled } = $table
+    const { isAllSelected: isAllCheckboxSelected, isIndeterminate: isAllCheckboxIndeterminate, isAllCheckboxDisabled } = $table
     const { slots } = column
     const headerSlot = slots ? slots.header : null
     const titleSlot = slots ? slots.title : null
     const checkboxOpts = $table.checkboxOpts
     const headerTitle = column.getTitle()
-    let isChecked = false
     let on
     if (!isHidden) {
-      isChecked = isAllCheckboxDisabled ? false : $table.isAllSelected
       on = {
         click (evnt) {
           if (!isAllCheckboxDisabled) {
-            $table.triggerCheckAllEvent(evnt, !isChecked)
+            $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected)
           }
         }
       }
     }
-    const checkboxParams = { ...params, checked: isChecked, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate }
+    const checkboxParams = { ...params, checked: isAllCheckboxSelected, disabled: isAllCheckboxDisabled, indeterminate: isAllCheckboxIndeterminate }
     if (headerSlot) {
       return renderTitleContent(h, checkboxParams, $table.callSlot(headerSlot, checkboxParams, h))
     }
@@ -384,7 +382,7 @@ export const Cell = {
     return renderTitleContent(h, checkboxParams, [
       h('span', {
         class: ['vxe-cell--checkbox', {
-          'is--checked': isChecked,
+          'is--checked': isAllCheckboxSelected,
           'is--disabled': isAllCheckboxDisabled,
           'is--indeterminate': isAllCheckboxIndeterminate
         }],

package/packages/table/src/methods.js

@@ -9,7 +9,7 @@ import { browse, getPaddingTopBottomSize, setScrollTop, setScrollLeft } from '..
 import { formats } from '../../v-x-e-table/src/formats'
 
 const { getRowid, getRowkey, setCellValue, hasChildrenList, getColumnList } = UtilTools
-const { calcHeight, hasClass, addClass, removeClass, getEventTargetNode } = DomTools
+const { calcHeight, hasClass, addClass, removeClass, getEventTargetNode, isNodeElement } = DomTools
 
 const isWebkit = browse['-webkit'] && !browse.edge
 const debounceScrollYDuration = browse.msie ? 80 : 20
@@ -294,11 +294,30 @@ const Methods = {
     })
   },
   /**
-   * 手动处理数据
+   * 手动处理数据，用于手动排序与筛选
    * 对于手动更改了排序、筛选...等条件后需要重新处理数据时可能会用到
    */
   updateData () {
-    return this.handleTableData(true).then(this.updateFooter).then(this.recalculate)
+    const { scrollXLoad, scrollYLoad } = this
+    return this.handleTableData(true).then(() => {
+      this.updateFooter()
+      this.checkSelectionStatus()
+      if (scrollXLoad || scrollYLoad) {
+        if (scrollXLoad) {
+          this.updateScrollXSpace()
+        }
+        if (scrollYLoad) {
+          this.updateScrollYSpace()
+        }
+        return this.refreshScroll()
+      }
+    }).then(() => {
+      this.updateCellAreas()
+      return this.recalculate(true)
+    }).then(() => {
+      // 存在滚动行为未结束情况
+      setTimeout(() => this.recalculate(), 50)
+    })
   },
   handleTableData (force) {
     const { scrollYLoad, scrollYStore, fullDataRowIdData, afterFullData } = this
@@ -1688,15 +1707,22 @@ const Methods = {
     const leftBodyElem = leftBody ? leftBody.$el : null
     const rightBodyElem = rightBody ? rightBody.$el : null
     const tableFooterElem = tableFooter ? tableFooter.$el : null
-    // 还原滚动条位置
-    if (lastScrollLeft || lastScrollTop) {
-      return restoreScrollLocation(this, lastScrollLeft, lastScrollTop)
-    }
-    // 重置
-    setScrollTop(tableBodyElem, lastScrollTop)
-    setScrollTop(leftBodyElem, lastScrollTop)
-    setScrollTop(rightBodyElem, lastScrollTop)
-    setScrollLeft(tableFooterElem, lastScrollLeft)
+    return new Promise(resolve => {
+      // 还原滚动条位置
+      if (lastScrollLeft || lastScrollTop) {
+        return restoreScrollLocation(this, lastScrollLeft, lastScrollTop).then(() => {
+          // 存在滚动行为未结束情况
+          setTimeout(resolve, 30)
+        })
+      }
+      // 重置
+      setScrollTop(tableBodyElem, lastScrollTop)
+      setScrollTop(leftBodyElem, lastScrollTop)
+      setScrollTop(rightBodyElem, lastScrollTop)
+      setScrollLeft(tableFooterElem, lastScrollLeft)
+      // 存在滚动行为未结束情况
+      setTimeout(resolve, 30)
+    })
   },
   /**
    * 计算单元格列宽，动态分配可用剩余空间
@@ -1965,7 +1991,7 @@ const Methods = {
           }
         } else if (layout === 'body') {
           const emptyBlockElem = elemStore[`${name}-${layout}-emptyBlock`]
-          if (wrapperElem) {
+          if (isNodeElement(wrapperElem)) {
             if (customMaxHeight) {
               wrapperElem.style.maxHeight = `${fixedType ? customMaxHeight - headerHeight - (showFooter ? 0 : scrollbarHeight) : customMaxHeight - headerHeight}px`
             } else {
@@ -1981,7 +2007,7 @@ const Methods = {
           if (fixedWrapperElem) {
             const isRightFixed = fixedType === 'right'
             const fixedColumn = columnStore[`${fixedType}List`]
-            if (wrapperElem) {
+            if (isNodeElement(wrapperElem)) {
               wrapperElem.style.top = `${headerHeight}px`
             }
             fixedWrapperElem.style.height = `${(customHeight > 0 ? customHeight - headerHeight - footerHeight : tableHeight) + headerHeight + footerHeight - scrollbarHeight * (showFooter ? 2 : 1)}px`
@@ -2045,7 +2071,7 @@ const Methods = {
           }
           tWidth = tableColumn.reduce((previous, column) => previous + column.renderWidth, 0)
 
-          if (wrapperElem) {
+          if (isNodeElement(wrapperElem)) {
             // 如果是固定列
             if (fixedWrapperElem) {
               wrapperElem.style.top = `${customHeight > 0 ? customHeight - footerHeight : tableHeight + headerHeight}px`
@@ -2964,14 +2990,28 @@ const Methods = {
     const { afterFullData, selection, treeIndeterminates, checkboxOpts, treeConfig } = this
     const { checkField, halfField, checkStrictly, checkMethod } = checkboxOpts
     if (!checkStrictly) {
+      const disableRows = []
+      const checkRows = []
+      let isAllResolve = false
       let isAllSelected = false
       let isIndeterminate = false
       if (checkField) {
-        isAllSelected = afterFullData.length && afterFullData.every(
+        isAllResolve = afterFullData.every(
           checkMethod
-            ? (row) => !checkMethod({ row }) || XEUtils.get(row, checkField)
+            ? (row) => {
+              if (!checkMethod({ row })) {
+                disableRows.push(row)
+                return true
+              }
+              if (XEUtils.get(row, checkField)) {
+                checkRows.push(row)
+                return true
+              }
+              return false
+            }
             : row => XEUtils.get(row, checkField)
         )
+        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
         if (treeConfig) {
           if (halfField) {
             isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, halfField) || treeIndeterminates.indexOf(row) > -1)
@@ -2986,11 +3026,22 @@ const Methods = {
           }
         }
       } else {
-        isAllSelected = afterFullData.length && afterFullData.every(
+        isAllResolve = afterFullData.every(
           checkMethod
-            ? (row) => !checkMethod({ row }) || selection.indexOf(row) > -1
+            ? (row) => {
+              if (!checkMethod({ row })) {
+                disableRows.push(row)
+                return true
+              }
+              if (selection.indexOf(row) > -1) {
+                checkRows.push(row)
+                return true
+              }
+              return false
+            }
             : row => selection.indexOf(row) > -1
         )
+        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
         if (treeConfig) {
           isIndeterminate = !isAllSelected && afterFullData.some(row => treeIndeterminates.indexOf(row) > -1 || selection.indexOf(row) > -1)
         } else {

package/packages/tools/src/dom.js

@@ -80,6 +80,17 @@ export function setScrollLeft (elem, scrollLeft) {
   }
 }
 
+export function setScrollLeftAndTop (elem, scrollLeft, scrollTop) {
+  if (elem) {
+    elem.scrollLeft = scrollLeft
+    elem.scrollTop = scrollTop
+  }
+}
+
+function isNodeElement (elem) {
+  return elem && elem.nodeType === 1
+}
+
 export const DomTools = {
   browse,
   isPx (val) {
@@ -225,7 +236,8 @@ export const DomTools = {
       }
     }
     return num
-  }
+  },
+  isNodeElement
 }
 
 export default DomTools

package/styles/base/checked.scss

@@ -170,5 +170,10 @@
         border-color: $vxe-primary-disabled-color;
       }
     }
+    .vxe-checkbox--indeterminate-icon {
+      &:after {
+        background-color: $vxe-primary-disabled-color;
+      }
+    }
   }
 }