vxe-table 3.14.0-beta.21 → 3.14.0-beta.23

package/es/table/module/keyboard/mixin.js

@@ -95,6 +95,39 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
     }
     return rangeRows;
 }
+function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow) {
+    const internalData = $xeTable;
+    const { afterFullData, visibleColumn } = internalData;
+    const params = Object.assign({}, args);
+    const _rowIndex = $xeTable.getVTRowIndex(params.row);
+    const _columnIndex = $xeTable.getVTColumnIndex(params.column);
+    evnt.preventDefault();
+    if (isUpArrow && _rowIndex > 0) {
+        // 移动到上一行
+        params.rowIndex = _rowIndex - 1;
+        params.row = afterFullData[params.rowIndex];
+    }
+    else if (isDwArrow && _rowIndex < afterFullData.length - 1) {
+        // 移动到下一行
+        params.rowIndex = _rowIndex + 1;
+        params.row = afterFullData[params.rowIndex];
+    }
+    else if (isLeftArrow && _columnIndex) {
+        // 移动到左侧单元格
+        params.columnIndex = _columnIndex - 1;
+        params.column = visibleColumn[params.columnIndex];
+    }
+    else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
+        // 移动到右侧单元格
+        params.columnIndex = _columnIndex + 1;
+        params.column = visibleColumn[params.columnIndex];
+    }
+    $xeTable.scrollToRow(params.row, params.column).then(() => {
+        params.cell = $xeTable.getCellElement(params.row, params.column);
+        $xeTable.handleSelected(params, evnt);
+    });
+    return params;
+}
 export default {
     methods: {
         // 处理 Tab 键移动
@@ -262,38 +295,40 @@ export default {
             }
         },
         // 处理可编辑方向键移动
-        moveSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+        moveArrowSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
             const $xeTable = this;
-            const internalData = $xeTable;
-            const { afterFullData, visibleColumn } = internalData;
-            const params = Object.assign({}, args);
-            const _rowIndex = $xeTable.getVTRowIndex(params.row);
-            const _columnIndex = $xeTable.getVTColumnIndex(params.column);
-            evnt.preventDefault();
-            if (isUpArrow && _rowIndex > 0) {
-                // 移动到上一行
-                params.rowIndex = _rowIndex - 1;
-                params.row = afterFullData[params.rowIndex];
+            const props = $xeTable;
+            const { highlightCurrentRow, highlightCurrentColumn } = props;
+            const rowOpts = $xeTable.computeRowOpts;
+            const columnOpts = $xeTable.computeColumnOpts;
+            handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
+            // 当前行按键上下移动
+            if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
+                $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
             }
-            else if (isDwArrow && _rowIndex < afterFullData.length - 1) {
-                // 移动到下一行
-                params.rowIndex = _rowIndex + 1;
-                params.row = afterFullData[params.rowIndex];
+            // 当前行按键左右移动
+            if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+                $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
             }
-            else if (isLeftArrow && _columnIndex) {
-                // 移动到左侧单元格
-                params.columnIndex = _columnIndex - 1;
-                params.column = visibleColumn[params.columnIndex];
+        },
+        moveEnterSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+            const $xeTable = this;
+            const rowOpts = $xeTable.computeRowOpts;
+            const currentRowOpts = $xeTable.computeCurrentRowOpts;
+            const columnOpts = $xeTable.computeColumnOpts;
+            const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
+            const params = handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
+            if ((rowOpts.isCurrent && currentRowOpts.isFollowSelected)) {
+                $xeTable.triggerCurrentRowEvent(evnt, params);
             }
-            else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
-                // 移动到右侧单元格
-                params.columnIndex = _columnIndex + 1;
-                params.column = visibleColumn[params.columnIndex];
+            if (columnOpts.isCurrent && currentColumnOpts.isFollowSelected) {
+                $xeTable.triggerCurrentColumnEvent(evnt, params);
             }
-            $xeTable.scrollToRow(params.row, params.column).then(() => {
-                params.cell = $xeTable.getCellElement(params.row, params.column);
-                $xeTable.handleSelected(params, evnt);
-            });
+        },
+        // 处理可编辑方向键移动
+        moveSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+            const $xeTable = this;
+            handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
         },
         handleCellMousedownEvent(evnt, params) {
             const $xeTable = this;

package/es/table/src/methods.js

@@ -2485,7 +2485,7 @@ const Methods = {
      */
     getParentHeight() {
         const $xeTable = this;
-        const $xeGrid = $xeTable.$xeGrid;
+        const $xeGrid = $xeTable.xeGrid;
         const props = $xeTable;
         const { height } = props;
         const el = $xeTable.$refs.refElem;
@@ -3597,7 +3597,7 @@ const Methods = {
         const treeOpts = $xeTable.computeTreeOpts;
         const childrenField = treeOpts.children || treeOpts.childrenField;
         const { transform, rowField, parentField, mapChildrenField } = treeOpts;
-        const { remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
+        const { isEvery, remote: allRemoteFilter, filterMethod: allFilterMethod } = filterOpts;
         const { remote: allRemoteSort, sortMethod: allSortMethod, multiple: sortMultiple, chronological } = sortOpts;
         let tableData = [];
         let tableTree = [];
@@ -3656,7 +3656,7 @@ const Methods = {
                     // 筛选虚拟树
                     tableTree = XEUtils.searchTree(tableFullTreeData, handleFilter, {
                         original: true,
-                        isEvery: true,
+                        isEvery,
                         children: mapChildrenField,
                         mapChildren: childrenField
                     });
@@ -3672,7 +3672,7 @@ const Methods = {
                     // 还原虚拟树
                     tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                         original: true,
-                        isEvery: true,
+                        isEvery,
                         children: mapChildrenField,
                         mapChildren: childrenField
                     });
@@ -3735,7 +3735,7 @@ const Methods = {
                 // 还原虚拟树
                 tableTree = XEUtils.searchTree(tableFullTreeData, () => true, {
                     original: true,
-                    isEvery: true,
+                    isEvery,
                     children: treeOpts.mapChildrenField,
                     mapChildren: childrenField
                 });
@@ -5105,8 +5105,7 @@ const Methods = {
         if (this.isActivated) {
             this.preventEvent(evnt, 'event.keydown', null, () => {
                 const { afterFullData } = internalData;
-                const { filterStore, isCtxMenu, ctxMenuStore, editStore, editOpts, editConfig, mouseConfig, mouseOpts, keyboardConfig, keyboardOpts, treeConfig, treeOpts, highlightCurrentRow, highlightCurrentColumn, currentRow, bodyCtxMenu, rowOpts } = this;
-                const columnOpts = $xeTable.computeColumnOpts;
+                const { filterStore, isCtxMenu, ctxMenuStore, editStore, editOpts, editConfig, mouseConfig, mouseOpts, keyboardConfig, keyboardOpts, treeConfig, treeOpts, highlightCurrentRow, currentRow, bodyCtxMenu, rowOpts } = this;
                 const { selected, actived } = editStore;
                 const { keyCode } = evnt;
                 const hasBackspaceKey = keyCode === 8;
@@ -5200,7 +5199,7 @@ const Methods = {
                                     this.moveTabSelected(activeParams, hasShiftKey, evnt);
                                 }
                                 else {
-                                    this.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
+                                    this.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                                 }
                             }
                             else {
@@ -5234,7 +5233,7 @@ const Methods = {
                                                 return;
                                             }
                                         }
-                                        this.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
+                                        this.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                                         if (enterMethod) {
                                             enterMethod(etrParams);
                                         }
@@ -5260,15 +5259,7 @@ const Methods = {
                     if (!isEditStatus) {
                         // 如果按下了方向键
                         if (selected.row && selected.column) {
-                            $xeTable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-                        }
-                        // 当前行按键上下移动
-                        if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-                            $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
-                        }
-                        // 当前行按键左右移动
-                        if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
-                            $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
+                            $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
                         }
                     }
                 }

package/es/table/src/table.js

@@ -409,6 +409,9 @@ export default {
         },
         $xegrid: {
             default: null
+        },
+        xeGrid: {
+            default: null
         }
     },
     data() {
@@ -1606,7 +1609,7 @@ export default {
         const VxeUILoadingComponent = VxeUI.getComponent('VxeLoading');
         const VxeUITooltipComponent = VxeUI.getComponent('VxeTooltip');
         const $xeTable = this;
-        const $xeGrid = $xeTable.$xeGrid;
+        const $xeGrid = $xeTable.xeGrid;
         const props = $xeTable;
         const slots = $xeTable.$scopedSlots;
         const reactData = $xeTable;

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.14.0-beta.21";
+export const version = "3.14.0-beta.23";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({
@@ -124,6 +124,7 @@ VxeUI.setConfig({
             // remote: false,
             // filterMethod: null,
             // destroyOnClose: false,
+            isEvery: true,
             showIcon: true
         },
         treeConfig: {

package/es/ui/src/log.js

@@ -1,5 +1,5 @@
 import { VxeUI } from '@vxe-ui/core';
 const { log } = VxeUI;
-const version = `table v${"3.14.0-beta.21"}`;
+const version = `table v${"3.14.0-beta.23"}`;
 export const warnLog = log.create('warn', version);
 export const errLog = log.create('error', version);

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.14.0-beta.21";
+const version = "3.14.0-beta.23";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2344,6 +2344,7 @@ core_.VxeUI.setConfig({
       // remote: false,
       // filterMethod: null,
       // destroyOnClose: false,
+      isEvery: true,
       showIcon: true
     },
     treeConfig: {
@@ -2843,7 +2844,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.14.0-beta.21"}`;
+const log_version = `table v${"3.14.0-beta.23"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8040,7 +8041,7 @@ const Methods = {
    */
   getParentHeight() {
     const $xeTable = this;
-    const $xeGrid = $xeTable.$xeGrid;
+    const $xeGrid = $xeTable.xeGrid;
     const props = $xeTable;
     const {
       height
@@ -9335,6 +9336,7 @@ const Methods = {
       mapChildrenField
     } = treeOpts;
     const {
+      isEvery,
       remote: allRemoteFilter,
       filterMethod: allFilterMethod
     } = filterOpts;
@@ -9447,7 +9449,7 @@ const Methods = {
           // 筛选虚拟树
           tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
             original: true,
-            isEvery: true,
+            isEvery,
             children: mapChildrenField,
             mapChildren: childrenField
           });
@@ -9461,7 +9463,7 @@ const Methods = {
           // 还原虚拟树
           tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
             original: true,
-            isEvery: true,
+            isEvery,
             children: mapChildrenField,
             mapChildren: childrenField
           });
@@ -9538,7 +9540,7 @@ const Methods = {
         // 还原虚拟树
         tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
           original: true,
-          isEvery: true,
+          isEvery,
           children: treeOpts.mapChildrenField,
           mapChildren: childrenField
         });
@@ -11091,12 +11093,10 @@ const Methods = {
           treeConfig,
           treeOpts,
           highlightCurrentRow,
-          highlightCurrentColumn,
           currentRow,
           bodyCtxMenu,
           rowOpts
         } = this;
-        const columnOpts = $xeTable.computeColumnOpts;
         const {
           selected,
           actived
@@ -11190,7 +11190,7 @@ const Methods = {
                 if (keyboardOpts.enterToTab) {
                   this.moveTabSelected(activeParams, hasShiftKey, evnt);
                 } else {
-                  this.moveSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
+                  this.moveEnterSelected(activeParams, isLeftArrow, true, isRightArrow, false, evnt);
                 }
               } else {
                 if (keyboardOpts.enterToTab) {
@@ -11227,7 +11227,7 @@ const Methods = {
                         return;
                       }
                     }
-                    this.moveSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
+                    this.moveEnterSelected(activeParams, isLeftArrow, false, isRightArrow, true, evnt);
                     if (enterMethod) {
                       enterMethod(etrParams);
                     }
@@ -11252,15 +11252,7 @@ const Methods = {
           if (!isEditStatus) {
             // 如果按下了方向键
             if (selected.row && selected.column) {
-              $xeTable.moveSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
-            }
-            // 当前行按键上下移动
-            if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
-              $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
-            }
-            // 当前行按键左右移动
-            if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
-              $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
+              $xeTable.moveArrowSelected(selected.args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt);
             }
           }
         } else if (isTab && keyboardConfig && keyboardOpts.isTab) {
@@ -23579,7 +23571,7 @@ function handleExportAndPrint($xeTable, options, isPrint) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
-  const $xeGrid = $xeTable.$xeGrid;
+  const $xeGrid = $xeTable.xeGrid;
   const {
     treeConfig,
     showHeader,
@@ -24410,6 +24402,39 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
   }
   return rangeRows;
 }
+function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow) {
+  const internalData = $xeTable;
+  const {
+    afterFullData,
+    visibleColumn
+  } = internalData;
+  const params = Object.assign({}, args);
+  const _rowIndex = $xeTable.getVTRowIndex(params.row);
+  const _columnIndex = $xeTable.getVTColumnIndex(params.column);
+  evnt.preventDefault();
+  if (isUpArrow && _rowIndex > 0) {
+    // 移动到上一行
+    params.rowIndex = _rowIndex - 1;
+    params.row = afterFullData[params.rowIndex];
+  } else if (isDwArrow && _rowIndex < afterFullData.length - 1) {
+    // 移动到下一行
+    params.rowIndex = _rowIndex + 1;
+    params.row = afterFullData[params.rowIndex];
+  } else if (isLeftArrow && _columnIndex) {
+    // 移动到左侧单元格
+    params.columnIndex = _columnIndex - 1;
+    params.column = visibleColumn[params.columnIndex];
+  } else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
+    // 移动到右侧单元格
+    params.columnIndex = _columnIndex + 1;
+    params.column = visibleColumn[params.columnIndex];
+  }
+  $xeTable.scrollToRow(params.row, params.column).then(() => {
+    params.cell = $xeTable.getCellElement(params.row, params.column);
+    $xeTable.handleSelected(params, evnt);
+  });
+  return params;
+}
 /* harmony default export */ var keyboard_mixin = ({
   methods: {
     // 处理 Tab 键移动
@@ -24581,38 +24606,43 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
       }
     },
     // 处理可编辑方向键移动
-    moveSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+    moveArrowSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
       const $xeTable = this;
-      const internalData = $xeTable;
+      const props = $xeTable;
       const {
-        afterFullData,
-        visibleColumn
-      } = internalData;
-      const params = Object.assign({}, args);
-      const _rowIndex = $xeTable.getVTRowIndex(params.row);
-      const _columnIndex = $xeTable.getVTColumnIndex(params.column);
-      evnt.preventDefault();
-      if (isUpArrow && _rowIndex > 0) {
-        // 移动到上一行
-        params.rowIndex = _rowIndex - 1;
-        params.row = afterFullData[params.rowIndex];
-      } else if (isDwArrow && _rowIndex < afterFullData.length - 1) {
-        // 移动到下一行
-        params.rowIndex = _rowIndex + 1;
-        params.row = afterFullData[params.rowIndex];
-      } else if (isLeftArrow && _columnIndex) {
-        // 移动到左侧单元格
-        params.columnIndex = _columnIndex - 1;
-        params.column = visibleColumn[params.columnIndex];
-      } else if (isRightArrow && _columnIndex < visibleColumn.length - 1) {
-        // 移动到右侧单元格
-        params.columnIndex = _columnIndex + 1;
-        params.column = visibleColumn[params.columnIndex];
-      }
-      $xeTable.scrollToRow(params.row, params.column).then(() => {
-        params.cell = $xeTable.getCellElement(params.row, params.column);
-        $xeTable.handleSelected(params, evnt);
-      });
+        highlightCurrentRow,
+        highlightCurrentColumn
+      } = props;
+      const rowOpts = $xeTable.computeRowOpts;
+      const columnOpts = $xeTable.computeColumnOpts;
+      handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
+      // 当前行按键上下移动
+      if ((isUpArrow || isDwArrow) && (rowOpts.isCurrent || highlightCurrentRow)) {
+        $xeTable.moveCurrentRow(isUpArrow, isDwArrow, evnt);
+      }
+      // 当前行按键左右移动
+      if ((isLeftArrow || isRightArrow) && (columnOpts.isCurrent || highlightCurrentColumn)) {
+        $xeTable.moveCurrentColumn(isLeftArrow, isRightArrow, evnt);
+      }
+    },
+    moveEnterSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+      const $xeTable = this;
+      const rowOpts = $xeTable.computeRowOpts;
+      const currentRowOpts = $xeTable.computeCurrentRowOpts;
+      const columnOpts = $xeTable.computeColumnOpts;
+      const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
+      const params = handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
+      if (rowOpts.isCurrent && currentRowOpts.isFollowSelected) {
+        $xeTable.triggerCurrentRowEvent(evnt, params);
+      }
+      if (columnOpts.isCurrent && currentColumnOpts.isFollowSelected) {
+        $xeTable.triggerCurrentColumnEvent(evnt, params);
+      }
+    },
+    // 处理可编辑方向键移动
+    moveSelected(args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow, evnt) {
+      const $xeTable = this;
+      handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRightArrow, isDwArrow);
     },
     handleCellMousedownEvent(evnt, params) {
       const $xeTable = this;
@@ -26185,6 +26215,9 @@ function renderBody(h, $xeTable) {
     },
     $xegrid: {
       default: null
+    },
+    xeGrid: {
+      default: null
     }
   },
   data() {
@@ -27465,7 +27498,7 @@ function renderBody(h, $xeTable) {
     const VxeUILoadingComponent = core_.VxeUI.getComponent('VxeLoading');
     const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
     const $xeTable = this;
-    const $xeGrid = $xeTable.$xeGrid;
+    const $xeGrid = $xeTable.xeGrid;
     const props = $xeTable;
     const slots = $xeTable.$scopedSlots;
     const reactData = $xeTable;