vxe-table 3.6.14-beta.1 → 3.6.14-beta.2

package/packages/table/src/methods.js

@@ -657,7 +657,7 @@ const Methods = {
    * 牺牲数据组装的耗时，用来换取使用过程中的流畅
    */
   cacheColumnMap () {
-    const { tableFullColumn, collectColumn, fullColumnMap, showOverflow } = this
+    const { tableFullColumn, collectColumn, fullColumnMap, showOverflow, columnOpts, rowOpts } = this
     const fullColumnIdData = this.fullColumnIdData = {}
     const fullColumnFieldData = this.fullColumnFieldData = {}
     const isGroup = collectColumn.some(hasChildrenList)
@@ -666,6 +666,7 @@ const Methods = {
     let treeNodeColumn
     let checkboxColumn
     let radioColumn
+    let htmlColumn
     let hasFixed
     const handleFunc = (column, index, items, path, parent) => {
       const { id: colid, field, fixed, type, treeNode } = column
@@ -678,9 +679,14 @@ const Methods = {
         }
         fullColumnFieldData[field] = rest
       }
+
       if (!hasFixed && fixed) {
         hasFixed = fixed
       }
+      if (!htmlColumn && type === 'html') {
+        htmlColumn = column
+      }
+
       if (treeNode) {
         if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
           if (treeNodeColumn) {
@@ -728,6 +734,18 @@ const Methods = {
           warnLog('vxe.error.errConflicts', [`table.show-footer-overflow=${this.showFooterOverflow}`, `column.show-footer-overflow=${column.showFooterOverflow}`])
         }
       }
+
+      if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
+        if (htmlColumn) {
+          if (!columnOpts.useKey) {
+            errLog('vxe.error.reqProp', ['column-config.useKey', 'column.type=html'])
+          }
+          if (!rowOpts.useKey) {
+            errLog('vxe.error.reqProp', ['row-config.useKey', 'column.type=html'])
+          }
+        }
+      }
+
       if (isAllOverflow && column.showOverflow === false) {
         isAllOverflow = false
       }
@@ -888,7 +906,7 @@ const Methods = {
     const { radioOpts, checkboxOpts, treeConfig, treeOpts, expandOpts } = this
     const rowkey = getRowkey(this)
     if (!XEUtils.isArray(records)) {
-      records = [records]
+      records = [records || {}]
     }
     return records.map(record => {
       this.tableFullColumn.forEach(column => {
@@ -928,10 +946,9 @@ const Methods = {
    * @param {Array} records 新数据
    */
   createData (records) {
-    const { treeConfig, treeOpts } = this
-    const handleRrecord = record => this.defineField(Object.assign({}, record))
-    const rows = treeConfig ? XEUtils.mapTree(records, handleRrecord, treeOpts) : records.map(handleRrecord)
-    return this.$nextTick().then(() => rows)
+    return this.$nextTick().then(() => {
+      return this.defineField(records)
+    })
   },
   /**
    * 创建 Row|Rows 对象
@@ -943,7 +960,7 @@ const Methods = {
     if (!isArr) {
       records = [records]
     }
-    return this.$nextTick().then(() => this.createData(records).then(rows => isArr ? rows : rows[0]))
+    return this.createData(records).then(rows => isArr ? rows : rows[0])
   },
   /**
    * 还原数据
@@ -3733,13 +3750,17 @@ const Methods = {
    * 判断指定列是否为筛选状态，如果为空则判断所有列
    * @param {String} fieldOrColumn 字段名
    */
-  isFilter (fieldOrColumn) {
+  isActiveFilterByColumn (fieldOrColumn) {
     const column = handleFieldOrColumn(this, fieldOrColumn)
     if (column) {
       return column.filters && column.filters.some(option => option.checked)
     }
     return this.getCheckedFilters().length > 0
   },
+  // 已废弃
+  isFilter (fieldOrColumn) {
+    return this.isActiveFilterByColumn(fieldOrColumn)
+  },
   /**
    * 判断展开行是否懒加载完成
    * @param {Row} row 行对象

package/types/table.d.ts

@@ -630,6 +630,11 @@ export declare class Table extends VXETableComponent {
    * 判断指定列是否为筛选状态，如果为空则判断所有列
    * @param column 列对象
    */
+  isActiveFilterByColumn(column: ColumnInfo): boolean;
+  /**
+   * 已废弃，请使用 isFilterByColumn
+   * @deprecated
+   */
   isFilter(column: ColumnInfo): boolean;
   /**
    * 用于 expand-config.lazy，用于懒加载展开行，判断展开行是否懒加载完成

package/types/v-x-e-table/renderer.d.ts

@@ -65,6 +65,8 @@ export interface RendererMapOptions {
   // 表单-项渲染
   itemClassName?: string | ((params: FormItemRenderParams) => string | { [key: string]: boolean })
   itemStyle?: string | VNodeStyle | ((params: FormItemRenderParams) => string | VNodeStyle)
+  itemContentClassName?: string | ((params: FormItemRenderParams) => string | { [key: string]: boolean })
+  itemContentStyle?: string | VNodeStyle | ((params: FormItemRenderParams) => string | VNodeStyle)
   renderItemTitle?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): SlotVNodeType | SlotVNodeType[];
   renderItemContent?(h: CreateElement, renderOpts: FormItemRenderOptions, params: FormItemRenderParams): SlotVNodeType | SlotVNodeType[];
   itemVisibleMethod?(params: FormItemVisibleParams): boolean;