vxe-table 4.7.48 → 4.7.49

package/lib/index.umd.js

@@ -1951,9 +1951,9 @@ function eqEmptyValue(cellValue) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "4.7.48";
+const version = "4.7.49";
 core_.VxeUI.version = version;
-core_.VxeUI.tableVersion = "4.7.48";
+core_.VxeUI.tableVersion = "4.7.49";
 core_.VxeUI.setConfig({
   emptyCell: '　',
   table: {
@@ -2331,7 +2331,7 @@ var es_array_push = __webpack_require__(4114);
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"4.7.48"}`;
+const log_version = `table v${"4.7.49"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -2469,6 +2469,7 @@ class ColumnInfo {
       renderWidth: 0,
       renderHeight: 0,
       renderResizeWidth: 0,
+      renderAutoWidth: 0,
       resizeWidth: 0,
       renderLeft: 0,
       renderArgs: [],
@@ -3466,7 +3467,8 @@ const Cell = {
       isHidden
     } = params;
     const {
-      reactData
+      reactData,
+      internalData
     } = $table;
     const {
       computeTreeOpts
@@ -3475,6 +3477,9 @@ const Cell = {
       treeExpandedMaps,
       treeExpandLazyLoadedMaps
     } = reactData;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
     const treeOpts = computeTreeOpts.value;
     const {
       row,
@@ -3496,9 +3501,11 @@ const Cell = {
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField;
     const rowChilds = row[childrenField];
+    const hasChild = rowChilds && rowChilds.length;
     const iconSlot = slots ? slots.icon : null;
     let hasLazyChilds = false;
     let isAceived = false;
+    let isLazyLoading = false;
     let isLazyLoaded = false;
     const ons = {};
     if (iconSlot) {
@@ -3508,8 +3515,10 @@ const Cell = {
       const rowid = getRowid($table, row);
       isAceived = !!treeExpandedMaps[rowid];
       if (lazy) {
-        isLazyLoaded = !!treeExpandLazyLoadedMaps[rowid];
+        const rest = fullAllDataRowIdData[rowid];
+        isLazyLoading = !!treeExpandLazyLoadedMaps[rowid];
         hasLazyChilds = row[hasChildField];
+        isLazyLoaded = !!rest.treeLoaded;
       }
     }
     if (!trigger || trigger === 'default') {
@@ -3524,11 +3533,11 @@ const Cell = {
       style: {
         paddingLeft: `${level * indent}px`
       }
-    }, [showIcon && (rowChilds && rowChilds.length || hasLazyChilds) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
+    }, [showIcon && (lazy ? isLazyLoaded ? hasChild : hasLazyChilds : hasChild) ? [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
       class: 'vxe-tree--btn-wrapper',
       ...ons
     }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-tree--node-btn', isLazyLoaded ? iconLoaded || cell_getIcon().TABLE_TREE_LOADED : isAceived ? iconOpen || cell_getIcon().TABLE_TREE_OPEN : iconClose || cell_getIcon().TABLE_TREE_CLOSE]
+      class: ['vxe-tree--node-btn', isLazyLoading ? iconLoaded || cell_getIcon().TABLE_TREE_LOADED : isAceived ? iconOpen || cell_getIcon().TABLE_TREE_OPEN : iconClose || cell_getIcon().TABLE_TREE_CLOSE]
     })])] : null, (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('div', {
       class: 'vxe-tree-cell'
     }, cellVNodes)])];
@@ -3962,7 +3971,7 @@ const Cell = {
     const defaultSlot = slots ? slots.default : null;
     const iconSlot = slots ? slots.icon : null;
     let isAceived = false;
-    let isLazyLoaded = false;
+    let isLazyLoading = false;
     if (iconSlot) {
       return $table.callSlot(iconSlot, params);
     }
@@ -3970,7 +3979,7 @@ const Cell = {
       const rowid = getRowid($table, row);
       isAceived = !!rowExpandedMaps[rowid];
       if (lazy) {
-        isLazyLoaded = !!rowExpandLazyLoadedMaps[rowid];
+        isLazyLoading = !!rowExpandLazyLoadedMaps[rowid];
       }
     }
     return [showIcon && (!visibleMethod || visibleMethod(params)) ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
@@ -3981,7 +3990,7 @@ const Cell = {
         $table.triggerRowExpandEvent(evnt, params);
       }
     }, [(0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('i', {
-      class: ['vxe-table--expand-btn', isLazyLoaded ? iconLoaded || cell_getIcon().TABLE_EXPAND_LOADED : isAceived ? iconOpen || cell_getIcon().TABLE_EXPAND_OPEN : iconClose || cell_getIcon().TABLE_EXPAND_CLOSE]
+      class: ['vxe-table--expand-btn', isLazyLoading ? iconLoaded || cell_getIcon().TABLE_EXPAND_LOADED : isAceived ? iconOpen || cell_getIcon().TABLE_EXPAND_OPEN : iconClose || cell_getIcon().TABLE_EXPAND_CLOSE]
     })]) : null, defaultSlot || labelField ? (0,external_commonjs_vue_commonjs2_vue_root_Vue_.h)('span', {
       class: 'vxe-table--expand-label'
     }, defaultSlot ? $table.callSlot(defaultSlot, params) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, labelField)) : null];
@@ -8215,6 +8224,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       computeSize
     } = useFns.useSize(props);
     const reactData = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)({
+      isCalcColumn: false,
       // 低性能的静态列
       staticColumns: [],
       // 渲染的列分组
@@ -8327,7 +8337,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         pxMinList: [],
         scaleList: [],
         scaleMinList: [],
-        autoList: []
+        autoList: [],
+        remainList: []
       },
       // 存放快捷菜单的信息
       ctxMenuStore: {
@@ -8672,6 +8683,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     const computeCustomOpts = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       return Object.assign({}, table_getConfig().table.customConfig, props.customConfig);
     });
+    const computeAutoWidthColumnList = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
+      const {
+        visibleColumn
+      } = internalData;
+      return visibleColumn.filter(column => column.width === 'auto');
+    });
     const computeFixedColumnSize = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.computed)(() => {
       const {
         collectColumn
@@ -9063,7 +9080,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       const val = props[key];
       let num = 0;
       if (val) {
-        if (val === 'auto') {
+        if (val === 'fill' || val === 'auto') {
           num = parentHeight;
         } else {
           const excludeHeight = $xeTable.getExcludeHeight();
@@ -9286,6 +9303,41 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       internalData.customMinHeight = calcHeight('minHeight');
       internalData.customMaxHeight = calcHeight('maxHeight');
     };
+    const calcCellWidth = () => {
+      const {
+        tableData
+      } = reactData;
+      const autoWidthColumnList = computeAutoWidthColumnList.value;
+      if (!tableData.length || !autoWidthColumnList.length) {
+        reactData.isCalcColumn = false;
+        return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)();
+      }
+      reactData.isCalcColumn = true;
+      return (0,external_commonjs_vue_commonjs2_vue_root_Vue_.nextTick)().then(() => {
+        const el = refElem.value;
+        if (el) {
+          autoWidthColumnList.forEach(column => {
+            const cellElList = el.querySelectorAll(`.vxe-body--column.${column.id}>.vxe-cell`);
+            const firstCellEl = cellElList[0];
+            let paddingSize = 0;
+            if (firstCellEl) {
+              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;
+            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);
+              }
+            });
+            column.renderAutoWidth = colWidth + paddingSize;
+          });
+          tablePrivateMethods.analyColumnWidth();
+        }
+        reactData.isCalcColumn = false;
+      });
+    };
     /**
      * 列宽算法
      * 支持 px、%、固定 混合分配
@@ -9319,7 +9371,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         pxList,
         scaleList,
         scaleMinList,
-        autoList
+        autoList,
+        remainList
       } = columnStore;
       // 最小宽
       pxMinList.forEach(column => {
@@ -9345,6 +9398,12 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         tableWidth += width;
         column.renderWidth = width;
       });
+      // 自适应宽
+      autoList.forEach(column => {
+        const width = Math.max(60, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.renderAutoWidth));
+        tableWidth += width;
+        column.renderWidth = width;
+      });
       // 调整了列宽
       resizeList.forEach(column => {
         const width = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toInteger(column.resizeWidth);
@@ -9352,7 +9411,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         column.renderWidth = width;
       });
       remainWidth -= tableWidth;
-      meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + autoList.length)) : 0;
+      meanWidth = remainWidth > 0 ? Math.floor(remainWidth / (scaleMinList.length + pxMinList.length + remainList.length)) : 0;
       if (fit) {
         if (remainWidth > 0) {
           scaleMinList.concat(pxMinList).forEach(column => {
@@ -9363,8 +9422,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
       } else {
         meanWidth = minCellWidth;
       }
-      // 自适应
-      autoList.forEach(column => {
+      // 剩余均分
+      remainList.forEach(column => {
         const width = Math.max(meanWidth, minCellWidth);
         column.renderWidth = width;
         tableWidth += width;
@@ -9374,7 +9433,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
          * 偏移量算法
          * 如果所有列足够放的情况下，从最后动态列开始分配
          */
-        const dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(autoList);
+        const dynamicList = scaleList.concat(scaleMinList).concat(pxMinList).concat(remainList);
         let dynamicSize = dynamicList.length - 1;
         if (dynamicSize > 0) {
           let odiffer = bodyWidth - tableWidth;
@@ -10490,10 +10549,10 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           const rowid = getRowid($xeTable, row);
           const rest = fullAllDataRowIdData[rowid];
           treeExpandLazyLoadedMaps[rowid] = row;
-          loadMethod({
+          Promise.resolve(loadMethod({
             $table: $xeTable,
             row
-          }).then(childRecords => {
+          })).then(childRecords => {
             rest.treeLoaded = true;
             if (treeExpandLazyLoadedMaps[rowid]) {
               delete treeExpandLazyLoadedMaps[rowid];
@@ -12162,6 +12221,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
        * 支持 width=? width=?px width=?% min-width=? min-width=?px min-width=?%
        */
       recalculate(refull) {
+        calcCellWidth();
         autoCellWidth();
         if (refull === true) {
           // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
@@ -14152,7 +14212,6 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
     /**
      * 处理显示 tooltip
      * @param {Event} evnt 事件
-     * @param {ColumnInfo} column 列配置
      * @param {Row} row 行对象
      */
     const handleTooltip = (evnt, cell, overflowElem, tipElem, params) => {
@@ -14229,7 +14288,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const el = refElem.value;
         if (el) {
           const parentElem = el.parentNode;
-          const parentPaddingSize = height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
+          const parentPaddingSize = height === 'fill' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0;
           return Math.floor($xeGrid ? $xeGrid.getParentHeight() : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(getComputedStyle(parentElem).height) - parentPaddingSize);
         }
         return 0;
@@ -14431,6 +14490,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         const scaleList = [];
         const scaleMinList = [];
         const autoList = [];
+        const remainList = [];
         tableFullColumn.forEach(column => {
           if (defaultWidth && !column.width) {
             column.width = defaultWidth;
@@ -14441,6 +14501,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           if (column.visible) {
             if (column.resizeWidth) {
               resizeList.push(column);
+            } else if (column.width === 'auto') {
+              autoList.push(column);
             } else if (isPx(column.width)) {
               pxList.push(column);
             } else if (isScale(column.width)) {
@@ -14450,7 +14512,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
             } else if (isScale(column.minWidth)) {
               scaleMinList.push(column);
             } else {
-              autoList.push(column);
+              remainList.push(column);
             }
           }
         });
@@ -14460,7 +14522,8 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           pxMinList,
           scaleList,
           scaleMinList,
-          autoList
+          autoList,
+          remainList
         });
       },
       saveCustomStore(type) {
@@ -16108,6 +16171,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
         editRules
       } = props;
       const {
+        isCalcColumn,
         isGroup,
         overflowX,
         overflowY,
@@ -16155,6 +16219,7 @@ const customStorageKey = 'VXE_CUSTOM_STORE';
           'row--highlight': rowOpts.isHover || highlightHoverRow,
           'column--highlight': columnOpts.isHover || highlightHoverColumn,
           'checkbox--range': checkboxOpts.range,
+          'column--calc': isCalcColumn,
           'is--header': showHeader,
           'is--footer': showFooter,
           'is--group': isGroup,
@@ -22684,9 +22749,9 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
       const tableProps = Object.assign({}, tableExtendProps);
       if (isZMax) {
         if (tableExtendProps.maxHeight) {
-          tableProps.maxHeight = 'auto';
+          tableProps.maxHeight = 'fill';
         } else {
-          tableProps.height = 'auto';
+          tableProps.height = 'fill';
         }
       }
       if (proxyConfig && isEnableConf(proxyOpts)) {
@@ -23793,7 +23858,7 @@ const gridComponentEmits = [...emits, 'page-change', 'form-submit', 'form-submit
         const topWrapper = refTopWrapper.value;
         const bottomWrapper = refBottomWrapper.value;
         const pagerWrapper = refPagerWrapper.value;
-        const parentPaddingSize = isZMax || height !== 'auto' ? 0 : getPaddingTopBottomSize(el.parentNode);
+        const parentPaddingSize = isZMax || !(height === 'auto' || height === 'fill') ? 0 : getPaddingTopBottomSize(el.parentNode);
         return parentPaddingSize + getPaddingTopBottomSize(el) + getOffsetHeight(formWrapper) + getOffsetHeight(toolbarWrapper) + getOffsetHeight(topWrapper) + getOffsetHeight(bottomWrapper) + getOffsetHeight(pagerWrapper);
       },
       getParentHeight() {