vxe-table 3.13.10 → 3.13.12

package/lib/index.umd.js

@@ -3201,7 +3201,7 @@ function getClass(property, params) {
 ;// ./packages/ui/index.ts
 
 
-const version = "3.13.10";
+const version = "3.13.12";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3828,7 +3828,7 @@ var es_iterator_map = __webpack_require__(1701);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.13.10"}`;
+const log_version = `table v${"3.13.12"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -6725,16 +6725,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) {
@@ -6750,14 +6744,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`;
         }
@@ -6812,7 +6818,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;
         // 如果是使用优化模式
@@ -6828,13 +6833,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` : '';
           // 兼容性处理
@@ -6845,7 +6856,6 @@ function updateStyle($xeTable) {
           emptyBlockElem.style.width = tWidth ? `${tWidth}px` : '';
         }
       } else if (layout === 'footer') {
-        let tWidth = tableWidth;
         let renderColumnList = tableColumn;
         let isOptimizeMode = false;
         // 如果是使用优化模式
@@ -6861,13 +6871,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`;
           // 如果是固定列