vxe-table 4.12.2 → 4.12.3

package/lib/table/src/table.js

@@ -2196,11 +2196,11 @@ var _default = exports.default = (0, _vue.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) {
@@ -2211,7 +2211,7 @@ var _default = exports.default = (0, _vue.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) {
@@ -2222,7 +2222,7 @@ var _default = exports.default = (0, _vue.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) {
@@ -7079,13 +7079,14 @@ var _default = exports.default = (0, _vue.defineComponent)({
     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,
@@ -7103,6 +7104,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           const treeOpts = computeTreeOpts.value;
           const menuList = computeMenuList.value;
           const rowOpts = computeRowOpts.value;
+          const columnOpts = computeColumnOpts.value;
           const {
             selected,
             actived
@@ -7144,7 +7146,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
             if ($xeTable.closeMenu) {
               $xeTable.closeMenu();
             }
-            tableMethods.closeFilter();
+            $xeTable.closeFilter();
             if (keyboardConfig && keyboardOpts.isEsc) {
               // 如果是激活编辑状态，则取消编辑
               if (actived.row) {
@@ -7258,18 +7260,27 @@ var _default = exports.default = (0, _vue.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));
                 }
               }
             }
           } 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) {
@@ -7314,9 +7325,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
               if (keyboardOpts.isDel && (0, _utils.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
                 };
@@ -7343,12 +7354,12 @@ var _default = exports.default = (0, _vue.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 && (0, _utils.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 {
@@ -7364,9 +7375,9 @@ var _default = exports.default = (0, _vue.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
               };
@@ -10764,6 +10775,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
           elemStore,
           fullColumnIdData
         } = internalData;
+        const mouseOpts = computeMouseOpts.value;
         const tableBody = refTableBody.value;
         const tableBodyElem = tableBody ? tableBody.$el : null;
         if (tableBodyElem) {
@@ -10822,6 +10834,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
           if (scrollXSpaceEl) {
             scrollXSpaceEl.style.width = `${ySpaceWidth}px`;
           }
+          if (isScrollXBig && mouseOpts.area) {
+            (0, _log.errLog)('vxe.error.notProp', ['mouse-config.area']);
+          }
           (0, _vue.nextTick)(() => {
             updateStyle();
           });
@@ -10845,6 +10860,7 @@ var _default = exports.default = (0, _vue.defineComponent)({
         const {
           startIndex
         } = scrollYStore;
+        const mouseOpts = computeMouseOpts.value;
         const expandOpts = computeExpandOpts.value;
         const rowOpts = computeRowOpts.value;
         const cellOpts = computeCellOpts.value;
@@ -10925,6 +10941,9 @@ var _default = exports.default = (0, _vue.defineComponent)({
         reactData.scrollYTop = scrollYTop;
         reactData.scrollYHeight = scrollYHeight;
         reactData.isScrollYBig = isScrollYBig;
+        if (isScrollYBig && mouseOpts.area) {
+          (0, _log.errLog)('vxe.error.notProp', ['mouse-config.area']);
+        }
         return (0, _vue.nextTick)().then(() => {
           updateStyle();
         });