vxe-table 4.12.2 → 4.12.3

package/es/table/src/table.js

@@ -1834,11 +1834,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 +1849,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 +1860,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 +6095,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 +6107,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 +6149,7 @@ export default defineComponent({
                         if ($xeTable.closeMenu) {
                             $xeTable.closeMenu();
                         }
-                        tableMethods.closeFilter();
+                        $xeTable.closeFilter();
                         if (keyboardConfig && keyboardOpts.isEsc) {
                             // 如果是激活编辑状态，则取消编辑
                             if (actived.row) {
@@ -6264,12 +6265,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 +6278,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 +6335,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 +6362,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 +6383,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 +9235,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 +9295,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 +9308,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 +9392,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();
                 });

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.3";
 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.3"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -3138,7 +3138,7 @@ function eqEmptyValue(cellValue) {
 ;// ./packages/ui/index.ts
 
 
-const version = "4.12.2";
+const version = "4.12.3";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -3587,7 +3587,7 @@ var esnext_iterator_some = __webpack_require__(7550);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.12.2"}`;
+const log_version = `table v${"4.12.3"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// ./packages/table/src/columnInfo.ts
@@ -12637,11 +12637,11 @@ const maxXWidth = 5e6;
       }
       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) {
@@ -12652,7 +12652,7 @@ const maxXWidth = 5e6;
       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) {
@@ -12663,7 +12663,7 @@ const maxXWidth = 5e6;
       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) {
@@ -17520,13 +17520,14 @@ const maxXWidth = 5e6;
     const handleGlobalKeydownEvent = evnt => {
       // 该行为只对当前激活的表格有效
       if (internalData.isActivated) {
-        tablePrivateMethods.preventEvent(evnt, 'event.keydown', null, () => {
+        $xeTable.preventEvent(evnt, 'event.keydown', null, () => {
           const {
             mouseConfig,
             keyboardConfig,
             treeConfig,
             editConfig,
-            highlightCurrentRow
+            highlightCurrentRow,
+            highlightCurrentColumn
           } = props;
           const {
             ctxMenuStore,
@@ -17544,6 +17545,7 @@ const maxXWidth = 5e6;
           const treeOpts = computeTreeOpts.value;
           const menuList = computeMenuList.value;
           const rowOpts = computeRowOpts.value;
+          const columnOpts = computeColumnOpts.value;
           const {
             selected,
             actived
@@ -17585,7 +17587,7 @@ const maxXWidth = 5e6;
             if ($xeTable.closeMenu) {
               $xeTable.closeMenu();
             }
-            tableMethods.closeFilter();
+            $xeTable.closeFilter();
             if (keyboardConfig && keyboardOpts.isEsc) {
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
@@ -17700,18 +17702,27 @@ const maxXWidth = 5e6;
                   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));
                 }
               }
             }
           } 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) {
@@ -17756,9 +17767,9 @@ const maxXWidth = 5e6;
               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
                 };
@@ -17785,12 +17796,12 @@ const maxXWidth = 5e6;
               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)) {
             const {
@@ -17806,9 +17817,9 @@ const maxXWidth = 5e6;
               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
               };
@@ -21214,6 +21225,7 @@ const maxXWidth = 5e6;
           elemStore,
           fullColumnIdData
         } = internalData;
+        const mouseOpts = computeMouseOpts.value;
         const tableBody = refTableBody.value;
         const tableBodyElem = tableBody ? tableBody.$el : null;
         if (tableBodyElem) {
@@ -21272,6 +21284,9 @@ const maxXWidth = 5e6;
           if (scrollXSpaceEl) {
             scrollXSpaceEl.style.width = `${ySpaceWidth}px`;
           }
+          if (isScrollXBig && mouseOpts.area) {
+            errLog('vxe.error.notProp', ['mouse-config.area']);
+          }
           (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)(() => {
             updateStyle();
           });
@@ -21295,6 +21310,7 @@ const maxXWidth = 5e6;
         const {
           startIndex
         } = scrollYStore;
+        const mouseOpts = computeMouseOpts.value;
         const expandOpts = computeExpandOpts.value;
         const rowOpts = computeRowOpts.value;
         const cellOpts = computeCellOpts.value;
@@ -21375,6 +21391,9 @@ const maxXWidth = 5e6;
         reactData.scrollYTop = scrollYTop;
         reactData.scrollYHeight = scrollYHeight;
         reactData.isScrollYBig = isScrollYBig;
+        if (isScrollYBig && mouseOpts.area) {
+          errLog('vxe.error.notProp', ['mouse-config.area']);
+        }
         return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
           updateStyle();
         });
@@ -23176,7 +23195,7 @@ menu_hook_hooks.add('tableMenuModule', {
           }
           ctxMenuStore[property] = selectItem || menuList[0];
         } else if (ctxMenuStore[property] && (hook_globalEvents.hasKey(evnt, hook_GLOBAL_EVENT_KEYS.ENTER) || hook_globalEvents.hasKey(evnt, hook_GLOBAL_EVENT_KEYS.SPACEBAR))) {
-          menuPrivateMethods.ctxMenuLinkEvent(evnt, ctxMenuStore[property]);
+          $xeTable.ctxMenuLinkEvent(evnt, ctxMenuStore[property]);
         }
       },
       handleOpenMenuEvent,