vxe-table 3.7.0-beta.9 → 3.7.1

package/packages/table/src/body.js

@@ -9,7 +9,7 @@ import { getSlotVNs } from '../../tools/vn'
 const renderType = 'body'
 
 // 滚动、拖动过程中不需要触发
-function isOperateMouse ($xetable) {
+function isVMScrollProcess ($xetable) {
   return $xetable._isResize || ($xetable.lastScrollTime && Date.now() < $xetable.lastScrollTime + $xetable.delayHover)
 }
 
@@ -122,7 +122,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
   // hover 进入事件
   if (showTitle || showTooltip || showAllTip || bindMouseenter || tooltipConfig) {
     tdOns.mouseenter = evnt => {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return
       }
       if (showTitle) {
@@ -139,7 +139,7 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
   // hover 退出事件
   if (showTooltip || showAllTip || bindMouseleave || tooltipConfig) {
     tdOns.mouseleave = evnt => {
-      if (isOperateMouse($xetable)) {
+      if (isVMScrollProcess($xetable)) {
         return
       }
       if (showTooltip || showAllTip) {
@@ -302,9 +302,9 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     treeOpts,
     expandOpts,
     editOpts,
-    treeExpandeds,
+    treeExpandedMaps,
     scrollYLoad,
-    rowExpandeds,
+    rowExpandedMaps,
     radioOpts,
     checkboxOpts,
     expandColumn,
@@ -312,6 +312,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     fullAllDataRowIdData,
     rowOpts
   } = $xetable
+  const childrenField = treeOpts.children || treeOpts.childrenField
   const rows = []
   tableData.forEach((row, $rowIndex) => {
     const trOn = {}
@@ -322,13 +323,13 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     // 事件绑定
     if (rowOpts.isHover || highlightHoverRow) {
       trOn.mouseenter = evnt => {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return
         }
         $xetable.triggerHoverEvent(evnt, { row, rowIndex })
       }
       trOn.mouseleave = () => {
-        if (isOperateMouse($xetable)) {
+        if (isVMScrollProcess($xetable)) {
           return
         }
         $xetable.clearHoverRow()
@@ -340,7 +341,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     const seq = rest ? rest.seq : -1
     const params = { $table: $xetable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
     // 行是否被展开
-    const isExpandRow = expandColumn && rowExpandeds.length && rowExpandeds.indexOf(row) > -1
+    const isExpandRow = expandColumn && !!rowExpandedMaps[rowid]
     // 树节点是否被展开
     let isExpandTree = false
     let rowChildren = []
@@ -349,9 +350,9 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     if (editConfig) {
       isNewRow = $xetable.isInsertByRow(row)
     }
-    if (treeConfig && !scrollYLoad && !treeOpts.transform && treeExpandeds.length) {
-      rowChildren = row[treeOpts.childrenField || treeOpts.children]
-      isExpandTree = rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1
+    if (treeConfig && !scrollYLoad && !treeOpts.transform) {
+      rowChildren = row[childrenField]
+      isExpandTree = rowChildren && rowChildren.length && !!treeExpandedMaps[rowid]
     }
     rows.push(
       h('tr', {
@@ -364,7 +365,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
             'is--expand-row': isExpandRow,
             'is--expand-tree': isExpandTree,
             'row--new': isNewRow && (editOpts.showStatus || editOpts.showInsertStatus),
-            'row--radio': radioOpts.highlight && $xetable.selectRow === row,
+            'row--radio': radioOpts.highlight && $xetable.selectRadioRow === row,
             'row--checked': checkboxOpts.highlight && $xetable.isCheckedByCheckboxRow(row)
           },
           rowClassName ? (XEUtils.isFunction(rowClassName) ? rowClassName(params) : rowClassName) : ''
@@ -503,8 +504,10 @@ export default {
   },
   beforeDestroy () {
     clearTimeout(this.wheelTime)
-    this.$el._onscroll = null
-    this.$el.onscroll = null
+    if (this.$el) {
+      this.$el._onscroll = null
+      this.$el.onscroll = null
+    }
   },
   destroyed () {
     const { $parent: $xetable, fixedType } = this

package/packages/table/src/cell.js

@@ -3,7 +3,7 @@ import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import DomTools from '../../tools/dom'
 import UtilTools, { eqEmptyValue, isEnableConf, getFuncText } from '../../tools/utils'
-import { getColumnConfig } from './util'
+import { getRowid, getColumnConfig } from './util'
 import { getSlotVNs } from '../../tools/vn'
 
 function renderHelpIcon (h, params) {
@@ -204,11 +204,13 @@ export const Cell = {
    */
   renderTreeIcon (h, params, cellVNodes) {
     const { $table, isHidden } = params
-    const { treeOpts, treeExpandeds, treeLazyLoadeds } = $table
+    const { treeOpts, treeExpandedMaps, treeExpandLazyLoadedMaps } = $table
     const { row, column, level } = params
     const { slots } = column
-    const { childrenField, children, hasChildField, hasChild, indent, lazy, trigger, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts
-    const rowChilds = row[childrenField || children]
+    const { indent, lazy, trigger, iconLoaded, showIcon, iconOpen, iconClose } = treeOpts
+    const childrenField = treeOpts.children || treeOpts.childrenField
+    const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
+    const rowChilds = row[childrenField]
     let hasLazyChilds = false
     let isAceived = false
     let isLazyLoaded = false
@@ -217,10 +219,11 @@ export const Cell = {
       return $table.callSlot(slots.icon, params, h, cellVNodes)
     }
     if (!isHidden) {
-      isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1
+      const rowid = getRowid($table, row)
+      isAceived = !!treeExpandedMaps[rowid]
       if (lazy) {
-        isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1
-        hasLazyChilds = row[hasChildField || hasChild]
+        isLazyLoaded = !!treeExpandLazyLoadedMaps[rowid]
+        hasLazyChilds = row[hasChildField]
       }
     }
     if (!trigger || trigger === 'default') {
@@ -294,13 +297,13 @@ export const Cell = {
   },
   renderRadioCell (h, params) {
     const { $table, column, isHidden } = params
-    const { radioOpts, selectRow } = $table
+    const { radioOpts, selectRadioRow } = $table
     const { slots } = column
     const { labelField, checkMethod, visibleMethod } = radioOpts
     const { row } = params
     const defaultSlot = slots ? slots.default : null
     const radioSlot = slots ? slots.radio : null
-    const isChecked = row === selectRow
+    const isChecked = row === selectRadioRow
     const isVisible = !visibleMethod || visibleMethod({ row })
     let isDisabled = !!checkMethod
     let on
@@ -407,7 +410,7 @@ export const Cell = {
   },
   renderCheckboxCell (h, params) {
     const { $table, row, column, isHidden } = params
-    const { treeConfig, treeIndeterminates, selectCheckboxRows } = $table
+    const { treeConfig, treeIndeterminateMaps, selectCheckboxMaps } = $table
     const { labelField, checkMethod, visibleMethod } = $table.checkboxOpts
     const { slots } = column
     const defaultSlot = slots ? slots.default : null
@@ -418,7 +421,8 @@ export const Cell = {
     let isDisabled = !!checkMethod
     let on
     if (!isHidden) {
-      isChecked = $table.findRowIndexOf(selectCheckboxRows, row) > -1
+      const rowid = getRowid($table, row)
+      isChecked = !!selectCheckboxMaps[rowid]
       on = {
         click (evnt) {
           if (!isDisabled && isVisible) {
@@ -431,7 +435,7 @@ export const Cell = {
         isDisabled = !checkMethod({ row })
       }
       if (treeConfig) {
-        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
+        indeterminate = !!treeIndeterminateMaps[rowid]
       }
     }
     const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
@@ -469,17 +473,19 @@ export const Cell = {
   },
   renderCheckboxCellByProp (h, params) {
     const { $table, row, column, isHidden } = params
-    const { treeConfig, treeIndeterminates } = $table
-    const { labelField, checkField, halfField, checkMethod, visibleMethod } = $table.checkboxOpts
+    const { treeConfig, treeIndeterminateMaps, checkboxOpts } = $table
+    const { labelField, checkField, checkMethod, visibleMethod } = checkboxOpts
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField
     const { slots } = column
     const defaultSlot = slots ? slots.default : null
     const checkboxSlot = slots ? slots.checkbox : null
-    let indeterminate = false
+    let isIndeterminate = false
     let isChecked = false
     const isVisible = !visibleMethod || visibleMethod({ row })
     let isDisabled = !!checkMethod
     let on
     if (!isHidden) {
+      const rowid = getRowid($table, row)
       isChecked = XEUtils.get(row, checkField)
       on = {
         click (evnt) {
@@ -493,10 +499,10 @@ export const Cell = {
         isDisabled = !checkMethod({ row })
       }
       if (treeConfig) {
-        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
+        isIndeterminate = !!treeIndeterminateMaps[rowid]
       }
     }
-    const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
+    const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate: isIndeterminate }
     if (checkboxSlot) {
       return $table.callSlot(checkboxSlot, checkboxParams, h)
     }
@@ -504,7 +510,7 @@ export const Cell = {
     if (isVisible) {
       checkVNs.push(
         h('span', {
-          class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
+          class: ['vxe-checkbox--icon', isIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       )
     }
@@ -520,7 +526,7 @@ export const Cell = {
         class: ['vxe-cell--checkbox', {
           'is--checked': isChecked,
           'is--disabled': isDisabled,
-          'is--indeterminate': halfField && !isChecked ? row[halfField] : indeterminate
+          'is--indeterminate': indeterminateField && !isChecked ? row[indeterminateField] : isIndeterminate
         }],
         on
       }, checkVNs)
@@ -535,7 +541,7 @@ export const Cell = {
    */
   renderExpandCell (h, params) {
     const { $table, isHidden, row, column } = params
-    const { expandOpts, rowExpandeds, expandLazyLoadeds } = $table
+    const { expandOpts, rowExpandedMaps, rowExpandLazyLoadedMaps } = $table
     const { lazy, labelField, iconLoaded, showIcon, iconOpen, iconClose, visibleMethod } = expandOpts
     const { slots } = column
     const defaultSlot = slots ? slots.default : null
@@ -545,9 +551,10 @@ export const Cell = {
       return $table.callSlot(slots.icon, params, h)
     }
     if (!isHidden) {
-      isAceived = $table.findRowIndexOf(rowExpandeds, params.row) > -1
+      const rowid = getRowid($table, row)
+      isAceived = !!rowExpandedMaps[rowid]
       if (lazy) {
-        isLazyLoaded = $table.findRowIndexOf(expandLazyLoadeds, row) > -1
+        isLazyLoaded = !!rowExpandLazyLoadedMaps[rowid]
       }
     }
     return [
@@ -685,7 +692,9 @@ export const Cell = {
           },
           on: {
             click (evnt) {
-              $table.triggerFilterEvent(evnt, params.column, params)
+              if ($table.triggerFilterEvent) {
+                $table.triggerFilterEvent(evnt, params.column, params)
+              }
             }
           }
         })