vxe-table 3.9.7 → 3.9.8

package/lib/index.umd.js

@@ -2220,9 +2220,9 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.9.7";
+const version = "3.9.8";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "3.9.7";
+core_.VxeUI.tableVersion = "3.9.8";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2764,7 +2764,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.9.7"}`;
+const log_version = `table v${"3.9.8"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3334,30 +3334,44 @@ function rowToVisible($xetable, row) {
   }
   return Promise.resolve();
 }
-function colToVisible($xetable, column) {
+function colToVisible($xeTable, column) {
+  const {
+    columnStore,
+    scrollXLoad,
+    visibleColumn
+  } = $xeTable;
   const {
     tableBody
-  } = $xetable.$refs;
+  } = $xeTable.$refs;
+  const {
+    leftList,
+    rightList
+  } = columnStore;
   const bodyElem = tableBody ? tableBody.$el : null;
+  let offsetFixedLeft = 0;
+  leftList.forEach(item => {
+    offsetFixedLeft += item.renderWidth;
+  });
+  let offsetFixedRight = 0;
+  rightList.forEach(item => {
+    offsetFixedRight += item.renderWidth;
+  });
   if (bodyElem) {
+    const bodyWidth = bodyElem.clientWidth;
+    const bodySrcollLeft = bodyElem.scrollLeft;
     const tdElem = bodyElem.querySelector(`.${column.id}`);
     if (tdElem) {
-      const bodyWidth = bodyElem.clientWidth;
-      const bodySrcollLeft = bodyElem.scrollLeft;
       const tdOffsetLeft = tdElem.offsetLeft + (tdElem.offsetParent ? tdElem.offsetParent.offsetLeft : 0);
       const tdWidth = tdElem.clientWidth;
       // 检测行是否在可视区中
-      if (tdOffsetLeft < bodySrcollLeft || tdOffsetLeft > bodySrcollLeft + bodyWidth) {
-        // 向左定位
-        return $xetable.scrollTo(tdOffsetLeft);
-      } else if (tdOffsetLeft + tdWidth >= bodyWidth + bodySrcollLeft) {
-        // 向右定位
-        return $xetable.scrollTo(bodySrcollLeft + tdWidth);
+      if (tdOffsetLeft < bodySrcollLeft + offsetFixedLeft) {
+        return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - 1);
+      } else if (tdOffsetLeft + tdWidth >= bodyWidth + bodySrcollLeft - offsetFixedRight) {
+        return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - offsetFixedRight + 1);
       }
     } else {
-      // 如果是虚拟渲染跨行滚动
-      if ($xetable.scrollXLoad) {
-        const visibleColumn = $xetable.visibleColumn;
+      // 检测是否在虚拟渲染可视区中
+      if (scrollXLoad) {
         let scrollLeft = 0;
         for (let index = 0; index < visibleColumn.length; index++) {
           if (visibleColumn[index] === column) {
@@ -3365,7 +3379,10 @@ function colToVisible($xetable, column) {
           }
           scrollLeft += visibleColumn[index].renderWidth;
         }
-        return $xetable.scrollTo(scrollLeft);
+        if (scrollLeft < bodySrcollLeft) {
+          return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - 1);
+        }
+        return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - offsetFixedRight + 1);
       }
     }
   }
@@ -4802,7 +4819,7 @@ function computeVirtualY(_vm) {
     visibleSize: 8
   };
 }
-function calculateMergerOffserIndex(list, offsetItem, type) {
+function calculateMergerOffsetIndex(list, offsetItem, type) {
   for (let mcIndex = 0, len = list.length; mcIndex < len; mcIndex++) {
     const mergeItem = list[mcIndex];
     const {
@@ -6279,6 +6296,7 @@ const Methods = {
       afterTreeFullData,
       afterFullData
     } = this;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
     if (treeConfig && treeOpts.transform) {
       const fullData = [];
       const expandMaps = {};
@@ -6290,7 +6308,7 @@ const Methods = {
           fullData.push(row);
         }
       }, {
-        children: treeOpts.mapChildrenField
+        children: childrenField
       });
       this.afterFullData = fullData;
       this.updateScrollYStatus(fullData);
@@ -6325,6 +6343,7 @@ const Methods = {
     const {
       transform
     } = treeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
     let tableData = [];
     let tableTree = [];
     const filterColumns = [];
@@ -6427,8 +6446,10 @@ const Methods = {
       if (treeConfig && transform) {
         // 筛选虚拟树
         tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, handleFilter, {
-          ...treeOpts,
-          original: true
+          original: true,
+          isEvery: true,
+          children: treeOpts.mapChildrenField,
+          mapChildren: childrenField
         });
         tableData = tableTree;
       } else {
@@ -6439,8 +6460,10 @@ const Methods = {
       if (treeConfig && transform) {
         // 还原虚拟树
         tableTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().searchTree(tableFullTreeData, () => true, {
-          ...treeOpts,
-          original: true
+          original: true,
+          isEvery: true,
+          children: treeOpts.mapChildrenField,
+          mapChildren: childrenField
         });
         tableData = tableTree;
       } else {
@@ -10940,7 +10963,7 @@ const Methods = {
       startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
       endIndex: toVisibleIndex + visibleSize + offsetSize
     };
-    calculateMergerOffserIndex(mergeList.concat(mergeFooterList), offsetItem, 'col');
+    calculateMergerOffsetIndex(mergeList.concat(mergeFooterList), offsetItem, 'col');
     const {
       startIndex: offsetStartIndex,
       endIndex: offsetEndIndex
@@ -11001,7 +11024,7 @@ const Methods = {
       startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
       endIndex: toVisibleIndex + visibleSize + offsetSize
     };
-    calculateMergerOffserIndex(mergeList, offsetItem, 'row');
+    calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
     const {
       startIndex: offsetStartIndex,
       endIndex: offsetEndIndex