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

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.7", "] ").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.7",
   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)));
       }
@@ -16427,8 +16434,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 +16601,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)));
       }
@@ -18046,8 +18055,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 +18496,7 @@ var Methods = {
         this.clearCopyCellArea();
       }
     }
-    this.saveCustomVisible();
-    this.saveCustomSort();
+    this.saveCustomStore();
     this.analyColumnWidth();
     return this.refreshColumn(true);
   },
@@ -18760,6 +18768,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,
@@ -20489,8 +20503,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 +20524,12 @@ 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;
+    }
     if (checkboxOpts.isShiftKey && evnt.shiftKey && !this.treeConfig) {
       var checkboxRecords = this.getCheckboxRecords();
       if (checkboxRecords.length) {
@@ -20952,23 +20974,33 @@ 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;
+    }
+    this.handleCheckAllEvent(evnt, value);
   },
   /**
    * 多选，切换所有行的选中状态
    */
   toggleAllCheckboxRow: function toggleAllCheckboxRow() {
-    this.triggerCheckAllEvent(null, !this.isAllSelected);
+    this.handleCheckAllEvent(null, !this.isAllSelected);
     return this.$nextTick();
   },
   /**
@@ -21036,6 +21068,10 @@ var Methods = {
     var oldValue = this.selectRadioRow,
       radioOpts = this.radioOpts;
     var row = params.row;
+    var trigger = radioOpts.trigger;
+    if (trigger === 'manual') {
+      return;
+    }
     var newValue = row;
     var isChange = oldValue !== newValue;
     if (isChange) {
@@ -21715,7 +21751,11 @@ 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;
+    }
     var rowid = getRowid(this, row);
     if (!lazy || !rowExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isRowExpandByRow(row);
@@ -22041,7 +22081,11 @@ 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;
+    }
     var rowid = getRowid(this, row);
     if (!lazy || !treeExpandLazyLoadedMaps[rowid]) {
       var expanded = !this.isTreeExpandByRow(row);
@@ -24392,7 +24436,6 @@ var Table = VxeTable;
 
 
 
-
 /* harmony default export */ var panel = ({
   name: 'VxeTableFilterPanel',
   props: {
@@ -24413,7 +24456,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 +24479,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 +24487,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 +24555,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 +24712,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 +24897,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;
@@ -26111,10 +26155,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)) {
@@ -32142,7 +32186,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) {
@@ -32298,7 +32342,7 @@ function getFooterCellValue($xetable, opts, items, column) {
   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) {
@@ -34825,6 +34869,8 @@ var Validator = VxeTableValidatorModule;
 
 
 
+
+
 var panel_formatText = utils.formatText;
 var panel_addClass = dom.addClass,
   panel_removeClass = dom.removeClass;
@@ -35028,12 +35074,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 +35196,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 +35397,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 +40060,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 +40154,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 +40240,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 +40294,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 +40728,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 +41197,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 +41236,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 +42377,7 @@ var Pulldown = VxePulldown;
     table: {
       emptyText: '暂无数据',
       allTitle: '全选/取消',
-      seqTitle: '#',
+      seqTitle: '序号',
       confirmFilter: '筛选',
       resetFilter: '重置',
       allFilter: '全部',