vxe-table 3.15.35 → 3.15.37

package/lib/index.umd.js

@@ -2002,7 +2002,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.15.35";
+const version = "3.15.37";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2646,7 +2646,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.15.35"}`;
+const log_version = `table v${"3.15.37"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5497,7 +5497,17 @@ function cacheColumnMap($xeTable) {
   reactData.expandColumn = expandColumn;
   reactData.isAllOverflow = isAllOverflow;
 }
-const updateScrollYStatus = ($xeTable, fullData) => {
+function updateScrollXStatus($xeTable, fullColumn) {
+  const reactData = $xeTable;
+  const internalData = $xeTable;
+  const virtualXOpts = $xeTable.computeVirtualXOpts;
+  const allCols = fullColumn || internalData.tableFullColumn;
+  // 如果gt为0，则总是启用
+  const scrollXLoad = !!virtualXOpts.enabled && virtualXOpts.gt > -1 && (virtualXOpts.gt === 0 || virtualXOpts.gt < allCols.length);
+  reactData.scrollXLoad = scrollXLoad;
+  return scrollXLoad;
+}
+function updateScrollYStatus($xeTable, fullData) {
   const props = $xeTable;
   const reactData = $xeTable;
   const internalData = $xeTable;
@@ -5514,7 +5524,7 @@ const updateScrollYStatus = ($xeTable, fullData) => {
   const scrollYLoad = (transform || !treeConfig) && !!virtualYOpts.enabled && virtualYOpts.gt > -1 && (virtualYOpts.gt === 0 || virtualYOpts.gt < allList.length);
   reactData.scrollYLoad = scrollYLoad;
   return scrollYLoad;
-};
+}
 /**
  * 展开与收起树节点
  * @param rows
@@ -8692,7 +8702,6 @@ function parseColumns($xeTable, isReset) {
     isGroup,
     columnStore
   } = reactData;
-  const virtualXOpts = $xeTable.computeVirtualXOpts;
   const {
     collectColumn,
     tableFullColumn,
@@ -8752,15 +8761,16 @@ function parseColumns($xeTable, isReset) {
     });
   }
   const visibleColumn = leftList.concat(centerList).concat(rightList);
-  // 如果gt为0，则总是启用
-  const scrollXLoad = !!virtualXOpts.enabled && virtualXOpts.gt > -1 && (virtualXOpts.gt === 0 || virtualXOpts.gt < tableFullColumn.length);
+  internalData.visibleColumn = visibleColumn;
+  updateColumnOffsetLeft($xeTable);
+  const sXLoad = updateScrollXStatus($xeTable);
   reactData.hasFixedColumn = leftList.length > 0 || rightList.length > 0;
   Object.assign(columnStore, {
     leftList,
     centerList,
     rightList
   });
-  if (scrollXLoad) {
+  if (sXLoad) {
     // if (showOverflow) {
     //   if (!rowOpts.height) {
     //     const errColumn = internalData.tableFullColumn.find(column => column.showOverflow === false)
@@ -8798,7 +8808,6 @@ function parseColumns($xeTable, isReset) {
     $xeTable.clearMergeCells();
     $xeTable.clearMergeFooterItems();
   }
-  reactData.scrollXLoad = scrollXLoad;
   visibleColumn.forEach((column, index) => {
     const colid = column.id;
     const colRest = fullColumnIdData[colid];
@@ -8806,7 +8815,6 @@ function parseColumns($xeTable, isReset) {
       colRest._index = index;
     }
   });
-  internalData.visibleColumn = visibleColumn;
   handleTableColumn($xeTable);
   if (isReset) {
     return $xeTable.updateFooter().then(() => {
@@ -9495,31 +9503,42 @@ const Methods = {
    * @param {String} field 字段名
    */
   reloadRow(row, record, field) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const reactData = $xeTable;
+    const internalData = $xeTable;
+    const {
+      keepSource
+    } = props;
     const {
-      keepSource,
-      tableSourceData,
       tableData
-    } = this;
+    } = reactData;
+    const {
+      sourceDataRowIdData
+    } = internalData;
     if (keepSource) {
-      const rowIndex = this.getRowIndex(row);
-      const oRow = tableSourceData[rowIndex];
+      if ($xeTable.isAggregateRecord(row)) {
+        return $xeTable.$nextTick();
+      }
+      const oRow = sourceDataRowIdData[getRowid($xeTable, row)];
       if (oRow && row) {
         if (field) {
-          const newValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record || row, field);
+          const newValue = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(record || row, field), true);
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(row, field, newValue);
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(oRow, field, newValue);
         } else {
-          const newRecord = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone({
-            ...record
-          }, true);
+          const rowkey = getRowkey($xeTable);
+          const rowid = getRowid($xeTable, row);
+          const newRecord = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().clone(Object.assign({}, record), true);
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().set(newRecord, rowkey, rowid);
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().destructuring(oRow, Object.assign(row, newRecord));
         }
       }
-      this.tableData = tableData.slice(0);
+      reactData.tableData = tableData.slice(0);
     } else {
       errLog('vxe.error.reqProp', ['keep-source']);
     }
-    return this.$nextTick();
+    return $xeTable.$nextTick();
   },
   /**
    * 加载列配置
@@ -9528,10 +9547,28 @@ const Methods = {
    */
   loadColumn(columns) {
     const $xeTable = this;
-    const collectColumn = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(columns, column => cell.createColumn(this, column), {
+    const internalData = $xeTable;
+    const {
+      lastScrollLeft,
+      lastScrollTop
+    } = internalData;
+    const collectColumn = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().mapTree(columns, column => cell.createColumn($xeTable, column), {
       children: 'children'
     });
-    return handleColumn($xeTable, collectColumn);
+    return handleColumn($xeTable, collectColumn).then(() => {
+      let targetScrollLeft = lastScrollLeft;
+      let targetScrollTop = lastScrollTop;
+      const virtualXOpts = $xeTable.computeVirtualXOpts;
+      const virtualYOpts = $xeTable.computeVirtualYOpts;
+      // 是否在更新数据之后自动滚动重置滚动条
+      if (virtualXOpts.scrollToLeftOnChange) {
+        targetScrollLeft = 0;
+      }
+      if (virtualYOpts.scrollToTopOnChange) {
+        targetScrollTop = 0;
+      }
+      restoreScrollLocation($xeTable, targetScrollLeft, targetScrollTop);
+    });
   },
   /**
    * 加载列配置并恢复到初始状态
@@ -11609,7 +11646,7 @@ const Methods = {
     return new Promise(resolve => {
       // 还原滚动条位置
       if (lastScrollLeft || lastScrollTop) {
-        return restoreScrollLocation($xeTable, lastScrollLeft, lastScrollTop).then().then(() => {
+        return restoreScrollLocation($xeTable, lastScrollLeft, lastScrollTop).then(() => {
           // 存在滚动行为未结束情况
           setTimeout(resolve, 10);
         });
@@ -17109,15 +17146,15 @@ funcs.forEach(name => {
   Methods[name] = function (...args) {
     if (!this[`_${name}`]) {
       if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableExportModule']);
+        errLog('vxe.error.reqModule', ['Export']);
       } else if ('fullValidate,validate'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableValidatorModule']);
+        errLog('vxe.error.reqModule', ['Validator']);
       } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableFilterModule']);
+        errLog('vxe.error.reqModule', ['Filter']);
       } else if ('insert,insertAt,insertNextAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,getEditRecord,getActiveRecord,isEditByRow,isActiveByRow,setEditRow,setActiveRow,setEditCell,setActiveCell'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableEditModule']);
+        errLog('vxe.error.reqModule', ['Edit']);
       } else if ('openCustom'.split(',').includes(name)) {
-        errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
+        errLog('vxe.error.reqModule', ['Custom']);
       }
     }
     return this[`_${name}`] ? this[`_${name}`](...args) : null;
@@ -22902,7 +22939,7 @@ function handleEditActive($xeTable, params, evnt, isFocus, isPos) {
   params.cell = cell;
   if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
     // 激活编辑
-    if (!$xeTable.isPendingByRow(row)) {
+    if (!$xeTable.isPendingByRow(row) && !$xeTable.isAggregateRecord(row)) {
       if (actived.row !== row || (mode === 'cell' ? actived.column !== column : false)) {
         // 判断是否禁用编辑
         let type = 'edit-disabled';
@@ -23010,7 +23047,7 @@ function handleEditCell($xeTable, row, fieldOrColumn, isPos) {
     editConfig
   } = props;
   const column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? $xeTable.getColumnByField(fieldOrColumn) : fieldOrColumn;
-  if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
+  if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender) && !$xeTable.isAggregateRecord(row)) {
     return Promise.resolve(isPos ? $xeTable.scrollToRow(row, column) : null).then(() => {
       const cell = $xeTable.getCellElement(row, column);
       if (cell) {
@@ -25940,8 +25977,8 @@ function handleMoveSelected($xeTable, evnt, args, isLeftArrow, isUpArrow, isRigh
         let mouseScrollSpaceSize = 1;
         const triggerEvent = (type, evnt) => {
           this.emitEvent(`checkbox-range-${type}`, {
-            records: this.getCheckboxRecords(),
-            reserves: this.getCheckboxReserveRecords()
+            records: () => this.getCheckboxRecords(),
+            reserves: () => this.getCheckboxReserveRecords()
           }, evnt);
         };
         const handleChecked = evnt => {
@@ -26353,19 +26390,23 @@ function checkRuleStatus(rule, val) {
     beginValidate(rows, cols, cb, isFull) {
       const $xeTable = this;
       const props = $xeTable;
+      const reactData = $xeTable;
       const internalData = $xeTable;
       const validRest = {};
       const {
         editRules,
         treeConfig
       } = props;
+      const {
+        isRowGroupStatus
+      } = reactData;
       const {
         afterFullData,
         pendingRowMaps,
         removeRowMaps
       } = internalData;
       const treeOpts = $xeTable.computeTreeOpts;
-      const childrenField = treeOpts.children || treeOpts.childrenField;
+      const aggregateOpts = $xeTable.computeAggregateOpts;
       let validList;
       if (rows === true) {
         validList = afterFullData;
@@ -26396,6 +26437,9 @@ function checkRuleStatus(rule, val) {
           if (pendingRowMaps[rowid]) {
             return;
           }
+          if ($xeTable.isAggregateRecord(row)) {
+            return;
+          }
           if (isFull || !this.validRuleErr) {
             const colVailds = [];
             columns.forEach(column => {
@@ -26435,7 +26479,12 @@ function checkRuleStatus(rule, val) {
             rowValidErrs.push(Promise.all(colVailds));
           }
         };
-        if (treeConfig) {
+        if (isRowGroupStatus) {
+          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(validList, handleVaild, {
+            children: aggregateOpts.mapChildrenField
+          });
+        } else if (treeConfig) {
+          const childrenField = treeOpts.children || treeOpts.childrenField;
           external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(validList, handleVaild, {
             children: childrenField
           });
@@ -29438,8 +29487,6 @@ const {
       if ($table) {
         if ($table.triggerCustomEvent) {
           $table.triggerCustomEvent($event);
-        } else {
-          errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
         }
       }
     },
@@ -29454,8 +29501,6 @@ const {
       const $table = connectTable;
       if ($table) {
         $table.customOpenEvent($event);
-      } else {
-        errLog('vxe.error.reqModule', ['VxeTableCustomModule']);
       }
     },
     handleMouseleaveSettingEvent({
@@ -30083,6 +30128,39 @@ const {
 const grid_methods = {};
 const propKeys = Object.keys(props);
 const defaultLayouts = [['Form'], ['Toolbar', 'Top', 'Table', 'Bottom', 'Pager']];
+function initPages($xeGrid, propKey) {
+  const props = $xeGrid;
+  const reactData = $xeGrid;
+  const {
+    tablePage
+  } = reactData;
+  const {
+    pagerConfig
+  } = props;
+  const pagerOpts = $xeGrid.computePagerOpts;
+  if (pagerConfig && isEnableConf(pagerOpts)) {
+    if (propKey) {
+      if (pagerOpts[propKey]) {
+        tablePage[propKey] = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toNumber(pagerOpts[propKey]);
+      }
+    } else {
+      const {
+        currentPage,
+        pageSize,
+        total
+      } = pagerOpts;
+      if (currentPage) {
+        tablePage.currentPage = currentPage;
+      }
+      if (pageSize) {
+        tablePage.pageSize = pageSize;
+      }
+      if (total) {
+        tablePage.pageSize = total;
+      }
+    }
+  }
+}
 function renderDefaultForm(h, $xeGrid) {
   const VxeUIFormComponent = core_.VxeUI.getComponent('VxeForm');
   const props = $xeGrid;
@@ -30652,10 +30730,20 @@ Object.keys(table.methods).forEach(name => {
         footKeys
       };
     },
-    computePageConfFlag() {
+    computeCustomCurrentPageFlag() {
       const $xeGrid = this;
       const pagerOpts = $xeGrid.computePagerOpts;
-      return `${pagerOpts.currentPage}${pagerOpts.pageSize}`;
+      return pagerOpts.currentPage;
+    },
+    computeCustomPageSizeFlag() {
+      const $xeGrid = this;
+      const pagerOpts = $xeGrid.computePagerOpts;
+      return pagerOpts.pageSize;
+    },
+    computeCustomTotalFlag() {
+      const $xeGrid = this;
+      const pagerOpts = $xeGrid.computePagerOpts;
+      return pagerOpts.total;
     }
   },
   watch: {
@@ -30675,8 +30763,17 @@ Object.keys(table.methods).forEach(name => {
     proxyConfig() {
       this.initProxy();
     },
-    computePageConfFlag() {
-      this.initPages();
+    computeCustomCurrentPageFlag() {
+      const $xeGrid = this;
+      initPages($xeGrid, 'currentPage');
+    },
+    computeCustomPageSizeFlag() {
+      const $xeGrid = this;
+      initPages($xeGrid, 'pageSize');
+    },
+    computeCustomTotalFlag() {
+      const $xeGrid = this;
+      initPages($xeGrid, 'total');
     }
   },
   created() {
@@ -30710,7 +30807,7 @@ Object.keys(table.methods).forEach(name => {
         }
       }
     });
-    this.initPages();
+    initPages($xeGrid);
     grid_globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent);
   },
   mounted() {
@@ -30803,25 +30900,6 @@ Object.keys(table.methods).forEach(name => {
         }
       });
     },
-    initPages() {
-      const {
-        tablePage,
-        pagerConfig,
-        pagerOpts
-      } = this;
-      const {
-        currentPage,
-        pageSize
-      } = pagerOpts;
-      if (pagerConfig) {
-        if (currentPage) {
-          tablePage.currentPage = currentPage;
-        }
-        if (pageSize) {
-          tablePage.pageSize = pageSize;
-        }
-      }
-    },
     initProxy() {
       const {
         proxyInited,