vxe-table 4.13.22 → 4.13.24

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.13.22";
+const version = "4.13.24";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3599,7 +3599,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.13.22"}`;
+const log_version = `table v${"4.13.24"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -3851,6 +3851,12 @@ function toCssUnit(val, unit = 'px') {
   }
   return `${val || ''}`;
 }
+function queryElement(elem, selector) {
+  if (elem) {
+    return elem.querySelector(selector);
+  }
+  return null;
+}
 function getDomNode() {
   const documentElement = document.documentElement;
   const bodyElem = document.body;
@@ -4138,7 +4144,7 @@ function getPaddingLeftRightSize(elem) {
   }
   return 0;
 }
-function getElementMarginWidth(elem) {
+function getElementMarginAndWidth(elem) {
   if (elem) {
     const computedStyle = getComputedStyle(elem);
     const marginLeft = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(computedStyle.marginLeft);
@@ -4147,9 +4153,6 @@ function getElementMarginWidth(elem) {
   }
   return 0;
 }
-function queryCellElement(cell, selector) {
-  return cell.querySelector('.vxe-cell' + selector);
-}
 function toFilters(filters) {
   if (filters && external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(filters)) {
     return filters.map(({
@@ -4262,19 +4265,19 @@ function getColReMinWidth(params) {
   const showTitle = headOverflow === 'title';
   const showTooltip = headOverflow === true || headOverflow === 'tooltip';
   const hasEllipsis = showTitle || showTooltip || showEllipsis;
-  const minTitleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor((external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(cell).fontSize) || 14) * 1.6);
-  const paddingLeftRight = getPaddingLeftRightSize(cell) + getPaddingLeftRightSize(queryCellElement(cell, ''));
+  const minTitleWidth = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().floor((external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(cell).fontSize) || 14) * 1.8);
+  const paddingLeftRight = getPaddingLeftRightSize(cell) + getPaddingLeftRightSize(queryElement(cell, '.vxe-cell'));
   let mWidth = minTitleWidth + paddingLeftRight;
   // 默认最小宽处理
   if (hasEllipsis) {
-    const dragIconWidth = getPaddingLeftRightSize(queryCellElement(cell, '>.vxe-cell--drag-handle'));
-    const checkboxIconWidth = getPaddingLeftRightSize(queryCellElement(cell, '>.vxe-cell--checkbox'));
-    const requiredIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell--required-icon'));
-    const editIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell--edit-icon'));
-    const prefixIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell-title-prefix-icon'));
-    const suffixIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell-title-suffix-icon'));
-    const sortIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell--sort'));
-    const filterIconWidth = getElementMarginWidth(queryCellElement(cell, '>.vxe-cell--filter'));
+    const dragIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--drag-handle'));
+    const checkboxIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--checkbox'));
+    const requiredIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--required-icon'));
+    const editIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--edit-icon'));
+    const prefixIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell-title-prefix-icon'));
+    const suffixIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell-title-suffix-icon'));
+    const sortIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--sort'));
+    const filterIconWidth = getElementMarginAndWidth(queryElement(cell, '.vxe-cell--filter'));
     mWidth += dragIconWidth + checkboxIconWidth + requiredIconWidth + editIconWidth + prefixIconWidth + suffixIconWidth + filterIconWidth + sortIconWidth;
   }
   // 如果设置最小宽
@@ -4495,7 +4498,8 @@ function rowToVisible($xeTable, row) {
     showOverflow
   } = tableProps;
   const {
-    scrollYLoad
+    scrollYLoad,
+    scrollYTop
   } = reactData;
   const {
     elemStore,
@@ -4515,8 +4519,7 @@ function rowToVisible($xeTable, row) {
     const bodyScrollTop = bodyScrollElem.scrollTop;
     const trElem = bodyScrollElem.querySelector(`[rowid="${rowid}"]`);
     if (trElem) {
-      const trOffsetParent = trElem.offsetParent;
-      const trOffsetTop = trElem.offsetTop + (trOffsetParent ? trOffsetParent.offsetTop : 0);
+      const trOffsetTop = trElem.offsetTop + (scrollYLoad ? scrollYTop : 0);
       const trHeight = trElem.clientHeight;
       // 检测行是否在可视区中
       if (trOffsetTop < bodyScrollTop || trOffsetTop > bodyScrollTop + bodyHeight) {
@@ -4560,7 +4563,8 @@ function colToVisible($xeTable, column, row) {
     computeRightFixedWidth
   } = $xeTable.getComputeMaps();
   const {
-    scrollXLoad
+    scrollXLoad,
+    scrollXLeft
   } = reactData;
   const {
     elemStore,
@@ -4584,8 +4588,7 @@ function colToVisible($xeTable, column, row) {
       tdElem = bodyScrollElem.querySelector(`.${column.id}`);
     }
     if (tdElem) {
-      const tdOffsetParent = tdElem.offsetParent;
-      const tdOffsetLeft = tdElem.offsetLeft + (tdOffsetParent ? tdOffsetParent.offsetLeft : 0);
+      const tdOffsetLeft = tdElem.offsetLeft + (scrollXLoad ? scrollXLeft : 0);
       const cellWidth = tdElem.clientWidth;
       // 检测是否在可视区中
       if (tdOffsetLeft < bodyScrollLeft + leftFixedWidth) {
@@ -4676,15 +4679,17 @@ function renderTitlePrefixIcon(params) {
   } = params;
   const titlePrefix = column.titlePrefix || column.titleHelp;
   if (titlePrefix) {
-    return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-cell-title-prefix-icon', titlePrefix.iconStatus ? `theme--${titlePrefix.iconStatus}` : '', titlePrefix.icon || cell_getIcon().TABLE_TITLE_PREFIX],
+    return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+      class: ['vxe-cell-title-prefix-icon', titlePrefix.iconStatus ? `theme--${titlePrefix.iconStatus}` : ''],
       onMouseenter(evnt) {
         $table.triggerHeaderTitleEvent(evnt, titlePrefix, params);
       },
       onMouseleave(evnt) {
         $table.handleTargetLeaveEvent(evnt);
       }
-    });
+    }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+      class: titlePrefix.icon || cell_getIcon().TABLE_TITLE_PREFIX
+    })]);
   }
   return renderEmptyElement($table);
 }
@@ -4695,15 +4700,17 @@ function renderTitleSuffixIcon(params) {
   } = params;
   const titleSuffix = column.titleSuffix;
   if (titleSuffix) {
-    return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-cell-title-suffix-icon', titleSuffix.iconStatus ? `theme--${titleSuffix.iconStatus}` : '', titleSuffix.icon || cell_getIcon().TABLE_TITLE_SUFFIX],
+    return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+      class: ['vxe-cell-title-suffix-icon', titleSuffix.iconStatus ? `theme--${titleSuffix.iconStatus}` : ''],
       onMouseenter(evnt) {
         $table.triggerHeaderTitleEvent(evnt, titleSuffix, params);
       },
       onMouseleave(evnt) {
         $table.handleTargetLeaveEvent(evnt);
       }
-    });
+    }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+      class: titleSuffix.icon || cell_getIcon().TABLE_TITLE_SUFFIX
+    })]);
   }
   return renderEmptyElement($table);
 }
@@ -5988,11 +5995,13 @@ const Cell = {
     }
     let editIconVNs = [];
     if (isEnableConf(editConfig)) {
-      editIconVNs = [isRequired && editOpts.showAsterisk ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+      editIconVNs = [isRequired && editOpts.showAsterisk ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
         class: 'vxe-cell--required-icon'
-      }) : renderEmptyElement($table), isEnableConf(editRender) && editOpts.showIcon ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-        class: ['vxe-cell--edit-icon', editOpts.icon || cell_getIcon().TABLE_EDIT]
-      }) : renderEmptyElement($table)];
+      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i')]) : renderEmptyElement($table), isEnableConf(editRender) && editOpts.showIcon ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
+        class: 'vxe-cell--edit-icon'
+      }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
+        class: editOpts.icon || cell_getIcon().TABLE_EDIT
+      })]) : renderEmptyElement($table)];
     }
     return renderHeaderCellBaseVNs(params, editIconVNs.concat(Cell.renderHeaderTitle(params)).concat(sortable ? Cell.renderSortIcon(params) : []).concat(filters ? Cell.renderFilterIcon(params) : []));
   },