vxe-table 3.16.0-beta.3 → 3.16.0-beta.5

package/es/table/module/edit/mixin.js

@@ -86,11 +86,14 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         }
     });
 }
+// function insertGroupRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, newRecords: any[], isAppend: boolean) {
+// }
 function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     const props = $xeTable;
     const reactData = $xeTable;
     const internalData = $xeTable;
     const { treeConfig } = props;
+    const { isRowGroupStatus } = reactData;
     const { tableFullTreeData, afterFullData, mergeBodyList, tableFullData, fullDataRowIdData, fullAllDataRowIdData, insertRowMaps } = internalData;
     const treeOpts = $xeTable.computeTreeOpts;
     const { transform, rowField, mapChildrenField } = treeOpts;
@@ -104,6 +107,14 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
         if (treeConfig && transform) {
             insertTreeRow($xeTable, newRecords, false);
         }
+        else if (isRowGroupStatus) {
+            // 如果分组
+            if (treeConfig) {
+                throw new Error(getI18n('vxe.error.noTree', ['insert']));
+            }
+            warnLog(getI18n('vxe.error.noGroup', ['remove']));
+            // insertGroupRow($xeTable, newRecords, false)
+        }
         else {
             newRecords.forEach(item => {
                 const rowid = getRowid($xeTable, item);
@@ -128,6 +139,14 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             if (treeConfig && transform) {
                 insertTreeRow($xeTable, newRecords, true);
             }
+            else if (isRowGroupStatus) {
+                // 如果分组
+                if (treeConfig) {
+                    throw new Error(getI18n('vxe.error.noTree', ['insert']));
+                }
+                warnLog(getI18n('vxe.error.noGroup', ['remove']));
+                // insertGroupRow($xeTable, newRecords, true)
+            }
             else {
                 newRecords.forEach(item => {
                     const rowid = getRowid($xeTable, item);
@@ -192,6 +211,13 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
                     insertTreeRow($xeTable, newRecords, true);
                 }
             }
+            else if (isRowGroupStatus) {
+                // 如果分组
+                if (treeConfig) {
+                    throw new Error(getI18n('vxe.error.noTree', ['insert']));
+                }
+                warnLog(getI18n('vxe.error.noGroup', ['remove']));
+            }
             else {
                 if (treeConfig) {
                     throw new Error(getI18n('vxe.error.noTree', ['insert']));
@@ -489,7 +515,7 @@ export default {
             const reactData = $xeTable;
             const internalData = $xeTable;
             const { treeConfig } = props;
-            const { editStore } = reactData;
+            const { editStore, isRowGroupStatus } = reactData;
             const { tableFullTreeData, selectCheckboxMaps, afterFullData, mergeBodyList, tableFullData, pendingRowMaps, insertRowMaps, removeRowMaps } = internalData;
             const checkboxOpts = $xeTable.computeCheckboxOpts;
             const treeOpts = $xeTable.computeTreeOpts;
@@ -548,6 +574,10 @@ export default {
                         }
                     });
                 }
+                else if (isRowGroupStatus) {
+                    // 如果分组
+                    warnLog(getI18n('vxe.error.noGroup', ['remove']));
+                }
                 else {
                     rows.forEach((row) => {
                         const tfIndex = this.findRowIndexOf(tableFullData, row);

package/es/table/src/body.js

@@ -318,7 +318,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
                         colid,
                         rowid
                     },
-                    class: 'vxe-cell--wrapper'
+                    class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
                 }, column.renderCell(h, cellParams))
             ]));
         if (showValidTip && errorValidItem) {

package/es/table/src/footer.js

@@ -164,7 +164,7 @@ function renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData, row, $
                         attrs: {
                             colid
                         },
-                        class: 'vxe-cell--wrapper'
+                        class: 'vxe-cell--wrapper vxe-footer-cell--wrapper'
                     }, column.renderFooter(h, cellParams))
                 ]),
             /**

package/es/table/src/header.js

@@ -143,7 +143,7 @@ const renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) => {
                         attrs: {
                             colid
                         },
-                        class: 'vxe-cell--wrapper'
+                        class: 'vxe-cell--wrapper vxe-header-cell--wrapper'
                     }, column.renderHeader(h, cellParams))
                 ]),
             /**

package/es/table/src/methods.js

@@ -2634,7 +2634,7 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
         if (rceTimeout) {
             clearTimeout(rceTimeout);
             if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
-                resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
+                resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
             }
             else {
                 $xeTable.$nextTick(() => {
@@ -2643,11 +2643,11 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
             }
         }
         else {
-            resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
+            resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
         }
         internalData.rceTimeout = setTimeout(() => {
             internalData.rceTimeout = undefined;
-            handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight);
+            handleRecalculateStyle($xeTable, reFull, reWidth, reHeight);
         }, refreshDelay);
     });
 }
@@ -2935,9 +2935,8 @@ function loadTableData($xeTable, datas, isReset) {
             $xeTable.$nextTick()
                 .then(() => handleRecalculateStyle($xeTable, false, false, false))
                 .then(() => {
-                calcCellHeight($xeTable);
+                handleRecalculateStyle($xeTable, false, true, true);
                 updateRowOffsetTop($xeTable);
-                return handleRecalculateStyle($xeTable, false, false, false);
             })
                 .then(() => {
                 let targetScrollLeft = lastScrollLeft;
@@ -2957,7 +2956,7 @@ function loadTableData($xeTable, datas, isReset) {
                 if (oldScrollYLoad === sYLoad) {
                     restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
                         .then(() => {
-                        calcCellHeight($xeTable);
+                        handleRecalculateStyle($xeTable, false, true, true);
                         updateRowOffsetTop($xeTable);
                         resolve();
                     });
@@ -2966,7 +2965,7 @@ function loadTableData($xeTable, datas, isReset) {
                     setTimeout(() => {
                         restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop)
                             .then(() => {
-                            calcCellHeight($xeTable);
+                            handleRecalculateStyle($xeTable, false, true, true);
                             updateRowOffsetTop($xeTable);
                             resolve();
                         });
@@ -3228,7 +3227,7 @@ function handleColumn($xeTable, collectColumn) {
                 $xeTable.handleUpdateCustomColumn();
             }
             reactData.isColLoading = false;
-            return $xeTable.recalculate();
+            return handleLazyRecalculate($xeTable, false, true, true);
         });
     });
 }
@@ -3419,8 +3418,21 @@ function updateHeight($xeTable) {
         internalData.customHeight = 300;
     }
 }
-function calcColumnAutoWidth(column, wrapperEl) {
-    const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[colid="${column.id}"]`);
+function calcColumnAutoWidth($xeTable, column, wrapperEl) {
+    const columnOpts = $xeTable.computeColumnOpts;
+    const { autoOptions } = columnOpts;
+    const { isCalcHeader, isCalcBody, isCalcFooter } = autoOptions || {};
+    const querySelections = [];
+    if (isCalcHeader) {
+        querySelections.push(`.vxe-header-cell--wrapper[colid="${column.id}"]`);
+    }
+    if (isCalcBody) {
+        querySelections.push(`.vxe-body-cell--wrapper[colid="${column.id}"]`);
+    }
+    if (isCalcFooter) {
+        querySelections.push(`.vxe-footer-cell--wrapper[colid="${column.id}"]`);
+    }
+    const cellElemList = querySelections.length ? wrapperEl.querySelectorAll(querySelections.join(',')) : [];
     let leftRightPadding = 0;
     const firstCellEl = cellElemList[0];
     if (firstCellEl && firstCellEl.parentElement) {
@@ -3444,7 +3456,7 @@ function calcCellWidth($xeTable) {
         autoWidthColumnList.forEach(column => {
             const colid = column.id;
             const colRest = fullColumnIdData[colid];
-            const colWidth = calcColumnAutoWidth(column, el);
+            const colWidth = calcColumnAutoWidth($xeTable, column, el);
             if (colRest) {
                 colRest.width = Math.max(colWidth, colRest.width);
             }
@@ -5366,7 +5378,7 @@ const Methods = {
             const cellParams = Object.assign(params, { cell });
             const colMinWidth = getColReMinWidth(cellParams);
             el.setAttribute('data-calc-col', 'Y');
-            let resizeWidth = calcColumnAutoWidth(resizeColumn, el);
+            let resizeWidth = calcColumnAutoWidth($xeTable, resizeColumn, el);
             el.removeAttribute('data-calc-col');
             if (colRest) {
                 resizeWidth = Math.max(resizeWidth, colRest.width);

package/es/table/src/table.js

@@ -1772,24 +1772,24 @@ export default {
                     errLog('vxe.error.reqComp', ['vxe-tooltip']);
                 }
             }
+            if (this.autoResize) {
+                const resizeObserver = globalResize.create(() => {
+                    if (this.autoResize) {
+                        this.recalculate(true);
+                    }
+                });
+                resizeObserver.observe(this.$el);
+                resizeObserver.observe(this.getParentElem());
+                this.$resize = resizeObserver;
+            }
         });
-        if (this.autoResize) {
-            const resizeObserver = globalResize.create(() => {
-                if (this.autoResize) {
-                    this.recalculate(true);
-                }
-            });
-            resizeObserver.observe(this.$el);
-            resizeObserver.observe(this.getParentElem());
-            this.$resize = resizeObserver;
-        }
         if (virtualYOpts.mode !== 'scroll') {
             const tableViewportEl = $xeTable.$refs.refTableViewportElem;
             if (tableViewportEl) {
                 tableViewportEl.addEventListener('wheel', $xeTable.triggerBodyWheelEvent, { passive: false });
             }
         }
-        this.preventEvent(null, 'mounted');
+        $xeTable.preventEvent(null, 'mounted');
     },
     activated() {
         this.recalculate().then(() => this.refreshScroll());

package/es/ui/index.js

@@ -1,6 +1,6 @@
 import { VxeUI } from '@vxe-ui/core';
 import { getFuncText } from './src/utils';
-export const version = "3.16.0-beta.3";
+export const version = "3.16.0-beta.5";
 VxeUI.version = version;
 VxeUI.tableVersion = version;
 VxeUI.setConfig({

package/es/ui/src/log.js

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

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.16.0-beta.3";
+const version = "3.16.0-beta.5";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2667,7 +2667,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.16.0-beta.3"}`;
+const log_version = `table v${"3.16.0-beta.5"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -8369,18 +8369,18 @@ function handleLazyRecalculate($xeTable, reFull, reWidth, reHeight) {
     if (rceTimeout) {
       clearTimeout(rceTimeout);
       if (rceRunTime && rceRunTime + (refreshDelay - 5) < Date.now()) {
-        resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
+        resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
       } else {
         $xeTable.$nextTick(() => {
           resolve();
         });
       }
     } else {
-      resolve(handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight));
+      resolve(handleRecalculateStyle($xeTable, reFull, reWidth, reHeight));
     }
     internalData.rceTimeout = setTimeout(() => {
       internalData.rceTimeout = undefined;
-      handleRecalculateStyle($xeTable, !!reFull, reWidth, reHeight);
+      handleRecalculateStyle($xeTable, reFull, reWidth, reHeight);
     }, refreshDelay);
   });
 }
@@ -8703,9 +8703,8 @@ function loadTableData($xeTable, datas, isReset) {
     $xeTable.checkSelectionStatus();
     return new Promise(resolve => {
       $xeTable.$nextTick().then(() => handleRecalculateStyle($xeTable, false, false, false)).then(() => {
-        calcCellHeight($xeTable);
+        handleRecalculateStyle($xeTable, false, true, true);
         updateRowOffsetTop($xeTable);
-        return handleRecalculateStyle($xeTable, false, false, false);
       }).then(() => {
         let targetScrollLeft = lastScrollLeft;
         let targetScrollTop = lastScrollTop;
@@ -8723,14 +8722,14 @@ function loadTableData($xeTable, datas, isReset) {
         // 是否变更虚拟滚动
         if (oldScrollYLoad === sYLoad) {
           restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
-            calcCellHeight($xeTable);
+            handleRecalculateStyle($xeTable, false, true, true);
             updateRowOffsetTop($xeTable);
             resolve();
           });
         } else {
           setTimeout(() => {
             restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop).then(() => {
-              calcCellHeight($xeTable);
+              handleRecalculateStyle($xeTable, false, true, true);
               updateRowOffsetTop($xeTable);
               resolve();
             });
@@ -9027,7 +9026,7 @@ function handleColumn($xeTable, collectColumn) {
         $xeTable.handleUpdateCustomColumn();
       }
       reactData.isColLoading = false;
-      return $xeTable.recalculate();
+      return handleLazyRecalculate($xeTable, false, true, true);
     });
   });
 }
@@ -9252,8 +9251,27 @@ function updateHeight($xeTable) {
     internalData.customHeight = 300;
   }
 }
-function calcColumnAutoWidth(column, wrapperEl) {
-  const cellElemList = wrapperEl.querySelectorAll(`.vxe-cell--wrapper[colid="${column.id}"]`);
+function calcColumnAutoWidth($xeTable, column, wrapperEl) {
+  const columnOpts = $xeTable.computeColumnOpts;
+  const {
+    autoOptions
+  } = columnOpts;
+  const {
+    isCalcHeader,
+    isCalcBody,
+    isCalcFooter
+  } = autoOptions || {};
+  const querySelections = [];
+  if (isCalcHeader) {
+    querySelections.push(`.vxe-header-cell--wrapper[colid="${column.id}"]`);
+  }
+  if (isCalcBody) {
+    querySelections.push(`.vxe-body-cell--wrapper[colid="${column.id}"]`);
+  }
+  if (isCalcFooter) {
+    querySelections.push(`.vxe-footer-cell--wrapper[colid="${column.id}"]`);
+  }
+  const cellElemList = querySelections.length ? wrapperEl.querySelectorAll(querySelections.join(',')) : [];
   let leftRightPadding = 0;
   const firstCellEl = cellElemList[0];
   if (firstCellEl && firstCellEl.parentElement) {
@@ -9279,7 +9297,7 @@ function calcCellWidth($xeTable) {
     autoWidthColumnList.forEach(column => {
       const colid = column.id;
       const colRest = fullColumnIdData[colid];
-      const colWidth = calcColumnAutoWidth(column, el);
+      const colWidth = calcColumnAutoWidth($xeTable, column, el);
       if (colRest) {
         colRest.width = Math.max(colWidth, colRest.width);
       }
@@ -11483,7 +11501,7 @@ const Methods = {
       });
       const colMinWidth = getColReMinWidth(cellParams);
       el.setAttribute('data-calc-col', 'Y');
-      let resizeWidth = calcColumnAutoWidth(resizeColumn, el);
+      let resizeWidth = calcColumnAutoWidth($xeTable, resizeColumn, el);
       el.removeAttribute('data-calc-col');
       if (colRest) {
         resizeWidth = Math.max(resizeWidth, colRest.width);
@@ -17939,7 +17957,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
         colid,
         rowid
       },
-      class: 'vxe-cell--wrapper'
+      class: 'vxe-cell--wrapper vxe-body-cell--wrapper'
     }, column.renderCell(h, cellParams))]));
     if (showValidTip && errorValidItem) {
       const errRule = errorValidItem.rule;
@@ -18698,7 +18716,7 @@ const header_renderRows = (h, _vm, isGroup, isOptimizeMode, cols, $rowIndex) =>
       attrs: {
         colid
       },
-      class: 'vxe-cell--wrapper'
+      class: 'vxe-cell--wrapper vxe-header-cell--wrapper'
     }, column.renderHeader(h, cellParams))]),
     /**
     * 列宽拖动
@@ -19170,7 +19188,7 @@ function footer_renderRows(h, _vm, isOptimizeMode, tableColumn, footerTableData,
       attrs: {
         colid
       },
-      class: 'vxe-cell--wrapper'
+      class: 'vxe-cell--wrapper vxe-footer-cell--wrapper'
     }, column.renderFooter(h, cellParams))]),
     /**
      * 列宽拖动
@@ -23075,6 +23093,8 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
     }
   });
 }
+// function insertGroupRow ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, newRecords: any[], isAppend: boolean) {
+// }
 function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
   const props = $xeTable;
   const reactData = $xeTable;
@@ -23082,6 +23102,9 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
   const {
     treeConfig
   } = props;
+  const {
+    isRowGroupStatus
+  } = reactData;
   const {
     tableFullTreeData,
     afterFullData,
@@ -23109,6 +23132,13 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
     // 如果为虚拟树
     if (treeConfig && transform) {
       insertTreeRow($xeTable, newRecords, false);
+    } else if (isRowGroupStatus) {
+      // 如果分组
+      if (treeConfig) {
+        throw new Error(mixin_getI18n('vxe.error.noTree', ['insert']));
+      }
+      warnLog(mixin_getI18n('vxe.error.noGroup', ['remove']));
+      // insertGroupRow($xeTable, newRecords, false)
     } else {
       newRecords.forEach(item => {
         const rowid = getRowid($xeTable, item);
@@ -23148,6 +23178,13 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
       // 如果为虚拟树
       if (treeConfig && transform) {
         insertTreeRow($xeTable, newRecords, true);
+      } else if (isRowGroupStatus) {
+        // 如果分组
+        if (treeConfig) {
+          throw new Error(mixin_getI18n('vxe.error.noTree', ['insert']));
+        }
+        warnLog(mixin_getI18n('vxe.error.noGroup', ['remove']));
+        // insertGroupRow($xeTable, newRecords, true)
       } else {
         newRecords.forEach(item => {
           const rowid = getRowid($xeTable, item);
@@ -23248,6 +23285,12 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           warnLog('vxe.error.unableInsert');
           insertTreeRow($xeTable, newRecords, true);
         }
+      } else if (isRowGroupStatus) {
+        // 如果分组
+        if (treeConfig) {
+          throw new Error(mixin_getI18n('vxe.error.noTree', ['insert']));
+        }
+        warnLog(mixin_getI18n('vxe.error.noGroup', ['remove']));
       } else {
         if (treeConfig) {
           throw new Error(mixin_getI18n('vxe.error.noTree', ['insert']));
@@ -23594,7 +23637,8 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
         treeConfig
       } = props;
       const {
-        editStore
+        editStore,
+        isRowGroupStatus
       } = reactData;
       const {
         tableFullTreeData,
@@ -23671,6 +23715,9 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
               afterFullData.splice(afIndex, 1);
             }
           });
+        } else if (isRowGroupStatus) {
+          // 如果分组
+          warnLog(mixin_getI18n('vxe.error.noGroup', ['remove']));
         } else {
           rows.forEach(row => {
             const tfIndex = this.findRowIndexOf(tableFullData, row);
@@ -29597,17 +29644,17 @@ function renderBody(h, $xeTable) {
           errLog('vxe.error.reqComp', ['vxe-tooltip']);
         }
       }
+      if (this.autoResize) {
+        const resizeObserver = table_globalResize.create(() => {
+          if (this.autoResize) {
+            this.recalculate(true);
+          }
+        });
+        resizeObserver.observe(this.$el);
+        resizeObserver.observe(this.getParentElem());
+        this.$resize = resizeObserver;
+      }
     });
-    if (this.autoResize) {
-      const resizeObserver = table_globalResize.create(() => {
-        if (this.autoResize) {
-          this.recalculate(true);
-        }
-      });
-      resizeObserver.observe(this.$el);
-      resizeObserver.observe(this.getParentElem());
-      this.$resize = resizeObserver;
-    }
     if (virtualYOpts.mode !== 'scroll') {
       const tableViewportEl = $xeTable.$refs.refTableViewportElem;
       if (tableViewportEl) {
@@ -29616,7 +29663,7 @@ function renderBody(h, $xeTable) {
         });
       }
     }
-    this.preventEvent(null, 'mounted');
+    $xeTable.preventEvent(null, 'mounted');
   },
   activated() {
     this.recalculate().then(() => this.refreshScroll());
@@ -34072,6 +34119,7 @@ const Toolbar = VxeToolbar;
       notCommands: '全局指令 "{0}" 不存在',
       notSlot: '插槽 "{0}" 不存在',
       noTree: '树结构不支持 "{0}"',
+      noGroup: '数据分组后不支持 "{0}"',
       notProp: '不支持的参数 "{0}"',
       checkProp: '当数据量过大时可能会导致复选框卡顿，建议设置参数 "{0}" 提升渲染速度',
       coverProp: '"{0}" 的参数 "{1}" 重复定义，这可能会出现错误',