vxe-table 4.12.2 → 4.12.4

package/es/table/module/menu/hook.js

@@ -138,7 +138,7 @@ hooks.add('tableMenuModule', {
                     ctxMenuStore[property] = selectItem || menuList[0];
                 }
                 else if (ctxMenuStore[property] && (globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.ENTER) || globalEvents.hasKey(evnt, GLOBAL_EVENT_KEYS.SPACEBAR))) {
-                    menuPrivateMethods.ctxMenuLinkEvent(evnt, ctxMenuStore[property]);
+                    $xeTable.ctxMenuLinkEvent(evnt, ctxMenuStore[property]);
                 }
             },
             handleOpenMenuEvent,

package/es/table/src/table.js

@@ -792,6 +792,7 @@ export default defineComponent({
             computeBodyMenu,
             computeFooterMenu,
             computeIsMenu,
+            computeMenuList,
             computeMenuOpts,
             computeExportOpts,
             computeImportOpts,
@@ -1834,11 +1835,11 @@ export default defineComponent({
             }
             if (xLeftCornerEl) {
                 xLeftCornerEl.style.width = scrollbarXToTop ? `${osbWidth}px` : '';
-                xLeftCornerEl.style.display = scrollbarXToTop ? (osbWidth && osbHeight ? 'block' : '') : '';
+                xLeftCornerEl.style.display = scrollbarXToTop ? (overflowX && osbHeight ? 'block' : '') : '';
             }
             if (xRightCornerEl) {
                 xRightCornerEl.style.width = scrollbarXToTop ? '' : `${osbWidth}px`;
-                xRightCornerEl.style.display = scrollbarXToTop ? '' : (osbWidth && osbHeight ? 'block' : '');
+                xRightCornerEl.style.display = scrollbarXToTop ? '' : (overflowX && osbHeight ? 'block' : '');
             }
             const scrollYVirtualEl = refScrollYVirtualElem.value;
             if (scrollYVirtualEl) {
@@ -1849,7 +1850,7 @@ export default defineComponent({
             const yTopCornerEl = refScrollYTopCornerElem.value;
             if (yTopCornerEl) {
                 yTopCornerEl.style.height = `${headerHeight}px`;
-                yTopCornerEl.style.display = headerHeight ? 'block' : '';
+                yTopCornerEl.style.display = overflowY && headerHeight ? 'block' : '';
             }
             const yWrapperEl = refScrollYWrapperElem.value;
             if (yWrapperEl) {
@@ -1860,7 +1861,7 @@ export default defineComponent({
             if (yBottomCornerEl) {
                 yBottomCornerEl.style.height = `${footerHeight}px`;
                 yBottomCornerEl.style.top = `${headerHeight + bodyHeight}px`;
-                yBottomCornerEl.style.display = footerHeight ? 'block' : '';
+                yBottomCornerEl.style.display = overflowY && footerHeight ? 'block' : '';
             }
             const rowExpandEl = refRowExpandElem.value;
             if (rowExpandEl) {
@@ -6095,8 +6096,8 @@ export default defineComponent({
         const handleGlobalKeydownEvent = (evnt) => {
             // 该行为只对当前激活的表格有效
             if (internalData.isActivated) {
-                tablePrivateMethods.preventEvent(evnt, 'event.keydown', null, () => {
-                    const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow } = props;
+                $xeTable.preventEvent(evnt, 'event.keydown', null, () => {
+                    const { mouseConfig, keyboardConfig, treeConfig, editConfig, highlightCurrentRow, highlightCurrentColumn } = props;
                     const { ctxMenuStore, editStore, currentRow } = reactData;
                     const { afterFullData } = internalData;
                     const isMenu = computeIsMenu.value;
@@ -6107,6 +6108,7 @@ export default defineComponent({
                     const treeOpts = computeTreeOpts.value;
                     const menuList = computeMenuList.value;
                     const rowOpts = computeRowOpts.value;
+                    const columnOpts = computeColumnOpts.value;
                     const { selected, actived } = editStore;
                     const childrenField = treeOpts.children || treeOpts.childrenField;
                     const keyCode = evnt.keyCode;
@@ -6148,7 +6150,7 @@ export default defineComponent({
                         if ($xeTable.closeMenu) {
                             $xeTable.closeMenu();
                         }
-                        tableMethods.closeFilter();
+                        $xeTable.closeFilter();
                         if (keyboardConfig && keyboardOpts.isEsc) {
                             // 如果是激活编辑状态，则取消编辑
                             if (actived.row) {
@@ -6264,12 +6266,12 @@ export default defineComponent({
                                     const params = {
                                         $table: $xeTable,
                                         row: targetRow,
-                                        rowIndex: tableMethods.getRowIndex(targetRow),
-                                        $rowIndex: tableMethods.getVMRowIndex(targetRow)
+                                        rowIndex: $xeTable.getRowIndex(targetRow),
+                                        $rowIndex: $xeTable.getVMRowIndex(targetRow)
                                     };
-                                    tableMethods.setTreeExpand(currentRow, true)
-                                        .then(() => tableMethods.scrollToRow(targetRow))
-                                        .then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
+                                    $xeTable.setTreeExpand(currentRow, true)
+                                        .then(() => $xeTable.scrollToRow(targetRow))
+                                        .then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
                                 }
                             }
                         }
@@ -6277,9 +6279,19 @@ export default defineComponent({
                     else if (operArrow && keyboardConfig && keyboardOpts.isArrow) {
                         if (!isEditStatus) {
                             // 如果按下了方向键
-                            if (selected.row && selected.column) {
+                            if (mouseOpts.selected && selected.row && selected.column) {
                                 $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                             }
+                            else {
+                                // 当前行按键上下移动
+                                if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
+                                    $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+                                }
+                                // 当前行按键左右移动
+                                if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+                                    $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
+                                }
+                            }
                         }
                     }
                     else if (isTab && keyboardConfig && keyboardOpts.isTab) {
@@ -6324,9 +6336,9 @@ export default defineComponent({
                             if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
                                 const params = {
                                     row: selected.row,
-                                    rowIndex: tableMethods.getRowIndex(selected.row),
+                                    rowIndex: $xeTable.getRowIndex(selected.row),
                                     column: selected.column,
-                                    columnIndex: tableMethods.getColumnIndex(selected.column),
+                                    columnIndex: $xeTable.getColumnIndex(selected.column),
                                     $table: $xeTable,
                                     $grid: $xeGrid
                                 };
@@ -6351,14 +6363,14 @@ export default defineComponent({
                             evnt.preventDefault();
                             const params = {
                                 row: parentRow,
-                                rowIndex: tableMethods.getRowIndex(parentRow),
-                                $rowIndex: tableMethods.getVMRowIndex(parentRow),
+                                rowIndex: $xeTable.getRowIndex(parentRow),
+                                $rowIndex: $xeTable.getVMRowIndex(parentRow),
                                 $table: $xeTable,
                                 $grid: $xeGrid
                             };
-                            tableMethods.setTreeExpand(parentRow, false)
-                                .then(() => tableMethods.scrollToRow(parentRow))
-                                .then(() => tablePrivateMethods.triggerCurrentRowEvent(evnt, params));
+                            $xeTable.setTreeExpand(parentRow, false)
+                                .then(() => $xeTable.scrollToRow(parentRow))
+                                .then(() => $xeTable.triggerCurrentRowEvent(evnt, params));
                         }
                     }
                     else if (keyboardConfig && isEnableConf(editConfig) && keyboardOpts.isEdit && !hasCtrlKey && !hasMetaKey && (isSpacebar || (keyCode >= 48 && keyCode <= 57) || (keyCode >= 65 && keyCode <= 90) || (keyCode >= 96 && keyCode <= 111) || (keyCode >= 186 && keyCode <= 192) || (keyCode >= 219 && keyCode <= 222))) {
@@ -6372,9 +6384,9 @@ export default defineComponent({
                             const beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
                             const params = {
                                 row: selected.row,
-                                rowIndex: tableMethods.getRowIndex(selected.row),
+                                rowIndex: $xeTable.getRowIndex(selected.row),
                                 column: selected.column,
-                                columnIndex: tableMethods.getColumnIndex(selected.column),
+                                columnIndex: $xeTable.getColumnIndex(selected.column),
                                 $table: $xeTable,
                                 $grid: $xeGrid
                             };
@@ -9224,6 +9236,7 @@ export default defineComponent({
             updateScrollXSpace() {
                 const { isGroup, scrollXLoad, overflowX, scrollXWidth } = reactData;
                 const { visibleColumn, scrollXStore, elemStore, fullColumnIdData } = internalData;
+                const mouseOpts = computeMouseOpts.value;
                 const tableBody = refTableBody.value;
                 const tableBodyElem = tableBody ? tableBody.$el : null;
                 if (tableBodyElem) {
@@ -9283,6 +9296,9 @@ export default defineComponent({
                     if (scrollXSpaceEl) {
                         scrollXSpaceEl.style.width = `${ySpaceWidth}px`;
                     }
+                    if (isScrollXBig && mouseOpts.area) {
+                        errLog('vxe.error.notProp', ['mouse-config.area']);
+                    }
                     nextTick(() => {
                         updateStyle();
                     });
@@ -9293,6 +9309,7 @@ export default defineComponent({
                 const { isAllOverflow, scrollYLoad, expandColumn } = reactData;
                 const { scrollYStore, elemStore, isResizeCellHeight, afterFullData, fullAllDataRowIdData, rowExpandedMaps } = internalData;
                 const { startIndex } = scrollYStore;
+                const mouseOpts = computeMouseOpts.value;
                 const expandOpts = computeExpandOpts.value;
                 const rowOpts = computeRowOpts.value;
                 const cellOpts = computeCellOpts.value;
@@ -9376,6 +9393,9 @@ export default defineComponent({
                 reactData.scrollYTop = scrollYTop;
                 reactData.scrollYHeight = scrollYHeight;
                 reactData.isScrollYBig = isScrollYBig;
+                if (isScrollYBig && mouseOpts.area) {
+                    errLog('vxe.error.notProp', ['mouse-config.area']);
+                }
                 return nextTick().then(() => {
                     updateStyle();
                 });
@@ -10253,7 +10273,7 @@ export default defineComponent({
                 initTpImg();
             }
             nextTick(() => {
-                const { data, exportConfig, importConfig, treeConfig, showOverflow } = props;
+                const { data, exportConfig, importConfig, treeConfig, showOverflow, highlightCurrentRow, highlightCurrentColumn } = props;
                 const { scrollXStore, scrollYStore } = internalData;
                 const editOpts = computeEditOpts.value;
                 const treeOpts = computeTreeOpts.value;
@@ -10265,6 +10285,10 @@ export default defineComponent({
                 const mouseOpts = computeMouseOpts.value;
                 const exportOpts = computeExportOpts.value;
                 const importOpts = computeImportOpts.value;
+                const currentRowOpts = computeCurrentRowOpts.value;
+                const currentColumnOpts = computeCurrentColumnOpts.value;
+                const virtualXOpts = computeVirtualXOpts.value;
+                const virtualYOpts = computeVirtualYOpts.value;
                 if (props.rowId) {
                     warnLog('vxe.error.delProp', ['row-id', 'row-config.keyField']);
                 }
@@ -10364,6 +10388,26 @@ export default defineComponent({
                 if (checkboxOpts.halfField) {
                     warnLog('vxe.error.delProp', ['checkbox-config.halfField', 'checkbox-config.indeterminateField']);
                 }
+                if ((rowOpts.isCurrent || highlightCurrentRow) && !XEUtils.isBoolean(currentRowOpts.isFollowSelected)) {
+                    warnLog('vxe.error.notConflictProp', ['row-config.isCurrent', 'current-row-config.isFollowSelected']);
+                }
+                if ((columnOpts.isCurrent || highlightCurrentColumn) && !XEUtils.isBoolean(currentColumnOpts.isFollowSelected)) {
+                    warnLog('vxe.error.notConflictProp', ['column-config.isCurrent', 'current-column-config.isFollowSelected']);
+                }
+                // 如果不支持虚拟滚动
+                if (props.spanMethod) {
+                    if (virtualXOpts.enabled) {
+                        warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-x-config.enabled=false']);
+                    }
+                    if (virtualYOpts.enabled) {
+                        warnLog('vxe.error.notConflictProp', ['span-method', 'virtual-y-config.enabled=false']);
+                    }
+                }
+                if (props.footerSpanMethod) {
+                    if (virtualXOpts.enabled) {
+                        warnLog('vxe.error.notConflictProp', ['footer-span-method', 'virtual-x-config.enabled=false']);
+                    }
+                }
                 // 检查是否有安装需要的模块
                 if (props.editConfig && !$xeTable.insert) {
                     errLog('vxe.error.reqModule', ['Edit']);

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.12.2";
+export const version = "4.12.4";
 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${"4.12.2"}`;
+const version = `table v${"4.12.4"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);