vxe-table 3.13.9 → 3.13.11

package/lib/table/src/methods.js

@@ -259,8 +259,7 @@ function cacheColumnMap($xeTable) {
       index,
       items,
       parent: parentColumn || null,
-      width: 0,
-      oLeft: 0
+      width: 0
     };
     if (field) {
       if (fullColumnFieldData[field]) {
@@ -653,16 +652,10 @@ function updateStyle($xeTable) {
       if (layout === 'header') {
         // 表头体样式处理
         // 横向滚动渲染
-        let tWidth = tableWidth;
         let renderColumnList = tableColumn;
         let isOptimizeMode = false;
         if (isGroup) {
           renderColumnList = visibleColumn;
-          if (fixedType) {
-            if (wrapperElem) {
-              wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
-            }
-          }
         } else {
           // 如果是使用优化模式
           if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
@@ -678,14 +671,26 @@ function updateStyle($xeTable) {
             if (isOptimizeMode) {
               renderColumnList = fixedColumn || [];
             }
-            if (!isOptimizeMode) {
+          }
+        }
+        const tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
+        if (fixedType) {
+          if (isGroup) {
+            if (wrapperElem) {
+              wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
+            }
+          } else {
+            if (isOptimizeMode) {
               if (wrapperElem) {
                 wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
               }
+            } else {
+              if (wrapperElem) {
+                wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
+              }
             }
           }
         }
-        tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
         if (currScrollElem) {
           currScrollElem.style.height = `${headerHeight}px`;
         }
@@ -740,7 +745,6 @@ function updateStyle($xeTable) {
           fixedWrapperElem.style.height = `${customHeight > 0 ? customHeight : tableHeight + headerHeight + footerHeight + osbHeight}px`;
           fixedWrapperElem.style.width = `${fixedColumn.reduce((previous, column) => previous + column.renderWidth, 0)}px`;
         }
-        let tWidth = tableWidth;
         let renderColumnList = tableColumn;
         let isOptimizeMode = false;
         // 如果是使用优化模式
@@ -756,13 +760,19 @@ function updateStyle($xeTable) {
           if (isOptimizeMode) {
             renderColumnList = fixedColumn || [];
           }
-          if (!isOptimizeMode) {
+        }
+        const tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
+        if (fixedType) {
+          if (isOptimizeMode) {
             if (wrapperElem) {
               wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
             }
+          } else {
+            if (wrapperElem) {
+              wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
+            }
           }
         }
-        tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
         if (tableElem) {
           tableElem.style.width = tWidth ? `${tWidth}px` : '';
           // 兼容性处理
@@ -773,7 +783,6 @@ function updateStyle($xeTable) {
           emptyBlockElem.style.width = tWidth ? `${tWidth}px` : '';
         }
       } else if (layout === 'footer') {
-        let tWidth = tableWidth;
         let renderColumnList = tableColumn;
         let isOptimizeMode = false;
         // 如果是使用优化模式
@@ -789,13 +798,19 @@ function updateStyle($xeTable) {
           if (isOptimizeMode) {
             renderColumnList = fixedColumn || [];
           }
-          if (!isOptimizeMode) {
+        }
+        const tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
+        if (fixedType) {
+          if (isOptimizeMode) {
             if (wrapperElem) {
               wrapperElem.style.width = tWidth ? `${tWidth}px` : '';
             }
+          } else {
+            if (wrapperElem) {
+              wrapperElem.style.width = tableWidth ? `${tableWidth}px` : '';
+            }
           }
         }
-        tWidth = renderColumnList.reduce((previous, column) => previous + column.renderWidth, 0);
         if (currScrollElem) {
           currScrollElem.style.height = `${footerHeight}px`;
           // 如果是固定列
@@ -1838,21 +1853,6 @@ function handleScrollToRowColumn($xeTable, fieldOrColumn, row) {
   }
   return $xeTable.$nextTick();
 }
-const handleRowExpandReserve = ($xeTable, row, expanded) => {
-  const internalData = $xeTable;
-  const {
-    rowExpandedReserveRowMap
-  } = internalData;
-  const expandOpts = $xeTable.computeExpandOpts;
-  if (expandOpts.reserve) {
-    const rowid = (0, _util.getRowid)($xeTable, row);
-    if (expanded) {
-      rowExpandedReserveRowMap[rowid] = row;
-    } else if (rowExpandedReserveRowMap[rowid]) {
-      delete rowExpandedReserveRowMap[rowid];
-    }
-  }
-};
 // 计算可视渲染相关数据
 function computeScrollLoad($xeTable) {
   const reactData = $xeTable;
@@ -8669,7 +8669,7 @@ const Methods = {
         });
       }
       if (reserve) {
-        validRows.forEach(row => handleRowExpandReserve($xeTable, row, expanded));
+        validRows.forEach(row => this.handleRowExpandReserve(row, expanded));
       }
     }
     this.rowExpandedMaps = rExpandedMaps;
@@ -8704,32 +8704,42 @@ const Methods = {
    */
   clearRowExpand() {
     const $xeTable = this;
-    const reactData = $xeTable;
-    const internalData = $xeTable;
     const {
+      expandOpts,
       tableFullData
-    } = internalData;
-    const expandOpts = $xeTable.computeExpandOpts;
+    } = this;
     const {
       reserve
     } = expandOpts;
-    const expList = $xeTable.getRowExpandRecords();
-    reactData.rowExpandedMaps = {};
+    const expList = this.getRowExpandRecords();
+    this.rowExpandedMaps = {};
     if (reserve) {
-      tableFullData.forEach(row => handleRowExpandReserve($xeTable, row, false));
+      tableFullData.forEach(row => this.handleRowExpandReserve(row, false));
     }
-    return $xeTable.$nextTick().then(() => {
+    return this.$nextTick().then(() => {
       if (expList.length) {
-        return $xeTable.recalculate();
+        this.recalculate();
       }
-    }).then(() => {
-      return $xeTable.updateCellAreas();
-    });
+    }).then(() => $xeTable.updateCellAreas());
   },
   clearRowExpandReserve() {
     this.rowExpandedReserveRowMap = {};
     return this.$nextTick();
   },
+  handleRowExpandReserve(row, expanded) {
+    const {
+      rowExpandedReserveRowMap,
+      expandOpts
+    } = this;
+    if (expandOpts.reserve) {
+      const rowid = (0, _util.getRowid)(this, row);
+      if (expanded) {
+        rowExpandedReserveRowMap[rowid] = row;
+      } else if (rowExpandedReserveRowMap[rowid]) {
+        delete rowExpandedReserveRowMap[rowid];
+      }
+    }
+  },
   getRowExpandRecords() {
     const rest = [];
     _xeUtils.default.each(this.rowExpandedMaps, item => {