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

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
                 });

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.22";
 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.22"}`;
 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.22";
 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.22"}`;
 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
         });
@@ -23579,7 +23581,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,
@@ -24588,6 +24590,10 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         afterFullData,
         visibleColumn
       } = internalData;
+      const rowOpts = $xeTable.computeRowOpts;
+      const currentRowOpts = $xeTable.computeCurrentRowOpts;
+      const columnOpts = $xeTable.computeColumnOpts;
+      const currentColumnOpts = $xeTable.computeCurrentColumnOpts;
       const params = Object.assign({}, args);
       const _rowIndex = $xeTable.getVTRowIndex(params.row);
       const _columnIndex = $xeTable.getVTColumnIndex(params.column);
@@ -24609,6 +24615,12 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         params.columnIndex = _columnIndex + 1;
         params.column = visibleColumn[params.columnIndex];
       }
+      if (rowOpts.isCurrent && currentRowOpts.isFollowSelected) {
+        $xeTable.triggerCurrentRowEvent(evnt, params);
+      }
+      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);
@@ -26185,6 +26197,9 @@ function renderBody(h, $xeTable) {
     },
     $xegrid: {
       default: null
+    },
+    xeGrid: {
+      default: null
     }
   },
   data() {
@@ -27465,7 +27480,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;