vxe-table 3.15.7 → 3.15.9

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.7";
+const version = "3.15.9";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2433,8 +2433,8 @@ core_.VxeUI.setConfig({
       oSize: 2
     },
     scrollbarConfig: {
-      // width: 0,
-      // height: 0
+      width: 14,
+      height: 14
     }
   },
   // export: {
@@ -2858,7 +2858,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.7"}`;
+const log_version = `table v${"3.15.9"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -6366,7 +6366,8 @@ function updateStyle($xeTable) {
     columnStore,
     editStore,
     isAllOverflow,
-    expandColumn
+    expandColumn,
+    isColLoading
   } = reactData;
   const {
     visibleColumn,
@@ -6485,15 +6486,17 @@ function updateStyle($xeTable) {
           renderColumnList = visibleColumn;
         } else {
           // 如果是使用优化模式
-          if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
+          if (scrollXLoad && allColumnHeaderOverflow) {
             if (spanMethod || footerSpanMethod) {
               // 如果不支持优化模式
             } else {
               isOptimizeMode = true;
             }
           }
-          if (fixedType) {
+          if (!isOptimizeMode || !isColLoading && (fixedType || !overflowX)) {
             renderColumnList = visibleColumn;
+          }
+          if (fixedType) {
             // 如果是使用优化模式
             if (isOptimizeMode) {
               renderColumnList = fixedColumn || [];
@@ -6579,15 +6582,17 @@ function updateStyle($xeTable) {
         let renderColumnList = tableColumn;
         let isOptimizeMode = false;
         // 如果是使用优化模式
-        if (scrollXLoad || scrollYLoad || allColumnFooterOverflow) {
+        if (scrollXLoad && allColumnFooterOverflow) {
           if (spanMethod || footerSpanMethod) {
             // 如果不支持优化模式
           } else {
             isOptimizeMode = true;
           }
         }
-        if (fixedType) {
+        if (!isOptimizeMode) {
           renderColumnList = visibleColumn;
+        }
+        if (fixedType) {
           if (isOptimizeMode) {
             renderColumnList = fixedColumn || [];
           }
@@ -17984,10 +17989,10 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(headerCellOpts.padding) ? headerCellOpts.padding : cellOpts.padding;
     const headOverflow = 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;
     const headAlign = headerAlign || (compConf ? compConf.tableHeaderCellAlign : '') || allHeaderAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-    let showEllipsis = headOverflow === 'ellipsis';
+    const showEllipsis = headOverflow === 'ellipsis';
     const showTitle = headOverflow === 'title';
     const showTooltip = headOverflow === true || headOverflow === 'tooltip';
-    let hasEllipsis = showTitle || showTooltip || showEllipsis;
+    const hasEllipsis = showTitle || showTooltip || showEllipsis;
     let hasFilter = false;
     let firstFilterOption = null;
     if (filters) {
@@ -18019,10 +18024,6 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       click: evnt => $xeTable.triggerHeaderCellClickEvent(evnt, cellParams),
       dblclick: evnt => $xeTable.triggerHeaderCellDblclickEvent(evnt, cellParams)
     };
-    // 虚拟滚动不支持动态高度
-    if (scrollXLoad && !hasEllipsis) {
-      showEllipsis = hasEllipsis = true;
-    }
     const isColDragCell = columnOpts.drag && columnDragOpts.trigger === 'cell';
     let isDisabledDrag = false;
     if (isColDragCell) {
@@ -18045,7 +18046,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
     const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (!isGroup) {
+    if (isOptimizeMode && !isGroup) {
       if (!dragCol || dragCol.id !== colid) {
         if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
           isVNPreEmptyStatus = true;
@@ -18240,7 +18241,6 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       isColLoading,
       overflowX,
       scrollXLoad,
-      scrollYLoad,
       dragCol
     } = tableReactData;
     const {
@@ -18255,14 +18255,14 @@ function renderHeads(h, _vm, isGroup, isOptimizeMode, headerGroups) {
       renderColumnList = visibleColumn;
     } else {
       // 如果是使用优化模式
-      if (scrollXLoad || scrollYLoad || allColumnHeaderOverflow) {
+      if (scrollXLoad && allColumnHeaderOverflow) {
         if (spanMethod || footerSpanMethod) {
           // 如果不支持优化模式
         } else {
           isOptimizeMode = true;
         }
       }
-      if (!isColLoading && (fixedType || !overflowX)) {
+      if (!isOptimizeMode || !isColLoading && (fixedType || !overflowX)) {
         renderColumnList = visibleColumn;
       }
       if (fixedType) {
@@ -18385,7 +18385,7 @@ const {
   renderer: footer_renderer,
   renderEmptyElement: footer_renderEmptyElement
 } = core_.VxeUI;
-function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex, _rowIndex) {
+function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $rowIndex, _rowIndex) {
   const props = _vm;
   const $xeTable = _vm.$parent;
   const tableProps = $xeTable;
@@ -18449,10 +18449,10 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     const isPadding = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(footerCellOpts.padding) ? footerCellOpts.padding : cellOpts.padding;
     const footOverflow = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(showFooterOverflow) ? allColumnFooterOverflow : showFooterOverflow;
     const footAlign = footerAlign || (compConf ? compConf.tableFooterCellAlign : '') || allFooterAlign || align || (compConf ? compConf.tableCellAlign : '') || allAlign;
-    let showEllipsis = footOverflow === 'ellipsis';
+    const showEllipsis = footOverflow === 'ellipsis';
     const showTitle = footOverflow === 'title';
     const showTooltip = footOverflow === true || footOverflow === 'tooltip';
-    let hasEllipsis = showTitle || showTooltip || showEllipsis;
+    const hasEllipsis = showTitle || showTooltip || showEllipsis;
     const showResizable = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || allResizable;
     const attrs = {
       colid
@@ -18478,10 +18478,6 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
       type: footer_renderType,
       data: footerTableData
     };
-    // 纵向虚拟滚动不支持动态行高
-    if (scrollXLoad && !hasEllipsis) {
-      showEllipsis = hasEllipsis = true;
-    }
     if (showTitle || showTooltip || showAllTip) {
       tfOns.mouseenter = evnt => {
         if (showTitle) {
@@ -18548,7 +18544,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     const isLastColumn = $columnIndex === tableColumn.length - 1;
     const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
     let isVNPreEmptyStatus = false;
-    if (!isMergeCell) {
+    if (isOptimizeMode && !isMergeCell) {
       if (scrollXLoad && !column.fixed && !virtualXOpts.immediate && (_columnIndex < scrollXStore.visibleStartIndex - scrollXStore.preloadSize || _columnIndex > scrollXStore.visibleEndIndex + scrollXStore.preloadSize)) {
         isVNPreEmptyStatus = true;
       }
@@ -18601,7 +18597,7 @@ function footer_renderRows(h, _vm, tableColumn, footerTableData, row, $rowIndex,
     }) : footer_renderEmptyElement($xeTable)]);
   });
 }
-function footer_renderHeads(h, _vm, renderColumnList) {
+function footer_renderHeads(h, _vm, isOptimizeMode, renderColumnList) {
   const props = _vm;
   const $xeTable = _vm.$parent;
   const tableProps = $xeTable;
@@ -18639,13 +18635,13 @@ function footer_renderHeads(h, _vm, renderColumnList) {
           class: ['vxe-footer--row', footerRowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
           style: footerRowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : undefined
         }
-      }, footer_renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
+      }, footer_renderRows(h, _vm, isOptimizeMode, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
     }
     return h('tr', {
       key: $rowIndex,
       class: ['vxe-footer--row', footerRowClassName ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowClassName) ? footerRowClassName(rowParams) : footerRowClassName : ''],
       style: footerRowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(footerRowStyle) ? footerRowStyle(rowParams) : footerRowStyle : undefined
-    }, footer_renderRows(h, _vm, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
+    }, footer_renderRows(h, _vm, isOptimizeMode, renderColumnList, footerTableData, row, $rowIndex, _rowIndex));
   });
 }
 /* harmony default export */ var footer = ({
@@ -18733,20 +18729,19 @@ function footer_renderHeads(h, _vm, renderColumnList) {
       isColLoading,
       overflowX,
       scrollXLoad,
-      scrollYLoad,
       dragCol
     } = tableReactData;
     let renderColumnList = tableColumn;
     let isOptimizeMode = false;
     // 如果是使用优化模式
-    if (scrollXLoad || scrollYLoad || allColumnFooterOverflow) {
+    if (scrollXLoad && allColumnFooterOverflow) {
       if (spanMethod || footerSpanMethod) {
         // 如果不支持优化模式
       } else {
         isOptimizeMode = true;
       }
     }
-    if (!isColLoading && (fixedType || !overflowX)) {
+    if (!isOptimizeMode || !isColLoading && (fixedType || !overflowX)) {
       renderColumnList = visibleColumn;
     }
     if (fixedType) {
@@ -18826,7 +18821,7 @@ function footer_renderHeads(h, _vm, renderColumnList) {
     */
     h('tfoot', {
       ref: 'refFooterTFoot'
-    }, footer_renderHeads(h, this, renderColumnList))])])]);
+    }, footer_renderHeads(h, this, isOptimizeMode, renderColumnList))])])]);
   }
 });
 ;// CONCATENATED MODULE: ./packages/table/src/props.ts
@@ -31774,7 +31769,18 @@ function defaultEditRender(h, renderOpts, params) {
     on: getEditOns(renderOpts, params)
   })];
 }
-function radioAndCheckboxEditRender(h, renderOpts, params) {
+function checkboxEditRender(h, renderOpts, params) {
+  const {
+    row,
+    column
+  } = params;
+  const cellValue = getCellValue(row, column);
+  return [h(getDefaultComponent(renderOpts), {
+    props: getCellEditProps(renderOpts, params, cellValue),
+    on: getEditOns(renderOpts, params)
+  })];
+}
+function radioAndCheckboxGroupEditRender(h, renderOpts, params) {
   const {
     options
   } = renderOpts;
@@ -32487,10 +32493,13 @@ render_renderer.mixin({
     }
   },
   VxeRadioGroup: {
-    renderTableDefault: radioAndCheckboxEditRender
+    renderTableDefault: radioAndCheckboxGroupEditRender
+  },
+  VxeCheckbox: {
+    renderTableDefault: checkboxEditRender
   },
   VxeCheckboxGroup: {
-    renderTableDefault: radioAndCheckboxEditRender
+    renderTableDefault: radioAndCheckboxGroupEditRender
   },
   VxeSwitch: {
     tableAutoFocus: 'button',