vxe-table 3.11.13 → 3.11.15

package/lib/index.umd.js

@@ -2220,7 +2220,7 @@ function getClass(property, params) {
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
-const version = "3.11.13";
+const version = "3.11.15";
 core_.VxeUI.version = version;
 core_.VxeUI.tableVersion = version;
 core_.VxeUI.setConfig({
@@ -2774,7 +2774,7 @@ function isNodeElement(elem) {
 const {
   log: log_log
 } = core_.VxeUI;
-const log_version = `table v${"3.11.13"}`;
+const log_version = `table v${"3.11.15"}`;
 const warnLog = log_log.create('warn', log_version);
 const errLog = log_log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
@@ -5399,16 +5399,15 @@ function handleRecalculateLayout($xeTable, reFull) {
   }
   $xeTable.calcCellWidth();
   $xeTable.autoCellWidth();
-  if (reFull === true) {
-    // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
-    return $xeTable.computeScrollLoad().then(() => {
+  return $xeTable.computeScrollLoad().then(() => {
+    if (reFull === true) {
+      // 初始化时需要在列计算之后再执行优化运算，达到最优显示效果
       calcCellHeight($xeTable);
       $xeTable.calcCellWidth();
       $xeTable.autoCellWidth();
       return $xeTable.computeScrollLoad();
-    });
-  }
-  return $xeTable.computeScrollLoad();
+    }
+  });
 }
 function checkLastSyncScroll($xeTable, isRollX, isRollY) {
   const reactData = $xeTable;
@@ -6779,6 +6778,11 @@ const Methods = {
    * @returns
    */
   handleVirtualTreeToList() {
+    const $xeTable = this;
+    const internalData = $xeTable;
+    const {
+      fullAllDataRowIdData
+    } = internalData;
     const {
       treeOpts,
       treeConfig,
@@ -6794,6 +6798,10 @@ const Methods = {
         const rowid = getRowid(this, row);
         const parentRowid = getRowid(this, parent);
         if (!parent || expandMaps[parentRowid] && treeExpandedMaps[parentRowid]) {
+          const rowRest = fullAllDataRowIdData[rowid];
+          if (rowRest) {
+            rowRest._index = fullData.length;
+          }
           expandMaps[rowid] = 1;
           fullData.push(row);
         }
@@ -7017,24 +7025,69 @@ const Methods = {
     this.afterTreeFullData = tableTree;
     this.updateAfterDataIndex();
   },
+  updateTreeDataIndex() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      afterFullData,
+      fullDataRowIdData,
+      fullAllDataRowIdData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    if (treeConfig) {
+      if (treeOpts.transform) {
+        afterFullData.forEach((row, index) => {
+          const rowid = getRowid($xeTable, row);
+          const rowRest = fullAllDataRowIdData[rowid];
+          if (rowRest) {
+            rowRest._index = index;
+          } else {
+            const rest = {
+              row,
+              rowid,
+              seq: '-1',
+              index: -1,
+              $index: -1,
+              _index: index,
+              items: [],
+              parent: null,
+              level: 0,
+              height: 0
+            };
+            fullAllDataRowIdData[rowid] = rest;
+            fullDataRowIdData[rowid] = rest;
+          }
+        });
+      }
+    }
+  },
   /**
    * 预编译
    * 对渲染中的数据提前解析序号及索引。牺牲提前编译耗时换取渲染中额外损耗，使运行时更加流畅
    */
   updateAfterDataIndex() {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
     const {
-      treeConfig,
       afterFullData,
       fullDataRowIdData,
       fullAllDataRowIdData,
-      afterTreeFullData,
-      treeOpts
-    } = this;
+      afterTreeFullData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
     const childrenField = treeOpts.children || treeOpts.childrenField;
     const fullMaps = {};
     if (treeConfig) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(afterTreeFullData, (row, index, items, path) => {
-        const rowid = getRowid(this, row);
+        const rowid = getRowid($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid];
         const seq = path.map((num, i) => i % 2 === 0 ? Number(num) + 1 : '.').join('');
         if (rowRest) {
@@ -7060,9 +7113,10 @@ const Methods = {
       }, {
         children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField
       });
+      $xeTable.updateTreeDataIndex();
     } else {
       afterFullData.forEach((row, index) => {
-        const rowid = getRowid(this, row);
+        const rowid = getRowid($xeTable, row);
         const rowRest = fullAllDataRowIdData[rowid];
         const seq = index + 1;
         if (rowRest) {
@@ -7089,10 +7143,46 @@ const Methods = {
     }
     this.afterFullRowMaps = fullMaps;
   },
+  /**
+   * 只对 tree-config 有效，获取行的子级
+   */
+  getTreeRowChildren(rowOrRowid) {
+    const $xeTable = this;
+    const props = $xeTable;
+    const internalData = $xeTable;
+    const {
+      treeConfig
+    } = props;
+    const {
+      fullDataRowIdData
+    } = internalData;
+    const treeOpts = $xeTable.computeTreeOpts;
+    const {
+      transform,
+      mapChildrenField
+    } = treeOpts;
+    const childrenField = treeOpts.children || treeOpts.childrenField;
+    if (rowOrRowid && treeConfig) {
+      let rowid;
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(rowOrRowid)) {
+        rowid = rowOrRowid;
+      } else {
+        rowid = getRowid($xeTable, rowOrRowid);
+      }
+      if (rowid) {
+        const rest = fullDataRowIdData[rowid];
+        const row = rest ? rest.row : null;
+        if (row) {
+          return row[transform ? mapChildrenField : childrenField] || [];
+        }
+      }
+    }
+    return [];
+  },
   /**
    * 只对 tree-config 有效，获取行的父级
    */
-  getParentRow(rowOrRowid) {
+  getTreeParentRow(rowOrRowid) {
     const {
       treeConfig,
       fullDataRowIdData
@@ -7111,6 +7201,11 @@ const Methods = {
     }
     return null;
   },
+  getParentRow(rowOrRowid) {
+    const $xeTable = this;
+    warnLog('vxe.error.delFunc', ['getParentRow', 'getTreeParentRow']);
+    return $xeTable.getTreeParentRow(rowOrRowid);
+  },
   /**
    * 根据行的唯一主键获取行
    * @param {String/Number} rowid 行主键
@@ -11728,7 +11823,9 @@ const Methods = {
               }
               return this.$nextTick().then(() => {
                 if (transform) {
-                  return this.handleTableData();
+                  this.handleTableData();
+                  this.updateTreeDataIndex();
+                  return this.$nextTick();
                 }
               });
             });
@@ -11856,7 +11953,9 @@ const Methods = {
       validRows.forEach(row => this.handleTreeExpandReserve(row, expanded));
     }
     this.treeExpandedMaps = treeTempExpandedMaps;
-    return Promise.all(result).then(this.recalculate);
+    return Promise.all(result).then(() => {
+      return this.recalculate();
+    });
   },
   /**
    * 虚拟树的展开与收起
@@ -11867,9 +11966,14 @@ const Methods = {
   handleVirtualTreeExpand(rows, expanded) {
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
       this.handleVirtualTreeToList();
-      return this.handleTableData();
+      this.handleTableData();
+      this.updateTreeDataIndex();
     }).then(() => {
       return this.recalculate();
+    }).then(() => {
+      setTimeout(() => {
+        this.updateCellAreas();
+      }, 30);
     });
   },
   /**
@@ -13309,12 +13413,15 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     columnOpts,
     isDragColMove
   } = $xeTable;
+  const {
+    transform,
+    seqMode
+  } = treeOpts;
   const childrenField = treeOpts.children || treeOpts.childrenField;
   const rows = [];
   tableData.forEach((row, $rowIndex) => {
     const trOn = {};
     let rowIndex = $rowIndex;
-    const _rowIndex = $xeTable.getVTRowIndex(row);
     // 确保任何情况下 rowIndex 都精准指向真实 data 索引
     rowIndex = $xeTable.getRowIndex(row);
     // 当前行事件
@@ -13337,8 +13444,18 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
     }
     const rowid = getRowid($xeTable, row);
     const rest = fullAllDataRowIdData[rowid];
-    const rowLevel = rest ? rest.level : 0;
-    const seq = rest ? rest.seq : -1;
+    let rowLevel = 0;
+    let seq = -1;
+    let _rowIndex = 0;
+    if (rest) {
+      rowLevel = rest.level;
+      if (treeConfig && transform && seqMode === 'increasing') {
+        seq = rest._index + 1;
+      } else {
+        seq = rest.seq;
+      }
+      _rowIndex = rest._index;
+    }
     const params = {
       $table: $xeTable,
       seq,
@@ -13377,7 +13494,7 @@ function renderRows(h, _vm, $xeTable, fixedType, tableData, tableColumn) {
       };
     }
     const trClass = ['vxe-body--row', treeConfig ? `row--level-${rowLevel}` : '', {
-      'row--stripe': stripe && ($xeTable.getVTRowIndex(row) + 1) % 2 === 0,
+      'row--stripe': stripe && (_rowIndex + 1) % 2 === 0,
       'is--new': isNewRow,
       'is--expand-row': isExpandRow,
       'is--expand-tree': isExpandTree,
@@ -17853,8 +17970,8 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         };
         fullDataRowIdData[rowid] = rest;
         fullAllDataRowIdData[rowid] = rest;
-        afterFullData.push(item);
-        tableFullData.push(item);
+        afterFullData.unshift(item);
+        tableFullData.unshift(item);
       });
       // 刷新单元格合并
       mergeList.forEach(mergeItem => {
@@ -18902,7 +19019,7 @@ function toTableBorder(border) {
 function toBooleanValue(cellValue) {
   return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(cellValue) ? cellValue ? 'TRUE' : 'FALSE' : cellValue;
 }
-function getLabelData($xetable, opts, columns, datas) {
+function getBodyLabelData($xetable, opts, columns, datas) {
   const {
     isAllExpand,
     mode
@@ -19009,15 +19126,18 @@ function getLabelData($xetable, opts, columns, datas) {
     columns.forEach((column, $columnIndex) => {
       let cellValue = '';
       const renderOpts = column.editRender || column.cellRender;
-      let exportLabelMethod = column.exportMethod;
-      if (!exportLabelMethod && renderOpts && renderOpts.name) {
+      let bodyExportMethod = column.exportMethod;
+      if (!bodyExportMethod && renderOpts && renderOpts.name) {
         const compConf = export_mixin_renderer.get(renderOpts.name);
         if (compConf) {
-          exportLabelMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
+          bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
         }
       }
-      if (exportLabelMethod) {
-        cellValue = exportLabelMethod({
+      if (!bodyExportMethod) {
+        bodyExportMethod = columnOpts.exportMethod;
+      }
+      if (bodyExportMethod) {
+        cellValue = bodyExportMethod({
           $table: $xetable,
           row,
           column,
@@ -19079,7 +19199,7 @@ function getExportData($xetable, opts) {
       $rowIndex: index
     }));
   }
-  return getLabelData($xetable, opts, columns, datas);
+  return getBodyLabelData($xetable, opts, columns, datas);
 }
 function getBooleanValue(cellValue) {
   return cellValue === 'TRUE' || cellValue === 'true' || cellValue === true;
@@ -20302,8 +20422,11 @@ const convertToRows = originColumns => {
       }
       // 检查类型，如果为自定义导出，则不需要校验类型
       if (!opts.exportMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().includes(external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(exportOpts._typeMaps), type)) {
+        errLog('vxe.error.notType', [type]);
         if (true) {
-          errLog('vxe.error.notType', [type]);
+          if (['xlsx', 'pdf'].includes(type)) {
+            warnLog('vxe.error.reqPlugin', [4, 'plugin-export-xlsx']);
+          }
         }
         const params = {
           status: false
@@ -20833,8 +20956,8 @@ function getCheckboxRangeRows($xeTable, evnt, params, targetTrElem, trRect, offs
         mouseConfig,
         mouseOpts
       } = this;
-      if (mouseConfig && mouseOpts.area && this.handleCellAreaEvent) {
-        return this.handleCellAreaEvent(evnt, params);
+      if (mouseConfig && mouseOpts.area && this.handleMousedownCellAreaEvent) {
+        return this.handleMousedownCellAreaEvent(evnt, params);
       } else {
         if (checkboxConfig && checkboxOpts.range) {
           this.handleCheckboxRangeEvent(evnt, params);
@@ -22853,7 +22976,7 @@ function handleUupdateResize(_vm) {
       if (this.showFooter && !(this.footerMethod || this.footerData)) {
         warnLog('vxe.error.reqProp', ['footer-data | footer-method']);
       }
-      if (treeConfig && this.stripe) {
+      if (treeConfig && !treeOpts.transform && this.stripe) {
         warnLog('vxe.error.noTree', ['stripe']);
       }
       if (this.tooltipOpts.enabled) {
@@ -22896,7 +23019,10 @@ function handleUupdateResize(_vm) {
       if (this.rowOpts.height && !this.showOverflow) {
         warnLog('vxe.error.notProp', ['table.show-overflow']);
       }
-      if (!this.handleRecalculateCellAreas) {
+      if (!this.handleMousedownCellAreaEvent) {
+        if (this.areaConfig) {
+          warnLog('vxe.error.notProp', ['area-config']);
+        }
         if (this.clipConfig) {
           warnLog('vxe.error.notProp', ['clip-config']);
         }
@@ -22923,7 +23049,7 @@ function handleUupdateResize(_vm) {
       // if (this.mouseOpts.area && this.checkboxOpts.range) {
       //   warnLog('vxe.error.errConflicts', ['mouse-config.area', 'checkbox-config.range'])
       // }
-      if (this.treeConfig && this.mouseOpts.area) {
+      if (this.mouseOpts.area && this.treeConfig && !treeOpts.transform) {
         errLog('vxe.error.noTree', ['mouse-config.area']);
       }
     }
@@ -23036,7 +23162,7 @@ function handleUupdateResize(_vm) {
       const VxeUITooltipComponent = core_.VxeUI.getComponent('VxeTooltip');
       $xeTable.$nextTick(() => {
         if (props.loading) {
-          if (!VxeUILoadingComponent) {
+          if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
             errLog('vxe.error.reqComp', ['vxe-loading']);
           }
         }
@@ -23305,12 +23431,15 @@ function handleUupdateResize(_vm) {
         value: currLoading,
         icon: loadingOpts.icon,
         text: loadingOpts.text
-      }
-    }, $xeTable.callSlot(loadingSlot, {
-      $table: $xeTable,
-      $grid: $xeGrid,
-      loading: currLoading
-    }, h)) : loadingSlot ? h('div', {
+      },
+      scopedSlots: loadingSlot ? {
+        default: () => $xeTable.callSlot(loadingSlot, {
+          $table: $xeTable,
+          $grid: $xeGrid,
+          loading: currLoading
+        }, h)
+      } : {}
+    }) : loadingSlot ? h('div', {
       class: ['vxe-loading--custom-wrapper', {
         'is--visible': currLoading
       }]
@@ -26784,7 +26913,8 @@ const Toolbar = VxeToolbar;
       notType: '不支持的文件类型 "{0}"',
       notExp: '该浏览器不支持导入/导出功能',
       impFields: '导入失败，请检查字段名和数据格式是否正确',
-      treeNotImp: '树表格不支持导入'
+      treeNotImp: '树表格不支持导入',
+      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暂无数据',