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

package/lib/index.umd.js

@@ -11485,7 +11485,7 @@ var es_array_concat = __webpack_require__(8706);
 
 
 function getLog(message, params) {
-  return "[vxe-table v".concat("3.8.8-beta.6", "] ").concat(conf.i18n(message, params));
+  return "[vxe-table v".concat("3.8.8-beta.8", "] ").concat(conf.i18n(message, params));
 }
 function outLog(type) {
   return function (message, params) {
@@ -13165,7 +13165,7 @@ function setIcon(options) {
 var globalStore = {};
 var VXETable = {
   v: v,
-  version: "3.8.8-beta.6",
+  version: "3.8.8-beta.8",
   reg: reg,
   use: use,
   setConfig: setConfig,
@@ -14045,8 +14045,8 @@ function renderColumn(h, _vm, $xetable, seq, rowid, fixedType, rowLevel, row, ro
   var rowHeight = rowOpts.height;
   var renderOpts = editRender || cellRender;
   var compConf = renderOpts ? v_x_e_table.renderer.get(renderOpts.name) : null;
-  var compCellClassName = compConf ? compConf.cellClassName : '';
-  var compCellStyle = compConf ? compConf.cellStyle : '';
+  var compCellClassName = compConf ? compConf.tableCellClassName || compConf.cellClassName : '';
+  var compCellStyle = compConf ? compConf.tableCellStyle || compConf.cellStyle : '';
   var showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
   var columnIndex = $xetable.getColumnIndex(column);
   var _columnIndex = $xetable.getVTColumnIndex(column);
@@ -14340,7 +14340,8 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
     })));
     // 如果行被展开了
     if (isExpandRow) {
-      var expandHeight = expandOpts.height;
+      var expandHeight = expandOpts.height,
+        padding = expandOpts.padding;
       var cellStyle = {};
       if (expandHeight) {
         cellStyle.height = "".concat(expandHeight, "px");
@@ -14362,7 +14363,9 @@ function renderRows(h, _vm, $xetable, fixedType, tableData, tableColumn) {
         $rowIndex: $rowIndex
       };
       rows.push(h('tr', {
-        class: 'vxe-body--expanded-row',
+        class: ['vxe-body--expanded-row', {
+          'is--padding': padding
+        }],
         key: "expand_".concat(rowid),
         style: rowStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(rowStyle) ? rowStyle(expandParams) : rowStyle : null,
         on: trOn
@@ -15866,8 +15869,9 @@ function getFooterContent(h, params) {
   }
   if (renderOpts) {
     var compConf = v_x_e_table.renderer.get(renderOpts.name);
-    if (compConf && compConf.renderFooter) {
-      return getSlotVNs(compConf.renderFooter.call($table, h, renderOpts, params));
+    var rtFooter = compConf ? compConf.renderTableFooter || compConf.renderFooter : null;
+    if (rtFooter) {
+      return getSlotVNs(rtFooter.call($table, h, renderOpts, params));
     }
   }
   // 兼容老模式
@@ -15954,8 +15958,9 @@ var Cell = {
     }
     if (renderOpts) {
       var compConf = v_x_e_table.renderer.get(renderOpts.name);
-      if (compConf && compConf.renderHeader) {
-        return getSlotVNs(renderTitleContent(h, params, compConf.renderHeader.call($table, h, renderOpts, params)));
+      var rtHeader = compConf ? compConf.renderTableHeader || compConf.renderHeader : null;
+      if (rtHeader) {
+        return getSlotVNs(renderTitleContent(h, params, rtHeader.call($table, h, renderOpts, params)));
       }
     }
     return renderTitleContent(h, params, utils.formatText(column.getTitle(), 1));
@@ -15975,10 +15980,12 @@ var Cell = {
       return $table.callSlot(slots.default, params, h);
     }
     if (renderOpts) {
-      var funName = editRender ? 'renderCell' : 'renderDefault';
       var compConf = v_x_e_table.renderer.get(renderOpts.name);
-      if (compConf && compConf[funName]) {
-        return getSlotVNs(compConf[funName].call($table, h, renderOpts, Object.assign({
+      var rtDefault = compConf ? compConf.renderTableDefault || compConf.renderDefault : null;
+      var rtCell = compConf ? compConf.renderTableCell || compConf.renderCell : null;
+      var renderFn = editRender ? rtCell : rtDefault;
+      if (renderFn) {
+        return getSlotVNs(renderFn.call($table, h, renderOpts, Object.assign({
           $type: editRender ? 'edit' : 'cell'
         }, params)));
       }
@@ -16041,7 +16048,6 @@ var Cell = {
     }
     if (!trigger || trigger === 'default') {
       on.click = function (evnt) {
-        evnt.stopPropagation();
         $table.triggerTreeExpandEvent(evnt, params);
       };
     }
@@ -16122,7 +16128,6 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
-            evnt.stopPropagation();
             $table.triggerRadioRowEvent(evnt, params);
           }
         }
@@ -16183,7 +16188,6 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isAllCheckboxDisabled) {
-            evnt.stopPropagation();
             $table.triggerCheckAllEvent(evnt, !isAllCheckboxSelected);
           }
         }
@@ -16246,7 +16250,6 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
-            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -16322,7 +16325,6 @@ var Cell = {
       on = {
         click: function click(evnt) {
           if (!isDisabled && isVisible) {
-            evnt.stopPropagation();
             $table.triggerCheckRowEvent(evnt, params, !isChecked);
           }
         }
@@ -16407,7 +16409,6 @@ var Cell = {
       }],
       on: {
         click: function click(evnt) {
-          evnt.stopPropagation();
           $table.triggerRowExpandEvent(evnt, params);
         }
       }
@@ -16427,8 +16428,9 @@ var Cell = {
     }
     if (contentRender) {
       var compConf = v_x_e_table.renderer.get(contentRender.name);
-      if (compConf && compConf.renderExpand) {
-        return getSlotVNs(compConf.renderExpand.call($table, h, contentRender, params));
+      var rtExpand = compConf ? compConf.renderTableExpand || compConf.renderExpand : null;
+      if (rtExpand) {
+        return getSlotVNs(rtExpand.call($table, h, contentRender, params));
       }
     }
     return [];
@@ -16593,12 +16595,13 @@ var Cell = {
       editRender = column.editRender,
       formatter = column.formatter;
     var compConf = v_x_e_table.renderer.get(editRender.name);
+    var 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({
+      if (rtEdit) {
+        return getSlotVNs(rtEdit.call($table, h, editRender, Object.assign({
           $type: 'edit'
         }, params)));
       }
@@ -17808,6 +17811,72 @@ var Methods = {
     }
     return this.$nextTick();
   },
+  getCellElement: function getCellElement(row, fieldOrColumn) {
+    var column = handleFieldOrColumn(this, fieldOrColumn);
+    if (!column) {
+      return null;
+    }
+    var $refs = this.$refs;
+    var rowid = getRowid(this, row);
+    var bodyElem = null;
+    if (column) {
+      bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
+    }
+    if (bodyElem && bodyElem.$el) {
+      return bodyElem.$el.querySelector(".vxe-body--row[rowid=\"".concat(rowid, "\"] .").concat(column.id));
+    }
+    return null;
+  },
+  getCellLabel: function getCellLabel(row, fieldOrColumn) {
+    var column = handleFieldOrColumn(this, fieldOrColumn);
+    if (!column) {
+      return null;
+    }
+    var formatter = column.formatter;
+    var cellValue = utils.getCellValue(row, column);
+    var cellLabel = cellValue;
+    if (formatter) {
+      var rest, formatData;
+      var fullAllDataRowMap = this.fullAllDataRowMap;
+      var colid = column.id;
+      var cacheFormat = fullAllDataRowMap.has(row);
+      if (cacheFormat) {
+        rest = fullAllDataRowMap.get(row);
+        formatData = rest.formatData;
+        if (!formatData) {
+          formatData = fullAllDataRowMap.get(row).formatData = {};
+        }
+        if (rest && formatData[colid]) {
+          if (formatData[colid].value === cellValue) {
+            return formatData[colid].label;
+          }
+        }
+      }
+      var formatParams = {
+        cellValue: cellValue,
+        row: row,
+        rowIndex: this.getRowIndex(row),
+        column: column,
+        columnIndex: this.getColumnIndex(column)
+      };
+      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
+        var gFormatOpts = formats.get(formatter);
+        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
+      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
+        var _gFormatOpts = formats.get(formatter[0]);
+        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
+      } else {
+        cellLabel = formatter(formatParams);
+      }
+      if (formatData) {
+        formatData[colid] = {
+          value: cellValue,
+          label: cellLabel
+        };
+      }
+    }
+    return cellLabel;
+  },
   /**
    * 检查是否为临时行数据
    * @param {Row} row 行对象
@@ -17864,6 +17933,13 @@ var Methods = {
     var columns = this.visibleColumn;
     return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isUndefined(columnIndex) ? columns.slice(0) : columns[columnIndex];
   },
+  /**
+   * 根据列获取列的唯一主键
+   */
+  getColid: function getColid(fieldOrColumn) {
+    var column = handleFieldOrColumn(this, fieldOrColumn);
+    return column ? column.id : null;
+  },
   /**
    * 根据列的唯一主键获取列
    * @param {String} colid 列主键
@@ -18046,8 +18122,8 @@ var Methods = {
               filterRender = column.filterRender,
               field = column.field;
             var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
-            var compFilterMethod = compConf && compConf.renderFilter ? compConf.filterMethod : null;
-            var defaultFilterMethod = compConf ? compConf.defaultFilterMethod : null;
+            var compFilterMethod = compConf && compConf.renderFilter ? compConf.tableFilterMethod || compConf.filterMethod : null;
+            var defaultFilterMethod = compConf ? compConf.defaultTableFilterMethod || compConf.defaultFilterMethod : null;
             var cellValue = utils.getCellValue(row, column);
             if (filterMethod) {
               return itemList.some(function (item) {
@@ -18487,8 +18563,7 @@ var Methods = {
         this.clearCopyCellArea();
       }
     }
-    this.saveCustomVisible();
-    this.saveCustomSort();
+    this.saveCustomStore();
     this.analyColumnWidth();
     return this.refreshColumn(true);
   },
@@ -18760,6 +18835,12 @@ var Methods = {
     });
     return storeData;
   },
+  saveCustomStore: function saveCustomStore() {
+    this.saveCustomVisible();
+    this.saveCustomSort();
+    this.saveCustomFixed();
+    this.saveCustomResizable();
+  },
   saveCustomResizable: function saveCustomResizable(isReset) {
     var id = this.id,
       collectColumn = this.collectColumn,
@@ -19718,7 +19799,7 @@ var Methods = {
         var selected = editStore.selected,
           actived = editStore.actived;
         var keyCode = evnt.keyCode;
-        var isBack = keyCode === 8;
+        var hasBackspaceKey = keyCode === 8;
         var isTab = keyCode === 9;
         var isEnter = keyCode === 13;
         var isEsc = keyCode === 27;
@@ -19845,12 +19926,12 @@ var Methods = {
           } else if (actived.row || actived.column) {
             _this29.moveTabSelected(actived.args, hasShiftKey, evnt);
           }
-        } else if (keyboardConfig && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? isBack && keyboardOpts.isArrow : isBack))) {
+        } else if (keyboardConfig && (treeConfig || isEnableConf(editConfig)) && (isDel || (treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow ? hasBackspaceKey && keyboardOpts.isArrow : hasBackspaceKey))) {
           if (!isEditStatus) {
             var delMethod = keyboardOpts.delMethod,
               backMethod = keyboardOpts.backMethod;
             // 如果是删除键
-            if (keyboardOpts.isDel && (selected.row || selected.column)) {
+            if (keyboardOpts.isDel && isEnableConf(editConfig) && (selected.row || selected.column)) {
               var delPaqrams = {
                 row: selected.row,
                 rowIndex: _this29.getRowIndex(selected.row),
@@ -19863,7 +19944,7 @@ var Methods = {
               } else {
                 setCellValue(selected.row, selected.column, null);
               }
-              if (isBack) {
+              if (hasBackspaceKey) {
                 if (backMethod) {
                   backMethod({
                     row: selected.row,
@@ -19880,7 +19961,7 @@ var Methods = {
                 _this29.updateFooter();
               }
               _this29.emitEvent('cell-delete-value', delPaqrams, evnt);
-            } else if (isBack && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
+            } else if (hasBackspaceKey && keyboardOpts.isArrow && treeConfig && (rowOpts.isCurrent || highlightCurrentRow) && currentRow) {
               // 如果树形表格回退键关闭当前行返回父节点
               var _XEUtils$findTree = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().findTree(_this29.afterFullData, function (item) {
                   return item === currentRow;
@@ -20489,8 +20570,12 @@ var Methods = {
   handleToggleCheckRowEvent: function handleToggleCheckRowEvent(evnt, params) {
     var selectCheckboxMaps = this.selectCheckboxMaps,
       checkboxOpts = this.checkboxOpts;
-    var checkField = checkboxOpts.checkField;
+    var checkField = checkboxOpts.checkField,
+      trigger = checkboxOpts.trigger;
     var row = params.row;
+    if (trigger === 'manual') {
+      return;
+    }
     var value = false;
     if (checkField) {
       value = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, checkField);
@@ -20506,8 +20591,13 @@ var Methods = {
   triggerCheckRowEvent: function triggerCheckRowEvent(evnt, params, value) {
     var checkboxOpts = this.checkboxOpts,
       afterFullData = this.afterFullData;
-    var checkMethod = checkboxOpts.checkMethod;
+    var checkMethod = checkboxOpts.checkMethod,
+      trigger = checkboxOpts.trigger;
     var row = params.row;
+    if (trigger === 'manual') {
+      return;
+    }
+    evnt.stopPropagation();
     if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
       var checkboxRecords = this.getCheckboxRecords();
       if (checkboxRecords.length) {
@@ -20952,23 +21042,36 @@ var Methods = {
       }
     }
   },
+  handleCheckAllEvent: function 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: function triggerCheckAllEvent(evnt, value) {
-    this.handleCheckedAllCheckboxRow(value);
-    this.emitEvent('checkbox-all', {
-      records: this.getCheckboxRecords(),
-      reserves: this.getCheckboxReserveRecords(),
-      indeterminates: this.getCheckboxIndeterminateRecords(),
-      checked: value
-    }, evnt);
+    var checkboxOpts = this.checkboxOpts;
+    var trigger = checkboxOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
+    if (evnt) {
+      evnt.stopPropagation();
+    }
+    this.handleCheckAllEvent(evnt, value);
   },
   /**
    * 多选，切换所有行的选中状态
    */
   toggleAllCheckboxRow: function toggleAllCheckboxRow() {
-    this.triggerCheckAllEvent(null, !this.isAllSelected);
+    this.handleCheckAllEvent(null, !this.isAllSelected);
     return this.$nextTick();
   },
   /**
@@ -21036,6 +21139,11 @@ var Methods = {
     var oldValue = this.selectRadioRow,
       radioOpts = this.radioOpts;
     var row = params.row;
+    var trigger = radioOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
+    evnt.stopPropagation();
     var newValue = row;
     var isChange = oldValue !== newValue;
     if (isChange) {
@@ -21715,7 +21823,12 @@ var Methods = {
       rowExpandLazyLoadedMaps = this.rowExpandLazyLoadedMaps,
       column = this.expandColumn;
     var row = params.row;
-    var lazy = expandOpts.lazy;
+    var lazy = expandOpts.lazy,
+      trigger = expandOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
+    evnt.stopPropagation();
     var rowid = getRowid(this, row);
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isRowExpandByRow(row);
@@ -22041,7 +22154,12 @@ var Methods = {
       treeExpandLazyLoadedMaps = this.treeExpandLazyLoadedMaps;
     var row = params.row,
       column = params.column;
-    var lazy = treeOpts.lazy;
+    var lazy = treeOpts.lazy,
+      trigger = treeOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
+    evnt.stopPropagation();
     var rowid = getRowid(this, row);
     if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isTreeExpandByRow(row);
@@ -22751,7 +22869,7 @@ var Methods = {
         var type = 'change';
         if (_this57.hasCellRules) {
           if (_this57.hasCellRules(type, row, column)) {
-            var cell = _this57.getCell(row, column);
+            var cell = _this57.getCellElement(row, column);
             if (cell) {
               return _this57.validCellRules(type, row, column, cellValue).then(function () {
                 if (customVal && validStore.visible) {
@@ -22912,63 +23030,12 @@ var Methods = {
   /*************************
    * Publish methods
    *************************/
+  /**
+   * 已废弃，被 getCellElement 替换
+   * @deprecated
+   */
   getCell: function getCell(row, column) {
-    var $refs = this.$refs;
-    var rowid = getRowid(this, row);
-    var bodyElem = null;
-    if (column) {
-      bodyElem = $refs["".concat(column.fixed || 'table', "Body")] || $refs.tableBody;
-    }
-    if (bodyElem && bodyElem.$el) {
-      return bodyElem.$el.querySelector(".vxe-body--row[rowid=\"".concat(rowid, "\"] .").concat(column.id));
-    }
-    return null;
-  },
-  getCellLabel: function getCellLabel(row, column) {
-    var formatter = column.formatter;
-    var cellValue = utils.getCellValue(row, column);
-    var cellLabel = cellValue;
-    if (formatter) {
-      var rest, formatData;
-      var fullAllDataRowMap = this.fullAllDataRowMap;
-      var colid = column.id;
-      var cacheFormat = fullAllDataRowMap.has(row);
-      if (cacheFormat) {
-        rest = fullAllDataRowMap.get(row);
-        formatData = rest.formatData;
-        if (!formatData) {
-          formatData = fullAllDataRowMap.get(row).formatData = {};
-        }
-        if (rest && formatData[colid]) {
-          if (formatData[colid].value === cellValue) {
-            return formatData[colid].label;
-          }
-        }
-      }
-      var formatParams = {
-        cellValue: cellValue,
-        row: row,
-        rowIndex: this.getRowIndex(row),
-        column: column,
-        columnIndex: this.getColumnIndex(column)
-      };
-      if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(formatter)) {
-        var gFormatOpts = formats.get(formatter);
-        cellLabel = gFormatOpts && gFormatOpts.cellFormatMethod ? gFormatOpts.cellFormatMethod(formatParams) : '';
-      } else if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(formatter)) {
-        var _gFormatOpts = formats.get(formatter[0]);
-        cellLabel = _gFormatOpts && _gFormatOpts.cellFormatMethod ? _gFormatOpts.cellFormatMethod.apply(_gFormatOpts, [formatParams].concat(_toConsumableArray(formatter.slice(1)))) : '';
-      } else {
-        cellLabel = formatter(formatParams);
-      }
-      if (formatData) {
-        formatData[colid] = {
-          value: cellValue,
-          label: cellLabel
-        };
-      }
-    }
-    return cellLabel;
+    return this.getCellElement(row, column);
   },
   findRowIndexOf: function findRowIndexOf(list, row) {
     var _this64 = this;
@@ -24392,7 +24459,6 @@ var Table = VxeTable;
 
 
 
-
 /* harmony default export */ var panel = ({
   name: 'VxeTableFilterPanel',
   props: {
@@ -24413,7 +24479,7 @@ var Table = VxeTable;
       column = filterStore.column;
     var filterRender = column ? column.filterRender : null;
     var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
-    var filterClassName = compConf ? compConf.filterClassName : '';
+    var filterClassName = compConf ? compConf.tableFilterClassName || compConf.filterClassName : '';
     return h('div', {
       class: ['vxe-table--filter-wrapper', 'filter--prevent-default', compConf && compConf.className ? compConf.className : '', utils.getClass(filterClassName, Object.assign({
         $panel: this,
@@ -24436,6 +24502,7 @@ var Table = VxeTable;
         multiple = filterStore.multiple,
         maxHeight = filterStore.maxHeight;
       var slots = column.slots;
+      var rtFilter = compConf ? compConf.renderTableFilter || compConf.renderFilter : null;
       if (slots && slots.filter) {
         return [h('div', {
           class: 'vxe-table--filter-template'
@@ -24443,10 +24510,10 @@ var Table = VxeTable;
           $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({
+        }, getSlotVNs(rtFilter.call($xetable, h, filterRender, Object.assign({
           $panel: this,
           context: this
         }, args))))];
@@ -24511,7 +24578,7 @@ var Table = VxeTable;
       var filterRender = column.filterRender;
       var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
       var isDisabled = !hasCheckOption && !filterStore.isAllSelected && !filterStore.isIndeterminate;
-      return multiple && (!compConf || (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isBoolean(compConf.showFilterFooter) ? compConf.showFilterFooter !== false : compConf.isFooter !== false)) ? [h('div', {
+      return multiple(compConf ? !(compConf.showTableFilterFooter === false || compConf.showFilterFooter === false || compConf.isFooter === false) : true) ? [h('div', {
         class: 'vxe-table--filter-footer'
       }, [h('button', {
         class: {
@@ -24668,7 +24735,7 @@ var Table = VxeTable;
           filterMultiple = column.filterMultiple,
           filterRender = column.filterRender;
         var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
-        var filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.filterRecoverMethod : null);
+        var filterRecoverMethod = column.filterRecoverMethod || (compConf ? compConf.tableFilterRecoverMethod || compConf.filterRecoverMethod : null);
         var _DomTools$getDomNode = dom.getDomNode(),
           visibleWidth = _DomTools$getDomNode.visibleWidth;
         Object.assign(filterStore, {
@@ -24853,7 +24920,7 @@ var Table = VxeTable;
           filterRender = column.filterRender;
         if (filters) {
           var compConf = filterRender ? v_x_e_table.renderer.get(filterRender.name) : null;
-          var filterResetMethod = column.filterResetMethod || (compConf ? compConf.filterResetMethod : null);
+          var filterResetMethod = column.filterResetMethod || (compConf ? compConf.tableFilterResetMethod || compConf.filterResetMethod : null);
           filters.forEach(function (item) {
             item._checked = false;
             item.checked = false;
@@ -25251,7 +25318,7 @@ var Filter = VxeTableFilterModule;
                 column = params.column;
               if (keyboard && row && column) {
                 _this.scrollToRow(row, column).then(function () {
-                  var cell = _this.getCell(row, column);
+                  var cell = _this.getCellElement(row, column);
                   var _DomTools$getAbsolute2 = dom.getAbsolutePos(cell),
                     boundingTop = _DomTools$getAbsolute2.boundingTop,
                     boundingLeft = _DomTools$getAbsolute2.boundingLeft;
@@ -25903,7 +25970,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       var row = params.row,
         column = params.column;
       var editRender = column.editRender;
-      var cell = params.cell = params.cell || this.getCell(row, column);
+      var cell = params.cell = params.cell || this.getCellElement(row, column);
       var beforeEditMethod = editOpts.beforeEditMethod || editOpts.activeMethod;
       if (cell && isEnableConf(editConfig) && isEnableConf(editRender)) {
         // 激活编辑
@@ -26111,10 +26178,10 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
           autoselect = editRender.autoselect;
         var inputElem;
         if (!autofocus && compRender) {
-          autofocus = compRender.autofocus;
+          autofocus = compRender.tableAutofocus || compRender.autofocus;
         }
         if (!autoselect && compRender) {
-          autoselect = compRender.autoselect;
+          autoselect = compRender.tableAutoSelect || compRender.autoselect;
         }
         // 如果指定了聚焦 class
         if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(autofocus)) {
@@ -26173,7 +26240,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       var column = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isString(fieldOrColumn) ? this.getColumnByField(fieldOrColumn) : fieldOrColumn;
       if (row && column && isEnableConf(editConfig) && isEnableConf(column.editRender)) {
         return this.scrollToRow(row, true).then(function () {
-          var cell = _this8.getCell(row, column);
+          var cell = _this8.getCellElement(row, column);
           if (cell) {
             _this8.handleActived({
               row: row,
@@ -26200,7 +26267,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
       if (row && column && editOpts.trigger !== 'manual') {
         var rowIndex = this.findRowIndexOf(tableData, row);
         if (rowIndex > -1) {
-          var cell = this.getCell(row, column);
+          var cell = this.getCellElement(row, column);
           var params = {
             row: row,
             rowIndex: rowIndex,
@@ -26293,7 +26360,7 @@ function handleInsertRowAt(_vm, records, row, isInsertNextRow) {
         column = selected.column;
       this.reColSdCls();
       if (row && column) {
-        var cell = this.getCell(row, column);
+        var cell = this.getCellElement(row, column);
         if (cell) {
           dom.addClass(cell, 'col--selected');
         }
@@ -32142,7 +32209,7 @@ function getLabelData($xetable, opts, columns, datas) {
           if (!bodyExportMethod && renderOpts && renderOpts.name) {
             var compConf = v_x_e_table.renderer.get(renderOpts.name);
             if (compConf) {
-              bodyExportMethod = compConf.exportMethod || compConf.cellExportMethod;
+              bodyExportMethod = compConf.tableExportMethod || compConf.exportMethod || compConf.cellExportMethod;
             }
           }
           if (!bodyExportMethod) {
@@ -32185,7 +32252,7 @@ function getLabelData($xetable, opts, columns, datas) {
                     htmlCellElem.innerHTML = cellValue;
                     cellValue = htmlCellElem.innerText.trim();
                   } else {
-                    var cell = $xetable.getCell(row, column);
+                    var cell = $xetable.getCellElement(row, column);
                     if (cell) {
                       cellValue = cell.innerText.trim();
                     }
@@ -32252,7 +32319,7 @@ function getLabelData($xetable, opts, columns, datas) {
                 htmlCellElem.innerHTML = cellValue;
                 cellValue = htmlCellElem.innerText.trim();
               } else {
-                var cell = $xetable.getCell(row, column);
+                var cell = $xetable.getCellElement(row, column);
                 if (cell) {
                   cellValue = cell.innerText.trim();
                 }
@@ -32291,30 +32358,36 @@ function getHeaderTitle($xetable, opts, column) {
     $table: $xetable
   }) : (opts.original ? column.property : column.getTitle()) || '';
 }
-function getFooterCellValue($xetable, opts, items, column) {
+function getFooterCellValue($xetable, opts, row, column) {
   var columnOpts = $xetable.columnOpts;
   var renderOpts = column.editRender || column.cellRender;
   var footLabelMethod = column.footerExportMethod;
   if (!footLabelMethod && renderOpts && renderOpts.name) {
     var compConf = v_x_e_table.renderer.get(renderOpts.name);
     if (compConf) {
-      footLabelMethod = compConf.footerExportMethod || compConf.footerCellExportMethod;
+      footLabelMethod = compConf.tableFooterExportMethod || compConf.footerExportMethod || compConf.footerCellExportMethod;
     }
   }
   if (!footLabelMethod) {
     footLabelMethod = columnOpts.footerExportMethod;
   }
   var _columnIndex = $xetable.getVTColumnIndex(column);
-  var cellValue = footLabelMethod ? footLabelMethod({
-    $table: $xetable,
-    items: items,
-    itemIndex: _columnIndex,
-    row: items,
-    _columnIndex: _columnIndex,
-    column: column,
-    options: opts
-  }) : external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(items[_columnIndex]);
-  return cellValue;
+  if (footLabelMethod) {
+    return footLabelMethod({
+      $table: $xetable,
+      items: row,
+      itemIndex: _columnIndex,
+      row: row,
+      _columnIndex: _columnIndex,
+      column: column,
+      options: opts
+    });
+  }
+  // 兼容老模式
+  if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isArray(row)) {
+    return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().toValueString(row[_columnIndex]);
+  }
+  return external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().get(row, column.field);
 }
 function getFooterData(opts, footerTableData) {
   var footerFilterMethod = opts.footerFilterMethod;
@@ -32368,9 +32441,9 @@ function toCsv($xetable, opts, columns, datas) {
   if (opts.isFooter) {
     var footerTableData = $xetable.footerTableData;
     var footers = getFooterData(opts, footerTableData);
-    footers.forEach(function (rows) {
+    footers.forEach(function (row) {
       content += columns.map(function (column) {
-        return toTxtCellLabel(getFooterCellValue($xetable, opts, rows, column));
+        return toTxtCellLabel(getFooterCellValue($xetable, opts, row, column));
       }).join(',') + enterSymbol;
     });
   }
@@ -32391,9 +32464,9 @@ function toTxt($xetable, opts, columns, datas) {
   if (opts.isFooter) {
     var footerTableData = $xetable.footerTableData;
     var footers = getFooterData(opts, footerTableData);
-    footers.forEach(function (rows) {
+    footers.forEach(function (row) {
       content += columns.map(function (column) {
-        return toTxtCellLabel(getFooterCellValue($xetable, opts, rows, column));
+        return toTxtCellLabel(getFooterCellValue($xetable, opts, row, column));
       }).join(',') + enterSymbol;
     });
   }
@@ -32564,11 +32637,11 @@ function toHtml($xetable, opts, columns, datas) {
     var footers = getFooterData(opts, footerTableData);
     if (footers.length) {
       tables.push('<tfoot>');
-      footers.forEach(function (rows) {
+      footers.forEach(function (row) {
         tables.push("<tr>".concat(columns.map(function (column) {
           var footAlign = column.footerAlign || column.align || allFooterAlign || allAlign;
           var classNames = hasEllipsis($xetable, column, 'showOverflow', allColumnOverflow) ? ['col--ellipsis'] : [];
-          var cellValue = getFooterCellValue($xetable, opts, rows, column);
+          var cellValue = getFooterCellValue($xetable, opts, row, column);
           if (footAlign) {
             classNames.push("col--".concat(footAlign));
           }
@@ -32600,9 +32673,9 @@ function toXML($xetable, opts, columns, datas) {
   if (opts.isFooter) {
     var footerTableData = $xetable.footerTableData;
     var footers = getFooterData(opts, footerTableData);
-    footers.forEach(function (rows) {
+    footers.forEach(function (row) {
       xml += "<Row>".concat(columns.map(function (column) {
-        return "<Cell><Data ss:Type=\"String\">".concat(getFooterCellValue($xetable, opts, rows, column), "</Data></Cell>");
+        return "<Cell><Data ss:Type=\"String\">".concat(getFooterCellValue($xetable, opts, row, column), "</Data></Cell>");
       }).join(''), "</Row>");
     });
   }
@@ -33828,7 +33901,7 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
         }
         params.columnIndex = targetColumnIndex;
         params.column = targetColumn;
-        params.cell = this.getCell(params.row, params.column);
+        params.cell = this.getCellElement(params.row, params.column);
         if (editConfig) {
           if (editOpts.trigger === 'click' || editOpts.trigger === 'dblclick') {
             if (editOpts.mode === 'row') {
@@ -33918,7 +33991,7 @@ function getCheckboxRangeRows(_vm, params, targetTrElem, moveRange) {
         params.column = visibleColumn[params.columnIndex];
       }
       this.scrollToRow(params.row, params.column).then(function () {
-        params.cell = _this3.getCell(params.row, params.column);
+        params.cell = _this3.getCellElement(params.row, params.column);
         _this3.handleSelected(params, evnt);
       });
     },
@@ -34397,7 +34470,7 @@ function validErrorRuleValue(rule, val) {
               });
             };
             var posAndFinish = function posAndFinish() {
-              firstErrParams.cell = _this2.getCell(firstErrParams.row, firstErrParams.column);
+              firstErrParams.cell = _this2.getCellElement(firstErrParams.row, firstErrParams.column);
               dom.scrollToView(firstErrParams.cell);
               _this2.handleValidError(firstErrParams).then(finish);
             };
@@ -34825,6 +34898,8 @@ var Validator = VxeTableValidatorModule;
 
 
 
+
+
 var panel_formatText = utils.formatText;
 var panel_addClass = dom.addClass,
   panel_removeClass = dom.removeClass;
@@ -35028,12 +35103,14 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
     customColumnList = $xetable.customColumnList,
     columnOpts = $xetable.columnOpts,
     isMaxFixedColumn = $xetable.isMaxFixedColumn;
-  var allowVisible = customOpts.allowVisible,
+  var modalOptions = customOpts.modalOptions,
+    allowVisible = customOpts.allowVisible,
     allowSort = customOpts.allowSort,
     allowFixed = customOpts.allowFixed,
     allowResizable = customOpts.allowResizable,
     checkMethod = customOpts.checkMethod,
     visibleMethod = customOpts.visibleMethod;
+  var modalOpts = Object.assign({}, modalOptions);
   var trVNs = [];
   external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eachTree(customColumnList, function (column, index, items, path, parent) {
     var isVisible = visibleMethod ? visibleMethod({
@@ -35148,13 +35225,13 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
   return h('vxe-modal', {
     key: 'popup',
     props: {
-      className: 'vxe-table-custom-popup-wrapper vxe-table--ignore-clear',
+      className: ['vxe-table-custom-popup-wrapper', 'vxe-table--ignore-clear', modalOpts.className || ''].join(' '),
       value: customStore.visible,
-      title: conf.i18n('vxe.custom.cstmTitle'),
-      width: 700,
-      minWidth: 700,
-      height: 400,
-      minHeight: 400,
+      title: modalOpts.title || conf.i18n('vxe.custom.cstmTitle'),
+      width: modalOpts.width || '50vw',
+      minWidth: modalOpts.minWidth || 700,
+      height: modalOpts.height || '50vh',
+      minHeight: modalOpts.minHeight || 400,
       mask: true,
       lockView: true,
       showFooter: true,
@@ -35349,6 +35426,7 @@ var renderPopupPanel = function renderPopupPanel(h, _vm) {
           if (column.renderVisible && (!column.children || column.children.length)) {
             if (column.renderResizeWidth !== column.renderWidth) {
               column.resizeWidth = column.renderResizeWidth;
+              column.renderWidth = column.renderResizeWidth;
             }
           }
         }
@@ -40011,8 +40089,9 @@ function isActivetem($xeform, formItem) {
     return visible;
   }
   var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
-  if (!visibleMethod && compConf && compConf.itemVisibleMethod) {
-    visibleMethod = compConf.itemVisibleMethod;
+  var fiVisibleMethod = compConf ? compConf.formItemVisibleMethod || compConf.itemVisibleMethod : null;
+  if (!visibleMethod && fiVisibleMethod) {
+    visibleMethod = fiVisibleMethod;
   }
   if (!visibleMethod) {
     return true;
@@ -40104,9 +40183,10 @@ function renderTitle(h, _vm, item) {
       })
     }, [renderPrefixIcon(h, titlePrefix)]) : renderPrefixIcon(h, titlePrefix));
   }
+  var 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', {
     class: 'vxe-form--item-title-content'
   }, titVNs));
@@ -40189,12 +40269,12 @@ var VxeFormConfigItem = {
       titleClassName = item.titleClassName,
       titleStyle = item.titleStyle;
     var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
-    var itemClassName = compConf ? compConf.itemClassName : '';
-    var itemStyle = compConf ? compConf.itemStyle : null;
-    var itemContentClassName = compConf ? compConf.itemContentClassName : '';
-    var itemContentStyle = compConf ? compConf.itemContentStyle : null;
-    var itemTitleClassName = compConf ? compConf.itemTitleClassName : '';
-    var itemTitleStyle = compConf ? compConf.itemTitleStyle : null;
+    var itemClassName = compConf ? compConf.formItemClassName || compConf.itemClassName : '';
+    var itemStyle = compConf ? compConf.formItemStyle || compConf.itemStyle : null;
+    var itemContentClassName = compConf ? compConf.formItemContentClassName || compConf.itemContentClassName : '';
+    var itemContentStyle = compConf ? compConf.formItemContentStyle || compConf.itemContentStyle : null;
+    var itemTitleClassName = compConf ? compConf.formItemTitleClassName || compConf.itemTitleClassName : '';
+    var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
     var span = item.span || $xeform.span;
     var align = item.align || $xeform.align;
     var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -40243,10 +40323,11 @@ var VxeFormConfigItem = {
       }
     }
     var contentVNs = [];
+    var 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) {
@@ -40676,8 +40757,9 @@ function getResetValue(value, resetValue) {
             itemRender = item.itemRender;
           if (isEnableConf(itemRender)) {
             var compConf = v_x_e_table.renderer.get(itemRender.name);
-            if (compConf && compConf.itemResetMethod) {
-              compConf.itemResetMethod({
+            var fiResetMethod = compConf ? compConf.formItemResetMethod || compConf.itemResetMethod : null;
+            if (compConf && fiResetMethod) {
+              fiResetMethod({
                 data: data,
                 field: field,
                 property: field,
@@ -41144,12 +41226,12 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     titleClassName = item.titleClassName,
     titleStyle = item.titleStyle;
   var compConf = isEnableConf(itemRender) ? v_x_e_table.renderer.get(itemRender.name) : null;
-  var itemClassName = compConf ? compConf.itemClassName : '';
-  var itemStyle = compConf ? compConf.itemStyle : null;
-  var itemContentClassName = compConf ? compConf.itemContentClassName : '';
-  var itemContentStyle = compConf ? compConf.itemContentStyle : null;
-  var itemTitleClassName = compConf ? compConf.itemTitleClassName : '';
-  var itemTitleStyle = compConf ? compConf.itemTitleStyle : null;
+  var itemClassName = compConf ? compConf.formItemClassName || compConf.itemClassName : '';
+  var itemStyle = compConf ? compConf.formItemStyle || compConf.itemStyle : null;
+  var itemContentClassName = compConf ? compConf.formItemContentClassName || compConf.itemContentClassName : '';
+  var itemContentStyle = compConf ? compConf.formItemContentStyle || compConf.itemContentStyle : null;
+  var itemTitleClassName = compConf ? compConf.formItemTitleClassName || compConf.itemTitleClassName : '';
+  var itemTitleStyle = compConf ? compConf.formItemTitleStyle || compConf.itemTitleStyle : null;
   var span = item.span || _vm.span;
   var align = item.align || _vm.align;
   var titleAlign = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(item.titleAlign) ? allTitleAlign : item.titleAlign;
@@ -41183,10 +41265,11 @@ var renderItem = function renderItem(h, _vm, item, slots) {
     }
   }
   var contentVNs = [];
+  var 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) {
@@ -42323,7 +42406,7 @@ var Pulldown = VxePulldown;
     table: {
       emptyText: '暂无数据',
       allTitle: '全选/取消',
-      seqTitle: '#',
+      seqTitle: '序号',
       confirmFilter: '筛选',
       resetFilter: '重置',
       allFilter: '全部',