vxe-table 3.5.9 → 3.6.0-beta.10

package/packages/modal/src/modal.js

@@ -127,6 +127,7 @@ export default {
     const footerSlot = $scopedSlots.footer || slots.footer
     const headerSlot = $scopedSlots.header || slots.header
     const titleSlot = $scopedSlots.title || slots.title
+    const cornerSlot = $scopedSlots.corner || slots.corner
     const headerOns = {}
     if (draggable) {
       headerOns.mousedown = this.mousedownEvent
@@ -170,27 +171,34 @@ export default {
           }],
           on: headerOns
         }, headerSlot ? (!inited || (destroyOnClose && !visible) ? [] : getSlotVNs(headerSlot.call(this, { $modal: this }, h))) : [
-          titleSlot ? getSlotVNs(titleSlot.call(this, { $modal: this }, h)) : h('span', {
-            class: 'vxe-modal--title'
-          }, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title')),
-          showZoom ? h('i', {
-            class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN],
-            attrs: {
-              title: GlobalConfig.i18n(`vxe.modal.zoom${zoomLocat ? 'Out' : 'In'}`)
-            },
-            on: {
-              click: this.toggleZoomEvent
-            }
-          }) : _e(),
-          showClose ? h('i', {
-            class: ['vxe-modal--close-btn', 'trigger--btn', GlobalConfig.icon.MODAL_CLOSE],
-            attrs: {
-              title: GlobalConfig.i18n('vxe.modal.close')
-            },
-            on: {
-              click: this.closeEvent
-            }
-          }) : _e()
+          h('div', {
+            class: 'vxe-modal--header-title'
+          }, titleSlot ? getSlotVNs(titleSlot.call(this, { $modal: this }, h)) : (title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title'))),
+          h('div', {
+            class: 'vxe-modal--header-right'
+          }, [
+            cornerSlot ? h('span', {
+              class: 'vxe-modal--corner-warpper'
+            }, getSlotVNs(cornerSlot({ $modal: this }))) : _e(),
+            showZoom ? h('i', {
+              class: ['vxe-modal--zoom-btn', 'trigger--btn', zoomLocat ? GlobalConfig.icon.MODAL_ZOOM_OUT : GlobalConfig.icon.MODAL_ZOOM_IN],
+              attrs: {
+                title: GlobalConfig.i18n(`vxe.modal.zoom${zoomLocat ? 'Out' : 'In'}`)
+              },
+              on: {
+                click: this.toggleZoomEvent
+              }
+            }) : _e(),
+            showClose ? h('i', {
+              class: ['vxe-modal--close-btn', 'trigger--btn', GlobalConfig.icon.MODAL_CLOSE],
+              attrs: {
+                title: GlobalConfig.i18n('vxe.modal.close')
+              },
+              on: {
+                click: this.closeEvent
+              }
+            }) : _e()
+          ])
         ]) : null,
         h('div', {
           class: 'vxe-modal--body'
@@ -211,7 +219,7 @@ export default {
           !isMsg ? h(VxeLoading, {
             class: 'vxe-modal--loading',
             props: {
-              loading
+              value: loading
             }
           }) : null
         ]),

package/packages/radio/src/radio.js

@@ -34,10 +34,13 @@ export default {
     isStrict () {
       const { $xeradiogroup } = this
       return $xeradiogroup ? $xeradiogroup.strict : this.strict
+    },
+    isChecked () {
+      return this.$xeradiogroup ? this.$xeradiogroup.value === this.label : this.value === this.label
     }
   },
   render (h) {
-    const { $scopedSlots, $xeradiogroup, isDisabled, title, vSize, value, label, name, content } = this
+    const { $scopedSlots, $xeradiogroup, isDisabled, isChecked, title, vSize, name, content } = this
     const attrs = {}
     if (title) {
       attrs.title = title
@@ -45,6 +48,7 @@ export default {
     return h('label', {
       class: ['vxe-radio', {
         [`size--${vSize}`]: vSize,
+        'is--checked': isChecked,
         'is--disabled': isDisabled
       }],
       attrs
@@ -57,7 +61,7 @@ export default {
           disabled: isDisabled
         },
         domProps: {
-          checked: $xeradiogroup ? $xeradiogroup.value === label : value === label
+          checked: isChecked
         },
         on: {
           change: this.changeEvent,
@@ -65,7 +69,7 @@ export default {
         }
       }),
       h('span', {
-        class: 'vxe-radio--icon'
+        class: ['vxe-radio--icon', isChecked ? 'vxe-icon-radio-checked' : 'vxe-icon-radio-unchecked']
       }),
       h('span', {
         class: 'vxe-radio--label'

package/packages/select/src/select.js

@@ -125,21 +125,35 @@ function getSelectLabel (_vm, value) {
   return XEUtils.toValueString(item ? item[_vm.labelField] : value)
 }
 
+function checkOptionDisabled (_vm, isSelected, option, group) {
+  if (option.disabled) {
+    return true
+  }
+  if (group && group.disabled) {
+    return true
+  }
+  if (_vm.isMaximize && !isSelected) {
+    return true
+  }
+  return false
+}
+
 export function renderOption (h, _vm, list, group) {
   const { isGroup, labelField, valueField, optionKey, value, multiple, currentValue, optionOpts } = _vm
   const { useKey } = optionOpts
   return list.map((option, cIndex) => {
     const { slots } = option
-    const isVisible = !isGroup || isOptionVisible(option)
-    const isDisabled = (group && group.disabled) || option.disabled
     const optionValue = option[valueField]
+    const isSelected = multiple ? (value && value.indexOf(optionValue) > -1) : value === optionValue
+    const isVisible = !isGroup || isOptionVisible(option)
+    const isDisabled = checkOptionDisabled(_vm, isSelected, option, group)
     const optid = getOptid(_vm, option)
     const defaultSlot = slots ? slots.default : null
     return isVisible ? h('div', {
       key: useKey || optionKey ? optid : cIndex,
       class: ['vxe-select-option', option.className, {
         'is--disabled': isDisabled,
-        'is--selected': multiple ? (value && value.indexOf(optionValue) > -1) : value === optionValue,
+        'is--selected': isSelected,
         'is--hover': currentValue === optionValue
       }],
       attrs: {
@@ -240,6 +254,7 @@ export default {
     optionGroupProps: Object,
     optionConfig: Object,
     className: [String, Function],
+    max: [String, Number],
     size: { type: String, default: () => GlobalConfig.select.size || GlobalConfig.size },
     filterable: Boolean,
     filterMethod: Function,
@@ -336,6 +351,13 @@ export default {
         return getRemoteSelectLabel(this, value)
       }
       return getSelectLabel(this, value)
+    },
+    isMaximize () {
+      const { value, multiple, max } = this
+      if (multiple && max) {
+        return (value ? value.length : 0) >= XEUtils.toNumber(max)
+      }
+      return false
     }
   },
   watch: {

package/packages/table/src/body.js

@@ -298,6 +298,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     showOverflow: allColumnOverflow,
     treeConfig,
     treeOpts,
+    expandOpts,
     editOpts,
     treeExpandeds,
     scrollYLoad,
@@ -379,11 +380,13 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     )
     // 如果行被展开了
     if (isExpandRow) {
-      let cellStyle
+      const { height: expandHeight } = expandOpts
+      const cellStyle = {}
+      if (expandHeight) {
+        cellStyle.height = `${expandHeight}px`
+      }
       if (treeConfig) {
-        cellStyle = {
-          paddingLeft: `${(rowLevel * treeOpts.indent) + 30}px`
-        }
+        cellStyle.paddingLeft = `${(rowLevel * treeOpts.indent) + 30}px`
       }
       const { showOverflow } = expandColumn
       const hasEllipsis = (XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow)) ? allColumnOverflow : showOverflow
@@ -396,16 +399,20 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
           on: trOn
         }, [
           h('td', {
-            class: ['vxe-body--expanded-column', {
+            class: {
+              'vxe-body--expanded-column': 1,
               'fixed--hidden': fixedType && !hasFixedColumn,
               'col--ellipsis': hasEllipsis
-            }],
+            },
             attrs: {
               colspan: tableColumn.length
             }
           }, [
             h('div', {
-              class: 'vxe-body--expanded-cell',
+              class: {
+                'vxe-body--expanded-cell': 1,
+                'is--ellipsis': expandHeight
+              },
               style: cellStyle
             }, [
               expandColumn.renderData(h, expandParams)

package/packages/table/src/cell.js

@@ -217,9 +217,9 @@ export const Cell = {
       return $table.callSlot(slots.icon, params, h, cellVNodes)
     }
     if (!isHidden) {
-      isAceived = treeExpandeds.indexOf(row) > -1
+      isAceived = $table.findRowIndexOf(treeExpandeds, row) > -1
       if (lazy) {
-        isLazyLoaded = treeLazyLoadeds.indexOf(row) > -1
+        isLazyLoaded = $table.findRowIndexOf(treeLazyLoadeds, row) > -1
         hasLazyChilds = row[hasChild]
       }
     }
@@ -321,10 +321,7 @@ export const Cell = {
     if (isVisible) {
       radioVNs.push(
         h('span', {
-          class: 'vxe-radio--icon vxe-radio--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-radio--icon vxe-radio--unchecked-icon'
+          class: ['vxe-radio--icon', isChecked ? GlobalConfig.icon.TABLE_RADIO_CHECKED : GlobalConfig.icon.TABLE_RADIO_UNCHECKED]
         })
       )
     }
@@ -394,13 +391,7 @@ export const Cell = {
         on
       }, [
         h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllCheckboxSelected ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       ].concat(titleSlot || headerTitle ? [
         h('span', {
@@ -411,7 +402,7 @@ export const Cell = {
   },
   renderCheckboxCell (h, params) {
     const { $table, row, column, isHidden } = params
-    const { treeConfig, treeIndeterminates } = $table
+    const { treeConfig, treeIndeterminates, selection } = $table
     const { labelField, checkMethod, visibleMethod } = $table.checkboxOpts
     const { slots } = column
     const defaultSlot = slots ? slots.default : null
@@ -422,7 +413,7 @@ export const Cell = {
     let isDisabled = !!checkMethod
     let on
     if (!isHidden) {
-      isChecked = $table.selection.indexOf(row) > -1
+      isChecked = $table.findRowIndexOf(selection, row) > -1
       on = {
         click (evnt) {
           if (!isDisabled && isVisible) {
@@ -434,7 +425,7 @@ export const Cell = {
         isDisabled = !checkMethod({ row })
       }
       if (treeConfig) {
-        indeterminate = treeIndeterminates.indexOf(row) > -1
+        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
       }
     }
     const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
@@ -445,13 +436,7 @@ export const Cell = {
     if (isVisible) {
       checkVNs.push(
         h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       )
     }
@@ -501,7 +486,7 @@ export const Cell = {
         isDisabled = !checkMethod({ row })
       }
       if (treeConfig) {
-        indeterminate = treeIndeterminates.indexOf(row) > -1
+        indeterminate = $table.findRowIndexOf(treeIndeterminates, row) > -1
       }
     }
     const checkboxParams = { ...params, checked: isChecked, disabled: isDisabled, visible: isVisible, indeterminate }
@@ -512,13 +497,7 @@ export const Cell = {
     if (isVisible) {
       checkVNs.push(
         h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       )
     }
@@ -559,9 +538,9 @@ export const Cell = {
       return $table.callSlot(slots.icon, params, h)
     }
     if (!isHidden) {
-      isAceived = rowExpandeds.indexOf(params.row) > -1
+      isAceived = $table.findRowIndexOf(rowExpandeds, params.row) > -1
       if (lazy) {
-        isLazyLoaded = expandLazyLoadeds.indexOf(row) > -1
+        isLazyLoaded = $table.findRowIndexOf(expandLazyLoadeds, row) > -1
       }
     }
     return [

package/packages/table/src/methods.js

@@ -1125,9 +1125,9 @@ const Methods = {
     } else {
       const { selection } = this
       if (treeConfig) {
-        rowList = XEUtils.filterTree(currTableData, row => selection.indexOf(row) > -1, { children: transform ? mapChildren : children })
+        rowList = XEUtils.filterTree(currTableData, row => this.findRowIndexOf(selection, row) > -1, { children: transform ? mapChildren : children })
       } else {
-        rowList = currTableData.filter(row => selection.indexOf(row) > -1)
+        rowList = currTableData.filter(row => this.findRowIndexOf(selection, row) > -1)
       }
     }
     return rowList
@@ -2727,7 +2727,7 @@ const Methods = {
   getCheckboxIndeterminateRecords (isFull) {
     const { treeConfig, treeIndeterminates, afterFullData } = this
     if (treeConfig) {
-      return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(row => afterFullData.indexOf(row))
+      return isFull ? treeIndeterminates.slice(0) : treeIndeterminates.filter(row => this.findRowIndexOf(afterFullData, row) > -1)
     }
     return []
   },
@@ -2762,14 +2762,16 @@ const Methods = {
     return this.$nextTick()
   },
   isCheckedByCheckboxRow (row) {
+    const { selection } = this
     const { checkField } = this.checkboxOpts
     if (checkField) {
       return XEUtils.get(row, checkField)
     }
-    return this.selection.indexOf(row) > -1
+    return this.findRowIndexOf(selection, row) > -1
   },
   isIndeterminateByCheckboxRow (row) {
-    return this.treeIndeterminates.indexOf(row) > -1 && !this.isCheckedByCheckboxRow(row)
+    const { treeIndeterminates } = this
+    return this.findRowIndexOf(treeIndeterminates, row) > -1 && !this.isCheckedByCheckboxRow(row)
   },
   /**
    * 多选，行选中事件
@@ -2781,31 +2783,31 @@ const Methods = {
     if (checkField) {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
-          if (treeIndeterminates.indexOf(row) === -1) {
+          if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
             treeIndeterminates.push(row)
           }
           XEUtils.set(row, checkField, false)
         } else {
           // 更新子节点状态
           XEUtils.eachTree([row], (item) => {
-            if (row === item || (!checkMethod || checkMethod({ row: item }))) {
+            if (this.eqRow(item, row) || (!checkMethod || checkMethod({ row: item }))) {
               XEUtils.set(item, checkField, value)
-              XEUtils.remove(treeIndeterminates, half => half === item)
+              XEUtils.remove(treeIndeterminates, half => this.eqRow(half, item))
               this.handleCheckboxReserveRow(row, value)
             }
           }, treeOpts)
         }
         // 如果存在父节点，更新父节点状态
-        const matchObj = XEUtils.findTree(afterFullData, item => item === row, treeOpts)
+        const matchObj = XEUtils.findTree(afterFullData, item => this.eqRow(item, row), treeOpts)
         if (matchObj && matchObj.parent) {
           let parentStatus
           const vItems = checkMethod ? matchObj.items.filter((item) => checkMethod({ row: item })) : matchObj.items
-          const indeterminatesItem = XEUtils.find(matchObj.items, item => treeIndeterminates.indexOf(item) > -1)
+          const indeterminatesItem = XEUtils.find(matchObj.items, item => this.findRowIndexOf(treeIndeterminates, item) > -1)
           if (indeterminatesItem) {
             parentStatus = -1
           } else {
             const selectItems = matchObj.items.filter(item => XEUtils.get(item, checkField))
-            parentStatus = selectItems.filter(item => vItems.indexOf(item) > -1).length === vItems.length ? true : (selectItems.length || value === -1 ? -1 : false)
+            parentStatus = selectItems.filter(item => this.findRowIndexOf(vItems, item) > -1).length === vItems.length ? true : (selectItems.length || value === -1 ? -1 : false)
           }
           return this.handleSelectRow({ row: matchObj.parent }, parentStatus)
         }
@@ -2818,46 +2820,46 @@ const Methods = {
     } else {
       if (treeConfig && !checkStrictly) {
         if (value === -1) {
-          if (treeIndeterminates.indexOf(row) === -1) {
+          if (this.findRowIndexOf(treeIndeterminates, row) === -1) {
             treeIndeterminates.push(row)
           }
-          XEUtils.remove(selection, item => item === row)
+          XEUtils.remove(selection, item => this.eqRow(item, row))
         } else {
           // 更新子节点状态
           XEUtils.eachTree([row], (item) => {
-            if (row === item || (!checkMethod || checkMethod({ row: item }))) {
+            if (this.eqRow(item, row) || (!checkMethod || checkMethod({ row: item }))) {
               if (value) {
                 selection.push(item)
               } else {
-                XEUtils.remove(selection, select => select === item)
+                XEUtils.remove(selection, select => this.eqRow(select, item))
               }
-              XEUtils.remove(treeIndeterminates, half => half === item)
+              XEUtils.remove(treeIndeterminates, half => this.eqRow(half, item))
               this.handleCheckboxReserveRow(row, value)
             }
           }, treeOpts)
         }
         // 如果存在父节点，更新父节点状态
-        const matchObj = XEUtils.findTree(afterFullData, item => item === row, treeOpts)
+        const matchObj = XEUtils.findTree(afterFullData, item => this.eqRow(item, row), treeOpts)
         if (matchObj && matchObj.parent) {
           let parentStatus
           const vItems = checkMethod ? matchObj.items.filter((item) => checkMethod({ row: item })) : matchObj.items
-          const indeterminatesItem = XEUtils.find(matchObj.items, item => treeIndeterminates.indexOf(item) > -1)
+          const indeterminatesItem = XEUtils.find(matchObj.items, item => this.findRowIndexOf(treeIndeterminates, item) > -1)
           if (indeterminatesItem) {
             parentStatus = -1
           } else {
-            const selectItems = matchObj.items.filter(item => selection.indexOf(item) > -1)
-            parentStatus = selectItems.filter(item => vItems.indexOf(item) > -1).length === vItems.length ? true : (selectItems.length || value === -1 ? -1 : false)
+            const selectItems = matchObj.items.filter(item => this.findRowIndexOf(selection, item) > -1)
+            parentStatus = selectItems.filter(item => this.findRowIndexOf(vItems, item) > -1).length === vItems.length ? true : (selectItems.length || value === -1 ? -1 : false)
           }
           return this.handleSelectRow({ row: matchObj.parent }, parentStatus)
         }
       } else {
         if (!checkMethod || checkMethod({ row })) {
           if (value) {
-            if (selection.indexOf(row) === -1) {
+            if (this.findRowIndexOf(selection, row) === -1) {
               selection.push(row)
             }
           } else {
-            XEUtils.remove(selection, item => item === row)
+            XEUtils.remove(selection, item => this.eqRow(item, row))
           }
           this.handleCheckboxReserveRow(row, value)
         }
@@ -2869,7 +2871,7 @@ const Methods = {
     const { selection, checkboxOpts } = this
     const { checkField } = checkboxOpts
     const { row } = params
-    const value = checkField ? !XEUtils.get(row, checkField) : selection.indexOf(row) === -1
+    const value = checkField ? !XEUtils.get(row, checkField) : this.findRowIndexOf(selection, row) === -1
     if (evnt) {
       this.triggerCheckRowEvent(evnt, params, value)
     } else {
@@ -2880,7 +2882,12 @@ const Methods = {
     const { checkMethod } = this.checkboxOpts
     if (!checkMethod || checkMethod({ row: params.row })) {
       this.handleSelectRow(params, value)
-      this.emitEvent('checkbox-change', Object.assign({ records: this.getCheckboxRecords(), reserves: this.getCheckboxReserveRecords(), indeterminates: this.getCheckboxIndeterminateRecords(), checked: value }, params), evnt)
+      this.emitEvent('checkbox-change', Object.assign({
+        records: this.getCheckboxRecords(),
+        reserves: this.getCheckboxReserveRecords(),
+        indeterminates: this.getCheckboxIndeterminateRecords(),
+        checked: value
+      }, params), evnt)
     }
   },
   /**
@@ -2898,7 +2905,7 @@ const Methods = {
     const { afterFullData, treeConfig, treeOpts, selection, checkboxReserveRowMap, checkboxOpts } = this
     const { checkField, reserve, checkStrictly, checkMethod } = checkboxOpts
     let selectRows = []
-    const beforeSelection = treeConfig ? [] : selection.filter(row => afterFullData.indexOf(row) === -1)
+    const beforeSelection = treeConfig ? [] : selection.filter(row => this.findRowIndexOf(afterFullData, row) === -1)
     if (checkStrictly) {
       this.isAllSelected = value
     } else {
@@ -2945,7 +2952,7 @@ const Methods = {
              */
             if (checkMethod) {
               XEUtils.eachTree(afterFullData, (row) => {
-                if (checkMethod({ row }) ? 0 : selection.indexOf(row) > -1) {
+                if (checkMethod({ row }) ? 0 : this.findRowIndexOf(selection, row) > -1) {
                   selectRows.push(row)
                 }
               }, treeOpts)
@@ -2959,7 +2966,7 @@ const Methods = {
              * 如果不存在选中方法，则添加所有数据到临时集合中
              */
             if (checkMethod) {
-              selectRows = afterFullData.filter((row) => selection.indexOf(row) > -1 || checkMethod({ row }))
+              selectRows = afterFullData.filter((row) => this.findRowIndexOf(selection, row) > -1 || checkMethod({ row }))
             } else {
               selectRows = afterFullData.slice(0)
             }
@@ -2970,7 +2977,7 @@ const Methods = {
              * 如果不存在选中方法，无需处理，临时集合默认为空
              */
             if (checkMethod) {
-              selectRows = afterFullData.filter((row) => checkMethod({ row }) ? 0 : selection.indexOf(row) > -1)
+              selectRows = afterFullData.filter((row) => checkMethod({ row }) ? 0 : this.findRowIndexOf(selection, row) > -1)
             }
           }
         }
@@ -3017,9 +3024,9 @@ const Methods = {
         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)
+            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || XEUtils.get(row, halfField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
           } else {
-            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || treeIndeterminates.indexOf(row) > -1)
+            isIndeterminate = !isAllSelected && afterFullData.some(row => XEUtils.get(row, checkField) || this.findRowIndexOf(treeIndeterminates, row) > -1)
           }
         } else {
           if (halfField) {
@@ -3036,19 +3043,19 @@ const Methods = {
                 disableRows.push(row)
                 return true
               }
-              if (selection.indexOf(row) > -1) {
+              if (this.findRowIndexOf(selection, row) > -1) {
                 checkRows.push(row)
                 return true
               }
               return false
             }
-            : row => selection.indexOf(row) > -1
+            : row => this.findRowIndexOf(selection, row) > -1
         )
         isAllSelected = isAllResolve && afterFullData.length !== disableRows.length
         if (treeConfig) {
-          isIndeterminate = !isAllSelected && afterFullData.some(row => treeIndeterminates.indexOf(row) > -1 || selection.indexOf(row) > -1)
+          isIndeterminate = !isAllSelected && afterFullData.some(row => this.findRowIndexOf(treeIndeterminates, row) > -1 || this.findRowIndexOf(selection, row) > -1)
         } else {
-          isIndeterminate = !isAllSelected && afterFullData.some(row => selection.indexOf(row) > -1)
+          isIndeterminate = !isAllSelected && afterFullData.some(row => this.findRowIndexOf(selection, row) > -1)
         }
       }
       this.isAllSelected = isAllSelected
@@ -3695,7 +3702,7 @@ const Methods = {
     const rest = fullAllDataRowMap.get(row)
     if (lazy && rest) {
       rest.expandLoaded = false
-      XEUtils.remove(expandLazyLoadeds, item => row === item)
+      XEUtils.remove(expandLazyLoadeds, item => this.eqRow(item, row))
     }
     return this.$nextTick()
   },
@@ -3706,7 +3713,7 @@ const Methods = {
   reloadRowExpand (row) {
     const { expandOpts, expandLazyLoadeds } = this
     const { lazy } = expandOpts
-    if (lazy && expandLazyLoadeds.indexOf(row) === -1) {
+    if (lazy && this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
       this.clearRowExpandLoaded(row)
         .then(() => this.handleAsyncRowExpand(row))
     }
@@ -3726,7 +3733,7 @@ const Methods = {
     const { expandOpts, expandLazyLoadeds, expandColumn: column } = this
     const { row } = params
     const { lazy } = expandOpts
-    if (!lazy || expandLazyLoadeds.indexOf(row) === -1) {
+    if (!lazy || this.findRowIndexOf(expandLazyLoadeds, row) === -1) {
       const expanded = !this.isExpandByRow(row)
       const columnIndex = this.getColumnIndex(column)
       const $columnIndex = this.getVMColumnIndex(column)
@@ -3775,7 +3782,7 @@ const Methods = {
       }).catch(() => {
         rest.expandLoaded = false
       }).finally(() => {
-        XEUtils.remove(this.expandLazyLoadeds, item => item === row)
+        XEUtils.remove(this.expandLazyLoadeds, item => this.eqRow(item, row))
         resolve(this.$nextTick().then(this.recalculate))
       })
     })
@@ -3806,9 +3813,9 @@ const Methods = {
       const validRows = toggleMethod ? rows.filter(row => toggleMethod({ expanded, column, columnIndex, $columnIndex, row, rowIndex: this.getRowIndex(row), $rowIndex: this.getVMRowIndex(row) })) : rows
       if (expanded) {
         validRows.forEach(row => {
-          if (rowExpandeds.indexOf(row) === -1) {
+          if (this.findRowIndexOf(rowExpandeds, row) === -1) {
             const rest = fullAllDataRowMap.get(row)
-            const isLoad = lazy && !rest.expandLoaded && expandLazyLoadeds.indexOf(row) === -1
+            const isLoad = lazy && !rest.expandLoaded && this.findRowIndexOf(expandLazyLoadeds, row) === -1
             if (isLoad) {
               lazyRests.push(this.handleAsyncRowExpand(row))
             } else {
@@ -3817,7 +3824,7 @@ const Methods = {
           }
         })
       } else {
-        XEUtils.remove(rowExpandeds, row => validRows.indexOf(row) > -1)
+        XEUtils.remove(rowExpandeds, row => this.findRowIndexOf(validRows, row) > -1)
       }
       if (reserve) {
         validRows.forEach(row => this.handleRowExpandReserve(row, expanded))
@@ -3831,7 +3838,8 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isExpandByRow (row) {
-    return this.rowExpandeds.indexOf(row) > -1
+    const { rowExpandeds } = this
+    return this.findRowIndexOf(rowExpandeds, row) > -1
   },
   /**
    * 手动清空展开行状态，数据会恢复成未展开的状态