vxe-table 4.7.87 → 4.7.90

package/es/ui/index.js

@@ -1,8 +1,8 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "4.7.87";
+export const version = "4.7.90";
 VxeUI.version = version;
-VxeUI.tableVersion = "4.7.87";
+VxeUI.tableVersion = "4.7.90";
 VxeUI.setConfig({
     emptyCell: '　',
     table: {

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -1998,9 +1998,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.87";
+const version = "4.7.90";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.87";
+core_.VxeUI.tableVersion = "4.7.90";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2384,7 +2384,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.87"}`;
+const log_version = `table v${"4.7.90"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3176,33 +3176,45 @@ function colToVisible($xeTable, column) {
     refTableBody
   } = $xeTable.getRefMaps();
   const {
+    columnStore,
     scrollXLoad
   } = reactData;
   const {
     visibleColumn
   } = internalData;
+  const {
+    leftList,
+    rightList
+  } = columnStore;
   const tableBody = refTableBody.value;
   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 tdOffsetParent = tdElem.offsetParent;
       const tdOffsetLeft = tdElem.offsetLeft + (tdOffsetParent ? tdOffsetParent.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);
+      const cellWidth = tdElem.clientWidth;
+      // 检测是否在可视区中
+      if (tdOffsetLeft < bodySrcollLeft + offsetFixedLeft) {
+        return $xeTable.scrollTo(tdOffsetLeft - offsetFixedLeft - 1);
+      } else if (tdOffsetLeft + cellWidth - bodySrcollLeft > bodyWidth - offsetFixedRight) {
+        return $xeTable.scrollTo(tdOffsetLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));
       }
     } else {
-      // 如果是虚拟渲染跨行滚动
+      // 检测是否在虚拟渲染可视区中
       if (scrollXLoad) {
         let scrollLeft = 0;
+        const cellWidth = column.renderWidth;
         for (let index = 0; index < visibleColumn.length; index++) {
           const currCol = visibleColumn[index];
           if (currCol === column || currCol.id === column.id) {
@@ -3210,7 +3222,10 @@ function colToVisible($xeTable, column) {
           }
           scrollLeft += currCol.renderWidth;
         }
-        return $xeTable.scrollTo(scrollLeft);
+        if (scrollLeft < bodySrcollLeft) {
+          return $xeTable.scrollTo(scrollLeft - offsetFixedLeft - 1);
+        }
+        return $xeTable.scrollTo(scrollLeft + cellWidth - (bodyWidth - offsetFixedRight - 1));
       }
     }
   }
@@ -9210,7 +9225,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         visibleSize: 8
       };
     };
-    const calculateMergerOffserIndex = (list, offsetItem, type) => {
+    const calculateMergerOffsetIndex = (list, offsetItem, type) => {
       for (let mcIndex = 0, len = list.length; mcIndex < len; mcIndex++) {
         const mergeItem = list[mcIndex];
         const {
@@ -9593,7 +9608,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 });
               } else {
                 const labelEl = cellEl.firstChild;
-                titleWidth = labelEl.offsetWidth;
+                if (labelEl) {
+                  titleWidth = labelEl.offsetWidth;
+                }
               }
               if (titleWidth) {
                 colWidth = Math.max(colWidth, Math.ceil(titleWidth) + 4);
@@ -9873,6 +9890,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         treeExpandedMaps
       } = reactData;
       const treeOpts = computeTreeOpts.value;
+      const childrenField = treeOpts.children || treeOpts.childrenField;
       if (treeConfig && treeOpts.transform) {
         const fullData = [];
         const expandMaps = {};
@@ -9884,7 +9902,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             fullData.push(row);
           }
         }, {
-          children: treeOpts.mapChildrenField
+          children: childrenField
         });
         internalData.afterFullData = fullData;
         updateScrollYStatus(fullData);
@@ -9908,6 +9926,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const filterOpts = computeFilterOpts.value;
       const sortOpts = computeSortOpts.value;
       const treeOpts = computeTreeOpts.value;
+      const childrenField = treeOpts.children || treeOpts.childrenField;
       const {
         transform
       } = treeOpts;
@@ -10023,8 +10042,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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 {
@@ -10035,8 +10056,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           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 {
@@ -10084,8 +10107,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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 {
@@ -11185,7 +11210,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         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
@@ -11521,7 +11546,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         startIndex: Math.max(0, toVisibleIndex - 1 - offsetSize),
         endIndex: toVisibleIndex + visibleSize + offsetSize
       };
-      calculateMergerOffserIndex(mergeList, offsetItem, 'row');
+      calculateMergerOffsetIndex(mergeList, offsetItem, 'row');
       const {
         startIndex: offsetStartIndex,
         endIndex: offsetEndIndex
@@ -14983,7 +15008,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const {
           selectCheckboxMaps
         } = reactData;
-        const selectRowMaps = Object.assign({}, selectCheckboxMaps);
         const checkboxOpts = computeCheckboxOpts.value;
         const {
           checkField,
@@ -15015,6 +15039,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               }, value, isForce);
             });
           } else {
+            const selectRowMaps = Object.assign({}, selectCheckboxMaps);
             rows.forEach(row => {
               const rowid = getRowid($xeTable, row);
               if (isForce || !checkMethod || checkMethod({
@@ -15032,9 +15057,9 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
                 handleCheckboxReserveRow(row, value);
               }
             });
+            reactData.selectCheckboxMaps = selectRowMaps;
           }
         }
-        reactData.selectCheckboxMaps = selectRowMaps;
       },
       /**
        * 单行
@@ -25430,7 +25455,7 @@ core_.VxeUI.setTheme('light');
 ;// CONCATENATED MODULE: ./index.ts
 
 
-if (typeof window !== 'undefined' && window.VXETable) {
+if (typeof window !== 'undefined' && window.Vue) {
   if (!window.VxeUITable) {
     window.VxeUITable = components_namespaceObject;
   }