vxe-table 3.3.16 → 3.4.0-beta.0

package/lib/index.umd.js

@@ -8412,6 +8412,7 @@ var iconPrefix = 'vxe-icon--';
   table: {
     fit: true,
     showHeader: true,
+    animat: true,
     delayHover: 250,
     // keepSource: false,
     // showOverflow: null,
@@ -8420,7 +8421,6 @@ var iconPrefix = 'vxe-icon--';
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // resizable: false,
     // autoResize: false,
     // stripe: false,
     // border: false,
@@ -10958,7 +10958,6 @@ function clearTableAllStatus(_vm) {
 
 
 
-
 var renderType = 'body'; // 滚动、拖动过程中不需要触发
 
 function isOperateMouse($xetable) {
@@ -11028,7 +11027,8 @@ function renderColumn(h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel, r
       validOpts = $xetable.validOpts,
       editStore = $xetable.editStore,
       validStore = $xetable.validStore,
-      tooltipConfig = $xetable.tooltipConfig;
+      tooltipConfig = $xetable.tooltipConfig,
+      rowOpts = $xetable.rowOpts;
   var type = column.type,
       cellRender = column.cellRender,
       editRender = column.editRender,
@@ -11037,7 +11037,8 @@ function renderColumn(h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel, r
       className = column.className,
       treeNode = column.treeNode;
   var actived = editStore.actived;
-  var rHeight = sYOpts.rHeight;
+  var scrollYRHeight = sYOpts.rHeight;
+  var rowHeight = rowOpts.height;
   var showAllTip = tooltipOpts.showAll || tooltipOpts.enabled;
   var columnIndex = $xetable.getColumnIndex(column);
 
@@ -11212,7 +11213,7 @@ function renderColumn(h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel, r
         'c--ellipsis': showEllipsis
       }],
       style: {
-        maxHeight: hasEllipsis && rHeight ? "".concat(rHeight, "px") : ''
+        maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
       }
     }));
   } else {
@@ -11224,7 +11225,7 @@ function renderColumn(h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel, r
         'c--ellipsis': showEllipsis
       }],
       style: {
-        maxHeight: hasEllipsis && rHeight ? "".concat(rHeight, "px") : ''
+        maxHeight: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
       },
       attrs: {
         title: showTitle ? $xetable.getCellLabel(row, column) : null
@@ -11248,13 +11249,13 @@ function renderColumn(h, _vm, $xetable, $seq, seq, rowid, fixedType, rowLevel, r
     key: columnKey ? column.id : $columnIndex,
     attrs: attrs,
     style: Object.assign({
-      height: hasEllipsis && rHeight ? "".concat(rHeight, "px") : ''
+      height: hasEllipsis && (scrollYRHeight || rowHeight) ? "".concat(scrollYRHeight || rowHeight, "px") : ''
     }, cellStyle ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isFunction(cellStyle) ? cellStyle(params) : cellStyle : null),
     on: tdOns
   }, tdVNs);
 }
 
-function renderRows(h, _vm, $xetable, $seq, rowLevel, fixedType, tableData, tableColumn) {
+function renderRows(h, _vm, $xetable, $seq, fixedType, tableData, tableColumn) {
   var stripe = $xetable.stripe,
       rowKey = $xetable.rowKey,
       highlightHoverRow = $xetable.highlightHoverRow,
@@ -11273,7 +11274,8 @@ function renderRows(h, _vm, $xetable, $seq, rowLevel, fixedType, tableData, tabl
       radioOpts = $xetable.radioOpts,
       checkboxOpts = $xetable.checkboxOpts,
       expandColumn = $xetable.expandColumn,
-      hasFixedColumn = $xetable.hasFixedColumn;
+      hasFixedColumn = $xetable.hasFixedColumn,
+      fullAllDataRowIdData = $xetable.fullAllDataRowIdData;
   var rows = [];
   tableData.forEach(function (row, $rowIndex) {
     var trOn = {};
@@ -11311,6 +11313,8 @@ function renderRows(h, _vm, $xetable, $seq, rowLevel, fixedType, tableData, tabl
     }
 
     var rowid = UtilTools.getRowid($xetable, row);
+    var rest = fullAllDataRowIdData[rowid];
+    var rowLevel = rest ? rest.level : 0;
     var params = {
       $table: $xetable,
       $seq: $seq,
@@ -11390,11 +11394,11 @@ function renderRows(h, _vm, $xetable, $seq, rowLevel, fixedType, tableData, tabl
     } // 如果是树形表格
 
 
-    if (treeConfig && treeExpandeds.length) {
+    if (treeConfig && !scrollYLoad && treeExpandeds.length) {
       var rowChildren = row[treeOpts.children];
 
       if (rowChildren && rowChildren.length && treeExpandeds.indexOf(row) > -1) {
-        rows.push.apply(rows, _toConsumableArray(renderRows(h, _vm, $xetable, $seq ? "".concat($seq, ".").concat(seq) : "".concat(seq), rowLevel + 1, fixedType, rowChildren, tableColumn)));
+        rows.push.apply(rows, _toConsumableArray(renderRows(h, _vm, $xetable, $seq ? "".concat($seq, ".").concat(seq) : "".concat(seq), fixedType, rowChildren, tableColumn)));
       }
     }
   });
@@ -11569,7 +11573,7 @@ function syncBodyScroll(scrollTop, elem1, elem2) {
      */
     h('tbody', {
       ref: 'tbody'
-    }, renderRows(h, this, $xetable, '', 0, fixedType, tableData, tableColumn))]), h('div', {
+    }, renderRows(h, this, $xetable, '', fixedType, tableData, tableColumn))]), h('div', {
       class: 'vxe-table--checkbox-range'
     }), mouseConfig && mouseOpts.area ? h('div', {
       class: 'vxe-table--cell-area'
@@ -12780,8 +12784,6 @@ var Cell = {
 
 
 
-
-
 
 
 
@@ -13181,6 +13183,15 @@ var Methods = {
     this.tableData = scrollYLoad ? fullData.slice(scrollYStore.startIndex, scrollYStore.endIndex) : fullData.slice(0);
     return this.$nextTick();
   },
+  updateScrollYStatus: function updateScrollYStatus(fullData) {
+    var treeConfig = this.treeConfig,
+        treeOpts = this.treeOpts,
+        sYOpts = this.sYOpts;
+    var transform = treeOpts.transform;
+    var scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt < fullData.length;
+    this.scrollYLoad = scrollYLoad;
+    return scrollYLoad;
+  },
 
   /**
    * 加载表格数据
@@ -13193,44 +13204,50 @@ var Methods = {
         treeConfig = this.treeConfig,
         treeOpts = this.treeOpts,
         editStore = this.editStore,
-        sYOpts = this.sYOpts,
         scrollYStore = this.scrollYStore,
         scrollXStore = this.scrollXStore,
         lastScrollLeft = this.lastScrollLeft,
         lastScrollTop = this.lastScrollTop,
         oldScrollYLoad = this.scrollYLoad;
+    var treeData = [];
+    var fullData = datas ? datas.slice(0) : [];
 
-    if (treeConfig && treeOpts.transform) {
-      if (false) {}
+    if (treeConfig) {
+      // 树结构自动转换
+      if (treeOpts.transform) {
+        if (false) {}
 
-      datas = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toArrayTree(datas, {
-        key: treeOpts.rowtKey,
-        parentKey: treeOpts.parentKey,
-        children: treeOpts.children
-      });
+        treeData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toArrayTree(fullData, {
+          key: treeOpts.rowtKey,
+          parentKey: treeOpts.parentKey,
+          children: treeOpts.children
+        });
+        fullData = treeData.slice(0);
+      } else {
+        treeData = fullData.slice(0);
+      }
     }
 
-    var tableFullData = datas ? datas.slice(0) : [];
-    var scrollYLoad = !treeConfig && sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
     scrollYStore.startIndex = 0;
     scrollYStore.endIndex = 1;
     scrollXStore.startIndex = 0;
     scrollXStore.endIndex = 1;
     editStore.insertList = [];
-    editStore.removeList = []; // 全量数据
+    editStore.removeList = [];
+    var sYLoad = this.updateScrollYStatus(fullData);
+    this.scrollYLoad = sYLoad; // 全量数据
 
-    this.tableFullData = tableFullData; // 缓存数据
+    this.tableFullData = fullData;
+    this.treeFullData = treeData; // 缓存数据
 
-    this.updateCache(true); // 原始数据
+    this.cacheRowMap(true); // 原始数据
 
-    this.tableSynchData = datas;
+    this.tableSynchData = datas; // 克隆原数据，用于显示编辑状态，与编辑值做对比
 
     if (keepSource) {
-      this.tableSourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(tableFullData, true);
+      this.tableSourceData = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(fullData, true);
     }
 
-    this.scrollYLoad = scrollYLoad;
-
     if (false) {}
 
     if (this.clearCellAreas && this.mouseConfig) {
@@ -13249,8 +13266,8 @@ var Methods = {
     }).then(function () {
       _this2.computeScrollLoad();
     }).then(function () {
-      // 是否加载了数据
-      if (scrollYLoad) {
+      // 是否启用了虚拟滚动
+      if (sYLoad) {
         scrollYStore.endIndex = scrollYStore.visibleSize;
       }
 
@@ -13263,7 +13280,7 @@ var Methods = {
           return _this2.recalculate();
         }).then(function () {
           // 是否变更虚拟滚动
-          if (oldScrollYLoad === scrollYLoad) {
+          if (oldScrollYLoad === sYLoad) {
             restoreScrollLocation(_this2, lastScrollLeft, lastScrollTop).then(resolve);
           } else {
             setTimeout(function () {
@@ -13347,7 +13364,7 @@ var Methods = {
             tableSourceData[rowIndex] = record;
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clear(row, undefined);
             Object.assign(row, this.defineField(Object.assign({}, record)));
-            this.updateCache(true);
+            this.cacheRowMap(true);
           } else {
             external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.destructuring(oRow, external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.clone(row, true));
           }
@@ -13425,7 +13442,7 @@ var Methods = {
    * 更新数据行的 Map
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
-  updateCache: function updateCache(source) {
+  cacheRowMap: function cacheRowMap(source) {
     var _this8 = this;
 
     var treeConfig = this.treeConfig,
@@ -13438,7 +13455,7 @@ var Methods = {
     var rowkey = getRowkey(this);
     var isLazy = treeConfig && treeOpts.lazy;
 
-    var handleCache = function handleCache(row, index, items, path, parent) {
+    var handleCache = function handleCache(row, index, items, path, parent, nodes) {
       var rowid = methods_getRowid(_this8, row);
 
       if (eqEmptyValue(rowid)) {
@@ -13455,7 +13472,8 @@ var Methods = {
         rowid: rowid,
         index: treeConfig && parent ? -1 : index,
         items: items,
-        parent: parent
+        parent: parent,
+        level: nodes ? nodes.length - 1 : 0
       };
 
       if (source) {
@@ -13481,19 +13499,20 @@ var Methods = {
       tableFullData.forEach(handleCache);
     }
   },
-  loadChildren: function loadChildren(row, childRecords) {
+  loadTreeChildren: function loadTreeChildren(row, childRecords) {
     var _this9 = this;
 
+    var keepSource = this.keepSource,
+        tableSourceData = this.tableSourceData,
+        treeOpts = this.treeOpts,
+        fullDataRowIdData = this.fullDataRowIdData,
+        fullDataRowMap = this.fullDataRowMap,
+        fullAllDataRowMap = this.fullAllDataRowMap,
+        fullAllDataRowIdData = this.fullAllDataRowIdData;
+    var children = treeOpts.children;
+    var rest = fullAllDataRowIdData[methods_getRowid(this, row)];
+    var parentLevel = rest ? rest.level : 0;
     return this.createData(childRecords).then(function (rows) {
-      var keepSource = _this9.keepSource,
-          tableSourceData = _this9.tableSourceData,
-          treeOpts = _this9.treeOpts,
-          fullDataRowIdData = _this9.fullDataRowIdData,
-          fullDataRowMap = _this9.fullDataRowMap,
-          fullAllDataRowMap = _this9.fullAllDataRowMap,
-          fullAllDataRowIdData = _this9.fullAllDataRowIdData;
-      var children = treeOpts.children;
-
       if (keepSource) {
         var rowid = methods_getRowid(_this9, row);
         var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableSourceData, function (item) {
@@ -13505,14 +13524,15 @@ var Methods = {
         }
       }
 
-      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(rows, function (childRow, index, items, path, parent) {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(rows, function (childRow, index, items, path, parent, nodes) {
         var rowid = methods_getRowid(_this9, childRow);
         var rest = {
           row: childRow,
           rowid: rowid,
           index: -1,
           items: items,
-          parent: parent
+          parent: parent,
+          level: parentLevel + nodes.length
         };
         fullDataRowIdData[rowid] = rest;
         fullDataRowMap.set(childRow, rest);
@@ -15835,11 +15855,11 @@ var Methods = {
     var column = params.column;
     var titleHelp = column.titleHelp;
 
-    if (titleHelp.message) {
+    if (titleHelp.content || titleHelp.message) {
       var $refs = this.$refs,
           tooltipStore = this.tooltipStore;
       var tooltip = $refs.tooltip;
-      var content = UtilTools.getFuncText(titleHelp.message);
+      var content = UtilTools.getFuncText(titleHelp.content || titleHelp.message);
       this.handleTargetEnterEvent();
       tooltipStore.visible = true;
 
@@ -17389,10 +17409,10 @@ var Methods = {
   },
 
   /**
-   * 重新加载展开行的内容
+   * 重新懒加载展开行，并展开内容
    * @param {Row} row 行对象
    */
-  reloadExpandContent: function reloadExpandContent(row) {
+  lazyExpandContent: function lazyExpandContent(row) {
     var _this36 = this;
 
     var expandOpts = this.expandOpts,
@@ -17407,6 +17427,12 @@ var Methods = {
 
     return this.$nextTick();
   },
+  reloadExpandContent: function reloadExpandContent(row) {
+    if (false) {} // 即将废弃
+
+
+    return this.lazyExpandContent(row);
+  },
 
   /**
    * 展开行事件
@@ -17672,25 +17698,38 @@ var Methods = {
   },
 
   /**
-   * 重新加载树的子节点
+   * 重新懒加载树节点，并展开该节点
    * @param {Row} row 行对象
    */
-  reloadTreeChilds: function reloadTreeChilds(row) {
+  lazyTreeChildren: function lazyTreeChildren(row) {
     var _this40 = this;
 
     var treeOpts = this.treeOpts,
         treeLazyLoadeds = this.treeLazyLoadeds;
-    var lazy = treeOpts.lazy,
+    var transform = treeOpts.transform,
+        lazy = treeOpts.lazy,
         hasChild = treeOpts.hasChild;
 
     if (lazy && row[hasChild] && treeLazyLoadeds.indexOf(row) === -1) {
       this.clearTreeExpandLoaded(row).then(function () {
         return _this40.handleAsyncTreeExpandChilds(row);
+      }).then(function () {
+        if (transform) {
+          return _this40.updateVirtualTreeData();
+        }
+      }).then(function () {
+        return _this40.recalculate();
       });
     }
 
     return this.$nextTick();
   },
+  reloadTreeChilds: function reloadTreeChilds(row) {
+    if (false) {} // 即将废弃
+
+
+    return this.lazyTreeChildren(row);
+  },
 
   /**
    * 展开树节点事件
@@ -17783,7 +17822,7 @@ var Methods = {
         }
 
         if (childRecords) {
-          _this41.loadChildren(row, childRecords).then(function (childRows) {
+          _this41.loadTreeChildren(row, childRecords).then(function (childRows) {
             if (childRows.length && treeExpandeds.indexOf(row) === -1) {
               treeExpandeds.push(row);
             } // 如果当前节点已选中，则展开后子节点也被选中
@@ -17821,13 +17860,12 @@ var Methods = {
   },
 
   /**
-   * 设置展开树形节点，二个参数设置这一行展开与否
-   * 支持单行
-   * 支持多行
-   * @param {Array/Row} rows 行数据
-   * @param {Boolean} expanded 是否展开
+   * 默认，展开与收起树节点
+   * @param rows
+   * @param expanded
+   * @returns
    */
-  setTreeExpand: function setTreeExpand(rows, expanded) {
+  handleBaseTreeExpand: function handleBaseTreeExpand(rows, expanded) {
     var _this42 = this;
 
     var fullAllDataRowMap = this.fullAllDataRowMap,
@@ -17845,65 +17883,123 @@ var Methods = {
     var result = [];
     var columnIndex = this.getColumnIndex(treeNodeColumn);
     var $columnIndex = this.getVMColumnIndex(treeNodeColumn);
+    var validRows = toggleMethod ? rows.filter(function (row) {
+      return toggleMethod({
+        expanded: expanded,
+        column: treeNodeColumn,
+        columnIndex: columnIndex,
+        $columnIndex: $columnIndex,
+        row: row
+      });
+    }) : rows;
 
-    if (rows) {
-      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(rows)) {
-        rows = [rows];
-      }
+    if (accordion) {
+      validRows = validRows.length ? [validRows[validRows.length - 1]] : []; // 同一级只能展开一个
 
-      if (rows.length) {
-        var validRows = toggleMethod ? rows.filter(function (row) {
-          return toggleMethod({
-            expanded: expanded,
-            column: treeNodeColumn,
-            columnIndex: columnIndex,
-            $columnIndex: $columnIndex,
-            row: row
-          });
-        }) : rows;
+      var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
+        return item === validRows[0];
+      }, treeOpts);
 
-        if (accordion) {
-          validRows = validRows.length ? [validRows[validRows.length - 1]] : []; // 同一级只能展开一个
+      if (matchObj) {
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeExpandeds, function (item) {
+          return matchObj.items.indexOf(item) > -1;
+        });
+      }
+    }
 
-          var matchObj = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.findTree(tableFullData, function (item) {
-            return item === validRows[0];
-          }, treeOpts);
+    if (expanded) {
+      validRows.forEach(function (row) {
+        if (treeExpandeds.indexOf(row) === -1) {
+          var rest = fullAllDataRowMap.get(row);
+          var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
 
-          if (matchObj) {
-            external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeExpandeds, function (item) {
-              return matchObj.items.indexOf(item) > -1;
-            });
+          if (isLoad) {
+            result.push(_this42.handleAsyncTreeExpandChilds(row));
+          } else {
+            if (row[children] && row[children].length) {
+              treeExpandeds.push(row);
+            }
           }
         }
+      });
+    } else {
+      external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeExpandeds, function (row) {
+        return validRows.indexOf(row) > -1;
+      });
+    }
 
-        if (expanded) {
-          validRows.forEach(function (row) {
-            if (treeExpandeds.indexOf(row) === -1) {
-              var rest = fullAllDataRowMap.get(row);
-              var isLoad = lazy && row[hasChild] && !rest.treeLoaded && treeLazyLoadeds.indexOf(row) === -1; // 是否使用懒加载
+    if (reserve) {
+      validRows.forEach(function (row) {
+        return _this42.handleTreeExpandReserve(row, expanded);
+      });
+    }
 
-              if (isLoad) {
-                result.push(_this42.handleAsyncTreeExpandChilds(row));
-              } else {
-                if (row[children] && row[children].length) {
-                  treeExpandeds.push(row);
-                }
-              }
-            }
-          });
-        } else {
-          external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.remove(treeExpandeds, function (row) {
-            return validRows.indexOf(row) > -1;
-          });
-        }
+    return Promise.all(result).then(this.recalculate);
+  },
+  updateVirtualTreeData: function updateVirtualTreeData() {
+    var _this43 = this;
 
-        if (reserve) {
-          validRows.forEach(function (row) {
-            return _this42.handleTreeExpandReserve(row, expanded);
-          });
-        }
+    var oldScrollYLoad = this.scrollYLoad,
+        treeExpandeds = this.treeExpandeds,
+        treeOpts = this.treeOpts,
+        treeFullData = this.treeFullData;
+    var fullData = [];
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(treeFullData, function (row, index, items, path, parent) {
+      if (!parent || treeExpandeds.indexOf(parent) > -1) {
+        fullData.push(row);
+      }
+    }, treeOpts);
+    var scrollYLoad = this.updateScrollYStatus(fullData);
+    this.tableFullData = scrollYLoad ? fullData : treeFullData;
+
+    if (scrollYLoad || oldScrollYLoad !== scrollYLoad) {
+      return this.handleTableData(true).then(function () {
+        return _this43.recalculate();
+      });
+    }
+
+    return this.$nextTick();
+  },
 
-        return Promise.all(result).then(this.recalculate);
+  /**
+   * 虚拟树的展开与收起
+   * @param rows
+   * @param expanded
+   * @returns
+   */
+  handleVirtualTreeExpand: function handleVirtualTreeExpand(rows, expanded) {
+    var _this44 = this;
+
+    return this.handleBaseTreeExpand(rows, expanded).then(function () {
+      return _this44.updateVirtualTreeData();
+    }).then(function () {
+      return _this44.recalculate();
+    });
+  },
+
+  /**
+   * 设置展开树形节点，二个参数设置这一行展开与否
+   * 支持单行
+   * 支持多行
+   * @param {Array/Row} rows 行数据
+   * @param {Boolean} expanded 是否展开
+   */
+  setTreeExpand: function setTreeExpand(rows, expanded) {
+    var treeOpts = this.treeOpts;
+    var transform = treeOpts.transform;
+
+    if (rows) {
+      if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isArray(rows)) {
+        rows = [rows];
+      }
+
+      if (rows.length) {
+        // 如果为虚拟树
+        if (transform) {
+          return this.handleVirtualTreeExpand(rows, expanded);
+        } else {
+          return this.handleBaseTreeExpand(rows, expanded);
+        }
       }
     }
 
@@ -17922,7 +18018,7 @@ var Methods = {
    * 手动清空树形节点的展开状态，数据会恢复成未展开的状态
    */
   clearTreeExpand: function clearTreeExpand() {
-    var _this43 = this;
+    var _this45 = this;
 
     var treeOpts = this.treeOpts,
         treeExpandeds = this.treeExpandeds,
@@ -17933,13 +18029,13 @@ var Methods = {
 
     if (reserve) {
       external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.eachTree(tableFullData, function (row) {
-        return _this43.handleTreeExpandReserve(row, false);
+        return _this45.handleTreeExpandReserve(row, false);
       }, treeOpts);
     }
 
-    return this.$nextTick().then(function () {
+    return this.updateVirtualTreeData().then(function () {
       if (isExists) {
-        _this43.recalculate();
+        _this45.recalculate();
       }
     });
   },
@@ -18069,18 +18165,18 @@ var Methods = {
   },
   // 计算可视渲染相关数据
   computeScrollLoad: function computeScrollLoad() {
-    var _this44 = this;
+    var _this46 = this;
 
     return this.$nextTick().then(function () {
-      var sYOpts = _this44.sYOpts,
-          sXOpts = _this44.sXOpts,
-          scrollXLoad = _this44.scrollXLoad,
-          scrollYLoad = _this44.scrollYLoad,
-          scrollXStore = _this44.scrollXStore,
-          scrollYStore = _this44.scrollYStore; // 计算 X 逻辑
+      var sYOpts = _this46.sYOpts,
+          sXOpts = _this46.sXOpts,
+          scrollXLoad = _this46.scrollXLoad,
+          scrollYLoad = _this46.scrollYLoad,
+          scrollXStore = _this46.scrollXStore,
+          scrollYStore = _this46.scrollYStore; // 计算 X 逻辑
 
       if (scrollXLoad) {
-        var _computeVirtualX3 = computeVirtualX(_this44),
+        var _computeVirtualX3 = computeVirtualX(_this46),
             visibleXSize = _computeVirtualX3.visibleSize;
 
         var offsetXSize = sXOpts.oSize ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.toNumber(sXOpts.oSize) : browse.msie ? 10 : browse.edge ? 5 : 0;
@@ -18088,13 +18184,13 @@ var Methods = {
         scrollXStore.visibleSize = visibleXSize;
         scrollXStore.endIndex = Math.max(scrollXStore.startIndex + scrollXStore.visibleSize + offsetXSize, scrollXStore.endIndex);
 
-        _this44.updateScrollXData();
+        _this46.updateScrollXData();
       } else {
-        _this44.updateScrollXSpace();
+        _this46.updateScrollXSpace();
       } // 计算 Y 逻辑
 
 
-      var _computeVirtualY = computeVirtualY(_this44),
+      var _computeVirtualY = computeVirtualY(_this46),
           rowHeight = _computeVirtualY.rowHeight,
           visibleYSize = _computeVirtualY.visibleSize;
 
@@ -18106,14 +18202,14 @@ var Methods = {
         scrollYStore.visibleSize = visibleYSize;
         scrollYStore.endIndex = Math.max(scrollYStore.startIndex + visibleYSize + offsetYSize, scrollYStore.endIndex);
 
-        _this44.updateScrollYData();
+        _this46.updateScrollYData();
       } else {
-        _this44.updateScrollYSpace();
+        _this46.updateScrollYSpace();
       }
 
-      _this44.rowHeight = rowHeight;
+      _this46.rowHeight = rowHeight;
 
-      _this44.$nextTick(_this44.updateStyle);
+      _this46.$nextTick(_this46.updateStyle);
     });
   },
   handleTableColumn: function handleTableColumn() {
@@ -18227,7 +18323,7 @@ var Methods = {
    * @param {Number} scrollTop 上距离
    */
   scrollTo: function scrollTo(scrollLeft, scrollTop) {
-    var _this45 = this;
+    var _this47 = this;
 
     var $refs = this.$refs;
     var tableBody = $refs.tableBody,
@@ -18248,7 +18344,7 @@ var Methods = {
     if (this.scrollXLoad || this.scrollYLoad) {
       return new Promise(function (resolve) {
         return setTimeout(function () {
-          return resolve(_this45.$nextTick());
+          return resolve(_this47.$nextTick());
         }, 50);
       });
     }
@@ -18299,7 +18395,7 @@ var Methods = {
    * @param {Row} row 行对象
    */
   scrollToTreeRow: function scrollToTreeRow(row) {
-    var _this46 = this;
+    var _this48 = this;
 
     var tableFullData = this.tableFullData,
         treeConfig = this.treeConfig,
@@ -18314,15 +18410,15 @@ var Methods = {
       if (matchObj) {
         var nodes = matchObj.nodes;
         nodes.forEach(function (row, index) {
-          if (index < nodes.length - 1 && !_this46.isTreeExpandByRow(row)) {
-            rests.push(_this46.setTreeExpand(row, true));
+          if (index < nodes.length - 1 && !_this48.isTreeExpandByRow(row)) {
+            rests.push(_this48.setTreeExpand(row, true));
           }
         });
       }
     }
 
     return Promise.all(rests).then(function () {
-      return DomTools.rowToVisible(_this46, row);
+      return DomTools.rowToVisible(_this48, row);
     });
   },
 
@@ -18386,29 +18482,29 @@ var Methods = {
    * 如果单元格配置了校验规则，则会进行校验
    */
   updateStatus: function updateStatus(scope, cellValue) {
-    var _this47 = this;
+    var _this49 = this;
 
     var customVal = !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isUndefined(cellValue);
     return this.$nextTick().then(function () {
-      var $refs = _this47.$refs,
-          editRules = _this47.editRules,
-          validStore = _this47.validStore;
+      var $refs = _this49.$refs,
+          editRules = _this49.editRules,
+          validStore = _this49.validStore;
 
       if (scope && $refs.tableBody && editRules) {
         var row = scope.row,
             column = scope.column;
         var type = 'change';
 
-        if (_this47.hasCellRules(type, row, column)) {
-          var cell = _this47.getCell(row, column);
+        if (_this49.hasCellRules(type, row, column)) {
+          var cell = _this49.getCell(row, column);
 
           if (cell) {
-            return _this47.validCellRules(type, row, column, cellValue).then(function () {
+            return _this49.validCellRules(type, row, column, cellValue).then(function () {
               if (customVal && validStore.visible) {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this47.clearValidate();
+              _this49.clearValidate();
             }).catch(function (_ref7) {
               var rule = _ref7.rule;
 
@@ -18416,7 +18512,7 @@ var Methods = {
                 methods_setCellValue(row, column, cellValue);
               }
 
-              _this47.showValidTooltip({
+              _this49.showValidTooltip({
                 rule: rule,
                 row: row,
                 column: column,
@@ -18437,7 +18533,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges { row: Row|number, column: ColumnInfo|number, rowspan: number, colspan: number }
    */
   setMergeCells: function setMergeCells(merges) {
-    var _this48 = this;
+    var _this50 = this;
 
     if (this.spanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -18445,7 +18541,7 @@ var Methods = {
 
     setMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      return _this48.updateCellAreas();
+      return _this50.updateCellAreas();
     });
   },
 
@@ -18454,7 +18550,7 @@ var Methods = {
    * @param {TableMergeConfig[]} merges 多个或数组 [{row:Row|number, col:ColumnInfo|number}]
    */
   removeMergeCells: function removeMergeCells(merges) {
-    var _this49 = this;
+    var _this51 = this;
 
     if (this.spanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-cells', 'span-method']);
@@ -18462,7 +18558,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeList, this.afterFullData);
     return this.$nextTick().then(function () {
-      _this49.updateCellAreas();
+      _this51.updateCellAreas();
 
       return rest;
     });
@@ -18486,7 +18582,7 @@ var Methods = {
     this.setMergeFooterItems(this.mergeFooterItems);
   },
   setMergeFooterItems: function setMergeFooterItems(merges) {
-    var _this50 = this;
+    var _this52 = this;
 
     if (this.footerSpanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -18494,11 +18590,11 @@ var Methods = {
 
     setMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      return _this50.updateCellAreas();
+      return _this52.updateCellAreas();
     });
   },
   removeMergeFooterItems: function removeMergeFooterItems(merges) {
-    var _this51 = this;
+    var _this53 = this;
 
     if (this.footerSpanMethod) {
       UtilTools.error('vxe.error.errConflicts', ['merge-footer-items', 'footer-span-method']);
@@ -18506,7 +18602,7 @@ var Methods = {
 
     var rest = removeMerges(this, merges, this.mergeFooterList, null);
     return this.$nextTick().then(function () {
-      _this51.updateCellAreas();
+      _this53.updateCellAreas();
 
       return rest;
     });
@@ -18646,6 +18742,8 @@ var Methods = {
 var funcs = 'setFilter,clearFilter,getCheckedFilters,closeMenu,setActiveCellArea,getActiveCellArea,getCellAreas,clearCellAreas,copyCellArea,cutCellArea,pasteCellArea,getCopyCellArea,clearCopyCellArea,setCellAreas,openFind,openReplace,getSelectedCell,clearSelected,insert,insertAt,remove,removeCheckboxRow,removeRadioRow,removeCurrentRow,getRecordset,getInsertRecords,getRemoveRecords,getUpdateRecords,clearActived,getActiveRecord,isActiveByRow,setActiveRow,setActiveCell,setSelectCell,clearValidate,fullValidate,validate,openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',');
 funcs.forEach(function (name) {
   Methods[name] = function () {
+    if (false) {}
+
     return this["_".concat(name)] ? this["_".concat(name)].apply(this, arguments) : null;
   };
 });
@@ -18669,8 +18767,6 @@ funcs.forEach(function (name) {
 
 
 
-
-
 /**
  * 渲染浮固定列
  * 分别渲染左边固定列和右边固定列
@@ -18961,8 +19057,11 @@ function handleUupdateResize(_vm) {
     },
     // 是否自动根据状态属性去更新响应式表格宽高
     syncResize: [Boolean, String, Number],
-    // 设置列的默认参数，仅对部分支持的属性有效
+    // 列配置信息
     columnConfig: Object,
+    // 行配置信息
+    rowConfig: Object,
+    // 列调整配置项
     resizableConfig: Object,
     // 序号配置项
     seqConfig: Object,
@@ -19247,7 +19346,10 @@ function handleUupdateResize(_vm) {
       };
     },
     columnOpts: function columnOpts() {
-      return Object.assign({}, this.columnConfig);
+      return Object.assign({}, conf.table.columnConfig, this.columnConfig);
+    },
+    rowOpts: function rowOpts() {
+      return Object.assign({}, conf.table.rowConfig, this.rowConfig);
     },
     resizableOpts: function resizableOpts() {
       return Object.assign({}, conf.table.resizableConfig, this.resizableConfig);
@@ -20989,7 +21091,6 @@ var Menu = {
 
 
 
-
 /* harmony default export */ var edit_src_mixin = ({
   methods: {
     /**
@@ -21085,7 +21186,7 @@ var Menu = {
       this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
       this.handleTableData();
       this.updateFooter();
-      this.updateCache();
+      this.cacheRowMap();
       this.checkSelectionStatus();
 
       if (scrollYLoad) {
@@ -21202,7 +21303,7 @@ var Menu = {
       this.scrollYLoad = !treeConfig && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length;
       this.handleTableData();
       this.updateFooter();
-      this.updateCache();
+      this.cacheRowMap();
       this.checkSelectionStatus();
 
       if (scrollYLoad) {
@@ -25548,7 +25649,6 @@ function renderExtraSuffixIcon(h, _vm) {
 
 
 
-
 function isOptionVisible(option) {
   return option.visible !== false;
 }
@@ -25918,17 +26018,17 @@ function select_renderOpts(h, _vm) {
         this.fullOptionList = value;
       }
 
-      this.updateCache();
+      this.cacheItemMap();
     },
     options: function options(value) {
       this.fullGroupList = [];
       this.fullOptionList = value;
-      this.updateCache();
+      this.cacheItemMap();
     },
     optionGroups: function optionGroups(value) {
       this.fullOptionList = [];
       this.fullGroupList = value;
-      this.updateCache();
+      this.cacheItemMap();
     }
   },
   created: function created() {
@@ -25941,7 +26041,7 @@ function select_renderOpts(h, _vm) {
       this.fullOptionList = options;
     }
 
-    this.updateCache();
+    this.cacheItemMap();
     GlobalEvent.on(this, 'mousewheel', this.handleGlobalMousewheelEvent);
     GlobalEvent.on(this, 'mousedown', this.handleGlobalMousedownEvent);
     GlobalEvent.on(this, 'keydown', this.handleGlobalKeydownEvent);
@@ -26031,7 +26131,7 @@ function select_renderOpts(h, _vm) {
 
       return [];
     },
-    updateCache: function updateCache() {
+    cacheItemMap: function cacheItemMap() {
       var _this2 = this;
 
       var fullOptionList = this.fullOptionList,
@@ -27317,9 +27417,6 @@ var es_string_repeat = __webpack_require__("38cf");
 
 
 
-
-
-
 
 
 
@@ -27998,13 +28095,21 @@ function saveLocalFile(options) {
     if (navigator.msSaveBlob) {
       navigator.msSaveBlob(blob, name);
     } else {
+      var url = URL.createObjectURL(blob);
       var linkElem = document.createElement('a');
       linkElem.target = '_blank';
       linkElem.download = name;
-      linkElem.href = URL.createObjectURL(blob);
+      linkElem.href = url;
       document.body.appendChild(linkElem);
       linkElem.click();
       document.body.removeChild(linkElem);
+      requestAnimationFrame(function () {
+        if (linkElem.parentNode) {
+          linkElem.parentNode.removeChild(linkElem);
+        }
+
+        URL.revokeObjectURL(url);
+      });
     }
 
     return Promise.resolve();
@@ -28033,6 +28138,9 @@ function downloadFile($xetable, opts, content) {
     content: content
   }).then(function () {
     if (opts.message !== false) {
+      // 检测弹窗模块
+      if (false) {}
+
       v_x_e_table.modal.message({
         content: conf.i18n('vxe.table.expSuccess'),
         status: 'success'
@@ -28333,6 +28441,9 @@ function handleImport($xetable, content, opts) {
       }
 
       if (opts.message !== false) {
+        // 检测弹窗模块
+        if (false) {}
+
         v_x_e_table.modal.message({
           content: conf.i18n('vxe.table.impSuccess', [rows.length]),
           status: 'success'
@@ -28348,6 +28459,9 @@ function handleImport($xetable, content, opts) {
       });
     });
   } else if (opts.message !== false) {
+    // 检测弹窗模块
+    if (false) {}
+
     v_x_e_table.modal.message({
       content: conf.i18n('vxe.error.impFields'),
       status: 'error'
@@ -28372,6 +28486,9 @@ function handleFileImport($xetable, file, opts) {
 
   if (!importMethod && !external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.includes(v_x_e_table.config.importTypes, type)) {
     if (opts.message !== false) {
+      // 检测弹窗模块
+      if (false) {}
+
       v_x_e_table.modal.message({
         content: conf.i18n('vxe.error.notType', [type]),
         status: 'error'
@@ -28532,6 +28649,9 @@ function readLocalFile() {
         });
       } else {
         if (options.message !== false) {
+          // 检测弹窗模块
+          if (false) {}
+
           v_x_e_table.modal.message({
             content: conf.i18n('vxe.error.notType', [errType]),
             status: 'error'
@@ -29672,9 +29792,6 @@ var Keyboard = {
 
 
 
-
-
-
 /**
  * 校验规则
  */
@@ -29702,9 +29819,14 @@ var mixin_Rule = /*#__PURE__*/function () {
 
 
   _createClass(Rule, [{
+    key: "content",
+    get: function get() {
+      return UtilTools.getFuncText(this.$options.content || this.$options.message);
+    }
+  }, {
     key: "message",
     get: function get() {
-      return UtilTools.getFuncText(this.$options.message);
+      return this.content;
     }
   }]);
 
@@ -29989,7 +30111,7 @@ function validErrorRuleValue(rule, val) {
                     errorRules.push(new mixin_Rule({
                       type: 'custom',
                       trigger: trigger,
-                      message: customValid.message,
+                      content: customValid.message,
                       rule: new mixin_Rule(rule)
                     }));
                   } else if (customValid.catch) {
@@ -29999,7 +30121,7 @@ function validErrorRuleValue(rule, val) {
                       errorRules.push(new mixin_Rule({
                         type: 'custom',
                         trigger: trigger,
-                        message: e && e.message ? e.message : rule.message,
+                        content: e && e.message ? e.message : rule.content || rule.message,
                         rule: new mixin_Rule(rule)
                       }));
                     }));
@@ -30111,7 +30233,7 @@ function validErrorRuleValue(rule, val) {
           column = params.column,
           cell = params.cell;
       var validTip = $refs.validTip;
-      var content = rule.message;
+      var content = rule.content;
       return this.$nextTick(function () {
         Object.assign(_this5.validStore, {
           row: row,
@@ -30290,7 +30412,8 @@ var cellType = 'header';
         overflowX = $xetable.overflowX,
         scrollbarWidth = $xetable.scrollbarWidth,
         sortOpts = $xetable.sortOpts,
-        mouseConfig = $xetable.mouseConfig;
+        mouseConfig = $xetable.mouseConfig,
+        columnOpts = $xetable.columnOpts;
     var tableColumn = this.tableColumn;
     var headerGroups = headerColumn; // 如果是使用优化模式
 
@@ -30439,7 +30562,7 @@ var cellType = 'header';
         /**
          * 列宽拖动
          */
-        !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isBoolean(column.resizable) ? column.resizable : resizable) ? h('div', {
+        !fixedHiddenColumn && !isColGroup && (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default.a.isBoolean(column.resizable) ? column.resizable : columnOpts.resizable || resizable) ? h('div', {
           class: ['vxe-resizable', {
             'is--line': !border || border === 'none'
           }],
@@ -31138,8 +31261,6 @@ var Colgroup = Object.assign(src_group, {
 
 
 
-
-
 var grid_methods = {};
 var propKeys = Object.keys(packages_table.props);
 
@@ -31907,6 +32028,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                     });
 
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (false) {}
+
                       v_x_e_table.modal.message({
                         content: _this5.getRespMsg(rest, 'vxe.grid.delSuccess'),
                         status: 'success'
@@ -31922,6 +32046,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                     _this5.tableLoading = false;
 
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (false) {}
+
                       v_x_e_table.modal.message({
                         id: code,
                         content: _this5.getRespMsg(rest, 'vxe.grid.operError'),
@@ -31932,6 +32059,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                 });
               } else {
                 if (isMsg) {
+                  // 检测弹窗模块
+                  if (false) {}
+
                   v_x_e_table.modal.message({
                     id: code,
                     content: conf.i18n('vxe.grid.selectOneRecord'),
@@ -31991,6 +32121,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                     _this5.pendingRecords = [];
 
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (false) {}
+
                       v_x_e_table.modal.message({
                         content: _this5.getRespMsg(rest, 'vxe.grid.saveSuccess'),
                         status: 'success'
@@ -32006,6 +32139,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                     _this5.tableLoading = false;
 
                     if (isMsg) {
+                      // 检测弹窗模块
+                      if (false) {}
+
                       v_x_e_table.modal.message({
                         id: code,
                         content: _this5.getRespMsg(rest, 'vxe.grid.operError'),
@@ -32015,6 +32151,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
                   });
                 } else {
                   if (isMsg) {
+                    // 检测弹窗模块
+                    if (false) {}
+
                     v_x_e_table.modal.message({
                       id: code,
                       content: conf.i18n('vxe.grid.dataUnchanged'),
@@ -32075,6 +32214,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
             }
           });
         } else {
+          // 检测弹窗模块
+          if (false) {}
+
           v_x_e_table.modal.message({
             id: "msg_".concat(code),
             content: conf.i18n('vxe.grid.selectOneRecord'),
@@ -32150,6 +32292,9 @@ Object.keys(packages_table.methods).forEach(function (name) {
         this.clearCheckboxRow();
       } else {
         if (isMsg) {
+          // 检测弹窗模块
+          if (false) {}
+
           v_x_e_table.modal.message({
             id: code,
             content: conf.i18n('vxe.grid.selectOneRecord'),
@@ -35151,9 +35296,9 @@ function renderTitle(h, _vm, item) {
   var titVNs = [];
 
   if (titlePrefix) {
-    titVNs.push(titlePrefix.message ? h('vxe-tooltip', {
+    titVNs.push(titlePrefix.content || titlePrefix.message ? h('vxe-tooltip', {
       props: {
-        content: UtilTools.getFuncText(titlePrefix.message),
+        content: UtilTools.getFuncText(titlePrefix.content || titlePrefix.message),
         enterable: titlePrefix.enterable,
         theme: titlePrefix.theme
       }
@@ -35169,9 +35314,9 @@ function renderTitle(h, _vm, item) {
   var fixVNs = [];
 
   if (titleSuffix) {
-    fixVNs.push(titleSuffix.message ? h('vxe-tooltip', {
+    fixVNs.push(titleSuffix.content || titleSuffix.message ? h('vxe-tooltip', {
       props: {
-        content: UtilTools.getFuncText(titleSuffix.message),
+        content: UtilTools.getFuncText(titleSuffix.content || titleSuffix.message),
         enterable: titleSuffix.enterable,
         theme: titleSuffix.theme
       }
@@ -35208,9 +35353,6 @@ function renderTitle(h, _vm, item) {
 
 
 
-
-
-
 
 
 
@@ -35233,9 +35375,14 @@ var form_Rule = /*#__PURE__*/function () {
   }
 
   _createClass(Rule, [{
+    key: "content",
+    get: function get() {
+      return UtilTools.getFuncText(this.$options.content || this.$options.message);
+    }
+  }, {
     key: "message",
     get: function get() {
-      return UtilTools.getFuncText(this.$options.message);
+      return this.content;
     }
   }]);
 
@@ -35404,7 +35551,7 @@ function renderItems(h, _vm, itemList) {
       style: errRule.maxWidth ? {
         width: "".concat(errRule.maxWidth, "px")
       } : null
-    }, errRule.message) : null]))])]);
+    }, errRule.content) : null]))])]);
   });
 }
 
@@ -35424,7 +35571,12 @@ function renderItems(h, _vm, itemList) {
         return conf.form.size || conf.size;
       }
     },
-    span: [String, Number],
+    span: {
+      type: [String, Number],
+      default: function _default() {
+        return conf.form.span;
+      }
+    },
     align: {
       type: String,
       default: function _default() {
@@ -35437,7 +35589,12 @@ function renderItems(h, _vm, itemList) {
         return conf.form.titleAlign;
       }
     },
-    titleWidth: [String, Number],
+    titleWidth: {
+      type: [String, Number],
+      default: function _default() {
+        return conf.form.titleWidth;
+      }
+    },
     titleColon: {
       type: Boolean,
       default: function _default() {
@@ -35914,7 +36071,7 @@ function renderItems(h, _vm, itemList) {
                     errorRules.push(new form_Rule({
                       type: 'custom',
                       trigger: trigger,
-                      message: customValid.message,
+                      content: customValid.message,
                       rule: new form_Rule(rule)
                     }));
                   } else if (customValid.catch) {
@@ -35923,7 +36080,7 @@ function renderItems(h, _vm, itemList) {
                       errorRules.push(new form_Rule({
                         type: 'custom',
                         trigger: trigger,
-                        message: e ? e.message : rule.message,
+                        content: e ? e.message : rule.content || rule.message,
                         rule: new form_Rule(rule)
                       }));
                     }));