vxe-table 3.11.13 → 3.11.15

package/packages/locale/lang/uk-UA.ts

@@ -46,7 +46,8 @@ export default {
       notType: '不支持的文件类型 "{0}"',
       notExp: '该浏览器不支持导入/导出功能',
       impFields: '导入失败，请检查字段名和数据格式是否正确',
-      treeNotImp: '树表格不支持导入'
+      treeNotImp: '树表格不支持导入',
+      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暂无数据',

package/packages/locale/lang/vi-VN.ts

@@ -46,7 +46,8 @@ export default {
       notType: '不支持的文件类型 "{0}"',
       notExp: '该浏览器不支持导入/导出功能',
       impFields: '导入失败，请检查字段名和数据格式是否正确',
-      treeNotImp: '树表格不支持导入'
+      treeNotImp: '树表格不支持导入',
+      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暂无数据',

package/packages/locale/lang/zh-CHT.ts

@@ -46,7 +46,8 @@ export default {
       notType: '不支援的文件類型 "{0}"',
       notExp: '該瀏覽器不支援匯入/匯出功能',
       impFields: '匯入失敗，請檢查欄位名稱和資料格式是否正確',
-      treeNotImp: '樹表格不支援導入'
+      treeNotImp: '樹表格不支援導入',
+      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暫無數據',

package/packages/locale/lang/zh-CN.ts

@@ -46,7 +46,8 @@ export default {
       notType: '不支持的文件类型 "{0}"',
       notExp: '该浏览器不支持导入/导出功能',
       impFields: '导入失败，请检查字段名和数据格式是否正确',
-      treeNotImp: '树表格不支持导入'
+      treeNotImp: '树表格不支持导入',
+      reqPlugin: '可选扩展插件 "{1}" https://vxeui.com/other{0}/#/{1}/install'
     },
     table: {
       emptyText: '暂无数据',

package/packages/table/module/edit/mixin.ts

@@ -74,8 +74,8 @@ function handleInsertRowAt (_vm: any, records: any[], row: any, isInsertNextRow?
         const rest = { row: item, rowid, seq: -1, index: -1, _index: -1, $index: -1, items: afterFullData, parent: null, level: 0, height: 0 }
         fullDataRowIdData[rowid] = rest
         fullAllDataRowIdData[rowid] = rest
-        afterFullData.push(item)
-        tableFullData.push(item)
+        afterFullData.unshift(item)
+        tableFullData.unshift(item)
       })
       // 刷新单元格合并
       mergeList.forEach((mergeItem: any) => {

package/packages/table/module/export/mixin.ts

@@ -66,7 +66,7 @@ function toBooleanValue (cellValue: any) {
   return XEUtils.isBoolean(cellValue) ? (cellValue ? 'TRUE' : 'FALSE') : cellValue
 }
 
-function getLabelData ($xetable: any, opts: any, columns: any[], datas: any[]) {
+function getBodyLabelData ($xetable: any, opts: any, columns: any[], datas: any[]) {
   const { isAllExpand, mode } = opts
   const { treeConfig, treeOpts, radioOpts, checkboxOpts, columnOpts } = $xetable
   const childrenField = treeOpts.children || treeOpts.childrenField
@@ -152,15 +152,18 @@ function getLabelData ($xetable: any, opts: any, columns: any[], datas: any[]) {
     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 = renderer.get(renderOpts.name)
         if (compConf) {
-          exportLabelMethod = compConf.tableExportMethod || compConf.exportMethod || (compConf as any).cellExportMethod
+          bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod || (compConf as any).cellExportMethod
         }
       }
-      if (exportLabelMethod) {
-        cellValue = exportLabelMethod({ $table: $xetable, row, column, options: opts })
+      if (!bodyExportMethod) {
+        bodyExportMethod = columnOpts.exportMethod
+      }
+      if (bodyExportMethod) {
+        cellValue = bodyExportMethod({ $table: $xetable, row, column, options: opts })
       } else {
         switch (column.type) {
           case 'seq': {
@@ -207,7 +210,7 @@ function getExportData ($xetable: any, opts: any) {
   if (dataFilterMethod) {
     datas = datas.filter((row: any, index: any) => dataFilterMethod({ row, $rowIndex: index }))
   }
-  return getLabelData($xetable, opts, columns, datas)
+  return getBodyLabelData($xetable, opts, columns, datas)
 }
 
 function getBooleanValue (cellValue: any) {
@@ -1284,8 +1287,11 @@ export default {
 
       // 检查类型，如果为自定义导出，则不需要校验类型
       if (!opts.exportMethod && !XEUtils.includes(XEUtils.keys(exportOpts._typeMaps), type)) {
+        errLog('vxe.error.notType', [type])
         if (process.env.VUE_APP_VXE_ENV === 'development') {
-          errLog('vxe.error.notType', [type])
+          if (['xlsx', 'pdf'].includes(type)) {
+            warnLog('vxe.error.reqPlugin', [4, 'plugin-export-xlsx'])
+          }
         }
         const params = { status: false }
         return Promise.reject(params)

package/packages/table/module/keyboard/mixin.ts

@@ -213,8 +213,8 @@ export default {
     },
     handleCellMousedownEvent (evnt: any, params: any) {
       const { editConfig, editOpts, handleSelected, checkboxConfig, checkboxOpts, 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)

package/packages/table/src/body.ts

@@ -358,12 +358,12 @@ function renderRows (h: CreateElement, _vm: any, $xeTable: any, fixedType: any,
     columnOpts,
     isDragColMove
   } = $xeTable
+  const { transform, seqMode } = treeOpts
   const childrenField = treeOpts.children || treeOpts.childrenField
   const rows: any[] = []
   tableData.forEach((row: any, $rowIndex: any) => {
     const trOn: any = {}
     let rowIndex = $rowIndex
-    const _rowIndex = $xeTable.getVTRowIndex(row)
     // 确保任何情况下 rowIndex 都精准指向真实 data 索引
     rowIndex = $xeTable.getRowIndex(row)
     // 当前行事件
@@ -383,8 +383,18 @@ function renderRows (h: CreateElement, _vm: any, $xeTable: any, fixedType: any,
     }
     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, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
     // 行是否被展开
     const isExpandRow = expandColumn && !!rowExpandedMaps[rowid]
@@ -416,7 +426,7 @@ function renderRows (h: CreateElement, _vm: any, $xeTable: any, fixedType: any,
       '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,

package/packages/table/src/methods.ts

@@ -510,16 +510,15 @@ function handleRecalculateLayout ($xeTable: any, reFull: boolean) {
   }
   $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: any, isRollX: boolean, isRollY: boolean) {
@@ -1699,6 +1698,10 @@ const Methods = {
    * @returns
    */
   handleVirtualTreeToList () {
+    const $xeTable = this
+    const internalData = $xeTable
+
+    const { fullAllDataRowIdData } = internalData
     const { treeOpts, treeConfig, treeExpandedMaps, afterTreeFullData, afterFullData } = this
     const childrenField = treeOpts.children || treeOpts.childrenField
     if (treeConfig && treeOpts.transform) {
@@ -1708,6 +1711,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)
         }
@@ -1840,17 +1847,47 @@ 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: any, index: number) => {
+          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 { treeConfig, afterFullData, fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData, treeOpts } = this
+    const $xeTable = this
+    const props = $xeTable
+    const internalData = $xeTable
+
+    const { treeConfig } = props
+    const { afterFullData, fullDataRowIdData, fullAllDataRowIdData, afterTreeFullData } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const fullMaps: any = {}
     if (treeConfig) {
       XEUtils.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) {
@@ -1863,9 +1900,10 @@ const Methods = {
         }
         fullMaps[rowid] = row
       }, { children: treeOpts.transform ? treeOpts.mapChildrenField : childrenField })
+      $xeTable.updateTreeDataIndex()
     } else {
-      afterFullData.forEach((row: any, index: any) => {
-        const rowid = getRowid(this, row)
+      afterFullData.forEach((row: any, index: number) => {
+        const rowid = getRowid($xeTable, row)
         const rowRest = fullAllDataRowIdData[rowid]
         const seq = index + 1
         if (rowRest) {
@@ -1881,10 +1919,40 @@ const Methods = {
     }
     this.afterFullRowMaps = fullMaps
   },
+  /**
+   * 只对 tree-config 有效，获取行的子级
+   */
+  getTreeRowChildren (rowOrRowid: any) {
+    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 (XEUtils.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: any) {
+  getTreeParentRow (rowOrRowid: any) {
     const { treeConfig, fullDataRowIdData } = this
     if (rowOrRowid && treeConfig) {
       let rowid
@@ -1900,6 +1968,12 @@ const Methods = {
     }
     return null
   },
+  getParentRow (rowOrRowid: any) {
+    const $xeTable = this
+
+    warnLog('vxe.error.delFunc', ['getParentRow', 'getTreeParentRow'])
+    return $xeTable.getTreeParentRow(rowOrRowid)
+  },
   /**
    * 根据行的唯一主键获取行
    * @param {String/Number} rowid 行主键
@@ -5801,7 +5875,9 @@ const Methods = {
               }
               return this.$nextTick().then(() => {
                 if (transform) {
-                  return this.handleTableData()
+                  this.handleTableData()
+                  this.updateTreeDataIndex()
+                  return this.$nextTick()
                 }
               })
             })
@@ -5898,7 +5974,9 @@ const Methods = {
       validRows.forEach((row: any) => this.handleTreeExpandReserve(row, expanded))
     }
     this.treeExpandedMaps = treeTempExpandedMaps
-    return Promise.all(result).then(this.recalculate)
+    return Promise.all(result).then(() => {
+      return this.recalculate()
+    })
   },
   /**
    * 虚拟树的展开与收起
@@ -5909,9 +5987,14 @@ const Methods = {
   handleVirtualTreeExpand (rows: any, expanded: any) {
     return this.handleBaseTreeExpand(rows, expanded).then(() => {
       this.handleVirtualTreeToList()
-      return this.handleTableData()
+      this.handleTableData()
+      this.updateTreeDataIndex()
     }).then(() => {
       return this.recalculate()
+    }).then(() => {
+      setTimeout(() => {
+        this.updateCellAreas()
+      }, 30)
     })
   },
   /**

package/packages/table/src/table.ts

@@ -873,7 +873,7 @@ export default {
       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) {
@@ -912,7 +912,10 @@ export default {
       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'])
         }
@@ -939,7 +942,7 @@ export default {
       // 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'])
       }
     }
@@ -1056,7 +1059,7 @@ export default {
 
       $xeTable.$nextTick(() => {
         if (props.loading) {
-          if (!VxeUILoadingComponent) {
+          if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
             errLog('vxe.error.reqComp', ['vxe-loading'])
           }
         }
@@ -1357,8 +1360,13 @@ export default {
             value: currLoading,
             icon: loadingOpts.icon,
             text: loadingOpts.text
-          }
-        }, $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }, h))
+          },
+          scopedSlots: loadingSlot
+            ? {
+                default: () => $xeTable.callSlot(loadingSlot, { $table: $xeTable, $grid: $xeGrid, loading: currLoading }, h)
+              }
+            : {}
+        })
         : loadingSlot
           ? h('div', {
             class: ['vxe-loading--custom-wrapper', {