vxe-table 4.1.0-beta.0 → 4.1.2

package/packages/table/src/table.ts

@@ -261,6 +261,7 @@ export default defineComponent({
       treeExpandedReserveRowMap: {},
       // 完整数据、条件处理后
       tableFullData: [],
+      treeFullData: [],
       afterFullData: [],
       tableSynchData: [],
       tableSourceData: [],
@@ -332,7 +333,11 @@ export default defineComponent({
     })
 
     const computeColumnOpts = computed(() => {
-      return Object.assign({}, props.columnConfig) as VxeTablePropTypes.ColumnOpts
+      return Object.assign({}, GlobalConfig.table.columnConfig, props.columnConfig) as VxeTablePropTypes.ColumnOpts
+    })
+
+    const computeRowOpts = computed(() => {
+      return Object.assign({}, GlobalConfig.table.rowConfig, props.rowConfig) as VxeTablePropTypes.RowOpts
     })
 
     const computeResizableOpts = computed(() => {
@@ -539,6 +544,8 @@ export default defineComponent({
       computeValidOpts,
       computeSXOpts,
       computeSYOpts,
+      computeColumnOpts,
+      computeRowOpts,
       computeResizableOpts,
       computeSeqOpts,
       computeRadioOpts,
@@ -1131,7 +1138,7 @@ export default defineComponent({
         if (rest) {
           rest._index = _index
         } else {
-          fullDataRowIdData[rowid] = { row, rowid, index: -1, $index: -1, _index, items: [], parent: null }
+          fullDataRowIdData[rowid] = { row, rowid, index: -1, $index: -1, _index, items: [], parent: null, level: 0 }
         }
       })
     }
@@ -1331,7 +1338,7 @@ export default defineComponent({
 
             // 如果是使用优化模式
             if (fixedType) {
-              if (scrollXLoad || scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
+              if (scrollYLoad || (allColumnOverflow ? isAllOverflow : allColumnOverflow)) {
                 if (!mergeList.length && !spanMethod && !(keyboardConfig && keyboardOpts.isMerge)) {
                   tableColumn = fixedColumn
                 } else {
@@ -1419,15 +1426,9 @@ export default defineComponent({
                 const showTooltip = cellOverflow === true || cellOverflow === 'tooltip'
                 let hasEllipsis = showTitle || showTooltip || showEllipsis
                 const listElem = elemStore[`${name}-${layout}-list`]
-                // 滚动的渲染不支持动态行高
-                if (layout === 'header' || layout === 'footer') {
-                  if (scrollXLoad && !hasEllipsis) {
-                    hasEllipsis = true
-                  }
-                } else {
-                  if ((scrollXLoad || scrollYLoad) && !hasEllipsis) {
-                    hasEllipsis = true
-                  }
+                // 纵向虚拟滚动不支持动态行高
+                if (scrollYLoad && !hasEllipsis) {
+                  hasEllipsis = true
                 }
                 if (listElem) {
                   XEUtils.arrayEach(listElem.querySelectorAll(`.${column.id}`), (elem: any) => {
@@ -1682,7 +1683,7 @@ export default defineComponent({
               childRecords = []
             }
             if (childRecords) {
-              tableMethods.loadChildren(row, childRecords).then(childRows => {
+              tableMethods.loadTreeChildren(row, childRecords).then(childRows => {
                 if (childRows.length && $xetable.findRowIndexOf(treeExpandeds, row) === -1) {
                   treeExpandeds.push(row)
                 }
@@ -1795,7 +1796,6 @@ export default defineComponent({
         nextTick(updateStyle)
       })
     }
-
     /**
      * 加载表格数据
      * @param {Array} datas 数据
@@ -1804,27 +1804,56 @@ export default defineComponent({
       const { keepSource, treeConfig } = props
       const { editStore, scrollYLoad: oldScrollYLoad } = reactData
       const { scrollYStore, scrollXStore, lastScrollLeft, lastScrollTop } = internalData
-      const sYOpts = computeSYOpts.value
-      const tableFullData = datas ? datas.slice(0) : []
-      const scrollYLoad = !treeConfig && !!sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt < tableFullData.length
+      const treeOpts = computeTreeOpts.value
+      const { transform } = treeOpts
+      let treeData = []
+      let fullData = datas ? datas.slice(0) : []
+      if (treeConfig) {
+        if (transform) {
+          // 树结构自动转换
+          if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+            if (!treeOpts.rowtKey) {
+              errLog('vxe.error.reqProp', ['tree-config.rowtKey'])
+            }
+            if (!treeOpts.parentKey) {
+              errLog('vxe.error.reqProp', ['tree-config.parentKey'])
+            }
+            if (!treeOpts.children) {
+              errLog('vxe.error.reqProp', ['tree-config.children'])
+            }
+            fullData.forEach(row => {
+              if (row[treeOpts.children] && row[treeOpts.children].length) {
+                warnLog('vxe.error.errConflicts', ['tree-config.transform', `row.${treeOpts.children}`])
+              }
+            })
+          }
+          treeData = XEUtils.toArrayTree(fullData, { key: treeOpts.rowtKey, parentKey: treeOpts.parentKey, children: treeOpts.children })
+          fullData = treeData.slice(0)
+        } else {
+          treeData = fullData.slice(0)
+        }
+      }
       scrollYStore.startIndex = 0
       scrollYStore.endIndex = 1
       scrollXStore.startIndex = 0
       scrollXStore.endIndex = 1
       editStore.insertList = []
       editStore.removeList = []
+      const sYLoad = updateScrollYStatus(fullData)
+      reactData.scrollYLoad = sYLoad
       // 全量数据
-      internalData.tableFullData = tableFullData
+      internalData.tableFullData = fullData
+      internalData.treeFullData = treeData
       // 缓存数据
-      tablePrivateMethods.updateCache(true)
+      tablePrivateMethods.cacheRowMap(true)
       // 原始数据
       internalData.tableSynchData = datas
+      // 克隆原数据，用于显示编辑状态，与编辑值做对比
       if (keepSource) {
-        internalData.tableSourceData = XEUtils.clone(tableFullData, true)
+        internalData.tableSourceData = XEUtils.clone(fullData, true)
       }
-      reactData.scrollYLoad = scrollYLoad
       if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
-        if (scrollYLoad) {
+        if (sYLoad) {
           if (!(props.height || props.maxHeight)) {
             errLog('vxe.error.reqProp', ['table.height | table.max-height | table.scroll-y={enabled: false}'])
           }
@@ -1850,8 +1879,8 @@ export default defineComponent({
       }).then(() => {
         computeScrollLoad()
       }).then(() => {
-        // 是否加载了数据
-        if (scrollYLoad) {
+        // 是否启用了虚拟滚动
+        if (sYLoad) {
           scrollYStore.endIndex = scrollYStore.visibleSize
         }
         handleReserveStatus()
@@ -1861,7 +1890,7 @@ export default defineComponent({
             .then(() => tableMethods.recalculate())
             .then(() => {
               // 是否变更虚拟滚动
-              if (oldScrollYLoad === scrollYLoad) {
+              if (oldScrollYLoad === sYLoad) {
                 restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve)
               } else {
                 setTimeout(() => restoreScrollLocation($xetable, lastScrollLeft, lastScrollTop).then(resolve))
@@ -2077,6 +2106,97 @@ export default defineComponent({
       })
     }
 
+    const updateScrollYStatus = (fullData: any[]) => {
+      const { treeConfig } = props
+      const sYOpts = computeSYOpts.value
+      const treeOpts = computeTreeOpts.value
+      const { transform } = treeOpts
+      const scrollYLoad = (transform || !treeConfig) && !!sYOpts.enabled && sYOpts.gt > -1 && sYOpts.gt < fullData.length
+      reactData.scrollYLoad = scrollYLoad
+      return scrollYLoad
+    }
+
+    const updateVirtualTreeData = () => {
+      const { scrollYLoad: oldScrollYLoad, treeExpandeds } = reactData
+      const { treeFullData } = internalData
+      const treeOpts = computeTreeOpts.value
+      const fullData: any[] = []
+      XEUtils.eachTree(treeFullData, (row, index, items, path, parent) => {
+        if (!parent || $xetable.findRowIndexOf(treeExpandeds, parent) > -1) {
+          fullData.push(row)
+        }
+      }, treeOpts)
+      const scrollYLoad = updateScrollYStatus(fullData)
+      internalData.tableFullData = scrollYLoad ? fullData : treeFullData
+      if (scrollYLoad || oldScrollYLoad !== scrollYLoad) {
+        return tablePrivateMethods.handleTableData(true).then(() => tableMethods.recalculate())
+      }
+      return nextTick()
+    }
+
+    /**
+     * 展开与收起树节点
+     * @param rows
+     * @param expanded
+     * @returns
+     */
+    const handleBaseTreeExpand = (rows: any[], expanded: boolean) => {
+      const { treeExpandeds, treeLazyLoadeds, treeNodeColumn } = reactData
+      const { fullAllDataRowIdData, tableFullData } = internalData
+      const treeOpts = computeTreeOpts.value
+      const { reserve, lazy, hasChild, children, accordion, toggleMethod } = treeOpts
+      const result: any[] = []
+      const columnIndex = tableMethods.getColumnIndex(treeNodeColumn)
+      const $columnIndex = tableMethods.getVMColumnIndex(treeNodeColumn)
+      let validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xetable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows
+      if (accordion) {
+        validRows = validRows.length ? [validRows[validRows.length - 1]] : []
+        // 同一级只能展开一个
+        const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], treeOpts)
+        if (matchObj) {
+          XEUtils.remove(treeExpandeds, item => matchObj.items.indexOf(item) > -1)
+        }
+      }
+      if (expanded) {
+        validRows.forEach((row: any) => {
+          if ($xetable.findRowIndexOf(treeExpandeds, row) === -1) {
+            const rest = fullAllDataRowIdData[getRowid($xetable, row)]
+            const isLoad = lazy && row[hasChild] && !rest.treeLoaded && $xetable.findRowIndexOf(treeLazyLoadeds, row) === -1
+            // 是否使用懒加载
+            if (isLoad) {
+              result.push(handleAsyncTreeExpandChilds(row))
+            } else {
+              if (row[children] && row[children].length) {
+                treeExpandeds.push(row)
+              }
+            }
+          }
+        })
+      } else {
+        XEUtils.remove(treeExpandeds, row => $xetable.findRowIndexOf(validRows, row) > -1)
+      }
+      if (reserve) {
+        validRows.forEach((row: any) => handleTreeExpandReserve(row, expanded))
+      }
+      return Promise.all(result).then(() => {
+        return tableMethods.recalculate()
+      })
+    }
+
+    /**
+     * 虚拟树的展开与收起
+     * @param rows
+     * @param expanded
+     * @returns
+     */
+    const handleVirtualTreeExpand = (rows: any[], expanded: boolean) => {
+      return handleBaseTreeExpand(rows, expanded).then(() => {
+        return updateVirtualTreeData()
+      }).then(() => {
+        return tableMethods.recalculate()
+      })
+    }
+
     /**
      * 纵向 Y 可视渲染处理
      */
@@ -2197,7 +2317,7 @@ export default defineComponent({
                 tableSourceData[rowIndex] = record
                 XEUtils.clear(row, undefined)
                 Object.assign(row, tablePrivateMethods.defineField(Object.assign({}, record)))
-                tablePrivateMethods.updateCache(true)
+                tablePrivateMethods.cacheRowMap(true)
               } else {
                 XEUtils.destructuring(oRow, XEUtils.clone(row, true))
               }
@@ -2214,13 +2334,14 @@ export default defineComponent({
       /**
        * 用于树结构，给行数据加载子节点
        */
-      loadChildren (row, childRecords) {
+      loadTreeChildren (row, childRecords) {
+        const { keepSource } = props
+        const { tableSourceData, fullDataRowIdData, fullAllDataRowIdData } = internalData
+        const treeOpts = computeTreeOpts.value
+        const { children } = treeOpts
+        const rest = fullAllDataRowIdData[getRowid($xetable, row)]
+        const parentLevel = rest ? rest.level : 0
         return tableMethods.createData(childRecords).then((rows) => {
-          const { keepSource } = props
-          const { fullDataRowIdData, fullAllDataRowIdData } = internalData
-          const { tableSourceData } = internalData
-          const treeOpts = computeTreeOpts.value
-          const { children } = treeOpts
           if (keepSource) {
             const rowid = getRowid($xetable, row)
             const matchObj = XEUtils.findTree(tableSourceData, (item) => rowid === getRowid($xetable, item), treeOpts)
@@ -2228,9 +2349,9 @@ export default defineComponent({
               matchObj.item[children] = XEUtils.clone(rows, true)
             }
           }
-          XEUtils.eachTree(rows, (childRow, index, items, path, parent) => {
+          XEUtils.eachTree(rows, (childRow, index, items, path, parent, nodes) => {
             const rowid = getRowid($xetable, childRow)
-            const rest = { row: childRow, rowid, index: -1, _index: -1, $index: -1, items, parent }
+            const rest = { row: childRow, rowid, index: -1, _index: -1, $index: -1, items, parent, level: parentLevel + nodes.length }
             fullDataRowIdData[rowid] = rest
             fullAllDataRowIdData[rowid] = rest
           }, treeOpts)
@@ -3265,10 +3386,10 @@ export default defineComponent({
         return nextTick()
       },
       /**
-       * 重新加载展开行的内容
+       * 重新懒加载展开行，并展开内容
        * @param {Row} row 行对象
        */
-      reloadExpandContent (row) {
+      reloadRowExpand (row) {
         const { expandLazyLoadeds } = reactData
         const expandOpts = computeExpandOpts.value
         const { lazy } = expandOpts
@@ -3278,6 +3399,13 @@ export default defineComponent({
         }
         return nextTick()
       },
+      reloadExpandContent (row) {
+        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          warnLog('vxe.error.delFunc', ['reloadExpandContent', 'reloadRowExpand'])
+        }
+        // 即将废弃
+        return tableMethods.reloadRowExpand(row)
+      },
       /**
        * 切换展开行
        */
@@ -3398,19 +3526,33 @@ export default defineComponent({
         return nextTick()
       },
       /**
-       * 重新加载树的子节点
+       * 重新懒加载树节点，并展开该节点
        * @param {Row} row 行对象
        */
-      reloadTreeChilds (row) {
+      reloadTreeExpand (row) {
         const { treeLazyLoadeds } = reactData
         const treeOpts = computeTreeOpts.value
-        const { lazy, hasChild } = treeOpts
+        const { transform, lazy, hasChild } = treeOpts
         if (lazy && row[hasChild] && $xetable.findRowIndexOf(treeLazyLoadeds, row) === -1) {
-          tableMethods.clearTreeExpandLoaded(row)
-            .then(() => handleAsyncTreeExpandChilds(row))
+          tableMethods.clearTreeExpandLoaded(row).then(() => {
+            return handleAsyncTreeExpandChilds(row)
+          }).then(() => {
+            if (transform) {
+              return updateVirtualTreeData()
+            }
+          }).then(() => {
+            return tableMethods.recalculate()
+          })
         }
         return nextTick()
       },
+      reloadTreeChilds (row) {
+        if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+          warnLog('vxe.error.delFunc', ['reloadTreeChilds', 'reloadTreeExpand'])
+        }
+        // 即将废弃
+        return tableMethods.reloadTreeExpand(row)
+      },
       /**
        * 切换/展开树节点
        */
@@ -3442,51 +3584,19 @@ export default defineComponent({
        * @param {Boolean} expanded 是否展开
        */
       setTreeExpand (rows, expanded) {
-        const { treeExpandeds, treeLazyLoadeds, treeNodeColumn } = reactData
-        const { fullAllDataRowIdData, tableFullData } = internalData
         const treeOpts = computeTreeOpts.value
-        const { reserve, lazy, hasChild, children, accordion, toggleMethod } = treeOpts
-        const result: any[] = []
-        const columnIndex = tableMethods.getColumnIndex(treeNodeColumn)
-        const $columnIndex = tableMethods.getVMColumnIndex(treeNodeColumn)
+        const { transform } = treeOpts
         if (rows) {
           if (!XEUtils.isArray(rows)) {
             rows = [rows]
           }
           if (rows.length) {
-            let validRows = toggleMethod ? rows.filter((row: any) => toggleMethod({ $table: $xetable, expanded, column: treeNodeColumn, columnIndex, $columnIndex, row })) : rows
-            if (accordion) {
-              validRows = validRows.length ? [validRows[validRows.length - 1]] : []
-              // 同一级只能展开一个
-              const matchObj = XEUtils.findTree(tableFullData, item => item === validRows[0], treeOpts)
-              if (matchObj) {
-                XEUtils.remove(treeExpandeds, item => matchObj.items.indexOf(item) > -1)
-              }
-            }
-            if (expanded) {
-              validRows.forEach((row: any) => {
-                if ($xetable.findRowIndexOf(treeExpandeds, row) === -1) {
-                  const rest = fullAllDataRowIdData[getRowid($xetable, row)]
-                  const isLoad = lazy && row[hasChild] && !rest.treeLoaded && $xetable.findRowIndexOf(treeLazyLoadeds, row) === -1
-                  // 是否使用懒加载
-                  if (isLoad) {
-                    result.push(handleAsyncTreeExpandChilds(row))
-                  } else {
-                    if (row[children] && row[children].length) {
-                      treeExpandeds.push(row)
-                    }
-                  }
-                }
-              })
+            // 如果为虚拟树
+            if (transform) {
+              return handleVirtualTreeExpand(rows, expanded)
             } else {
-              XEUtils.remove(treeExpandeds, row => $xetable.findRowIndexOf(validRows, row) > -1)
+              return handleBaseTreeExpand(rows, expanded)
             }
-            if (reserve) {
-              validRows.forEach((row: any) => handleTreeExpandReserve(row, expanded))
-            }
-            return Promise.all(result).then(() => {
-              return tableMethods.recalculate()
-            })
           }
         }
         return nextTick()
@@ -3504,15 +3614,15 @@ export default defineComponent({
        */
       clearTreeExpand () {
         const { treeExpandeds } = reactData
-        const { tableFullData } = internalData
+        const { treeFullData } = internalData
         const treeOpts = computeTreeOpts.value
         const { reserve } = treeOpts
         const isExists = treeExpandeds.length
         reactData.treeExpandeds = []
         if (reserve) {
-          XEUtils.eachTree(tableFullData, row => handleTreeExpandReserve(row, false), treeOpts)
+          XEUtils.eachTree(treeFullData, row => handleTreeExpandReserve(row, false), treeOpts)
         }
-        return nextTick().then(() => {
+        return updateVirtualTreeData().then(() => {
           if (isExists) {
             tableMethods.recalculate()
           }
@@ -4339,13 +4449,13 @@ export default defineComponent({
        * 更新数据行的 Map
        * 牺牲数据组装的耗时，用来换取使用过程中的流畅
        */
-      updateCache (isSource) {
+      cacheRowMap (isSource) {
         const { treeConfig } = props
         const treeOpts = computeTreeOpts.value
-        let { fullDataRowIdData, fullAllDataRowIdData, tableFullData } = internalData
+        let { fullDataRowIdData, fullAllDataRowIdData, tableFullData, treeFullData } = internalData
         const rowkey = getRowkey($xetable)
         const isLazy = treeConfig && treeOpts.lazy
-        const handleCache = (row: any, index: any, items: any, path?: any, parent?: any) => {
+        const handleCache = (row: any, index: any, items: any, path?: any, parent?: any, nodes?: any[]) => {
           let rowid = getRowid($xetable, row)
           if (eqEmptyValue(rowid)) {
             rowid = getRowUniqueId()
@@ -4354,7 +4464,7 @@ export default defineComponent({
           if (isLazy && row[treeOpts.hasChild] && XEUtils.isUndefined(row[treeOpts.children])) {
             row[treeOpts.children] = null
           }
-          const rest = { row, rowid, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items, parent }
+          const rest = { row, rowid, index: treeConfig && parent ? -1 : index, _index: -1, $index: -1, items, parent, level: nodes ? nodes.length - 1 : 0 }
           if (isSource) {
             fullDataRowIdData[rowid] = rest
           }
@@ -4365,7 +4475,7 @@ export default defineComponent({
         }
         fullAllDataRowIdData = internalData.fullAllDataRowIdData = {}
         if (treeConfig) {
-          XEUtils.eachTree(tableFullData, handleCache, treeOpts)
+          XEUtils.eachTree(treeFullData, handleCache, treeOpts)
         } else {
           tableFullData.forEach(handleCache)
         }
@@ -4632,10 +4742,10 @@ export default defineComponent({
       triggerHeaderHelpEvent (evnt, params) {
         const { column } = params
         const { titleHelp } = column
-        if (titleHelp.message) {
+        if (titleHelp.content || titleHelp.message) {
           const { tooltipStore } = internalData
           const $tooltip = refTooltip.value
-          const content = getFuncText(titleHelp.message)
+          const content = getFuncText(titleHelp.content || titleHelp.message)
           handleTargetEnterEvent()
           tooltipStore.visible = true
           if ($tooltip) {
@@ -5214,6 +5324,19 @@ export default defineComponent({
       }
     }
 
+    if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+      'openExport,openPrint,exportData,openImport,importData,saveFile,readFile,importByFile,print'.split(',').forEach(name => {
+        ($xetable as any)[name] = function () {
+          errLog('vxe.error.reqModule', ['Export'])
+        }
+      })
+      'clearValidate,fullValidate,validate'.split(',').forEach(name => {
+        ($xetable as any)[name] = function () {
+          errLog('vxe.error.reqModule', ['Validator'])
+        }
+      })
+    }
+
     Object.assign($xetable, tableMethods, tablePrivateMethods)
 
     /**
@@ -5421,12 +5544,16 @@ export default defineComponent({
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
           const customOpts = computeCustomOpts.value
           const mouseOpts = computeMouseOpts.value
+          const rowOpts = computeRowOpts.value
           if (!props.id && props.customConfig && (customOpts.storage === true || (customOpts.storage && customOpts.storage.resizable) || (customOpts.storage && customOpts.storage.visible))) {
             errLog('vxe.error.reqProp', ['id'])
           }
           if (props.treeConfig && checkboxOpts.range) {
             errLog('vxe.error.noTree', ['checkbox-config.range'])
           }
+          if (rowOpts.height && !props.showOverflow) {
+            warnLog('vxe.error.notProp', ['table.show-overflow'])
+          }
           if (!$xetable.handleUpdateCellAreas) {
             if (props.clipConfig) {
               warnLog('vxe.error.notProp', ['clip-config'])

package/packages/v-x-e-table/src/conf.ts

@@ -20,7 +20,6 @@ const GlobalConfig: VXETableGlobalConfig = {
     // resizeInterval: 500,
     // size: null,
     // zIndex: null,
-    // resizable: false,
     // autoResize: false,
     // stripe: false,
     // border: false,
@@ -66,6 +65,8 @@ const GlobalConfig: VXETableGlobalConfig = {
       showIcon: true
     },
     treeConfig: {
+      rowtKey: 'id',
+      parentKey: 'parentId',
       children: 'children',
       hasChild: 'hasChild',
       indent: 20,

package/packages/validator/src/hook.ts

@@ -27,8 +27,12 @@ class Rule {
    * 获取校验不通过的消息
    * 支持国际化翻译
    */
+  get content () {
+    return getFuncText(this.$options.content || this.$options.message)
+  }
+
   get message () {
-    return getFuncText(this.$options.message)
+    return this.content
   }
 
   [key: string]: any
@@ -272,7 +276,7 @@ const validatorHook: VxeGlobalHooksHandles.HookOptions = {
           const rules = XEUtils.get(editRules, property)
           if (rules) {
             const cellValue = XEUtils.isUndefined(val) ? XEUtils.get(row, property) : val
-            rules.forEach((rule: any) => {
+            rules.forEach((rule) => {
               const { type, trigger, required } = rule
               if (validType === 'all' || !trigger || validType === trigger) {
                 if (XEUtils.isFunction(rule.validator)) {
@@ -289,13 +293,13 @@ const validatorHook: VxeGlobalHooksHandles.HookOptions = {
                   if (customValid) {
                     if (XEUtils.isError(customValid)) {
                       validRuleErr = true
-                      errorRules.push(new Rule({ type: 'custom', trigger, message: customValid.message, rule: new Rule(rule) }))
+                      errorRules.push(new Rule({ type: 'custom', trigger, content: customValid.message, rule: new Rule(rule) }))
                     } else if (customValid.catch) {
                       // 如果为异步校验（注：异步校验是并发无序的）
                       syncVailds.push(
                         customValid.catch((e: any) => {
                           validRuleErr = true
-                          errorRules.push(new Rule({ type: 'custom', trigger, message: e && e.message ? e.message : rule.message, rule: new Rule(rule) }))
+                          errorRules.push(new Rule({ type: 'custom', trigger, content: e && e.message ? e.message : (rule.content || rule.message), rule: new Rule(rule) }))
                         })
                       )
                     }
@@ -367,7 +371,7 @@ const validatorHook: VxeGlobalHooksHandles.HookOptions = {
         const validOpts = computeValidOpts.value
         const { rule, row, column, cell } = params
         const validTip = refValidTooltip.value
-        const content = rule.message
+        const content = rule.content
         return nextTick().then(() => {
           Object.assign(validStore, {
             row,

package/types/column.d.ts

@@ -104,8 +104,12 @@ export namespace VxeColumnPropTypes {
   export type FooterExportMethod = (params: FooterExportParams) => string | number;
 
   export interface TitleHelp {
-    message?: string | number;
+    content?: string | number;
     icon?: string;
+    /**
+     * @deprecated 已废弃，请使用 content
+     */
+    message?: string;
   }
 
   export type CellType = 'auto' | 'number' | 'string';

package/types/form-item.d.ts

@@ -92,10 +92,14 @@ export namespace VxeFormItemPropTypes {
   export type ClassName = string | ((params: ClassNameParams) => string);
 
   interface PrefixOption {
-    message?: string;
+    content?: string;
     enterable?: boolean;
     theme?: string;
     icon?: string;
+    /**
+     * @deprecated 已废弃，请使用 content
+     */
+    message?: string;
   }
   export type TitlePrefix = PrefixOption
   export type TitleSuffix = PrefixOption

package/types/form.d.ts

@@ -235,9 +235,13 @@ export namespace VxeFormDefines {
     /**
      * 提示消息
      */
-    message?: string;
+    content?: string;
     trigger?: 'change';
     maxWidth?: number;
+    /**
+     * @deprecated 已废弃，请使用 content
+     */
+    message?: string;
   }
 
   interface ValidateErrorParams {

package/types/modal.d.ts

@@ -167,11 +167,6 @@ export type VxeModalProps = {
   position?: VxeModalPropTypes.Position;
   title?: VxeModalPropTypes.Title;
   duration?: VxeModalPropTypes.Duration;
-  /**
-   * 请使用 content
-   * @deprecated
-   */
-  message?: VxeModalPropTypes.Content;
   content?: VxeModalPropTypes.Content;
   cancelButtonText?: VxeModalPropTypes.CancelButtonText;
   confirmButtonText?: VxeModalPropTypes.ConfirmButtonText;
@@ -203,6 +198,10 @@ export type VxeModalProps = {
   animat?: VxeModalPropTypes.Animat;
   beforeHideMethod?: VxeModalPropTypes.BeforeHideMethod;
   slots?: VxeModalPropTypes.Slots;
+  /**
+   * @deprecated 已废弃，请使用 content
+   */
+  message?: VxeModalPropTypes.Content;
 }
 
 export type ModalSlots = {