vxe-table 3.14.4 → 3.15.0-beta.0

package/lib/table/src/methods.js

@@ -299,39 +299,33 @@ function cacheColumnMap($xeTable) {
       htmlColumn = column;
     }
     if (treeNode) {
-      if (process.env.NODE_ENV === 'development') {
-        if (treeNodeColumn) {
-          (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
-        }
+      if (treeNodeColumn) {
+        (0, _log.warnLog)('vxe.error.colRepet', ['tree-node', treeNode]);
       }
       if (!treeNodeColumn) {
         treeNodeColumn = column;
       }
     } else if (type === 'expand') {
-      if (process.env.NODE_ENV === 'development') {
-        if (expandColumn) {
-          (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
-        }
+      if (expandColumn) {
+        (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
       }
       if (!expandColumn) {
         expandColumn = column;
       }
     }
-    if (process.env.NODE_ENV === 'development') {
-      if (type === 'checkbox') {
-        if (checkboxColumn) {
-          (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
-        }
-        if (!checkboxColumn) {
-          checkboxColumn = column;
-        }
-      } else if (type === 'radio') {
-        if (radioColumn) {
-          (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
-        }
-        if (!radioColumn) {
-          radioColumn = column;
-        }
+    if (type === 'checkbox') {
+      if (checkboxColumn) {
+        (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
+      }
+      if (!checkboxColumn) {
+        checkboxColumn = column;
+      }
+    } else if (type === 'radio') {
+      if (radioColumn) {
+        (0, _log.warnLog)('vxe.error.colRepet', ['type', type]);
+      }
+      if (!radioColumn) {
+        radioColumn = column;
       }
     }
     if (isAllOverflow && column.showOverflow === false) {
@@ -1526,20 +1520,48 @@ function calculateMergerOffsetIndex(list, offsetItem, type) {
     }
   }
 }
-function setMerges($xeTable, merges, mList, rowList) {
-  // const props = $xeTable
+function buildMergeData(mergeConfigs) {
+  const mergeMaps = {};
+  if (mergeConfigs && mergeConfigs.length) {
+    for (let mIndex = 0; mIndex < mergeConfigs.length; mIndex++) {
+      const {
+        row: _rowIndex,
+        col: _columnIndex,
+        rowspan: mergeRowspan,
+        colspan: mergeColspan
+      } = mergeConfigs[mIndex];
+      for (let i = 0; i < mergeRowspan; i++) {
+        for (let j = 0; j < mergeColspan; j++) {
+          mergeMaps[`${_rowIndex + i}:${_columnIndex + j}`] = !i && !j ? {
+            rowspan: mergeRowspan,
+            colspan: mergeColspan
+          } : {
+            rowspan: 0,
+            colspan: 0
+          };
+        }
+      }
+    }
+  }
+  return mergeMaps;
+}
+const handleBodyMerge = ($xeTable, merges) => {
   const internalData = $xeTable;
+  const {
+    fullAllDataRowIdData,
+    fullColumnIdData,
+    visibleColumn,
+    afterFullData,
+    mergeBodyList,
+    mergeBodyMaps
+  } = internalData;
   if (merges) {
-    // const { treeConfig } = props
     const {
-      visibleColumn
-    } = internalData;
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
     if (!_xeUtils.default.isArray(merges)) {
       merges = [merges];
     }
-    // if (treeConfig && merges.length) {
-    //   errLog('vxe.error.noTree', ['merge-cells | merge-footer-items'])
-    // }
     merges.forEach(item => {
       let {
         row,
@@ -1547,42 +1569,117 @@ function setMerges($xeTable, merges, mList, rowList) {
         rowspan,
         colspan
       } = item;
-      if (rowList && _xeUtils.default.isNumber(row)) {
-        row = rowList[row];
+      let mergeRowIndex = -1;
+      let mergeColumnIndex = -1;
+      if (_xeUtils.default.isNumber(row)) {
+        mergeRowIndex = row;
+      } else {
+        const rowid = row ? handleGetRowId(row) : null;
+        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+        if (rowRest) {
+          mergeRowIndex = rowRest._index;
+        }
       }
       if (_xeUtils.default.isNumber(col)) {
-        col = visibleColumn[col];
+        mergeColumnIndex = col;
+      } else {
+        const colid = col ? col.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
       }
-      if ((rowList ? row : _xeUtils.default.isNumber(row)) && col && (rowspan || colspan)) {
+      if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
         rowspan = _xeUtils.default.toNumber(rowspan) || 1;
         colspan = _xeUtils.default.toNumber(colspan) || 1;
         if (rowspan > 1 || colspan > 1) {
-          const mcIndex = _xeUtils.default.findIndexOf(mList, item => item._row === row && item._col === col);
-          const mergeItem = mList[mcIndex];
+          const row = afterFullData[mergeRowIndex];
+          const column = visibleColumn[mergeColumnIndex];
+          let mergeItem = mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
           if (mergeItem) {
             mergeItem.rowspan = rowspan;
             mergeItem.colspan = colspan;
             mergeItem._rowspan = rowspan;
             mergeItem._colspan = colspan;
           } else {
-            const mergeRowIndex = rowList ? rowList.indexOf(row) : row;
-            const mergeColIndex = visibleColumn.indexOf(col);
-            mList.push({
+            mergeItem = {
               row: mergeRowIndex,
-              col: mergeColIndex,
+              col: mergeColumnIndex,
               rowspan,
               colspan,
               _row: row,
-              _col: col,
+              _col: column,
               _rowspan: rowspan,
               _colspan: colspan
-            });
+            };
+            mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+            mergeBodyList.push(mergeItem);
           }
         }
       }
     });
   }
-}
+};
+const handleFooterMerge = ($xeTable, merges) => {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    footerTableData
+  } = reactData;
+  const {
+    mergeFooterList,
+    mergeFooterMaps
+  } = internalData;
+  if (merges) {
+    const {
+      visibleColumn
+    } = internalData;
+    if (!_xeUtils.default.isArray(merges)) {
+      merges = [merges];
+    }
+    merges.forEach(item => {
+      let {
+        row: margeRow,
+        col: margeCol,
+        rowspan,
+        colspan
+      } = item;
+      const mergeRowIndex = _xeUtils.default.isNumber(margeRow) ? margeRow : -1;
+      let mergeColumnIndex = -1;
+      if (_xeUtils.default.isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      }
+      if (mergeRowIndex > -1 && mergeColumnIndex > -1 && (rowspan || colspan)) {
+        rowspan = _xeUtils.default.toNumber(rowspan) || 1;
+        colspan = _xeUtils.default.toNumber(colspan) || 1;
+        if (rowspan > 1 || colspan > 1) {
+          const row = footerTableData[mergeRowIndex];
+          const column = visibleColumn[mergeColumnIndex];
+          let mergeItem = mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          if (mergeItem) {
+            mergeItem.rowspan = rowspan;
+            mergeItem.colspan = colspan;
+            mergeItem._rowspan = rowspan;
+            mergeItem._colspan = colspan;
+          } else {
+            mergeItem = {
+              row: mergeRowIndex,
+              col: mergeColumnIndex,
+              rowspan,
+              colspan,
+              _row: row,
+              _col: column,
+              _rowspan: rowspan,
+              _colspan: colspan
+            };
+            mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+            mergeFooterList.push(mergeItem);
+          }
+        }
+      }
+    });
+  }
+};
 function removeMerges($xeTable, merges, mList, rowList) {
   // const props = $xeTable
   const internalData = $xeTable;
@@ -2317,11 +2414,11 @@ function loadScrollXData($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    mergeList,
-    mergeFooterList,
     isScrollXBig
   } = reactData;
   const {
+    mergeBodyList,
+    mergeFooterList,
     scrollXStore
   } = internalData;
   const {
@@ -2340,7 +2437,7 @@ function loadScrollXData($xeTable) {
   };
   scrollXStore.visibleStartIndex = toVisibleIndex - 1;
   scrollXStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-  calculateMergerOffsetIndex(mergeList.concat(mergeFooterList), offsetItem, 'col');
+  calculateMergerOffsetIndex(mergeBodyList.concat(mergeFooterList), offsetItem, 'col');
   const {
     startIndex: offsetStartIndex,
     endIndex: offsetEndIndex
@@ -2565,11 +2662,11 @@ function loadScrollYData($xeTable) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
-    mergeList,
     isAllOverflow,
     isScrollYBig
   } = reactData;
   const {
+    mergeBodyList,
     scrollYStore
   } = internalData;
   const {
@@ -2589,7 +2686,7 @@ function loadScrollYData($xeTable) {
   };
   scrollYStore.visibleStartIndex = toVisibleIndex - 1;
   scrollYStore.visibleEndIndex = toVisibleIndex + visibleSize + 1;
-  calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
+  calculateMergerOffsetIndex(mergeBodyList, offsetItem, 'row');
   const {
     startIndex: offsetStartIndex,
     endIndex: offsetEndIndex
@@ -3023,7 +3120,7 @@ const Methods = {
    * 对于某些特殊的场景，比如深层树节点元素发生变动时可能会用到
    */
   syncData() {
-    (0, _log.warnLog)('vxe.error.delFunc', ['syncData', 'getData']);
+    (0, _log.errLog)('vxe.error.delFunc', ['syncData', 'getData']);
     return this.$nextTick().then(() => {
       this.tableData = [];
       return this.$nextTick().then(() => this.loadTableData(this.tableFullData, true));
@@ -3034,38 +3131,43 @@ const Methods = {
    * 对于手动更改了排序、筛选...等条件后需要重新处理数据时可能会用到
    */
   updateData() {
+    const $xeTable = this;
+    const reactData = $xeTable;
     const {
       scrollXLoad,
       scrollYLoad
-    } = this;
-    return this.handleTableData(true).then(() => {
-      this.updateFooter();
+    } = reactData;
+    return $xeTable.handleTableData(true).then(() => {
+      $xeTable.updateFooter();
       if (scrollXLoad || scrollYLoad) {
         if (scrollXLoad) {
-          this.updateScrollXSpace();
+          $xeTable.updateScrollXSpace();
         }
         if (scrollYLoad) {
-          this.updateScrollYSpace();
+          $xeTable.updateScrollYSpace();
         }
-        return this.refreshScroll();
+        return $xeTable.refreshScroll();
       }
     }).then(() => {
-      this.updateCellAreas();
-      return this.recalculate(true);
+      $xeTable.updateCellAreas();
+      return $xeTable.recalculate(true);
     }).then(() => {
       // 存在滚动行为未结束情况
-      setTimeout(() => this.recalculate(), 50);
+      setTimeout(() => $xeTable.recalculate(), 50);
     });
   },
   handleTableData(force) {
     const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      scrollYLoad
+    } = reactData;
     const {
-      scrollYLoad,
       scrollYStore,
-      fullDataRowIdData,
-      afterFullData
-    } = this;
-    let fullList = afterFullData;
+      fullDataRowIdData
+    } = internalData;
+    let fullList = internalData.afterFullData;
     // 是否进行数据处理
     if (force) {
       // 更新数据，处理筛选和排序
@@ -3074,14 +3176,17 @@ const Methods = {
       fullList = handleVirtualTreeToList($xeTable);
     }
     const tableData = scrollYLoad ? fullList.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullList.slice(0);
+    const visibleDataRowIdMaps = {};
     tableData.forEach((row, $index) => {
       const rowid = (0, _util.getRowid)(this, row);
       const rest = fullDataRowIdData[rowid];
       if (rest) {
         rest.$index = $index;
       }
+      visibleDataRowIdMaps[rowid] = row;
     });
     this.tableData = tableData;
+    internalData.visibleDataRowIdData = visibleDataRowIdMaps;
     return this.$nextTick();
   },
   /**
@@ -3107,6 +3212,7 @@ const Methods = {
       lastScrollTop
     } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
+    const expandOpts = $xeTable.computeExpandOpts;
     const {
       transform
     } = treeOpts;
@@ -3165,7 +3271,7 @@ const Methods = {
     internalData.tableFullData = fullData;
     internalData.tableFullTreeData = treeData;
     // 缓存数据
-    $xeTable.cacheRowMap(true);
+    $xeTable.cacheRowMap(isReset);
     // 原始数据
     internalData.tableSynchData = datas;
     if (isReset) {
@@ -3183,6 +3289,7 @@ const Methods = {
     $xeTable.clearMergeFooterItems();
     $xeTable.handleTableData(true);
     $xeTable.updateFooter();
+    $xeTable.handleUpdateBodyMerge();
     return $xeTable.$nextTick().then(() => {
       updateHeight($xeTable);
       updateStyle($xeTable);
@@ -3194,6 +3301,9 @@ const Methods = {
         scrollYStore.endIndex = scrollYStore.visibleSize;
       }
       if (sYLoad) {
+        if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
+          (0, _log.errLog)('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
+        }
         // if (showOverflow) {
         //   if (!rowOpts.height) {
         //     const errColumn = internalData.tableFullColumn.find((column: any) => column.showOverflow === false)
@@ -3354,7 +3464,7 @@ const Methods = {
   /**
    * 更新数据行的 Map
    */
-  cacheRowMap() {
+  cacheRowMap(isReset) {
     const $xeTable = this;
     const props = $xeTable;
     const reactData = $xeTable;
@@ -3374,7 +3484,7 @@ const Methods = {
     const {
       lazy
     } = treeOpts;
-    const fullAllDataRowIdMaps = Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
+    const fullAllDataRowIdMaps = isReset ? {} : Object.assign({}, fullAllDataRowIdData); // 存在已删除数据
     const fullDataRowIdMaps = {};
     const {
       handleUpdateRowId
@@ -4228,10 +4338,14 @@ const Methods = {
   getCheckboxRecords(isFull) {
     const $xeTable = this;
     const props = $xeTable;
+    const reactData = $xeTable;
     const internalData = $xeTable;
     const {
       treeConfig
     } = props;
+    const {
+      updateCheckboxFlag
+    } = reactData;
     const {
       tableFullData,
       afterFullData,
@@ -4252,28 +4366,30 @@ const Methods = {
     } = checkboxOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     let rowList = [];
-    if (checkField) {
-      if (treeConfig) {
-        const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
-        rowList = _xeUtils.default.filterTree(currTableData, row => _xeUtils.default.get(row, checkField), {
-          children: transform ? mapChildrenField : childrenField
-        });
-      } else {
-        const currTableData = isFull ? tableFullData : afterFullData;
-        rowList = currTableData.filter(row => _xeUtils.default.get(row, checkField));
-      }
-    } else {
-      _xeUtils.default.each(selectCheckboxMaps, (row, rowid) => {
-        if (isFull) {
-          if (fullDataRowIdData[rowid]) {
-            rowList.push(fullDataRowIdData[rowid].row);
-          }
+    if (updateCheckboxFlag) {
+      if (checkField) {
+        if (treeConfig) {
+          const currTableData = isFull ? transform ? tableFullTreeData : tableFullData : transform ? afterTreeFullData : afterFullData;
+          rowList = _xeUtils.default.filterTree(currTableData, row => _xeUtils.default.get(row, checkField), {
+            children: transform ? mapChildrenField : childrenField
+          });
         } else {
-          if (afterFullRowMaps[rowid]) {
-            rowList.push(afterFullRowMaps[rowid]);
-          }
+          const currTableData = isFull ? tableFullData : afterFullData;
+          rowList = currTableData.filter(row => _xeUtils.default.get(row, checkField));
         }
-      });
+      } else {
+        _xeUtils.default.each(selectCheckboxMaps, (row, rowid) => {
+          if (isFull) {
+            if (fullDataRowIdData[rowid]) {
+              rowList.push(fullDataRowIdData[rowid].row);
+            }
+          } else {
+            if (afterFullRowMaps[rowid]) {
+              rowList.push(afterFullRowMaps[rowid]);
+            }
+          }
+        });
+      }
     }
     return rowList;
   },
@@ -6377,6 +6493,29 @@ const Methods = {
     this.updateCellAreas();
     this.recalculate(true);
   },
+  /**
+   * 处理合并
+   */
+  handleUpdateBodyMerge() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      mergeBodyList
+    } = internalData;
+    internalData.mergeBodyCellMaps = buildMergeData(mergeBodyList);
+    reactData.mergeBodyFlag++;
+  },
+  handleUpdateFooterMerge() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      mergeFooterList
+    } = internalData;
+    internalData.mergeFooterCellMaps = buildMergeData(mergeFooterList);
+    reactData.mergeFootFlag++;
+  },
   handleTargetLeaveEvent() {
     const $xeTable = this;
     const internalData = $xeTable;
@@ -10565,26 +10704,33 @@ const Methods = {
    */
   updateFooter() {
     const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
     const $xeGrid = $xeTable.$xeGrid;
     const {
       showFooter,
-      visibleColumn,
       footerData,
       footerMethod
-    } = this;
+    } = props;
+    const {
+      visibleColumn,
+      afterFullData
+    } = internalData;
     let footData = [];
     if (showFooter && footerData && footerData.length) {
       footData = footerData.slice(0);
     } else if (showFooter && footerMethod) {
       footData = visibleColumn.length ? footerMethod({
         columns: visibleColumn,
-        data: this.afterFullData,
+        data: afterFullData,
         $table: $xeTable,
         $grid: $xeGrid
       }) : [];
     }
-    this.footerTableData = footData;
-    return this.$nextTick();
+    reactData.footerTableData = footData;
+    $xeTable.handleUpdateFooterMerge();
+    return $xeTable.$nextTick();
   },
   /**
    * 更新列状态 updateStatus({ row, column }, cellValue)
@@ -10609,12 +10755,14 @@ const Methods = {
    */
   setMergeCells(merges) {
     const $xeTable = this;
-    if (this.spanMethod) {
+    const props = $xeTable;
+    if (props.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
-    setMerges(this, merges, this.mergeList, this.afterFullData);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    handleBodyMerge($xeTable, merges);
+    $xeTable.handleUpdateBodyMerge();
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
   },
@@ -10624,12 +10772,14 @@ const Methods = {
    */
   removeMergeCells(merges) {
     const $xeTable = this;
-    if (this.spanMethod) {
+    const props = $xeTable;
+    const internalData = $xeTable;
+    if (props.spanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-cells', 'span-method']);
     }
-    const rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    const rest = removeMerges($xeTable, merges, internalData.mergeBodyList, internalData.afterFullData);
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       updateStyle($xeTable);
       return rest;
     });
@@ -10638,37 +10788,46 @@ const Methods = {
    * 获取所有被合并的单元格
    */
   getMergeCells() {
-    return this.mergeList.slice(0);
+    const $xeTable = this;
+    const internalData = $xeTable;
+    return internalData.mergeBodyList.slice(0);
   },
   /**
    * 清除所有单元格合并
    */
   clearMergeCells() {
     const $xeTable = this;
-    this.mergeList = [];
-    return this.$nextTick().then(() => {
+    const internalData = $xeTable;
+    internalData.mergeBodyList = [];
+    internalData.mergeBodyMaps = {};
+    internalData.mergeBodyCellMaps = {};
+    return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });
   },
   setMergeFooterItems(merges) {
     const $xeTable = this;
-    if (this.footerSpanMethod) {
+    const props = $xeTable;
+    if (props.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
-    setMerges(this, merges, this.mergeFooterList);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    handleFooterMerge($xeTable, merges);
+    $xeTable.handleUpdateFooterMerge();
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
   },
   removeMergeFooterItems(merges) {
     const $xeTable = this;
-    if (this.footerSpanMethod) {
+    const props = $xeTable;
+    const internalData = $xeTable;
+    if (props.footerSpanMethod) {
       (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
     }
-    const rest = removeMerges(this, merges, this.mergeFooterList, null);
-    return this.$nextTick().then(() => {
-      this.updateCellAreas();
+    const rest = removeMerges($xeTable, merges, internalData.mergeFooterList);
+    return $xeTable.$nextTick().then(() => {
+      $xeTable.updateCellAreas();
       updateStyle($xeTable);
       return rest;
     });
@@ -10677,15 +10836,20 @@ const Methods = {
    * 获取所有被合并的表尾
    */
   getMergeFooterItems() {
-    return this.mergeFooterList.slice(0);
+    const $xeTable = this;
+    const internalData = $xeTable;
+    return internalData.mergeFooterList.slice(0);
   },
   /**
    * 清除所有表尾合并
    */
   clearMergeFooterItems() {
     const $xeTable = this;
-    this.mergeFooterList = [];
-    return this.$nextTick().then(() => {
+    const internalData = $xeTable;
+    internalData.mergeFooterList = [];
+    internalData.mergeFooterMaps = {};
+    internalData.mergeFooterCellMaps = {};
+    return $xeTable.$nextTick().then(() => {
       return updateStyle($xeTable);
     });
   },