vxe-table 3.14.0-beta.24 → 3.14.0-beta.26

package/es/table/src/methods.js

@@ -415,7 +415,7 @@ function updateStyle($xeTable) {
     const internalData = $xeTable;
     const { border, showHeaderOverflow: allColumnHeaderOverflow, showFooterOverflow: allColumnFooterOverflow, mouseConfig, spanMethod, footerSpanMethod } = props;
     const { isGroup, currentRow, tableColumn, scrollXLoad, scrollYLoad, overflowX, scrollbarWidth, overflowY, scrollbarHeight, scrollXWidth, columnStore, editStore, isAllOverflow, expandColumn } = reactData;
-    const { visibleColumn, fullColumnIdData, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
+    const { visibleColumn, tableHeight, headerHeight, footerHeight, elemStore, customHeight, customMinHeight, customMaxHeight } = internalData;
     const el = $xeTable.$refs.refElem;
     if (!el) {
         return;
@@ -424,7 +424,6 @@ function updateStyle($xeTable) {
     const osbWidth = overflowY ? scrollbarWidth : 0;
     const osbHeight = overflowX ? scrollbarHeight : 0;
     const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
-    const cellOffsetWidth = $xeTable.computeCellOffsetWidth;
     const mouseOpts = $xeTable.computeMouseOpts;
     const expandOpts = $xeTable.computeExpandOpts;
     const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
@@ -692,56 +691,6 @@ function updateStyle($xeTable) {
                     tableElem.style.width = tWidth ? `${tWidth}px` : '';
                 }
             }
-            const colgroupElem = getRefElem(elemStore[`${name}-${layout}-colgroup`]);
-            if (colgroupElem) {
-                XEUtils.arrayEach(colgroupElem.children, (colElem) => {
-                    const colid = colElem.getAttribute('name');
-                    if (fullColumnIdData[colid]) {
-                        const colRest = fullColumnIdData[colid];
-                        const column = colRest.column;
-                        const { showHeaderOverflow, showFooterOverflow, showOverflow } = column;
-                        let cellOverflow;
-                        colElem.style.width = `${column.renderWidth}px`;
-                        if (layout === 'header') {
-                            cellOverflow = XEUtils.isUndefined(showHeaderOverflow) || XEUtils.isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-                        }
-                        else if (layout === 'footer') {
-                            cellOverflow = XEUtils.isUndefined(showFooterOverflow) || XEUtils.isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
-                        }
-                        else {
-                            cellOverflow = XEUtils.isUndefined(showOverflow) || XEUtils.isNull(showOverflow) ? isAllOverflow : showOverflow;
-                        }
-                        const showEllipsis = cellOverflow === 'ellipsis';
-                        const showTitle = cellOverflow === 'title';
-                        const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-                        let hasEllipsis = showTitle || showTooltip || showEllipsis;
-                        const listElem = getRefElem(elemStore[`${name}-${layout}-list`]);
-                        // 纵向虚拟滚动不支持动态行高
-                        if (scrollYLoad && !hasEllipsis) {
-                            hasEllipsis = true;
-                        }
-                        if (listElem) {
-                            XEUtils.arrayEach(listElem.querySelectorAll(`.${column.id}`), (elem) => {
-                                const colspan = parseInt(elem.getAttribute('colspan') || 1);
-                                const cellElem = elem.querySelector('.vxe-cell');
-                                let colWidth = column.renderWidth;
-                                if (cellElem) {
-                                    if (colspan > 1) {
-                                        const columnIndex = $xeTable.getColumnIndex(column);
-                                        for (let index = 1; index < colspan; index++) {
-                                            const nextColumn = $xeTable.getColumns(columnIndex + index);
-                                            if (nextColumn) {
-                                                colWidth += nextColumn.renderWidth;
-                                            }
-                                        }
-                                    }
-                                    cellElem.style.width = hasEllipsis ? `${colWidth - (cellOffsetWidth * colspan)}px` : '';
-                                }
-                            });
-                        }
-                    }
-                });
-            }
         });
     });
     if (currentRow) {
@@ -1475,6 +1424,7 @@ function autoCellWidth($xeTable) {
     internalData.headerHeight = headerHeight;
     internalData.footerHeight = footerHeight;
     reactData.overflowX = overflowX;
+    reactData.resizeWidthFlag++;
     updateColumnOffsetLeft($xeTable);
     updateHeight($xeTable);
     reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight());
@@ -1944,8 +1894,8 @@ function parseColumns($xeTable, isReset) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
-    const { showOverflow } = props;
-    const rowOpts = $xeTable.computeRowOpts;
+    // const { showOverflow } = props
+    // const rowOpts = $xeTable.computeRowOpts
     const leftList = [];
     const centerList = [];
     const rightList = [];
@@ -2018,28 +1968,28 @@ function parseColumns($xeTable, isReset) {
     reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
     Object.assign(columnStore, { leftList, centerList, rightList });
     if (scrollXLoad) {
-        if (showOverflow) {
-            if (!rowOpts.height) {
-                const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-                if (errColumn) {
-                    errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-                }
-            }
-        }
-        if (process.env.NODE_ENV === 'development') {
-            // if (props.showHeader && !props.showHeaderOverflow) {
-            //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
-            // }
-            // if (props.showFooter && !props.showFooterOverflow) {
-            //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
-            // }
-            if (props.spanMethod) {
-                warnLog('vxe.error.scrollErrProp', ['span-method']);
-            }
-            if (props.footerSpanMethod) {
-                warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
-            }
-        }
+        // if (showOverflow) {
+        //   if (!rowOpts.height) {
+        //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+        //     if (errColumn) {
+        //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+        //     }
+        //   }
+        // }
+        // if (process.env.NODE_ENV === 'development') {
+        // if (props.showHeader && !props.showHeaderOverflow) {
+        //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
+        // }
+        // if (props.showFooter && !props.showFooterOverflow) {
+        //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
+        // }
+        if (props.spanMethod) {
+            warnLog('vxe.error.scrollErrProp', ['span-method']);
+        }
+        if (props.footerSpanMethod) {
+            warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
+        }
+        // }
         if (isReset) {
             const { visibleSize } = handleVirtualXVisible($xeTable);
             scrollXStore.startIndex = 0;
@@ -8540,7 +8490,7 @@ const Methods = {
         const { scrollXLoad, scrollYLoad, expandColumn } = reactData;
         const leftFixedWidth = $xeTable.computeLeftFixedWidth;
         const rightFixedWidth = $xeTable.computeRightFixedWidth;
-        if (!(scrollYLoad || leftFixedWidth || rightFixedWidth || expandColumn)) {
+        if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
             return;
         }
         const { elemStore, lastScrollTop, lastScrollLeft } = internalData;

package/es/table/src/table.js

@@ -633,6 +633,7 @@ export default {
             rowExpandHeightFlag: 1,
             calcCellHeightFlag: 1,
             resizeHeightFlag: 1,
+            resizeWidthFlag: 1,
             isCustomStatus: false,
             isDragRowMove: false,
             dragRow: null,

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.14.0-beta.24";
+export const version = "3.14.0-beta.26";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.14.0-beta.24"}`;
+const version = `table v${"3.14.0-beta.26"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.0-beta.24";
+const version = "3.14.0-beta.26";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2844,7 +2844,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.14.0-beta.24"}`;
+const log_version = `table v${"3.14.0-beta.26"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5704,7 +5704,6 @@ function updateStyle($xeTable) {
   } = reactData;
   const {
     visibleColumn,
-    fullColumnIdData,
     tableHeight,
     headerHeight,
     footerHeight,
@@ -5721,7 +5720,6 @@ function updateStyle($xeTable) {
   const osbWidth = overflowY ? scrollbarWidth : 0;
   const osbHeight = overflowX ? scrollbarHeight : 0;
   const emptyPlaceholderElem = $xeTable.$refs.refEmptyPlaceholder;
-  const cellOffsetWidth = $xeTable.computeCellOffsetWidth;
   const mouseOpts = $xeTable.computeMouseOpts;
   const expandOpts = $xeTable.computeExpandOpts;
   const bodyWrapperElem = getRefElem(elemStore['main-body-wrapper']);
@@ -5983,58 +5981,6 @@ function updateStyle($xeTable) {
           tableElem.style.width = tWidth ? `${tWidth}px` : '';
         }
       }
-      const colgroupElem = getRefElem(elemStore[`${name}-${layout}-colgroup`]);
-      if (colgroupElem) {
-        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(colgroupElem.children, colElem => {
-          const colid = colElem.getAttribute('name');
-          if (fullColumnIdData[colid]) {
-            const colRest = fullColumnIdData[colid];
-            const column = colRest.column;
-            const {
-              showHeaderOverflow,
-              showFooterOverflow,
-              showOverflow
-            } = column;
-            let cellOverflow;
-            colElem.style.width = `${column.renderWidth}px`;
-            if (layout === 'header') {
-              cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showHeaderOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showHeaderOverflow) ? allColumnHeaderOverflow : showHeaderOverflow;
-            } else if (layout === 'footer') {
-              cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showFooterOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
-            } else {
-              cellOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(showOverflow) || external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isNull(showOverflow) ? isAllOverflow : showOverflow;
-            }
-            const showEllipsis = cellOverflow === 'ellipsis';
-            const showTitle = cellOverflow === 'title';
-            const showTooltip = cellOverflow === true || cellOverflow === 'tooltip';
-            let hasEllipsis = showTitle || showTooltip || showEllipsis;
-            const listElem = getRefElem(elemStore[`${name}-${layout}-list`]);
-            // 纵向虚拟滚动不支持动态行高
-            if (scrollYLoad && !hasEllipsis) {
-              hasEllipsis = true;
-            }
-            if (listElem) {
-              external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(listElem.querySelectorAll(`.${column.id}`), elem => {
-                const colspan = parseInt(elem.getAttribute('colspan') || 1);
-                const cellElem = elem.querySelector('.vxe-cell');
-                let colWidth = column.renderWidth;
-                if (cellElem) {
-                  if (colspan > 1) {
-                    const columnIndex = $xeTable.getColumnIndex(column);
-                    for (let index = 1; index < colspan; index++) {
-                      const nextColumn = $xeTable.getColumns(columnIndex + index);
-                      if (nextColumn) {
-                        colWidth += nextColumn.renderWidth;
-                      }
-                    }
-                  }
-                  cellElem.style.width = hasEllipsis ? `${colWidth - cellOffsetWidth * colspan}px` : '';
-                }
-              });
-            }
-          }
-        });
-      }
     });
   });
   if (currentRow) {
@@ -6887,6 +6833,7 @@ function autoCellWidth($xeTable) {
   internalData.headerHeight = headerHeight;
   internalData.footerHeight = footerHeight;
   reactData.overflowX = overflowX;
+  reactData.resizeWidthFlag++;
   updateColumnOffsetLeft($xeTable);
   updateHeight($xeTable);
   reactData.parentHeight = Math.max(internalData.headerHeight + footerHeight + 20, $xeTable.getParentHeight());
@@ -7425,10 +7372,8 @@ function parseColumns($xeTable, isReset) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const {
-    showOverflow
-  } = props;
-  const rowOpts = $xeTable.computeRowOpts;
+  // const { showOverflow } = props
+  // const rowOpts = $xeTable.computeRowOpts
   const leftList = [];
   const centerList = [];
   const rightList = [];
@@ -7505,28 +7450,28 @@ function parseColumns($xeTable, isReset) {
     rightList
   });
   if (scrollXLoad) {
-    if (showOverflow) {
-      if (!rowOpts.height) {
-        const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false);
-        if (errColumn) {
-          errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true']);
-        }
-      }
+    // if (showOverflow) {
+    //   if (!rowOpts.height) {
+    //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
+    //     if (errColumn) {
+    //       errLog('vxe.error.errProp', [`column[field="${errColumn.field}"].show-overflow=false`, 'show-overflow=true'])
+    //     }
+    //   }
+    // }
+    // if (process.env.VUE_APP_VXE_ENV === 'development') {
+    // if (props.showHeader && !props.showHeaderOverflow) {
+    //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
+    // }
+    // if (props.showFooter && !props.showFooterOverflow) {
+    //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
+    // }
+    if (props.spanMethod) {
+      warnLog('vxe.error.scrollErrProp', ['span-method']);
     }
-    if (true) {
-      // if (props.showHeader && !props.showHeaderOverflow) {
-      //   warnLog('vxe.error.reqProp', ['show-header-overflow'])
-      // }
-      // if (props.showFooter && !props.showFooterOverflow) {
-      //   warnLog('vxe.error.reqProp', ['show-footer-overflow'])
-      // }
-      if (props.spanMethod) {
-        warnLog('vxe.error.scrollErrProp', ['span-method']);
-      }
-      if (props.footerSpanMethod) {
-        warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
-      }
+    if (props.footerSpanMethod) {
+      warnLog('vxe.error.scrollErrProp', ['footer-span-method']);
     }
+    // }
     if (isReset) {
       const {
         visibleSize
@@ -15166,7 +15111,7 @@ const Methods = {
     } = reactData;
     const leftFixedWidth = $xeTable.computeLeftFixedWidth;
     const rightFixedWidth = $xeTable.computeRightFixedWidth;
-    if (!(scrollYLoad || leftFixedWidth || rightFixedWidth || expandColumn)) {
+    if (!(leftFixedWidth || rightFixedWidth || expandColumn)) {
       return;
     }
     const {
@@ -16046,7 +15991,8 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const tableReactData = $xeTable;
   const tableInternalData = $xeTable;
   const {
-    fullAllDataRowIdData
+    fullAllDataRowIdData,
+    visibleColumn
   } = tableInternalData;
   const {
     columnKey,
@@ -16073,6 +16019,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     scrollYLoad,
     calcCellHeightFlag,
     resizeHeightFlag,
+    resizeWidthFlag,
     mergeList,
     editStore,
     isAllOverflow,
@@ -16104,6 +16051,7 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
   const columnOpts = $xeTable.computeColumnOpts;
   const mouseOpts = $xeTable.computeMouseOpts;
   const areaOpts = $xeTable.computeAreaOpts;
+  const cellOffsetWidth = $xeTable.computeCellOffsetWidth;
   const {
     selectCellToRow
   } = areaOpts;
@@ -16297,6 +16245,18 @@ function renderTdColumn(h, _vm, seq, rowid, fixedType, isOptimizeMode, rowLevel,
     }
   }
   const tcStyle = {};
+  if (hasEllipsis && resizeWidthFlag) {
+    let tsColspan = tdAttrs.colspan || 0;
+    if (tsColspan > 1) {
+      for (let index = 1; index < tsColspan; index++) {
+        const nextColumn = visibleColumn[columnIndex + index];
+        if (nextColumn) {
+          tsColspan += nextColumn.renderWidth;
+        }
+      }
+    }
+    tcStyle.width = `${column.renderWidth - cellOffsetWidth * tsColspan}px`;
+  }
   if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
     tcStyle.height = `${cellHeight}px`;
   } else {
@@ -26439,6 +26399,7 @@ function renderBody(h, $xeTable) {
       rowExpandHeightFlag: 1,
       calcCellHeightFlag: 1,
       resizeHeightFlag: 1,
+      resizeWidthFlag: 1,
       isCustomStatus: false,
       isDragRowMove: false,
       dragRow: null,