vxe-table 3.18.1 → 3.18.2

package/lib/table/src/methods.js

@@ -1334,7 +1334,7 @@ function updateStyle($xeTable) {
   }
   if (xRightCornerEl) {
     xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`;
-    xRightCornerEl.style.display = scrollbarXToTop ? '' : overflowX && osbHeight ? 'block' : '';
+    xRightCornerEl.style.display = scrollbarXToTop ? '' : xScrollbarVisible === 'visible' ? 'block' : '';
   }
   const scrollYVirtualEl = $xeTable.$refs.refScrollYVirtualElem;
   if (scrollYVirtualEl) {
@@ -1345,7 +1345,7 @@ function updateStyle($xeTable) {
   const yTopCornerEl = $xeTable.$refs.refScrollYTopCornerElem;
   if (yTopCornerEl) {
     yTopCornerEl.style.height = `${tHeaderHeight}px`;
-    yTopCornerEl.style.display = overflowY && tHeaderHeight ? 'block' : '';
+    yTopCornerEl.style.display = tHeaderHeight && yScrollbarVisible === 'visible' ? 'block' : '';
   }
   const yWrapperEl = $xeTable.$refs.refScrollYWrapperElem;
   if (yWrapperEl) {
@@ -1356,7 +1356,7 @@ function updateStyle($xeTable) {
   if (yBottomCornerEl) {
     yBottomCornerEl.style.height = `${tFooterHeight}px`;
     yBottomCornerEl.style.top = `${tHeaderHeight + tbHeight}px`;
-    yBottomCornerEl.style.display = overflowY && tFooterHeight ? 'block' : '';
+    yBottomCornerEl.style.display = tFooterHeight && yScrollbarVisible === 'visible' ? 'block' : '';
   }
   const rowExpandEl = $xeTable.$refs.refRowExpandElem;
   if (rowExpandEl) {
@@ -2384,15 +2384,71 @@ function handleBodyMerge($xeTable, merges) {
     });
   }
 }
-function handleFooterMerge($xeTable, merges) {
+function removeBodyMerges($xeTable, merges) {
+  const internalData = $xeTable;
+  const {
+    mergeBodyList,
+    fullColumnIdData,
+    fullAllDataRowIdData,
+    mergeBodyMaps
+  } = internalData;
+  const rest = [];
+  if (merges) {
+    const {
+      handleGetRowId
+    } = (0, _util.createHandleGetRowId)($xeTable);
+    if (!_xeUtils.default.isArray(merges)) {
+      merges = [merges];
+    }
+    merges.forEach(item => {
+      const {
+        row: margeRow,
+        col: margeCol
+      } = item;
+      let mergeRowIndex = -1;
+      let mergeColumnIndex = -1;
+      if (_xeUtils.default.isNumber(margeRow)) {
+        mergeRowIndex = margeRow;
+      } else {
+        const rowid = margeRow ? handleGetRowId(margeRow) : null;
+        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
+        if (rowRest) {
+          mergeRowIndex = rowRest._index;
+        }
+      }
+      if (_xeUtils.default.isNumber(margeCol)) {
+        mergeColumnIndex = margeCol;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
+      }
+      const mcIndex = _xeUtils.default.findIndexOf(mergeBodyList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
+      if (mcIndex > -1) {
+        const rItems = mergeBodyList.splice(mcIndex, 1);
+        const item = rItems[0];
+        if (item) {
+          rest.push(rItems[0]);
+          if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          }
+        }
+      }
+    });
+  }
+  return rest;
+}
+function handleHeaderMerge($xeTable, merges) {
   const reactData = $xeTable;
   const internalData = $xeTable;
   const {
     footerTableData
   } = reactData;
   const {
-    mergeFooterList,
-    mergeFooterMaps,
+    mergeHeaderList,
+    mergeHeaderMaps,
     fullColumnIdData
   } = internalData;
   if (merges) {
@@ -2426,7 +2482,7 @@ function handleFooterMerge($xeTable, merges) {
         if (rowspan > 1 || colspan > 1) {
           const row = footerTableData[mergeRowIndex];
           const column = visibleColumn[mergeColumnIndex];
-          let mergeItem = mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          let mergeItem = mergeHeaderMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
           if (mergeItem) {
             mergeItem.rowspan = rowspan;
             mergeItem.colspan = colspan;
@@ -2443,27 +2499,23 @@ function handleFooterMerge($xeTable, merges) {
               _rowspan: rowspan,
               _colspan: colspan
             };
-            mergeFooterMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
-            mergeFooterList.push(mergeItem);
+            mergeHeaderMaps[`${mergeRowIndex}:${mergeColumnIndex}`] = mergeItem;
+            mergeHeaderList.push(mergeItem);
           }
         }
       }
     });
   }
 }
-function removeBodyMerges($xeTable, merges) {
+function removeHeaderMerges($xeTable, merges) {
   const internalData = $xeTable;
   const {
-    mergeBodyList,
+    mergeHeaderList,
     fullColumnIdData,
-    fullAllDataRowIdData,
-    mergeBodyMaps
+    mergeHeaderMaps
   } = internalData;
   const rest = [];
   if (merges) {
-    const {
-      handleGetRowId
-    } = (0, _util.createHandleGetRowId)($xeTable);
     if (!_xeUtils.default.isArray(merges)) {
       merges = [merges];
     }
@@ -2472,17 +2524,8 @@ function removeBodyMerges($xeTable, merges) {
         row: margeRow,
         col: margeCol
       } = item;
-      let mergeRowIndex = -1;
+      const mergeRowIndex = _xeUtils.default.isNumber(margeRow) ? margeRow : -1;
       let mergeColumnIndex = -1;
-      if (_xeUtils.default.isNumber(margeRow)) {
-        mergeRowIndex = margeRow;
-      } else {
-        const rowid = margeRow ? handleGetRowId(margeRow) : null;
-        const rowRest = rowid ? fullAllDataRowIdData[rowid] : null;
-        if (rowRest) {
-          mergeRowIndex = rowRest._index;
-        }
-      }
       if (_xeUtils.default.isNumber(margeCol)) {
         mergeColumnIndex = margeCol;
       } else {
@@ -2492,14 +2535,14 @@ function removeBodyMerges($xeTable, merges) {
           mergeColumnIndex = colRest._index;
         }
       }
-      const mcIndex = _xeUtils.default.findIndexOf(mergeBodyList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
+      const mcIndex = _xeUtils.default.findIndexOf(mergeHeaderList, item => item.row === mergeRowIndex && item.col === mergeColumnIndex);
       if (mcIndex > -1) {
-        const rItems = mergeBodyList.splice(mcIndex, 1);
+        const rItems = mergeHeaderList.splice(mcIndex, 1);
         const item = rItems[0];
         if (item) {
-          rest.push(rItems[0]);
-          if (mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
-            delete mergeBodyMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
+          rest.push(item);
+          if (mergeHeaderMaps[`${mergeRowIndex}:${mergeColumnIndex}`]) {
+            delete mergeHeaderMaps[`${mergeRowIndex}:${mergeColumnIndex}`];
           }
         }
       }
@@ -2507,6 +2550,73 @@ function removeBodyMerges($xeTable, merges) {
   }
   return rest;
 }
+function handleFooterMerge($xeTable, merges) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const {
+    footerTableData
+  } = reactData;
+  const {
+    mergeFooterList,
+    mergeFooterMaps,
+    fullColumnIdData
+  } = 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;
+      } else {
+        const colid = margeCol ? margeCol.id : null;
+        const colRest = colid ? fullColumnIdData[colid] : null;
+        if (colRest) {
+          mergeColumnIndex = colRest._index;
+        }
+      }
+      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 removeFooterMerges($xeTable, merges) {
   const internalData = $xeTable;
   const {
@@ -2634,10 +2744,26 @@ function clearAllSort($xeTable) {
 function calcTableHeight($xeTable, key) {
   const props = $xeTable;
   const reactData = $xeTable;
+  const {
+    editConfig
+  } = props;
   const {
     parentHeight
   } = reactData;
-  const val = props[key];
+  let val = props[key];
+  if (key === 'minHeight') {
+    const defMinHeight = getConfig().table.minHeight;
+    if (_xeUtils.default.eqNull(val)) {
+      if ((0, _utils.eqEmptyValue)(defMinHeight)) {
+        // 编辑模式默认最小高度
+        if ((0, _utils.isEnableConf)(editConfig)) {
+          val = 144;
+        }
+      } else {
+        val = defMinHeight;
+      }
+    }
+  }
   let num = 0;
   if (val) {
     if (val === '100%' || val === 'auto') {
@@ -3186,13 +3312,24 @@ function handleDefaultMergeCells($xeTable) {
     $xeTable.setMergeCells(mergeCells);
   }
 }
+function handleDefaultMergeHeaderItems($xeTable) {
+  const props = $xeTable;
+  const {
+    mergeHeaderCells
+  } = props;
+  if (mergeHeaderCells) {
+    $xeTable.setMergeHeaderCells(mergeHeaderCells);
+  }
+}
 function handleDefaultMergeFooterItems($xeTable) {
   const props = $xeTable;
   const {
+    mergeFooterCells,
     mergeFooterItems
   } = props;
-  if (mergeFooterItems) {
-    $xeTable.setMergeFooterItems(mergeFooterItems);
+  const mFooterCells = mergeFooterCells || mergeFooterItems;
+  if (mFooterCells) {
+    $xeTable.setMergeFooterCells(mFooterCells);
   }
 }
 // 计算可视渲染相关数据
@@ -3698,6 +3835,10 @@ function loadTableData($xeTable, datas, isReset) {
     }
     handleReserveStatus($xeTable);
     $xeTable.checkSelectionStatus();
+    $xeTable.dispatchEvent('data-change', {
+      visibleColumn: internalData.visibleColumn,
+      visibleData: internalData.afterFullData
+    }, null);
     return new Promise(resolve => {
       $xeTable.$nextTick().then(() => handleRecalculateStyle($xeTable, false, false, false)).then(() => {
         handleRecalculateStyle($xeTable, false, true, true);
@@ -3754,6 +3895,7 @@ function handleLoadDefaults($xeTable) {
   handleDefaultTreeExpand($xeTable);
   handleDefaultRowGroupExpand($xeTable);
   handleDefaultMergeCells($xeTable);
+  handleDefaultMergeHeaderItems($xeTable);
   handleDefaultMergeFooterItems($xeTable);
   $xeTable.$nextTick(() => setTimeout(() => $xeTable.recalculate()));
 }
@@ -7780,6 +7922,16 @@ const Methods = {
     internalData.mergeBodyCellMaps = buildMergeData(mergeBodyList);
     reactData.mergeBodyFlag++;
   },
+  handleUpdateHeaderMerge() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      mergeHeaderList
+    } = internalData;
+    internalData.mergeHeaderCellMaps = buildMergeData(mergeHeaderList);
+    reactData.mergeHeadFlag++;
+  },
   handleUpdateFooterMerge() {
     const $xeTable = this;
     const reactData = $xeTable;
@@ -13008,6 +13160,10 @@ const Methods = {
     }
     reactData.footerTableData = footData;
     $xeTable.handleUpdateFooterMerge();
+    $xeTable.dispatchEvent('footer-data-change', {
+      visibleColumn: internalData.visibleColumn,
+      footData
+    }, null);
     return $xeTable.$nextTick();
   },
   /**
@@ -13094,45 +13250,101 @@ const Methods = {
       return updateStyle($xeTable);
     });
   },
-  setMergeFooterItems(merges) {
+  setMergeHeaderCells(merges) {
+    const $xeTable = this;
+    handleHeaderMerge($xeTable, merges);
+    $xeTable.handleUpdateHeaderMerge();
+    return $xeTable.$nextTick().then(() => {
+      return updateStyle($xeTable);
+    });
+  },
+  /**
+   * 移除表头单元格合并 [{row:Row|number, col:ColumnInfo|number}]
+   */
+  removeMergeHeaderCells(merges) {
+    const $xeTable = this;
+    const rest = removeHeaderMerges($xeTable, merges);
+    $xeTable.handleUpdateHeaderMerge();
+    return $xeTable.$nextTick().then(() => {
+      updateStyle($xeTable);
+      return rest;
+    });
+  },
+  /**
+   * 获取所有被合并的表头单元格
+   */
+  getMergeHeaderCells() {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    return internalData.mergeHeaderList.slice(0);
+  },
+  /**
+   * 清除所有表头单元格合并
+   */
+  clearMergeHeaderCells() {
+    const $xeTable = this;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    internalData.mergeHeaderList = [];
+    internalData.mergeHeaderMaps = {};
+    internalData.mergeHeaderCellMaps = {};
+    reactData.mergeHeadFlag++;
+    return $xeTable.$nextTick().then(() => {
+      return updateStyle($xeTable);
+    });
+  },
+  setMergeFooterCells(merges) {
     const $xeTable = this;
     const props = $xeTable;
     if (props.footerSpanMethod) {
-      (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+      (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-cells | merge-footer-items', 'footer-span-method']);
     }
     handleFooterMerge($xeTable, merges);
     $xeTable.handleUpdateFooterMerge();
     return $xeTable.$nextTick().then(() => {
-      $xeTable.updateCellAreas();
       return updateStyle($xeTable);
     });
   },
-  removeMergeFooterItems(merges) {
+  setMergeFooterItems(merges) {
+    const $xeTable = this;
+    // errLog('vxe.error.delFunc', ['setMergeFooterItems', 'setMergeFooterCells'])
+    return $xeTable.setMergeFooterCells(merges);
+  },
+  removeMergeFooterCells(merges) {
     const $xeTable = this;
     const props = $xeTable;
     if (props.footerSpanMethod) {
-      (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
+      (0, _log.errLog)('vxe.error.errConflicts', ['merge-footer-cells | merge-footer-items', 'footer-span-method']);
     }
     const rest = removeFooterMerges($xeTable, merges);
     $xeTable.handleUpdateFooterMerge();
     return $xeTable.$nextTick().then(() => {
-      $xeTable.updateCellAreas();
       updateStyle($xeTable);
       return rest;
     });
   },
+  removeMergeFooterItems(merges) {
+    const $xeTable = this;
+    // errLog('vxe.error.delFunc', ['removeMergeFooterItems', 'removeMergeFooterCells'])
+    return $xeTable.removeMergeFooterCells(merges);
+  },
   /**
    * 获取所有被合并的表尾
    */
-  getMergeFooterItems() {
+  getMergeFooterCells() {
     const $xeTable = this;
     const internalData = $xeTable;
     return internalData.mergeFooterList.slice(0);
   },
+  getMergeFooterItems() {
+    const $xeTable = this;
+    // errLog('vxe.error.delFunc', ['getMergeFooterItems', 'getMergeFooterCells'])
+    return $xeTable.getMergeFooterCells();
+  },
   /**
    * 清除所有表尾合并
    */
-  clearMergeFooterItems() {
+  clearMergeFooterCells() {
     const $xeTable = this;
     const reactData = $xeTable;
     const internalData = $xeTable;
@@ -13144,6 +13356,11 @@ const Methods = {
       return updateStyle($xeTable);
     });
   },
+  clearMergeFooterItems() {
+    const $xeTable = this;
+    // errLog('vxe.error.delFunc', ['clearMergeFooterItems', 'clearMergeFooterCells'])
+    return $xeTable.clearMergeFooterCells();
+  },
   handleUpdateAggData() {
     const $xeTable = this;
     const internalData = $xeTable;