vxe-table 3.20.0 → 3.20.2

package/es/table/src/body.js

@@ -11,9 +11,11 @@ const renderType = 'body';
 const isVMScrollProcess = ($xeTable) => {
     const tableProps = $xeTable;
     const tableReactData = $xeTable;
+    const tableInternalData = $xeTable;
     const { delayHover } = tableProps;
-    const { lastScrollTime, isDragResize } = tableReactData;
-    return !!(isDragResize || (lastScrollTime && Date.now() < lastScrollTime + delayHover));
+    const { isDragResize } = tableReactData;
+    const { lastSTime } = tableInternalData;
+    return !!(isDragResize || (lastSTime && Date.now() < lastSTime + delayHover));
 };
 function renderLine(h, $xeTable, rowid, params, cellHeight) {
     const tableProps = $xeTable;

package/es/table/src/column.js

@@ -133,7 +133,7 @@ export const columnProps = {
     // 内容渲染配置项
     contentRender: Object,
     // 聚合函数
-    aggFunc: [String, Boolean],
+    aggFunc: [Boolean, String],
     // 将单元格复制到剪贴板
     copyMethod: Function,
     // 将剪贴单元格的值清除

package/es/table/src/methods.js

@@ -3357,7 +3357,7 @@ function loadTableData($xeTable, datas, isReload, isReset) {
             if (reactData.expandColumn && expandOpts.mode !== 'fixed') {
                 errLog('vxe.error.notConflictProp', ['column.type="expand', 'expand-config.mode="fixed"']);
             }
-            if (virtualYOpts.mode === 'scroll' && expandOpts.mode === 'fixed') {
+            if (virtualYOpts.mode === 'scroll' && reactData.expandColumn && expandOpts.mode === 'fixed') {
                 warnLog('vxe.error.notConflictProp', ['virtual-y-config.mode=scroll', 'expand-config.mode=inside']);
             }
             // if (showOverflow) {
@@ -3862,7 +3862,7 @@ function handleSyncScroll($xeTable, isRollX, isRollY) {
     return Promise.all([
         xRest,
         yRest,
-        $xeTable.updateCellAreas()
+        scrollXLoad || scrollYLoad ? $xeTable.updateCellAreas() : null
     ]);
 }
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
@@ -8248,6 +8248,7 @@ const tableMethods = {
         if (!checkMethod || checkMethod({ $table: $xeTable, row })) {
             let newValue = row;
             let isChange = oldValue !== newValue;
+            const selected = !isChange;
             if (isChange) {
                 handleCheckedRadioRow($xeTable, newValue);
             }
@@ -8259,7 +8260,7 @@ const tableMethods = {
                 }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('radio-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
             }
         }
     },
@@ -8270,7 +8271,7 @@ const tableMethods = {
         const columnOpts = $xeTable.computeColumnOpts;
         const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
         const beforeRowMethod = currentColumnOpts.beforeSelectMethod || columnOpts.currentMethod;
-        const { column: newValue } = params;
+        let { column: newValue } = params;
         const { trigger, strict } = currentColumnOpts;
         if (trigger === 'manual') {
             return;
@@ -8282,8 +8283,9 @@ const tableMethods = {
                 $xeTable.setCurrentColumn(newValue);
             }
             else {
-                isChange = true;
-                if (selected) {
+                isChange = oldValue === newValue;
+                if (isChange) {
+                    newValue = null;
                     $xeTable.clearCurrentColumn();
                 }
                 else {
@@ -8291,7 +8293,7 @@ const tableMethods = {
                 }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('current-column-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('current-column-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
             }
         }
         else {
@@ -8305,7 +8307,7 @@ const tableMethods = {
         const rowOpts = $xeTable.computeRowOpts;
         const currentRowOpts = $xeTable.computeCurrentRowOpts;
         const beforeRowMethod = currentRowOpts.beforeSelectMethod || rowOpts.currentMethod;
-        const { row: newValue } = params;
+        let { row: newValue } = params;
         const { trigger, strict } = currentRowOpts;
         if (trigger === 'manual') {
             return;
@@ -8317,8 +8319,9 @@ const tableMethods = {
                 $xeTable.setCurrentRow(newValue);
             }
             else {
-                isChange = true;
-                if (selected) {
+                isChange = oldValue === newValue;
+                if (isChange) {
+                    newValue = null;
                     $xeTable.clearCurrentRow();
                 }
                 else {
@@ -8326,9 +8329,9 @@ const tableMethods = {
                 }
             }
             if (isChange) {
-                $xeTable.dispatchEvent('current-row-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('current-row-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
                 // 已废弃
-                $xeTable.dispatchEvent('current-change', Object.assign({ oldValue, newValue }, params), evnt);
+                $xeTable.dispatchEvent('current-change', Object.assign({ oldValue, newValue, selected }, params), evnt);
             }
         }
         else {
@@ -11071,7 +11074,6 @@ const tableMethods = {
     handleScrollEvent(evnt, isRollY, isRollX, scrollTop, scrollLeft, params) {
         const $xeTable = this;
         const props = $xeTable;
-        const reactData = $xeTable;
         const internalData = $xeTable;
         const { highlightHoverRow } = props;
         const { lastScrollLeft, lastScrollTop } = internalData;
@@ -11137,7 +11139,7 @@ const tableMethods = {
             }
             internalData.lastScrollTop = scrollTop;
         }
-        reactData.lastScrollTime = Date.now();
+        internalData.lastSTime = Date.now();
         const evntParams = Object.assign({ source: sourceType, scrollTop,
             scrollLeft,
             bodyHeight,
@@ -11393,7 +11395,7 @@ const tableMethods = {
         if (!bodyScrollElem) {
             return;
         }
-        const wheelSpeed = getWheelSpeed(reactData.lastScrollTime);
+        const wheelSpeed = getWheelSpeed(internalData.lastSTime);
         const deltaTop = shiftKey ? 0 : (deltaY * wheelSpeed);
         const deltaLeft = (shiftKey ? (deltaX || deltaY) : deltaX) * wheelSpeed;
         const currScrollTop = bodyScrollElem.scrollTop;
@@ -11880,14 +11882,18 @@ const tableMethods = {
             setScrollLeft(bodyScrollElem, scrollLeft);
             setScrollLeft(headerScrollElem, scrollLeft);
             setScrollLeft(footerScrollElem, scrollLeft);
-            loadScrollXData($xeTable);
+            if (reactData.scrollXLoad) {
+                loadScrollXData($xeTable);
+            }
         }
         if (XEUtils.isNumber(scrollTop)) {
             setScrollTop(yHandleEl, scrollTop);
             setScrollTop(bodyScrollElem, scrollTop);
             setScrollTop(leftScrollElem, scrollTop);
             setScrollTop(rightScrollElem, scrollTop);
-            loadScrollYData($xeTable);
+            if (reactData.scrollYLoad) {
+                loadScrollYData($xeTable);
+            }
         }
         return new Promise(resolve => {
             setTimeout(() => {

package/es/table/src/table.js

@@ -1,6 +1,6 @@
 import XEUtils from 'xe-utils';
 import { getFuncText, isEnableConf } from '../../ui/src/utils';
-import { initTpImg } from '../../ui/src/dom';
+import { initTpImg, toCssUnit } from '../../ui/src/dom';
 import { createReactData, createInternalData, createHandleGetRowId, getCalcHeight, hasDeepKey } from './util';
 import { VxeUI } from '../../ui';
 import methods from './methods';
@@ -1136,6 +1136,19 @@ export default {
             }
             return '';
         },
+        computeTableStyle() {
+            const $xeTable = this;
+            const scrollbarOpts = $xeTable.computeScrollbarOpts;
+            const { width, height } = scrollbarOpts;
+            const tStys = {};
+            if (width) {
+                tStys['--vxe-ui-table-view-scrollbar-width'] = toCssUnit(width);
+            }
+            if (height) {
+                tStys['--vxe-ui-table-view-scrollbar-height'] = toCssUnit(height);
+            }
+            return tStys;
+        },
         computeTableRowExpandedList() {
             const $xeTable = this;
             const reactData = $xeTable;
@@ -1919,6 +1932,7 @@ export default {
             footer: slots.footerTooltip || slots['footer-tooltip']
         };
         const currTooltipSlot = tooltipStore.visible && tooltipStore.type ? tipSlots[tooltipStore.type] : null;
+        const tableStyle = $xeTable.computeTableStyle;
         const rowDragOpts = $xeTable.computeRowDragOpts;
         const tableTipConfig = $xeTable.computeTableTipConfig;
         const validTipConfig = $xeTable.computeValidTipConfig;
@@ -1986,6 +2000,7 @@ export default {
                     'is--virtual-x': scrollXLoad,
                     'is--virtual-y': scrollYLoad
                 }],
+            style: tableStyle,
             attrs: {
                 spellcheck: false
             },

package/es/table/src/util.js

@@ -124,6 +124,7 @@ export function createInternalData() {
         tFooterHeight: 0,
         teleportToWrapperElem: null,
         popupToWrapperElem: null,
+        lastSTime: 0,
         inited: false,
         tooltipTimeout: null,
         initStatus: false,
@@ -153,8 +154,6 @@ export function createReactData() {
         scrollbarWidth: 0,
         // 横向滚动条的高度
         scrollbarHeight: 0,
-        // 最后滚动时间戳
-        lastScrollTime: 0,
         // 行高
         rowHeight: 0,
         // 表格父容器的高度

package/es/table/style.css

@@ -2415,7 +2415,7 @@
 .vxe-table .vxe-table--scroll-x-handle {
   overflow-y: hidden;
   overflow-x: scroll;
-  height: 18px;
+  height: var(--vxe-ui-table-view-scrollbar-height);
 }
 .vxe-table .vxe-table--scroll-y-handle,
 .vxe-table .vxe-table--scroll-y-wrapper {
@@ -2427,7 +2427,7 @@
 .vxe-table .vxe-table--scroll-y-handle {
   overflow-y: scroll;
   overflow-x: hidden;
-  width: 18px;
+  width: var(--vxe-ui-table-view-scrollbar-width);
   height: 100%;
 }
 .vxe-table .vxe-table--scroll-x-space {