vxe-table 3.11.29 → 3.11.30-beta.1

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.29";
+const version = "3.11.30-beta.1";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2790,7 +2790,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.29"}`;
+const log_version = `table v${"3.11.30-beta.1"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5918,6 +5918,7 @@ const Methods = {
     });
   },
   handleColumn(collectColumn) {
+    const $xeTable = this;
     this.collectColumn = collectColumn;
     const tableFullColumn = getColumnList(collectColumn);
     this.tableFullColumn = tableFullColumn;
@@ -5947,6 +5948,9 @@ const Methods = {
             $table: this
           });
         }
+        if ($xeTable.handleUpdateCustomColumn) {
+          $xeTable.handleUpdateCustomColumn();
+        }
         return this.recalculate();
       });
     });
@@ -9543,11 +9547,12 @@ const Methods = {
     }
   },
   handleCheckedCheckboxRow(rows, value, isForce) {
+    const $xeTable = this;
     if (rows && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(rows)) {
       rows = [rows];
     }
-    this.handleBatchSelectRows(rows, !!value, isForce);
-    this.checkSelectionStatus();
+    $xeTable.handleBatchSelectRows(rows, !!value, isForce);
+    $xeTable.checkSelectionStatus();
     return this.$nextTick();
   },
   /**
@@ -9580,271 +9585,118 @@ const Methods = {
     return !!treeIndeterminateMaps[getRowid(this, row)] && !this.isCheckedByCheckboxRow(row);
   },
   /**
-   * 多行
+   * 切换选中
    * 多选，行选中事件
-   * value 选中true 不选false 半选-1
    */
-  handleBatchSelectRows(rows, value, isForce) {
+  handleBatchSelectRows(rows, checked, isForce) {
     const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
     const {
       treeConfig
-    } = $xeTable;
+    } = props;
     const {
-      selectCheckboxMaps,
-      checkboxOpts
-    } = this;
+      selectCheckboxMaps
+    } = reactData;
+    const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      transform,
+      mapChildrenField
+    } = treeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
       checkStrictly,
       checkMethod
     } = checkboxOpts;
+    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
     if (checkField) {
+      // 树结构
       if (treeConfig && !checkStrictly) {
-        rows.forEach(row => {
-          this.handleSelectRow({
-            row
-          }, value, isForce);
-        });
-      } else {
-        rows.forEach(row => {
+        // 更新子节点状态
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, row => {
           if (isForce || !checkMethod || checkMethod({
             row
           })) {
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
-            this.handleCheckboxReserveRow(row, value);
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, checked);
+            if (indeterminateField) {
+              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
+            }
+            $xeTable.handleCheckboxReserveRow(row, checked);
           }
+        }, {
+          children: transform ? mapChildrenField : childrenField
         });
-      }
-    } else {
-      if (treeConfig && !checkStrictly) {
-        rows.forEach(row => {
-          this.handleSelectRow({
-            row
-          }, value, isForce);
-        });
+        reactData.selectCheckboxMaps = selectRowMaps;
+        return;
       } else {
-        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+        // 列表
         rows.forEach(row => {
-          const rowid = getRowid($xeTable, row);
           if (isForce || !checkMethod || checkMethod({
             row
           })) {
-            if (value) {
-              if (!selectRowMaps[rowid]) {
-                selectRowMaps[rowid] = row;
-              }
-            } else {
-              if (selectRowMaps[rowid]) {
-                delete selectRowMaps[rowid];
-              }
-            }
-            this.handleCheckboxReserveRow(row, value);
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, checked);
+            $xeTable.handleCheckboxReserveRow(row, checked);
           }
         });
-        this.selectCheckboxMaps = selectRowMaps;
       }
+      reactData.selectCheckboxMaps = selectRowMaps;
+      return;
     }
-  },
-  /**
-   * 多选，行选中事件
-   * value 选中true 不选false 半选-1
-   */
-  handleSelectRow({
-    row
-  }, value, isForce) {
-    const {
-      selectCheckboxMaps,
-      afterFullData,
-      treeConfig,
-      treeOpts,
-      treeIndeterminateMaps,
-      checkboxOpts
-    } = this;
-    const {
-      checkField,
-      checkStrictly,
-      checkMethod
-    } = checkboxOpts;
-    const selectRowMaps = {
-      ...selectCheckboxMaps
-    };
-    const childrenField = treeOpts.children || treeOpts.childrenField;
-    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
-    const rowid = getRowid(this, row);
-    if (checkField) {
-      if (treeConfig && !checkStrictly) {
-        if (value === -1) {
-          if (!treeIndeterminateMaps[rowid]) {
-            if (indeterminateField) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, true);
-            }
-            treeIndeterminateMaps[rowid] = row;
-          }
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, false);
-        } else {
-          // 更新子节点状态
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], item => {
-            if (this.eqRow(item, row) || isForce || !checkMethod || checkMethod({
-              row: item
-            })) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(item, checkField, value);
-              if (indeterminateField) {
-                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
-              }
-              delete treeIndeterminateMaps[getRowid(this, item)];
-              this.handleCheckboxReserveRow(row, value);
-            }
-          }, {
-            children: childrenField
-          });
-        }
-        // 如果存在父节点，更新父节点状态
-        const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, item => this.eqRow(item, row), {
-          children: childrenField
-        });
-        if (matchObj && matchObj.parent) {
-          let parentStatus;
-          const vItems = [];
-          const vItemMaps = {};
-          if (!isForce && checkMethod) {
-            matchObj.items.forEach(item => {
-              if (checkMethod({
-                row: item
-              })) {
-                const itemRid = getRowid(this, item);
-                vItemMaps[itemRid] = item;
-                vItems.push(item);
-              }
-            });
-          } else {
-            matchObj.items.forEach(item => {
-              const itemRid = getRowid(this, item);
-              vItemMaps[itemRid] = item;
-              vItems.push(item);
-            });
-          }
-          const indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(matchObj.items, item => !!treeIndeterminateMaps[getRowid(this, item)]);
-          if (indeterminatesItem) {
-            parentStatus = -1;
-          } else {
-            const selectItems = [];
-            matchObj.items.forEach(item => {
-              if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField)) {
-                selectItems.push(item);
-              }
-            });
-            parentStatus = selectItems.filter(item => vItemMaps[getRowid(this, item)]).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
-          }
-          this.selectCheckboxMaps = selectRowMaps;
-          return this.handleSelectRow({
-            row: matchObj.parent
-          }, parentStatus, isForce);
-        }
-      } else {
-        if (isForce || !checkMethod || checkMethod({
-          row
-        })) {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
-          this.handleCheckboxReserveRow(row, value);
-        }
-      }
-    } else {
-      if (treeConfig && !checkStrictly) {
-        if (value === -1) {
-          if (!treeIndeterminateMaps[rowid]) {
-            if (indeterminateField) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, true);
-            }
-            treeIndeterminateMaps[rowid] = row;
-          }
-          if (selectRowMaps[rowid]) {
-            delete selectRowMaps[rowid];
-          }
-        } else {
-          // 更新子节点状态
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree([row], item => {
-            const itemRid = getRowid(this, item);
-            if (this.eqRow(item, row) || isForce || !checkMethod || checkMethod({
-              row: item
-            })) {
-              if (value) {
-                selectRowMaps[itemRid] = item;
-              } else {
-                if (selectRowMaps[itemRid]) {
-                  delete selectRowMaps[itemRid];
-                }
-              }
-              if (indeterminateField) {
-                external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
-              }
-              delete treeIndeterminateMaps[getRowid(this, item)];
-              this.handleCheckboxReserveRow(row, value);
-            }
-          }, {
-            children: childrenField
-          });
-        }
-        // 如果存在父节点，更新父节点状态
-        const matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(afterFullData, item => this.eqRow(item, row), {
-          children: childrenField
-        });
-        if (matchObj && matchObj.parent) {
-          let parentStatus;
-          const vItems = [];
-          const vItemMaps = {};
-          if (!isForce && checkMethod) {
-            matchObj.items.forEach(item => {
-              if (checkMethod({
-                row: item
-              })) {
-                const itemRid = getRowid(this, item);
-                vItemMaps[itemRid] = item;
-                vItems.push(item);
-              }
-            });
-          } else {
-            matchObj.items.forEach(item => {
-              const itemRid = getRowid(this, item);
-              vItemMaps[itemRid] = item;
-              vItems.push(item);
-            });
-          }
-          const indeterminatesItem = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().find(matchObj.items, item => !!treeIndeterminateMaps[getRowid(this, item)]);
-          if (indeterminatesItem) {
-            parentStatus = -1;
-          } else {
-            const selectItems = [];
-            matchObj.items.forEach(item => {
-              const itemRid = getRowid(this, item);
-              if (selectRowMaps[itemRid]) {
-                selectItems.push(item);
-              }
-            });
-            parentStatus = selectItems.filter(item => vItemMaps[getRowid(this, item)]).length === vItems.length ? true : selectItems.length || value === -1 ? -1 : false;
-          }
-          this.selectCheckboxMaps = selectRowMaps;
-          return this.handleSelectRow({
-            row: matchObj.parent
-          }, parentStatus, isForce);
-        }
-      } else {
+    // 树结构
+    if (treeConfig && !checkStrictly) {
+      // 更新子节点状态
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(rows, row => {
+        const rowid = getRowid($xeTable, row);
         if (isForce || !checkMethod || checkMethod({
           row
         })) {
-          if (value) {
-            if (!selectRowMaps[rowid]) {
-              selectRowMaps[rowid] = row;
-            }
+          if (checked) {
+            selectRowMaps[rowid] = row;
           } else {
             if (selectRowMaps[rowid]) {
               delete selectRowMaps[rowid];
             }
           }
-          this.handleCheckboxReserveRow(row, value);
+          $xeTable.handleCheckboxReserveRow(row, checked);
         }
-      }
+      }, {
+        children: transform ? mapChildrenField : childrenField
+      });
+      reactData.selectCheckboxMaps = selectRowMaps;
+      return;
     }
-    this.selectCheckboxMaps = selectRowMaps;
+    // 列表
+    rows.forEach(row => {
+      const rowid = getRowid($xeTable, row);
+      if (isForce || !checkMethod || checkMethod({
+        row
+      })) {
+        if (checked) {
+          if (!selectRowMaps[rowid]) {
+            selectRowMaps[rowid] = row;
+          }
+        } else {
+          if (selectRowMaps[rowid]) {
+            delete selectRowMaps[rowid];
+          }
+        }
+        $xeTable.handleCheckboxReserveRow(row, checked);
+      }
+    });
+    reactData.selectCheckboxMaps = selectRowMaps;
+  },
+  /**
+   * 即将移除
+   * @deprecated
+   */
+  handleSelectRow({
+    row
+  }, checked, isForce) {
+    const $xeTable = this;
+    $xeTable.handleBatchSelectRows([row], checked, isForce);
   },
   handleToggleCheckRowEvent(evnt, params) {
     const {
@@ -9861,20 +9713,20 @@ const Methods = {
     if (trigger === 'manual') {
       return;
     }
-    let value = false;
+    let checked = false;
     if (checkField) {
-      value = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
+      checked = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
     } else {
-      value = !selectCheckboxMaps[getRowid(this, row)];
+      checked = !selectCheckboxMaps[getRowid(this, row)];
     }
     if (evnt) {
-      this.triggerCheckRowEvent(evnt, params, value);
+      this.triggerCheckRowEvent(evnt, params, checked);
     } else {
-      this.handleSelectRow(params, value);
+      this.handleSelectRow(params, checked);
       this.checkSelectionStatus();
     }
   },
-  triggerCheckRowEvent(evnt, params, value) {
+  triggerCheckRowEvent(evnt, params, checked) {
     const {
       checkboxOpts,
       afterFullData
@@ -9910,13 +9762,13 @@ const Methods = {
     if (!checkMethod || checkMethod({
       row
     })) {
-      this.handleSelectRow(params, value);
+      this.handleSelectRow(params, checked);
       this.checkSelectionStatus();
       this.emitEvent('checkbox-change', Object.assign({
         records: this.getCheckboxRecords(),
         reserves: this.getCheckboxReserveRecords(),
         indeterminates: this.getCheckboxIndeterminateRecords(),
-        checked: value
+        checked
       }, params), evnt);
     }
   },
@@ -9924,6 +9776,7 @@ const Methods = {
    * 多选，切换某一行的选中状态
    */
   toggleCheckboxRow(row) {
+    const $xeTable = this;
     const {
       selectCheckboxMaps,
       checkboxOpts
@@ -9931,14 +9784,14 @@ const Methods = {
     const {
       checkField
     } = checkboxOpts;
-    const value = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : !selectCheckboxMaps[getRowid(this, row)];
-    this.handleSelectRow({
-      row
-    }, value, true);
-    this.checkSelectionStatus();
-    return this.$nextTick();
+    const checked = checkField ? !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : !selectCheckboxMaps[getRowid($xeTable, row)];
+    $xeTable.handleBatchSelectRows([row], checked, true);
+    $xeTable.checkSelectionStatus();
+    return $xeTable.$nextTick();
   },
-  handleCheckedAllCheckboxRow(value, isForce) {
+  handleCheckedAllCheckboxRow(checked, isForce) {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       afterFullData,
       treeConfig,
@@ -9967,7 +9820,7 @@ const Methods = {
     }
     // 疑惑！
     if (checkStrictly) {
-      this.isAllSelected = value;
+      this.isAllSelected = checked;
     } else {
       /**
        * 绑定属性方式（高性能，有污染）
@@ -9978,10 +9831,10 @@ const Methods = {
           if (isForce || !checkMethod || checkMethod({
             row
           })) {
-            if (value) {
+            if (checked) {
               selectRowMaps[getRowid(this, row)] = row;
             }
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, value);
+            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, checkField, checked);
           }
           if (treeConfig && indeterminateField) {
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, indeterminateField, false);
@@ -10002,7 +9855,7 @@ const Methods = {
          * 无需任何属性，直接绑定
          */
         if (treeConfig) {
-          if (value) {
+          if (checked) {
             /**
              * 如果是树勾选
              * 如果方法成立，则添加到临时集合中
@@ -10035,7 +9888,7 @@ const Methods = {
             }
           }
         } else {
-          if (value) {
+          if (checked) {
             /**
              * 如果是行勾选
              * 如果存在选中方法且成立或者本身已勾选，则添加到临时集合中
@@ -10075,7 +9928,7 @@ const Methods = {
         }
       }
       if (reserve) {
-        if (value) {
+        if (checked) {
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(selectRowMaps, (row, rowid) => {
             checkboxReserveRowMap[rowid] = row;
           });
@@ -10085,6 +9938,8 @@ const Methods = {
       }
       this.selectCheckboxMaps = checkField ? {} : selectRowMaps;
     }
+    reactData.isAllSelected = checked;
+    reactData.isIndeterminate = false;
     this.treeIndeterminateMaps = {};
     this.treeIndeterminateRowMaps = {};
     this.checkSelectionStatus();
@@ -10097,81 +9952,182 @@ const Methods = {
   setAllCheckboxRow(value) {
     return this.handleCheckedAllCheckboxRow(value, true);
   },
-  checkSelectionStatus() {
+  updateCheckboxStatus() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const {
-      afterFullData,
-      selectCheckboxMaps,
-      treeIndeterminateMaps,
-      checkboxOpts,
       treeConfig
-    } = this;
+    } = props;
+    const {
+      selectCheckboxMaps,
+      treeIndeterminateMaps
+    } = reactData;
+    const selectRowMaps = Object.assign({}, selectCheckboxMaps);
+    const halfRowMaps = Object.assign({}, treeIndeterminateMaps);
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      transform,
+      mapChildrenField
+    } = treeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
     const {
       checkField,
       checkStrictly,
       checkMethod
     } = checkboxOpts;
-    const indeterminateField = checkboxOpts.indeterminateField || checkboxOpts.halfField;
-    if (!checkStrictly) {
-      const disableRows = [];
-      const checkRows = [];
-      let isAllResolve = false;
-      let isAllSelected = false;
-      let isIndeterminate = false;
-      if (checkField) {
-        isAllResolve = afterFullData.every(checkMethod ? row => {
-          if (!checkMethod({
-            row
+    const {
+      afterTreeFullData
+    } = internalData;
+    if (checkStrictly) {
+      return;
+    }
+    // 树结构
+    if (treeConfig) {
+      const childRowMaps = {};
+      const childRowList = [];
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, row => {
+        const rowid = getRowid($xeTable, row);
+        const childList = row[transform ? mapChildrenField : childrenField];
+        if (childList && childList.length && !childRowMaps[rowid]) {
+          childRowMaps[rowid] = 1;
+          childRowList.unshift([row, rowid, childList]);
+        }
+      }, {
+        children: transform ? mapChildrenField : childrenField
+      });
+      childRowList.forEach(vals => {
+        const row = vals[0];
+        const rowid = vals[1];
+        const childList = vals[2];
+        let sLen = 0; // 已选
+        let hLen = 0; // 半选
+        let vLen = 0; // 有效行
+        childList.forEach(checkMethod ? item => {
+          const childRowid = getRowid($xeTable, item);
+          const isSelect = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField) : selectRowMaps[childRowid];
+          if (checkMethod({
+            row: item
           })) {
-            disableRows.push(row);
-            return true;
+            if (isSelect) {
+              sLen++;
+            } else if (halfRowMaps[childRowid]) {
+              hLen++;
+            }
+            vLen++;
+          } else {
+            if (isSelect) {
+              sLen++;
+            } else if (halfRowMaps[childRowid]) {
+              hLen++;
+            }
           }
-          if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField)) {
-            checkRows.push(row);
-            return true;
+        } : item => {
+          const childRowid = getRowid($xeTable, item);
+          const isSelect = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(item, checkField) : selectRowMaps[childRowid];
+          if (isSelect) {
+            sLen++;
+          } else if (halfRowMaps[childRowid]) {
+            hLen++;
           }
-          return false;
-        } : row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
-        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
-        if (treeConfig) {
-          if (indeterminateField) {
-            isIndeterminate = !isAllSelected && afterFullData.some(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField) || !!treeIndeterminateMaps[getRowid(this, row)]);
-          } else {
-            isIndeterminate = !isAllSelected && afterFullData.some(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || !!treeIndeterminateMaps[getRowid(this, row)]);
+          vLen++;
+        });
+        const isSelected = sLen >= vLen;
+        const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
+        if (checkField) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField, isSelected);
+        }
+        if (isSelected) {
+          if (!checkField) {
+            selectRowMaps[rowid] = row;
+          }
+          if (halfRowMaps[rowid]) {
+            delete halfRowMaps[rowid];
           }
         } else {
-          if (indeterminateField) {
-            isIndeterminate = !isAllSelected && afterFullData.some(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, indeterminateField));
+          if (!checkField) {
+            if (selectRowMaps[rowid]) {
+              delete selectRowMaps[rowid];
+            }
+          }
+          if (halfSelect) {
+            halfRowMaps[rowid] = row;
           } else {
-            isIndeterminate = !isAllSelected && afterFullData.some(row => external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField));
+            if (halfRowMaps[rowid]) {
+              delete halfRowMaps[rowid];
+            }
           }
         }
+      });
+    }
+    reactData.selectCheckboxMaps = selectRowMaps;
+    reactData.treeIndeterminateMaps = halfRowMaps;
+  },
+  updateAllCheckboxStatus() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      selectCheckboxMaps,
+      treeIndeterminateMaps
+    } = reactData;
+    const checkboxOpts = $xeTable.computeCheckboxOpts;
+    const {
+      checkField,
+      checkMethod
+    } = checkboxOpts;
+    const {
+      afterFullData,
+      afterTreeFullData
+    } = internalData;
+    let sLen = 0; // 已选
+    let hLen = 0; // 半选
+    let vLen = 0; // 有效行
+    const rootList = treeConfig ? afterTreeFullData : afterFullData;
+    rootList.forEach(checkMethod ? row => {
+      const childRowid = getRowid($xeTable, row);
+      const selected = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : selectCheckboxMaps[childRowid];
+      if (checkMethod({
+        row
+      })) {
+        if (selected) {
+          sLen++;
+        } else if (treeIndeterminateMaps[childRowid]) {
+          hLen++;
+        }
+        vLen++;
       } else {
-        isAllResolve = afterFullData.every(checkMethod ? row => {
-          if (!checkMethod({
-            row
-          })) {
-            disableRows.push(row);
-            return true;
-          }
-          if (selectCheckboxMaps[getRowid(this, row)]) {
-            checkRows.push(row);
-            return true;
-          }
-          return false;
-        } : row => selectCheckboxMaps[getRowid(this, row)]);
-        isAllSelected = isAllResolve && afterFullData.length !== disableRows.length;
-        if (treeConfig) {
-          isIndeterminate = !isAllSelected && afterFullData.some(row => {
-            const itemRid = getRowid(this, row);
-            return treeIndeterminateMaps[itemRid] || selectCheckboxMaps[itemRid];
-          });
-        } else {
-          isIndeterminate = !isAllSelected && afterFullData.some(row => selectCheckboxMaps[getRowid(this, row)]);
+        if (selected) {
+          sLen++;
+        } else if (treeIndeterminateMaps[childRowid]) {
+          hLen++;
         }
       }
-      this.isAllSelected = isAllSelected;
-      this.isIndeterminate = isIndeterminate;
-    }
+    } : row => {
+      const childRowid = getRowid($xeTable, row);
+      const selected = checkField ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField) : selectCheckboxMaps[childRowid];
+      if (selected) {
+        sLen++;
+      } else if (treeIndeterminateMaps[childRowid]) {
+        hLen++;
+      }
+      vLen++;
+    });
+    const isSelected = sLen >= vLen;
+    const halfSelect = !isSelected && (sLen >= 1 || hLen >= 1);
+    reactData.isAllSelected = isSelected;
+    reactData.isIndeterminate = halfSelect;
+  },
+  checkSelectionStatus() {
+    const $xeTable = this;
+    $xeTable.updateCheckboxStatus();
+    $xeTable.updateAllCheckboxStatus();
   },
   // 还原展开、选中等相关状态
   handleReserveStatus() {
@@ -21765,6 +21721,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
       }
     },
     handleCheckboxRangeEvent(evnt, params) {
+      const $xeTable = this;
       const {
         column,
         cell
@@ -21844,9 +21801,7 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
             lastRangeRows = rangeRows;
             if (evnt.ctrlKey) {
               rangeRows.forEach(row => {
-                this.handleSelectRow({
-                  row
-                }, selectRecords.indexOf(row) === -1);
+                $xeTable.handleBatchSelectRows([row], selectRecords.indexOf(row) === -1);
               });
             } else {
               this.setAllCheckboxRow(false);
@@ -22555,33 +22510,17 @@ function validErrorRuleValue(rule, val) {
 /* harmony default export */ var custom_mixin = ({
   methods: {
     _openCustom() {
+      const $xeTable = this;
+      const reactData = $xeTable;
       const {
         initStore,
-        customStore,
-        collectColumn
-      } = this;
-      const sortMaps = {};
-      const fixedMaps = {};
-      const visibleMaps = {};
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
-        const colid = column.getKey();
-        column.renderFixed = column.fixed;
-        column.renderVisible = column.visible;
-        column.renderResizeWidth = column.renderWidth;
-        sortMaps[colid] = column.renderSortNumber;
-        fixedMaps[colid] = column.fixed;
-        visibleMaps[colid] = column.visible;
-      }, {
-        children: 'children'
-      });
-      customStore.oldSortMaps = sortMaps;
-      customStore.oldFixedMaps = fixedMaps;
-      customStore.oldVisibleMaps = visibleMaps;
-      this.customColumnList = collectColumn.slice(0);
+        customStore
+      } = reactData;
       customStore.visible = true;
       initStore.custom = true;
-      this.checkCustomStatus();
-      this.calcMaxHeight();
+      $xeTable.handleUpdateCustomColumn();
+      $xeTable.checkCustomStatus();
+      $xeTable.calcMaxHeight();
       return this.$nextTick().then(() => this.calcMaxHeight());
     },
     _closeCustom() {
@@ -22852,6 +22791,35 @@ function validErrorRuleValue(rule, val) {
         this.closeCustom();
         this.emitCustomEvent('close', evnt);
       }
+    },
+    handleUpdateCustomColumn() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        customStore
+      } = reactData;
+      const {
+        collectColumn
+      } = internalData;
+      if (customStore.visible) {
+        const sortMaps = {};
+        const fixedMaps = {};
+        const visibleMaps = {};
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(collectColumn, column => {
+          const colid = column.getKey();
+          column.renderFixed = column.fixed;
+          column.renderVisible = column.visible;
+          column.renderResizeWidth = column.renderWidth;
+          sortMaps[colid] = column.renderSortNumber;
+          fixedMaps[colid] = column.fixed;
+          visibleMaps[colid] = column.visible;
+        });
+        customStore.oldSortMaps = sortMaps;
+        customStore.oldFixedMaps = fixedMaps;
+        customStore.oldVisibleMaps = visibleMaps;
+        reactData.customColumnList = collectColumn.slice(0);
+      }
     }
   }
 });
@@ -23567,24 +23535,40 @@ function handleUupdateResize(_vm) {
       } = this;
       return tableColumn.length || visibleColumn.length ? visibleColumn.filter(column => column.width === 'auto' || column.minWidth === 'auto') : [];
     },
-    fixedColumnSize() {
+    computeFixedColumnSize() {
+      const $xeTable = this;
+      const reactData = $xeTable;
+      const internalData = $xeTable;
+      const {
+        tableColumn
+      } = reactData;
       const {
         collectColumn
-      } = this;
+      } = internalData;
       let fixedSize = 0;
-      collectColumn.forEach(column => {
-        if (column.renderFixed) {
-          fixedSize++;
-        }
-      });
+      // 只判断第一层
+      if (tableColumn.length && collectColumn.length) {
+        collectColumn.forEach(column => {
+          if (column.renderFixed) {
+            fixedSize++;
+          }
+        });
+      }
       return fixedSize;
     },
+    fixedColumnSize() {
+      const $xeTable = this;
+      return $xeTable.computeFixedColumnSize;
+    },
     computeIsMaxFixedColumn() {
+      const $xeTable = this;
+      const fixedColumnSize = $xeTable.computeFixedColumnSize;
+      const columnOpts = $xeTable.columnOpts;
       const {
         maxFixedSize
-      } = this.columnOpts;
+      } = columnOpts;
       if (maxFixedSize) {
-        return this.fixedColumnSize >= maxFixedSize;
+        return fixedColumnSize >= maxFixedSize;
       }
       return false;
     },