vxe-table 3.13.17 → 3.13.19

package/packages/table/render/index.ts

@@ -184,10 +184,8 @@ function getComponentOns (renderOpts: any, params: any, eFns?: {
   const ons: any = {}
   XEUtils.objectEach(events, (func, key: any) => {
     ons[getOnName(key)] = function (...args: any[]) {
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (!XEUtils.isFunction(func)) {
-          errLog('vxe.error.errFunc', [func])
-        }
+      if (!XEUtils.isFunction(func)) {
+        errLog('vxe.error.errFunc', [func])
       }
       func(params, ...args)
     }
@@ -622,6 +620,62 @@ function handleExportTreeSelectMethod (params: any) {
   return options.original ? getCellValue(row, column) : getTreeSelectCellValue(column.editRender || column.cellRender, params)
 }
 
+function handleNumberCell (h: CreateElement, renderOpts: VxeGlobalRendererHandles.RenderTableDefaultOptions, params: VxeGlobalRendererHandles.RenderTableDefaultParams) {
+  const { props = {}, showNegativeStatus } = renderOpts
+  const { row, column } = params
+  const { type } = props
+  let cellValue = XEUtils.get(row, column.field)
+  let isNegative = false
+  if (!isEmptyValue(cellValue)) {
+    const numberInputConfig = getConfig().numberInput || {}
+    if (type === 'float') {
+      const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true)
+      const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1)
+      cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits)
+      if (!autoFill) {
+        cellValue = XEUtils.toNumber(cellValue)
+      }
+      if (showNegativeStatus) {
+        if (cellValue < 0) {
+          isNegative = true
+        }
+      }
+    } else if (type === 'amount') {
+      const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true)
+      const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2)
+      const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false)
+      cellValue = XEUtils.toNumber(cellValue)
+      if (showNegativeStatus) {
+        if (cellValue < 0) {
+          isNegative = true
+        }
+      }
+      cellValue = XEUtils.commafy(cellValue, { digits })
+      if (!autoFill) {
+        const [iStr, dStr] = cellValue.split('.')
+        if (dStr) {
+          const dRest = dStr.replace(/0+$/, '')
+          cellValue = dRest ? [iStr, '.', dRest].join('') : iStr
+        }
+      }
+      if (showCurrency) {
+        cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`
+      }
+    } else {
+      if (showNegativeStatus) {
+        if (XEUtils.toNumber(cellValue) < 0) {
+          isNegative = true
+        }
+      }
+    }
+  }
+  return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative
+    ? {
+        class: 'is--negative'
+      }
+    : {})
+}
+
 /**
  * 表格 - 渲染器
  */
@@ -687,64 +741,19 @@ renderer.mixin({
     renderTableFilter: defaultFilterRender,
     tableFilterDefaultMethod: handleInputFilterMethod
   },
+  FormatNumberInput: {
+    renderTableDefault: handleNumberCell,
+    tableFilterDefaultMethod: handleInputFilterMethod,
+    tableExportMethod (params) {
+      const { row, column } = params
+      const cellValue = XEUtils.get(row, column.field)
+      return cellValue
+    }
+  },
   VxeNumberInput: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultEditRender,
-    renderTableCell (h, renderOpts, params) {
-      const { props = {}, showNegativeStatus } = renderOpts
-      const { row, column } = params
-      const { type } = props
-      let cellValue = XEUtils.get(row, column.field)
-      let isNegative = false
-      if (!isEmptyValue(cellValue)) {
-        const numberInputConfig = getConfig().numberInput || {}
-        if (type === 'float') {
-          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true)
-          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 1)
-          cellValue = XEUtils.toFixed(XEUtils.floor(cellValue, digits), digits)
-          if (!autoFill) {
-            cellValue = XEUtils.toNumber(cellValue)
-          }
-          if (showNegativeStatus) {
-            if (cellValue < 0) {
-              isNegative = true
-            }
-          }
-        } else if (type === 'amount') {
-          const autoFill = handleDefaultValue(props.autoFill, numberInputConfig.autoFill, true)
-          const digits = handleDefaultValue(props.digits, numberInputConfig.digits, 2)
-          const showCurrency = handleDefaultValue(props.showCurrency, numberInputConfig.showCurrency, false)
-          cellValue = XEUtils.toNumber(cellValue)
-          if (showNegativeStatus) {
-            if (cellValue < 0) {
-              isNegative = true
-            }
-          }
-          cellValue = XEUtils.commafy(cellValue, { digits })
-          if (!autoFill) {
-            const [iStr, dStr] = cellValue.split('.')
-            if (dStr) {
-              const dRest = dStr.replace(/0+$/, '')
-              cellValue = dRest ? [iStr, '.', dRest].join('') : iStr
-            }
-          }
-          if (showCurrency) {
-            cellValue = `${props.currencySymbol || numberInputConfig.currencySymbol || getI18n('vxe.numberInput.currencySymbol') || ''}${cellValue}`
-          }
-        } else {
-          if (showNegativeStatus) {
-            if (XEUtils.toNumber(cellValue) < 0) {
-              isNegative = true
-            }
-          }
-        }
-      }
-      return getCellLabelVNs(h, renderOpts, params, cellValue, isNegative
-        ? {
-            class: 'is--negative'
-          }
-        : {})
-    },
+    renderTableCell: handleNumberCell,
     renderTableFooter (h, renderOpts, params) {
       const { props = {} } = renderOpts
       const { row, column, _columnIndex } = params
@@ -851,11 +860,22 @@ renderer.mixin({
     tableFilterDefaultMethod: handleFilterMethod,
     tableExportMethod: handleExportSelectMethod
   },
+  /**
+   * 已废弃，被 FormatSelect 替换
+   * @deprecated
+   */
   formatOption: {
     renderTableDefault (h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params))
     }
   },
+  FormatSelect: {
+    renderTableDefault (h, renderOpts, params) {
+      return getCellLabelVNs(h, renderOpts, params, getSelectCellValue(renderOpts, params))
+    },
+    tableFilterDefaultMethod: handleFilterMethod,
+    tableExportMethod: handleExportSelectMethod
+  },
   VxeTreeSelect: {
     tableAutoFocus: 'input',
     renderTableEdit: defaultTableOrTreeSelectEditRender,
@@ -872,11 +892,21 @@ renderer.mixin({
     },
     tableExportMethod: handleExportTreeSelectMethod
   },
+  /**
+   * 已废弃，被 FormatTreeSelect 替换
+   * @deprecated
+   */
   formatTree: {
     renderTableDefault (h, renderOpts, params) {
       return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params))
     }
   },
+  FormatTreeSelect: {
+    renderTableDefault (h, renderOpts, params) {
+      return getCellLabelVNs(h, renderOpts, params, getTreeSelectCellValue(renderOpts, params))
+    },
+    tableExportMethod: handleExportTreeSelectMethod
+  },
   VxeColorPicker: {
     tableAutoFocus: 'input',
     renderTableEdit (h, renderOpts, params: VxeGlobalRendererHandles.RenderTableEditParams & { $table: VxeTableConstructor & VxeTablePrivateMethods }) {

package/packages/table/src/columnInfo.ts

@@ -15,40 +15,38 @@ export class ColumnInfo {
     const visible = XEUtils.isBoolean(_vm.visible) ? _vm.visible : true
     const tableProps = $xetable
 
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      const types = ['seq', 'checkbox', 'radio', 'expand', 'html']
-      if (_vm.type && types.indexOf(_vm.type) === -1) {
-        warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')])
-      }
-      if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
-        warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}'])
-      }
-      if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
-        warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}'])
+    const types = ['seq', 'checkbox', 'radio', 'expand', 'html']
+    if (_vm.type && types.indexOf(_vm.type) === -1) {
+      warnLog('vxe.error.errProp', [`type=${_vm.type}`, types.join(', ')])
+    }
+    if (XEUtils.isBoolean(_vm.cellRender) || (_vm.cellRender && !XEUtils.isObject(_vm.cellRender))) {
+      warnLog('vxe.error.errProp', [`column.cell-render=${_vm.cellRender}`, 'column.cell-render={}'])
+    }
+    if (XEUtils.isBoolean(_vm.editRender) || (_vm.editRender && !XEUtils.isObject(_vm.editRender))) {
+      warnLog('vxe.error.errProp', [`column.edit-render=${_vm.editRender}`, 'column.edit-render={}'])
+    }
+    if (_vm.type === 'expand') {
+      const { treeConfig } = tableProps
+      if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
+        errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand'])
       }
-      if (_vm.type === 'expand') {
-        const { treeConfig } = tableProps
-        if (treeConfig && ($xetable.treeOpts.showLine || $xetable.treeOpts.line)) {
-          errLog('vxe.error.errConflicts', ['tree-config.line', 'column.type=expand'])
+    }
+    if (_vm.remoteSort) {
+      warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote'])
+    }
+    if (_vm.sortMethod) {
+      warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod'])
+    }
+    if (formatter) {
+      if (XEUtils.isString(formatter)) {
+        const gFormatOpts = formats.get(formatter) || XEUtils[formatter]
+        if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+          errLog('vxe.error.notFormats', [formatter])
         }
-      }
-      if (_vm.remoteSort) {
-        warnLog('vxe.error.delProp', ['column.remote-sort', 'sort-config.remote'])
-      }
-      if (_vm.sortMethod) {
-        warnLog('vxe.error.delProp', ['column.sort-method', 'sort-config.sortMethod'])
-      }
-      if (formatter) {
-        if (XEUtils.isString(formatter)) {
-          const gFormatOpts = formats.get(formatter) || XEUtils[formatter]
-          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-            errLog('vxe.error.notFormats', [formatter])
-          }
-        } else if (XEUtils.isArray(formatter)) {
-          const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]]
-          if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
-            errLog('vxe.error.notFormats', [formatter[0]])
-          }
+      } else if (XEUtils.isArray(formatter)) {
+        const gFormatOpts = formats.get(formatter[0]) || XEUtils[formatter[0]]
+        if (!gFormatOpts || !XEUtils.isFunction(gFormatOpts.tableCellFormatMethod || gFormatOpts.cellFormatMethod)) {
+          errLog('vxe.error.notFormats', [formatter[0]])
         }
       }
     }

package/packages/table/src/methods.ts

@@ -7,7 +7,7 @@ import { getRowUniqueId, clearTableAllStatus, getRowkey, getRowid, rowToVisible,
 import { getSlotVNs } from '../../ui/src/vn'
 import { warnLog, errLog } from '../../ui/src/log'
 
-import type { VxeTableDefines, VxeColumnPropTypes, VxeTableEmits, ValueOf, TableReactData, VxeTableConstructor, VxeToolbarConstructor, TableInternalData, VxeTablePrivateMethods, VxeTooltipInstance, VxeTablePropTypes } from '../../../types'
+import type { VxeTableDefines, VxeColumnPropTypes, VxeTableEmits, ValueOf, TableReactData, VxeTableConstructor, VxeToolbarConstructor, TableInternalData, VxeGridConstructor, GridPrivateMethods, VxeTablePrivateMethods, VxeTooltipInstance, VxeTablePropTypes } from '../../../types'
 
 const { getConfig, getI18n, renderer, formats, interceptor, createEvent } = VxeUI
 
@@ -2297,10 +2297,26 @@ const Methods = {
    * 获取父容器的高度
    */
   getParentHeight () {
-    const { $el, $xegrid, height } = this
-    const parentElem = $el.parentNode
-    const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0
-    return Math.floor($xegrid ? $xegrid.getParentHeight() : XEUtils.toNumber(getComputedStyle(parentElem).height) - parentPaddingSize)
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const $xeGrid = $xeTable.$xeGrid as VxeGridConstructor & GridPrivateMethods
+    const props = $xeTable
+
+    const { height } = props
+    const el = $xeTable.$refs.refElem as HTMLDivElement
+    if (el) {
+      const parentElem = el.parentNode as HTMLElement
+      const parentPaddingSize = height === '100%' || height === 'auto' ? getPaddingTopBottomSize(parentElem) : 0
+      let parentWrapperHeight = 0
+      if (parentElem) {
+        if ($xeGrid && hasClass(parentElem, 'vxe-grid--table-wrapper')) {
+          parentWrapperHeight = $xeGrid.getParentHeight()
+        } else {
+          parentWrapperHeight = parentElem.clientHeight
+        }
+      }
+      return Math.floor(parentWrapperHeight - parentPaddingSize)
+    }
+    return 0
   },
   /**
    * 获取需要排除的高度
@@ -2393,28 +2409,26 @@ const Methods = {
     if (treeConfig) {
       // 树结构自动转换
       if (treeOpts.transform) {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          if (!treeOpts.rowField) {
-            errLog('vxe.error.reqProp', ['table.tree-config.rowField'])
-          }
-          if (!treeOpts.parentField) {
-            errLog('vxe.error.reqProp', ['table.tree-config.parentField'])
-          }
-          if (!childrenField) {
-            errLog('vxe.error.reqProp', ['tree-config.childrenField'])
-          }
-          if (!treeOpts.mapChildrenField) {
-            errLog('vxe.error.reqProp', ['tree-config.mapChildrenField'])
-          }
-          if (childrenField === treeOpts.mapChildrenField) {
-            errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField'])
-          }
-          // fullData.forEach(row => {
-          //   if (row[childrenField] && row[childrenField].length) {
-          //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
-          //   }
-          // })
+        if (!treeOpts.rowField) {
+          errLog('vxe.error.reqProp', ['table.tree-config.rowField'])
+        }
+        if (!treeOpts.parentField) {
+          errLog('vxe.error.reqProp', ['table.tree-config.parentField'])
         }
+        if (!childrenField) {
+          errLog('vxe.error.reqProp', ['tree-config.childrenField'])
+        }
+        if (!treeOpts.mapChildrenField) {
+          errLog('vxe.error.reqProp', ['tree-config.mapChildrenField'])
+        }
+        if (childrenField === treeOpts.mapChildrenField) {
+          errLog('vxe.error.errConflicts', ['tree-config.childrenField', 'tree-config.mapChildrenField'])
+        }
+        // fullData.forEach(row => {
+        //   if (row[childrenField] && row[childrenField].length) {
+        //     warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${childrenField}`])
+        //   }
+        // })
         treeData = XEUtils.toArrayTree(fullData, {
           key: treeOpts.rowField,
           parentKey: treeOpts.parentField,
@@ -2480,16 +2494,14 @@ const Methods = {
         //   }
         // }
 
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          if (!(this.height || this.maxHeight)) {
-            errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
-          }
-          // if (!this.showOverflow) {
-          //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
-          // }
-          if (this.spanMethod) {
-            warnLog('vxe.error.scrollErrProp', ['table.span-method'])
-          }
+        if (!(this.height || this.maxHeight)) {
+          errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
+        }
+        // if (!this.showOverflow) {
+        //   warnLog('vxe.error.reqProp', ['table.show-overflow'])
+        // }
+        if (this.spanMethod) {
+          errLog('vxe.error.scrollErrProp', ['table.span-method'])
         }
       }
 
@@ -2634,17 +2646,19 @@ const Methods = {
   cacheRowMap () {
     const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
     const props = $xeTable
+    const reactData = $xeTable as unknown as TableReactData
     const internalData = $xeTable as unknown as TableInternalData
 
     const { treeConfig } = props
-    const treeOpts = $xeTable.computeTreeOpts
+    const { treeExpandedMaps } = reactData
     const { fullAllDataRowIdData, tableFullData, tableFullTreeData } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
     const childrenField = treeOpts.children || treeOpts.childrenField
     const hasChildField = treeOpts.hasChild || treeOpts.hasChildField
     const rowkey = getRowkey($xeTable)
-    const isLazy = treeConfig && treeOpts.lazy
-    const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
+    const fullAllDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = { ...fullAllDataRowIdData } // 存在已删除数据
     const fullDataRowIdMaps: Record<string, VxeTableDefines.RowCacheItem> = {}
+    const treeTempExpandedMaps = { ...treeExpandedMaps }
     const handleRow = (row: any, index: number, items: any, path?: any[], parentRow?: any, nodes?: any[]) => {
       let rowid = getRowid($xeTable, row)
       const seq = treeConfig && path ? toTreePathSeq(path) : index + 1
@@ -2653,13 +2667,24 @@ const Methods = {
         rowid = getRowUniqueId()
         XEUtils.set(row, rowkey, rowid)
       }
-      if (isLazy && row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
-        row[childrenField] = null
+      if (treeConfig && treeOpts.lazy) {
+        const treeExpRest = treeExpandedMaps[rowid]
+        if (row[hasChildField] && XEUtils.isUndefined(row[childrenField])) {
+          row[childrenField] = null
+        }
+        if (treeExpRest) {
+          if (!row[childrenField] || !row[childrenField].length) {
+            delete treeTempExpandedMaps[rowid]
+          }
+        }
       }
       let rowRest = fullAllDataRowIdData[rowid]
       if (!rowRest) {
         rowRest = { row, rowid, seq, index: -1, _index: -1, $index: -1, treeIndex: index, items, parent: parentRow, level, height: 0, resizeHeight: 0, oTop: 0, expandHeight: 0 }
       }
+      rowRest.treeLoaded = false
+      rowRest.expandLoaded = false
+
       rowRest.row = row
       rowRest.items = items
       rowRest.parent = parentRow
@@ -2668,13 +2693,14 @@ const Methods = {
       fullDataRowIdMaps[rowid] = rowRest
       fullAllDataRowIdMaps[rowid] = rowRest
     }
-    internalData.fullDataRowIdData = fullDataRowIdMaps
-    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps
     if (treeConfig) {
       XEUtils.eachTree(tableFullTreeData, handleRow, { children: childrenField })
     } else {
       tableFullData.forEach(handleRow)
     }
+    internalData.fullDataRowIdData = fullDataRowIdMaps
+    internalData.fullAllDataRowIdData = fullAllDataRowIdMaps
+    reactData.treeExpandedMaps = treeTempExpandedMaps
   },
   cacheSourceMap (fullData: any[]) {
     let { treeConfig, treeOpts, sourceDataRowIdData } = this
@@ -3010,12 +3036,20 @@ const Methods = {
    * 如果还额外传了 field 则还原指定的单元格数据
    */
   revertData (rows: any, field: any) {
-    const { keepSource, tableSourceData, treeConfig } = this
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const props = $xeTable
+    const reactData = $xeTable as unknown as TableReactData
+    const internalData = $xeTable as unknown as TableInternalData
+
+    const { keepSource, treeConfig } = props
+    const { fullAllDataRowIdData, fullDataRowIdData, tableSourceData, sourceDataRowIdData, tableFullData, afterFullData } = internalData
+    const treeOpts = $xeTable.computeTreeOpts
+    const { transform } = treeOpts
     if (!keepSource) {
       if (process.env.VUE_APP_VXE_ENV === 'development') {
-        warnLog('vxe.error.reqProp', ['keep-source'])
+        errLog('vxe.error.reqProp', ['keep-source'])
       }
-      return this.$nextTick()
+      return $xeTable.$nextTick()
     }
     let targetRows = rows
     if (rows) {
@@ -3023,30 +3057,52 @@ const Methods = {
         targetRows = [rows]
       }
     } else {
-      targetRows = XEUtils.toArray(this.getUpdateRecords())
+      targetRows = XEUtils.toArray($xeTable.getUpdateRecords())
     }
+    let reDelFlag = false
     if (targetRows.length) {
-      targetRows.forEach((row: any) => {
-        if (!this.isInsertByRow(row)) {
-          const rowIndex = this.getRowIndex(row)
-          if (treeConfig && rowIndex === -1) {
-            errLog('vxe.error.noTree', ['revertData'])
-          }
-          const oRow = tableSourceData[rowIndex]
-          if (oRow && row) {
-            if (field) {
-              XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true))
-            } else {
-              XEUtils.destructuring(row, XEUtils.clone(oRow, true))
+      targetRows.forEach((item: any) => {
+        const rowid = getRowid($xeTable, item)
+        const rowRest = fullAllDataRowIdData[rowid]
+        if (rowRest) {
+          const row = rowRest.row
+          if (!$xeTable.isInsertByRow(row)) {
+            const oRow = sourceDataRowIdData[rowid]
+            if (oRow && row) {
+              if (field) {
+                XEUtils.set(row, field, XEUtils.clone(XEUtils.get(oRow, field), true))
+              } else {
+                XEUtils.destructuring(row, XEUtils.clone(oRow, true))
+              }
+              if (!fullDataRowIdData[rowid] && $xeTable.isRemoveByRow(row)) {
+                tableFullData.unshift(row)
+                afterFullData.unshift(row)
+                reDelFlag = true
+              }
             }
           }
         }
       })
     }
     if (rows) {
-      return this.$nextTick()
+      if (reDelFlag) {
+        $xeTable.updateFooter()
+        $xeTable.cacheRowMap(false)
+        $xeTable.handleTableData(treeConfig && transform)
+        if (!(treeConfig && transform)) {
+          $xeTable.updateAfterDataIndex()
+        }
+        $xeTable.checkSelectionStatus()
+        if (reactData.scrollYLoad) {
+          $xeTable.updateScrollYSpace()
+        }
+      }
+      return $xeTable.$nextTick().then(() => {
+        $xeTable.updateCellAreas()
+        return $xeTable.recalculate()
+      })
     }
-    return this.reloadData(tableSourceData)
+    return $xeTable.reloadData(tableSourceData)
   },
   /**
    * 清空单元格内容
@@ -3162,17 +3218,28 @@ const Methods = {
    * @param {Row} row 行对象
    */
   isInsertByRow (row: any) {
-    const { editStore } = this
-    const rowid = getRowid(this, row)
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+
+    const { editStore } = reactData
+    const rowid = getRowid($xeTable, row)
     return !!editStore.insertMaps[rowid]
   },
+  isRemoveByRow (row: any) {
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
+
+    const { editStore } = reactData
+    const rowid = getRowid($xeTable, row)
+    return !!editStore.removeMaps[rowid]
+  },
   /**
    * 删除所有新增的临时数据
    * @returns
    */
   removeInsertRow () {
-    const $xeTable = this
-    const reactData = $xeTable
+    const $xeTable = this as VxeTableConstructor & VxeTablePrivateMethods
+    const reactData = $xeTable as unknown as TableReactData
 
     const { editStore } = reactData
     editStore.insertMaps = {}
@@ -9016,19 +9083,17 @@ const funcs = 'setFilter,openFilter,clearFilter,saveFilterPanel,resetFilterPanel
 
 funcs.forEach(name => {
   Methods[name] = function (...args: any[]) {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      if (!this[`_${name}`]) {
-        if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
-          errLog('vxe.error.reqModule', ['VxeTableExportModule'])
-        } else if ('fullValidate,validate'.split(',').includes(name)) {
-          errLog('vxe.error.reqModule', ['VxeTableValidatorModule'])
-        } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
-          errLog('vxe.error.reqModule', ['VxeTableFilterModule'])
-        } 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'])
-        } else if ('openCustom'.split(',').includes(name)) {
-          errLog('vxe.error.reqModule', ['VxeTableCustomModule'])
-        }
+    if (!this[`_${name}`]) {
+      if ('openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').includes(name)) {
+        errLog('vxe.error.reqModule', ['VxeTableExportModule'])
+      } else if ('fullValidate,validate'.split(',').includes(name)) {
+        errLog('vxe.error.reqModule', ['VxeTableValidatorModule'])
+      } else if ('setFilter,openFilter,clearFilter,getCheckedFilters'.split(',').includes(name)) {
+        errLog('vxe.error.reqModule', ['VxeTableFilterModule'])
+      } 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'])
+      } else if ('openCustom'.split(',').includes(name)) {
+        errLog('vxe.error.reqModule', ['VxeTableCustomModule'])
       }
     }
     return this[`_${name}`] ? this[`_${name}`](...args) : null

package/packages/table/src/table.ts

@@ -1577,27 +1577,25 @@ export default {
       }
     }
 
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      // 使用已安装的组件，如果未安装则不渲染
-      const VxeUILoadingComponent = VxeUI.getComponent<VxeLoadingComponent>('VxeLoading')
-      const VxeUITooltipComponent = VxeUI.getComponent<VxeTooltipComponent>('VxeTooltip')
+    // 使用已安装的组件，如果未安装则不渲染
+    const VxeUILoadingComponent = VxeUI.getComponent<VxeLoadingComponent>('VxeLoading')
+    const VxeUITooltipComponent = VxeUI.getComponent<VxeTooltipComponent>('VxeTooltip')
 
-      $xeTable.$nextTick(() => {
-        if (props.loading) {
-          if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
-            errLog('vxe.error.reqComp', ['vxe-loading'])
-          }
+    $xeTable.$nextTick(() => {
+      if (props.loading) {
+        if (!VxeUILoadingComponent && !this.$scopedSlots.loading) {
+          errLog('vxe.error.reqComp', ['vxe-loading'])
         }
-        if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
+      }
+      if ((props.showOverflow === true || props.showOverflow === 'tooltip') ||
           (props.showHeaderOverflow === true || props.showHeaderOverflow === 'tooltip') ||
           (props.showFooterOverflow === true || props.showFooterOverflow === 'tooltip') ||
           props.tooltipConfig || props.editRules) {
-          if (!VxeUITooltipComponent) {
-            errLog('vxe.error.reqComp', ['vxe-tooltip'])
-          }
+        if (!VxeUITooltipComponent) {
+          errLog('vxe.error.reqComp', ['vxe-tooltip'])
         }
-      })
-    }
+      }
+    })
     if (this.autoResize) {
       const resizeObserver = globalResize.create(() => {
         if (this.autoResize) {

package/packages/table/src/util.ts

@@ -151,12 +151,10 @@ export function assembleColumn (_vm: any) {
   const { $el, $xetable, $xecolumn, columnConfig } = _vm
   const groupConfig = $xecolumn ? $xecolumn.columnConfig : null
   if (groupConfig) {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      if ($xecolumn.$options._componentTag === 'vxe-table-column') {
-        errLog('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`])
-      } else if ($xecolumn.$options._componentTag === 'vxe-column') {
-        warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`])
-      }
+    if ($xecolumn.$options._componentTag === 'vxe-table-column') {
+      errLog('vxe.error.groupTag', [`<vxe-table-colgroup title=${$xecolumn.title} ...>`, `<vxe-table-column title=${$xecolumn.title} ...>`])
+    } else if ($xecolumn.$options._componentTag === 'vxe-column') {
+      warnLog('vxe.error.groupTag', [`<vxe-colgroup title=${$xecolumn.title} ...>`, `<vxe-column title=${$xecolumn.title} ...>`])
     }
     if (!groupConfig.children) {
       groupConfig.children = []