vxe-table 3.8.8-beta.6 → 3.8.8-beta.7

package/packages/filter/src/mixin.js

@@ -58,7 +58,7 @@ export default {
         const { target: targetElem, pageX } = evnt
         const { filters, filterMultiple, filterRender } = column
         const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
-        const filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.filterRecoverMethod : null)
+        const filterRecoverMethod = column.filterRecoverMethod || (compConf ? (compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod) : null)
         const { visibleWidth } = DomTools.getDomNode()
         Object.assign(filterStore, {
           args: params,
@@ -206,7 +206,7 @@ export default {
         const { filters, filterRender } = column
         if (filters) {
           const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
-          const filterResetMethod = column.filterResetMethod || (compConf ? compConf.filterResetMethod : null)
+          const filterResetMethod = column.filterResetMethod || (compConf ? (compConf.tableFilterResetMethod || compConf.filterResetMethod) : null)
           filters.forEach((item) => {
             item._checked = false
             item.checked = false

package/packages/filter/src/panel.js

@@ -1,7 +1,6 @@
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VXETable from '../../v-x-e-table'
 import UtilTools from '../../tools/utils'
-import XEUtils from 'xe-utils'
 import { getSlotVNs } from '../../tools/vn'
 
 export default {
@@ -20,7 +19,7 @@ export default {
     const { args, column } = filterStore
     const filterRender = column ? column.filterRender : null
     const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
-    const filterClassName = compConf ? compConf.filterClassName : ''
+    const filterClassName = compConf ? (compConf.tableFilterClassName || compConf.filterClassName) : ''
     return h('div', {
       class: [
         'vxe-table--filter-wrapper',
@@ -41,17 +40,18 @@ export default {
       const { $parent: $xetable, filterStore } = this
       const { args, column, multiple, maxHeight } = filterStore
       const { slots } = column
+      const rtFilter = compConf ? (compConf.renderTableFilter || compConf.renderFilter) : null
       if (slots && slots.filter) {
         return [
           h('div', {
             class: 'vxe-table--filter-template'
           }, $xetable.callSlot(slots.filter, Object.assign({ $panel: this, context: this }, args), h))
         ]
-      } else if (compConf && compConf.renderFilter) {
+      } else if (rtFilter) {
         return [
           h('div', {
             class: 'vxe-table--filter-template'
-          }, getSlotVNs(compConf.renderFilter.call($xetable, h, filterRender, Object.assign({ $panel: this, context: this }, args))))
+          }, getSlotVNs(rtFilter.call($xetable, h, filterRender, Object.assign({ $panel: this, context: this }, args))))
         ]
       }
       const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some(item => item._checked)
@@ -122,7 +122,7 @@ export default {
       const filterRender = column.filterRender
       const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
       const isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate
-      return multiple && (!compConf || (XEUtils.isBoolean(compConf.showFilterFooter) ? compConf.showFilterFooter !== false : compConf.isFooter !== false)) ? [
+      return multiple(compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [
         h('div', {
           class: 'vxe-table--filter-footer'
         }, [

package/packages/form/src/form-config-item.js

@@ -30,12 +30,12 @@ const VxeFormConfigItem = {
     const { rules, data, collapseAll, validOpts, titleAlign: allTitleAlign, titleWidth: allTitleWidth, titleColon: allTitleColon, titleAsterisk: allTitleAsterisk, titleOverflow: allTitleOverflow, vertical: allVertical } = $xeform
     const { slots, title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, vertical, children, showTitle, contentClassName, contentStyle, titleClassName, titleStyle } = item
     const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
-    const itemClassName = compConf ? compConf.itemClassName : ''
-    const itemStyle = compConf ? compConf.itemStyle : null
-    const itemContentClassName = compConf ? compConf.itemContentClassName : ''
-    const itemContentStyle = compConf ? compConf.itemContentStyle : null
-    const itemTitleClassName = compConf ? compConf.itemTitleClassName : ''
-    const itemTitleStyle = compConf ? compConf.itemTitleStyle : null
+    const itemClassName = compConf ? (compConf.formItemClassName || compConf.itemClassName) : ''
+    const itemStyle = compConf ? (compConf.formItemStyle || compConf.itemStyle) : null
+    const itemContentClassName = compConf ? (compConf.formItemContentClassName || compConf.itemContentClassName) : ''
+    const itemContentStyle = compConf ? (compConf.formItemContentStyle || compConf.itemContentStyle) : null
+    const itemTitleClassName = compConf ? (compConf.formItemTitleClassName || compConf.itemTitleClassName) : ''
+    const itemTitleStyle = compConf ? (compConf.formItemTitleStyle || compConf.itemTitleStyle) : null
     const span = item.span || $xeform.span
     const align = item.align || $xeform.align
     const titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign
@@ -75,10 +75,11 @@ const VxeFormConfigItem = {
       }
     }
     let contentVNs = []
+    const rfiContent = compConf ? (compConf.renderFormItemContent || compConf.renderItemContent) : null
     if (slots && slots.default) {
       contentVNs = $xeform.callSlot(slots.default, params, h)
-    } else if (compConf && compConf.renderItemContent) {
-      contentVNs = getSlotVNs(compConf.renderItemContent.call($xeform, h, itemRender, params))
+    } else if (rfiContent) {
+      contentVNs = getSlotVNs(rfiContent.call($xeform, h, itemRender, params))
     } else if (compConf && compConf.renderItem) {
       contentVNs = getSlotVNs(compConf.renderItem.call($xeform, h, itemRender, params))
     } else if (field) {

package/packages/form/src/form-item.js

@@ -67,12 +67,12 @@ const renderItem = (h, _vm, item, slots) => {
   const { _e, rules, data, collapseAll, validOpts, titleAlign: allTitleAlign, titleWidth: allTitleWidth, titleColon: allTitleColon, titleAsterisk: allTitleAsterisk, titleOverflow: allTitleOverflow, vertical: allVertical } = _vm
   const { title, folding, visible, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, vertical, showTitle, contentClassName, contentStyle, titleClassName, titleStyle } = item
   const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
-  const itemClassName = compConf ? compConf.itemClassName : ''
-  const itemStyle = compConf ? compConf.itemStyle : null
-  const itemContentClassName = compConf ? compConf.itemContentClassName : ''
-  const itemContentStyle = compConf ? compConf.itemContentStyle : null
-  const itemTitleClassName = compConf ? compConf.itemTitleClassName : ''
-  const itemTitleStyle = compConf ? compConf.itemTitleStyle : null
+  const itemClassName = compConf ? (compConf.formItemClassName || compConf.itemClassName) : ''
+  const itemStyle = compConf ? (compConf.formItemStyle || compConf.itemStyle) : null
+  const itemContentClassName = compConf ? (compConf.formItemContentClassName || compConf.itemContentClassName) : ''
+  const itemContentStyle = compConf ? (compConf.formItemContentStyle || compConf.itemContentStyle) : null
+  const itemTitleClassName = compConf ? (compConf.formItemTitleClassName || compConf.itemTitleClassName) : ''
+  const itemTitleStyle = compConf ? (compConf.formItemTitleStyle || compConf.itemTitleStyle) : null
   const span = item.span || _vm.span
   const align = item.align || _vm.align
   const titleAlign = XEUtils.eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign
@@ -97,10 +97,11 @@ const renderItem = (h, _vm, item, slots) => {
     }
   }
   let contentVNs = []
+  const rfiContent = compConf ? (compConf.renderFormItemContent || compConf.renderItemContent) : null
   if (slots && slots.default) {
     contentVNs = _vm.callSlot(slots.default, params, h)
-  } else if (compConf && compConf.renderItemContent) {
-    contentVNs = getSlotVNs(compConf.renderItemContent.call(_vm, h, itemRender, params))
+  } else if (rfiContent) {
+    contentVNs = getSlotVNs(rfiContent.call(_vm, h, itemRender, params))
   } else if (compConf && compConf.renderItem) {
     contentVNs = getSlotVNs(compConf.renderItem.call(_vm, h, itemRender, params))
   } else if (field) {

package/packages/form/src/form.js

@@ -271,8 +271,9 @@ export default {
           const { field, resetValue, itemRender } = item
           if (isEnableConf(itemRender)) {
             const compConf = VXETable.renderer.get(itemRender.name)
-            if (compConf && compConf.itemResetMethod) {
-              compConf.itemResetMethod({ data, field, property: field, item, $form: this, $grid: this.xegrid })
+            const fiResetMethod = compConf ? (compConf.formItemResetMethod || compConf.itemResetMethod) : null
+            if (compConf && fiResetMethod) {
+              fiResetMethod({ data, field, property: field, item, $form: this, $grid: this.xegrid })
             } else if (field) {
               XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : XEUtils.clone(resetValue, true))
             }

package/packages/form/src/render.js

@@ -45,10 +45,11 @@ export function renderTitle (h, _vm, item) {
         : renderPrefixIcon(h, titlePrefix)
     )
   }
+  const rfiTitle = compConf ? (compConf.renderFormItemTitle || compConf.renderItemTitle) : null
   titVNs.push(
     h('span', {
       class: 'vxe-form--item-title-label'
-    }, compConf && compConf.renderItemTitle ? getSlotVNs(compConf.renderItemTitle(itemRender, params)) : (slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)))
+    }, rfiTitle ? getSlotVNs(rfiTitle(itemRender, params)) : (slots && slots.title ? _vm.callSlot(slots.title, params, h) : getFuncText(item.title)))
   )
   contVNs.push(
     h('div', {

package/packages/form/src/util.js

@@ -39,8 +39,8 @@ class ItemConfig {
     })
     if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
       const compConf = item.itemRender ? VXETable.renderer.get(item.itemRender.name) : null
-      if (compConf && !compConf.renderItemContent && compConf.renderItem) {
-        warnLog('vxe.error.delProp', ['item-render.renderItem', 'item-render.renderItemContent'])
+      if (compConf && !(compConf.renderFormItemContent || compConf.renderItemContent) && compConf.renderItem) {
+        warnLog('vxe.error.delProp', ['item-render.renderItem', 'item-render.renderFormItemContent'])
       }
     }
   }
@@ -77,8 +77,9 @@ export function isActivetem ($xeform, formItem) {
     return visible
   }
   const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
-  if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
-    visibleMethod = compConf.itemVisibleMethod
+  const fiVisibleMethod = compConf ? (compConf.formItemVisibleMethod || compConf.itemVisibleMethod) : null
+  if (!visibleMethod && fiVisibleMethod) {
+    visibleMethod = fiVisibleMethod
   }
   if (!visibleMethod) {
     return true

package/packages/locale/lang/en-US.js

@@ -45,7 +45,7 @@ export default {
     table: {
       emptyText: 'No Data',
       allTitle: 'Select all / cancel',
-      seqTitle: '#',
+      seqTitle: 'S/N',
       confirmFilter: 'Confirm',
       resetFilter: 'Reset',
       allFilter: 'All',

package/packages/locale/lang/es-ES.js

@@ -45,7 +45,7 @@ export default {
     table: {
       emptyText: 'No hay datos',
       allTitle: 'Seleccionar todo / cancelar',
-      seqTitle: '#',
+      seqTitle: 'S/N',
       confirmFilter: 'Confirmar',
       resetFilter: 'Restablecer',
       allFilter: 'Todo',

package/packages/locale/lang/ja-JP.js

@@ -45,7 +45,7 @@ export default {
     table: {
       emptyText: 'データがありません',
       allTitle: '全て選択/取消',
-      seqTitle: '#',
+      seqTitle: 'S/N',
       confirmFilter: 'OK',
       resetFilter: 'リセット',
       allFilter: '全て',

package/packages/locale/lang/pt-BR.js

@@ -45,7 +45,7 @@ export default {
     table: {
       emptyText: 'Sem dados',
       allTitle: 'Selecionar todos / cancelar',
-      seqTitle: '#',
+      seqTitle: 'S/N',
       confirmFilter: 'Confirmar',
       resetFilter: 'Redefinir',
       allFilter: 'Todos',

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

@@ -45,7 +45,7 @@ export default {
     table: {
       emptyText: '暂无数据',
       allTitle: '全选/取消',
-      seqTitle: '#',
+      seqTitle: '序号',
       confirmFilter: '筛选',
       resetFilter: '重置',
       allFilter: '全部',

package/packages/locale/lang/zh-TC.js

@@ -45,7 +45,7 @@ export default {
     table: {
       emptyText: '暫無資料',
       allTitle: '全選/取消',
-      seqTitle: '#',
+      seqTitle: '序號',
       confirmFilter: '篩選',
       resetFilter: '重置',
       allFilter: '全部',

package/packages/table/src/body.js

@@ -94,8 +94,8 @@ function renderColumn (h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, r
   const { height: rowHeight } = rowOpts
   const renderOpts = editRender || cellRender
   const compConf = renderOpts ? VXETable.renderer.get(renderOpts.name) : null
-  const compCellClassName = compConf ? compConf.cellClassName : ''
-  const compCellStyle = compConf ? compConf.cellStyle : ''
+  const compCellClassName = compConf ? (compConf.tableCellClassName || compConf.cellClassName) : ''
+  const compCellStyle = compConf ? (compConf.tableCellStyle || compConf.cellStyle) : ''
   const showAllTip = tooltipOpts.showAll || tooltipOpts.enabled
   const columnIndex = $xetable.getColumnIndex(column)
   const _columnIndex = $xetable.getVTColumnIndex(column)
@@ -389,7 +389,7 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
     )
     // 如果行被展开了
     if (isExpandRow) {
-      const { height: expandHeight } = expandOpts
+      const { height: expandHeight, padding } = expandOpts
       const cellStyle = {}
       if (expandHeight) {
         cellStyle.height = `${expandHeight}px`
@@ -402,7 +402,9 @@ function renderRows (h, _vm, $xetable, fixedType, tableData, tableColumn) {
       const expandParams = { $table: $xetable, seq, column: expandColumn, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex }
       rows.push(
         h('tr', {
-          class: 'vxe-body--expanded-row',
+          class: ['vxe-body--expanded-row', {
+            'is--padding': padding
+          }],
           key: `expand_${rowid}`,
           style: rowStyle ? (XEUtils.isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle) : null,
           on: trOn
@@ -559,7 +561,7 @@ export default {
       emptyContent = $scopedSlots.empty.call(this, { $table: $xetable }, h)
     } else {
       const compConf = emptyOpts.name ? VXETable.renderer.get(emptyOpts.name) : null
-      const renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null
+      const renderTableEmptyView = compConf ? (compConf.renderTableEmptyView || compConf.renderEmpty) : null
       if (renderTableEmptyView) {
         emptyContent = getSlotVNs(renderTableEmptyView.call(this, h, emptyOpts, { $table: $xetable }))
       } else {

package/packages/table/src/cell.js

@@ -96,8 +96,9 @@ function getFooterContent (h, params) {
   }
   if (renderOpts) {
     const compConf = VXETable.renderer.get(renderOpts.name)
-    if (compConf && compConf.renderFooter) {
-      return getSlotVNs(compConf.renderFooter.call($table, h, renderOpts, params))
+    const rtFooter = compConf ? (compConf.renderTableFooter || compConf.renderFooter) : null
+    if (rtFooter) {
+      return getSlotVNs(rtFooter.call($table, h, renderOpts, params))
     }
   }
   // 兼容老模式
@@ -174,8 +175,9 @@ export const Cell = {
     }
     if (renderOpts) {
       const compConf = VXETable.renderer.get(renderOpts.name)
-      if (compConf && compConf.renderHeader) {
-        return getSlotVNs(renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params)))
+      const rtHeader = compConf ? (compConf.renderTableHeader || compConf.renderHeader) : null
+      if (rtHeader) {
+        return getSlotVNs(renderTitleContent(h, params, rtHeader.call($table, h, renderOpts, params)))
       }
     }
     return renderTitleContent(h, params, UtilTools.formatText(column.getTitle(), 1))
@@ -191,10 +193,12 @@ export const Cell = {
       return $table.callSlot(slots.default, params, h)
     }
     if (renderOpts) {
-      const funName = editRender ? 'renderCell' : 'renderDefault'
       const compConf = VXETable.renderer.get(renderOpts.name)
-      if (compConf && compConf[funName]) {
-        return getSlotVNs(compConf[funName].call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params)))
+      const rtDefault = compConf ? (compConf.renderTableDefault || compConf.renderDefault) : null
+      const rtCell = compConf ? (compConf.renderTableCell || compConf.renderCell) : null
+      const renderFn = editRender ? rtCell : rtDefault
+      if (renderFn) {
+        return getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params)))
       }
     }
     const cellValue = $table.getCellLabel(row, column)
@@ -610,8 +614,9 @@ export const Cell = {
     }
     if (contentRender) {
       const compConf = VXETable.renderer.get(contentRender.name)
-      if (compConf && compConf.renderExpand) {
-        return getSlotVNs(compConf.renderExpand.call($table, h, contentRender, params))
+      const rtExpand = compConf ? (compConf.renderTableExpand || compConf.renderExpand) : null
+      if (rtExpand) {
+        return getSlotVNs(rtExpand.call($table, h, contentRender, params))
       }
     }
     return []
@@ -775,12 +780,13 @@ export const Cell = {
     const { $table, column } = params
     const { slots, editRender, formatter } = column
     const compConf = VXETable.renderer.get(editRender.name)
+    const rtEdit = compConf ? (compConf.renderTableEdit || compConf.renderEdit) : null
     if (isEdit) {
       if (slots && slots.edit) {
         return $table.callSlot(slots.edit, params, h)
       }
-      if (compConf && compConf.renderEdit) {
-        return getSlotVNs(compConf.renderEdit.call($table, h, editRender, Object.assign({ $type: 'edit' }, params)))
+      if (rtEdit) {
+        return getSlotVNs(rtEdit.call($table, h, editRender, Object.assign({ $type: 'edit' }, params)))
       }
       return []
     }

package/packages/table/src/methods.js

@@ -1287,8 +1287,8 @@ const Methods = {
           if (valueList.length && !allRemoteFilter) {
             const { filterMethod, filterRender, field } = column
             const compConf = filterRender ? VXETable.renderer.get(filterRender.name) : null
-            const compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null
-            const defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null
+            const compFilterMethod = compConf && compConf.renderFilter ? (compConf.tableFilterMethod || compConf.filterMethod) : null
+            const defaultFilterMethod = compConf ? (compConf.defaultTableFilterMethod || compConf.defaultFilterMethod) : null
             const cellValue = UtilTools.getCellValue(row, column)
             if (filterMethod) {
               return itemList.some((item) => filterMethod({ value: item.value, option: item, cellValue, row, column, $table: this }))
@@ -1620,8 +1620,7 @@ const Methods = {
         this.clearCopyCellArea()
       }
     }
-    this.saveCustomVisible()
-    this.saveCustomSort()
+    this.saveCustomStore()
     this.analyColumnWidth()
     return this.refreshColumn(true)
   },
@@ -1854,6 +1853,12 @@ const Methods = {
     })
     return storeData
   },
+  saveCustomStore () {
+    this.saveCustomVisible()
+    this.saveCustomSort()
+    this.saveCustomFixed()
+    this.saveCustomResizable()
+  },
   saveCustomResizable (isReset) {
     const { id, collectColumn, customConfig, customOpts } = this
     const { storage } = customOpts
@@ -3394,8 +3399,11 @@ const Methods = {
   },
   handleToggleCheckRowEvent (evnt, params) {
     const { selectCheckboxMaps, checkboxOpts } = this
-    const { checkField } = checkboxOpts
+    const { checkField, trigger } = checkboxOpts
     const { row } = params
+    if (trigger === 'manual') {
+      return
+    }
     let value = false
     if (checkField) {
       value = !XEUtils.get(row, checkField)
@@ -3410,8 +3418,11 @@ const Methods = {
   },
   triggerCheckRowEvent (evnt, params, value) {
     const { checkboxOpts, afterFullData } = this
-    const { checkMethod } = checkboxOpts
+    const { checkMethod, trigger } = checkboxOpts
     const { row } = params
+    if (trigger === 'manual') {
+      return
+    }
     if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
       const checkboxRecords = this.getCheckboxRecords()
       if (checkboxRecords.length) {
@@ -3771,18 +3782,28 @@ const Methods = {
       }
     }
   },
+  handleCheckAllEvent (evnt, value) {
+    this.handleCheckedAllCheckboxRow(value)
+    if (evnt) {
+      this.emitEvent('checkbox-all', { records: this.getCheckboxRecords(), reserves: this.getCheckboxReserveRecords(), indeterminates: this.getCheckboxIndeterminateRecords(), checked: value }, evnt)
+    }
+  },
   /**
    * 多选，选中所有事件
    */
   triggerCheckAllEvent (evnt, value) {
-    this.handleCheckedAllCheckboxRow(value)
-    this.emitEvent('checkbox-all', { records: this.getCheckboxRecords(), reserves: this.getCheckboxReserveRecords(), indeterminates: this.getCheckboxIndeterminateRecords(), checked: value }, evnt)
+    const { checkboxOpts } = this
+    const { trigger } = checkboxOpts
+    if (trigger === 'manual') {
+      return
+    }
+    this.handleCheckAllEvent(evnt, value)
   },
   /**
    * 多选，切换所有行的选中状态
    */
   toggleAllCheckboxRow () {
-    this.triggerCheckAllEvent(null, !this.isAllSelected)
+    this.handleCheckAllEvent(null, !this.isAllSelected)
     return this.$nextTick()
   },
   /**
@@ -3838,6 +3859,10 @@ const Methods = {
   triggerRadioRowEvent (evnt, params) {
     const { selectRadioRow: oldValue, radioOpts } = this
     const { row } = params
+    const { trigger } = radioOpts
+    if (trigger === 'manual') {
+      return
+    }
     let newValue = row
     let isChange = oldValue !== newValue
     if (isChange) {
@@ -4413,7 +4438,10 @@ const Methods = {
   triggerRowExpandEvent (evnt, params) {
     const { expandOpts, rowExpandLazyLoadedMaps, expandColumn: column } = this
     const { row } = params
-    const { lazy } = expandOpts
+    const { lazy, trigger } = expandOpts
+    if (trigger === 'manual') {
+      return
+    }
     const rowid = getRowid(this, row)
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       const expanded = !this.isRowExpandByRow(row)
@@ -4688,7 +4716,10 @@ const Methods = {
   triggerTreeExpandEvent (evnt, params) {
     const { treeOpts, treeExpandLazyLoadedMaps } = this
     const { row, column } = params
-    const { lazy } = treeOpts
+    const { lazy, trigger } = treeOpts
+    if (trigger === 'manual') {
+      return
+    }
     const rowid = getRowid(this, row)
     if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
       const expanded = !this.isTreeExpandByRow(row)

package/packages/table/src/table.js

@@ -70,7 +70,7 @@ function renderEmptyContenet (h, _vm) {
     emptyContent = $scopedSlots.empty.call(_vm, params, h)
   } else {
     const compConf = emptyOpts.name ? VXETable.renderer.get(emptyOpts.name) : null
-    const renderTableEmptyView = compConf ? compConf.renderTableEmptyView || compConf.renderEmpty : null
+    const renderTableEmptyView = compConf ? (compConf.renderTableEmptyView || compConf.renderEmpty) : null
     if (renderTableEmptyView) {
       emptyContent = getSlotVNs(renderTableEmptyView.call(_vm, h, emptyOpts, params))
     } else {

package/styles/custom.scss

@@ -63,19 +63,19 @@
   border: 1px solid $vxe-table-border-color;
   border-radius: $vxe-border-radius;
   box-shadow: $vxe-base-popup-box-shadow;
-  &.placement--topLeft {
+  &.placement--top-left {
     top: 2px;
     left: 2px;
   }
-  &.placement--topRight {
+  &.placement--top-right {
     top: 2px;
     right: 2px;
   }
-  &.placement--bottomLeft {
+  &.placement--bottom-left {
     bottom: 2px;
     left: 2px;
   }
-  &.placement--bottomRight {
+  &.placement--bottom-right {
     bottom: 2px;
     right: 2px;
   }

package/styles/table.scss

@@ -1032,6 +1032,15 @@
       padding-left: 0.5em;
     }
   }
+  .vxe-body--expanded-row {
+    &.is--padding {
+      & > .vxe-body--expanded-column {
+        & > .vxe-body--expanded-cell {
+          padding: $vxe-table-expand-padding-default;
+        }
+      }
+    }
+  }
   .vxe-body--expanded-column {
     border-bottom: $vxe-table-border-width solid $vxe-table-border-color;
     border-right: $vxe-table-border-width solid $vxe-table-border-color;

package/styles/variable.scss

@@ -113,6 +113,8 @@ $vxe-table-cell-extend-area-border-color: $vxe-table-cell-area-border-color !def
 $vxe-table-cell-active-area-border-color: $vxe-table-cell-area-border-color !default;
 $vxe-table-cell-area-background-color: rgba(64,158,255,0.2) !default;
 
+$vxe-table-expand-padding-default: 16px !default;
+
 $vxe-table-checkbox-range-border-width: 1px !default;
 $vxe-table-checkbox-range-border-color: #006af1 !default;
 $vxe-table-checkbox-range-background-color: rgba(50,128,252,0.2) !default;