vxe-table 4.7.62 → 4.7.64

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.62";
+const version = "4.7.64";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.62";
+core_.VxeUI.tableVersion = "4.7.64";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2332,7 +2332,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.62"}`;
+const log_version = `table v${"4.7.64"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -3109,7 +3109,7 @@ function rowToVisible($xeTable, row) {
     } else {
       // 如果是虚拟渲染跨行滚动
       if (scrollYLoad) {
-        return $xeTable.scrollTo(null, (afterFullData.indexOf(row) - 1) * scrollYStore.rowHeight);
+        return $xeTable.scrollTo(null, ($xeTable.findRowIndexOf(afterFullData, row) - 1) * scrollYStore.rowHeight);
       }
     }
   }
@@ -3152,10 +3152,11 @@ function colToVisible($xeTable, column) {
       if (scrollXLoad) {
         let scrollLeft = 0;
         for (let index = 0; index < visibleColumn.length; index++) {
-          if (visibleColumn[index] === column) {
+          const currCol = visibleColumn[index];
+          if (currCol === column || currCol.id === column.id) {
             break;
           }
-          scrollLeft += visibleColumn[index].renderWidth;
+          scrollLeft += currCol.renderWidth;
         }
         return $xeTable.scrollTo(scrollLeft);
       }
@@ -8344,6 +8345,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         resizeList: [],
         pxList: [],
         pxMinList: [],
+        autoMinList: [],
         scaleList: [],
         scaleMinList: [],
         autoList: [],
@@ -8711,7 +8713,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const {
         visibleColumn
       } = internalData;
-      return visibleColumn.filter(column => column.width === 'auto');
+      const {
+        tableColumn
+      } = reactData;
+      return tableColumn.length || visibleColumn.length ? visibleColumn.filter(column => column.width === 'auto' || column.minWidth === 'auto') : [];
     });
     const computeFixedColumnSize = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
@@ -9349,11 +9354,11 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               const cellStyle = getComputedStyle(firstCellEl);
               paddingSize = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingLeft) + external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(cellStyle.paddingRight)) + 2;
             }
-            let colWidth = column.renderAutoWidth - paddingSize + 2;
+            let colWidth = column.renderAutoWidth - paddingSize;
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().arrayEach(cellElList, cellEl => {
               const labelEl = cellEl.firstChild;
               if (labelEl) {
-                colWidth = Math.max(colWidth, labelEl.offsetWidth);
+                colWidth = Math.max(colWidth, Math.ceil(labelEl.offsetWidth) + 4);
               }
             });
             column.renderAutoWidth = colWidth + paddingSize;
@@ -9393,6 +9398,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const {
         resizeList,
         pxMinList,
+        autoMinList,
         pxList,
         scaleList,
         scaleMinList,
@@ -9405,6 +9411,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableWidth += minWidth;
         column.renderWidth = minWidth;
       });
+      // 最小自适应
+      autoMinList.forEach(column => {
+        const scaleWidth = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
+        tableWidth += scaleWidth;
+        column.renderWidth = scaleWidth;
+      });
       // 最小百分比
       scaleMinList.forEach(column => {
         const scaleWidth = Math.floor(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.minWidth) * meanWidth);
@@ -9436,10 +9448,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         column.renderWidth = width;
       });
       remainWidth -= tableWidth;
-      meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + remainList.length)) : 0;
+      meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + autoMinList.length + remainList.length)) : 0;
       if (fit) {
         if (remainWidth > 0) {
-          scaleMinList.concat(pxMinList).forEach(column => {
+          scaleMinList.concat(pxMinList).concat(autoMinList).forEach(column => {
             tableWidth += meanWidth;
             column.renderWidth += meanWidth;
           });
@@ -9458,7 +9470,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
          * 偏移量算法
          * 如果所有列足够放的情况下，从最后动态列开始分配
          */
-        const dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(remainList);
+        const dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoMinList).concat(remainList);
         let dynamicSize = dynamicList.length - 1;
         if (dynamicSize > 0) {
           let odiffer = bodyWidth - tableWidth;
@@ -14509,6 +14521,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const resizeList = [];
         const pxList = [];
         const pxMinList = [];
+        const autoMinList = [];
         const scaleList = [];
         const scaleMinList = [];
         const autoList = [];
@@ -14531,6 +14544,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
               scaleList.push(column);
             } else if (isPx(column.minWidth)) {
               pxMinList.push(column);
+            } else if (column.minWidth === 'auto') {
+              autoMinList.push(column);
             } else if (isScale(column.minWidth)) {
               scaleMinList.push(column);
             } else {
@@ -14542,6 +14557,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           resizeList,
           pxList,
           pxMinList,
+          autoMinList,
           scaleList,
           scaleMinList,
           autoList,