vxe-table 3.17.0-beta.11 → 3.17.0-beta.13

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.17.0-beta.11";
+const version = "3.17.0-beta.13";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2668,7 +2668,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.17.0-beta.11"}`;
+const log_version = `table v${"3.17.0-beta.13"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5888,6 +5888,7 @@ function updateAfterListIndex($xeTable) {
         $index: -1,
         _index: index,
         treeIndex: -1,
+        _tIndex: -1,
         items: [],
         parent: null,
         level: 0,
@@ -5926,6 +5927,7 @@ function updateAfterDataIndex($xeTable) {
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const fullMaps = {};
   if (treeConfig) {
+    let _treeIndex = 0;
     const {
       handleGetRowId
     } = createHandleGetRowId($xeTable);
@@ -5936,6 +5938,7 @@ function updateAfterDataIndex($xeTable) {
       if (rowRest) {
         rowRest.seq = seq;
         rowRest.treeIndex = index;
+        rowRest._tIndex = _treeIndex;
       } else {
         const rest = {
           row,
@@ -5945,6 +5948,7 @@ function updateAfterDataIndex($xeTable) {
           $index: -1,
           _index: -1,
           treeIndex: -1,
+          _tIndex: _treeIndex,
           items: [],
           parent: null,
           level: 0,
@@ -5956,6 +5960,7 @@ function updateAfterDataIndex($xeTable) {
         fullAllDataRowIdData[rowid] = rest;
         fullDataRowIdData[rowid] = rest;
       }
+      _treeIndex++;
       fullMaps[rowid] = row;
     }, {
       children: transform ? treeOpts.mapChildrenField : childrenField
@@ -7918,7 +7923,7 @@ const calcCellHeight = $xeTable => {
   } = internalData;
   const defaultRowHeight = $xeTable.computeDefaultRowHeight;
   const el = $xeTable.$refs.refElem;
-  if (!isAllOverflow && scrollYLoad && el) {
+  if (!isAllOverflow && (scrollYLoad || scrollXLoad) && el) {
     const {
       handleGetRowId
     } = createHandleGetRowId($xeTable);
@@ -9855,6 +9860,7 @@ const Methods = {
           _index: -1,
           $index: -1,
           treeIndex: index,
+          _tIndex: -1,
           items,
           parent: parentRow,
           level,
@@ -9998,6 +10004,7 @@ const Methods = {
           _index: -1,
           $index: -1,
           treeIndex: -1,
+          _tIndex: -1,
           items,
           parent: parentRow,
           level: parentLevel + nodes.length,
@@ -18076,7 +18083,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
   if (!fixedHiddenColumn && editConfig && (editRender || cellRender) && (editOpts.showStatus || editOpts.showUpdateStatus)) {
     isDirty = $xeTable.isUpdateByRow(row, column.field);
   }
-  const isVNAutoHeight = scrollYLoad && !hasEllipsis;
+  const isVNAutoHeight = !hasEllipsis && (scrollYLoad || scrollXLoad);
   let cellHeight = getCellRestHeight(rowRest, cellOpts, rowOpts, defaultRowHeight);
   const isLastColumn = $columnIndex === columns.length - 1;
   const isAutoCellWidth = !column.resizeWidth && (column.minWidth === 'auto' || column.width === 'auto');
@@ -18112,7 +18119,7 @@ function renderTdColumn(h, $xeTable, seq, rowid, fixedType, isOptimizeMode, rowL
     }
     tcStyle.width = `${column.renderWidth + mergeColWidth - cellOffsetWidth}px`;
   }
-  if (scrollYLoad || hasEllipsis || isCsHeight || isRsHeight) {
+  if (scrollYLoad || scrollXLoad || hasEllipsis || isCsHeight || isRsHeight) {
     tcStyle.height = `${cellHeight}px`;
   } else {
     tcStyle.minHeight = `${cellHeight}px`;
@@ -18304,14 +18311,15 @@ function renderRows(h, _vm, fixedType, isOptimizeMode, tableData, tableColumn) {
       };
     }
     if (rowRest) {
+      rowIndex = rowRest.index;
+      _rowIndex = rowRest._index;
       rowLevel = rowRest.level;
+      seq = rowRest.seq;
       if (hasRowGroupAggregate || treeConfig && transform && seqMode === 'increasing') {
         seq = rowRest._index + 1;
-      } else {
-        seq = rowRest.seq;
+      } else if (treeConfig && seqMode === 'fixed') {
+        seq = rowRest._tIndex + 1;
       }
-      rowIndex = rowRest.index;
-      _rowIndex = rowRest._index;
     }
     const params = {
       $table: $xeTable,
@@ -23228,6 +23236,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         _index: -1,
         $index: -1,
         treeIndex: -1,
+        _tIndex: -1,
         items: parentChilds,
         parent: parentRow,
         level: parentLevel + 1,
@@ -23252,6 +23261,7 @@ function insertTreeRow($xeTable, newRecords, isAppend) {
         _index: -1,
         $index: -1,
         treeIndex: -1,
+        _tIndex: -1,
         items: tableFullTreeData,
         parent: null,
         level: 0,
@@ -23322,6 +23332,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
           _index: -1,
           $index: -1,
           treeIndex: -1,
+          _tIndex: -1,
           items: afterFullData,
           parent: null,
           level: 0,
@@ -23368,6 +23379,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
             _index: -1,
             $index: -1,
             treeIndex: -1,
+            _tIndex: -1,
             items: afterFullData,
             parent: null,
             level: 0,
@@ -23418,6 +23430,7 @@ function handleInsertRowAt($xeTable, records, targetRow, isInsertNextRow) {
               _index: -1,
               $index: -1,
               treeIndex: -1,
+              _tIndex: -1,
               items: parentMapChilds,
               parent: parentRow,
               level: parentLevel + 1,
@@ -28207,15 +28220,16 @@ function renderRowExpandedVNs(h, $xeTable) {
       let rowIndex = -1;
       let $rowIndex = -1;
       if (rowRest) {
+        rowIndex = rowRest.index;
+        $rowIndex = rowRest.$index;
+        _rowIndex = rowRest._index;
         rowLevel = rowRest.level;
+        seq = rowRest.seq;
         if (isRowGroupStatus || treeConfig && transform && seqMode === 'increasing') {
           seq = rowRest._index + 1;
-        } else {
-          seq = rowRest.seq;
+        } else if (treeConfig && seqMode === 'fixed') {
+          seq = rowRest._tIndex + 1;
         }
-        rowIndex = rowRest.index;
-        $rowIndex = rowRest.$index;
-        _rowIndex = rowRest._index;
       }
       if (expandHeight) {
         cellStyle.height = `${expandHeight}px`;
@@ -31374,6 +31388,14 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
       const pagerOpts = $xeGrid.computePagerOpts;
       return pagerOpts.total;
     },
+    computePageCount() {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      return Math.max(Math.ceil(tablePage.total / tablePage.pageSize), 1);
+    },
     computeIsLoading() {
       const $xeGrid = this;
       const props = $xeGrid;
@@ -31463,7 +31485,7 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
             tablePage.pageSize = pageSize;
           }
           if (total) {
-            tablePage.pageSize = total;
+            tablePage.total = total;
           }
         }
       }
@@ -32204,29 +32226,71 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
       return $xeGrid.$nextTick();
     },
     homePage() {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      tablePage.currentPage = 1;
+      return $xeGrid.$nextTick();
+    },
+    homePageByEvent(evnt) {
       const $xeGrid = this;
       const $pager = $xeGrid.$refs.refPager;
       if ($pager) {
-        return $pager.homePage();
+        $pager.homePageByEvent(evnt);
       }
-      return $xeGrid.$nextTick();
     },
     endPage() {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      const pageCount = $xeGrid.computePageCount;
+      tablePage.currentPage = pageCount;
+      return $xeGrid.$nextTick();
+    },
+    endPageByEvent(evnt) {
       const $xeGrid = this;
       const $pager = $xeGrid.$refs.refPager;
       if ($pager) {
-        return $pager.endPage();
+        $pager.endPageByEvent(evnt);
       }
+    },
+    setCurrentPage(currentPage) {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      const pageCount = $xeGrid.computePageCount;
+      tablePage.currentPage = Math.min(pageCount, Math.max(1, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(currentPage)));
       return $xeGrid.$nextTick();
     },
-    jumpPage(currentPage) {
+    setCurrentPageByEvent(evnt, currentPage) {
       const $xeGrid = this;
       const $pager = $xeGrid.$refs.refPager;
       if ($pager) {
-        return $pager.jumpPage(currentPage);
+        $pager.setCurrentPageByEvent(evnt, currentPage);
       }
+    },
+    setPageSize(pageSize) {
+      const $xeGrid = this;
+      const reactData = $xeGrid.reactData;
+      const {
+        tablePage
+      } = reactData;
+      tablePage.pageSize = Math.max(1, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(pageSize));
       return $xeGrid.$nextTick();
     },
+    setPageSizeByEvent(evnt, pageSize) {
+      const $xeGrid = this;
+      const $pager = $xeGrid.$refs.refPager;
+      if ($pager) {
+        $pager.setPageSizeByEvent(evnt, pageSize);
+      }
+    },
     triggerToolbarCommitEvent(params, evnt) {
       const $xeGrid = this;
       const {
@@ -32407,6 +32471,11 @@ external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default(
         type: reactData.isZMax ? 'max' : 'revert'
       }, evnt);
     },
+    getParams() {
+      const $xeGrid = this;
+      const props = $xeGrid;
+      return props.params;
+    },
     zoom() {
       const $xeGrid = this;
       const reactData = $xeGrid.reactData;