vxe-table 4.7.77 → 4.7.78

package/packages/table/module/custom/panel.ts

@@ -916,9 +916,14 @@ export default defineComponent({
 
     if (process.env.VUE_APP_VXE_ENV === 'development') {
       nextTick(() => {
+        const customOpts = computeCustomOpts.value
+        const { mode } = customOpts
         if (!VxeUIModalComponent) {
           errLog('vxe.error.reqComp', ['vxe-modal'])
         }
+        if (!VxeUIDrawerComponent && (mode === 'drawer')) {
+          errLog('vxe.error.reqComp', ['vxe-drawer'])
+        }
         if (!VxeUIButtonComponent) {
           errLog('vxe.error.reqComp', ['vxe-button'])
         }

package/packages/table/src/body.ts

@@ -24,7 +24,10 @@ export default defineComponent({
     tableData: Array as PropType<any[]>,
     tableColumn: Array as PropType<VxeTableDefines.ColumnInfo[]>,
     fixedColumn: Array as PropType<VxeTableDefines.ColumnInfo[]>,
-    fixedType: { type: String as PropType<VxeColumnPropTypes.Fixed>, default: null }
+    fixedType: {
+      type: String as PropType<VxeColumnPropTypes.Fixed>,
+      default: null
+    }
   },
   setup (props) {
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)
@@ -162,7 +165,28 @@ export default defineComponent({
       const errorValidItem = validErrorMaps[`${rowid}:${colid}`]
       const showValidTip = editRules && validOpts.showMessage && (validOpts.message === 'default' ? (height || tableData.length > 1) : validOpts.message === 'inline')
       const attrs: any = { colid }
-      const params: VxeTableDefines.CellRenderBodyParams = { $table: $xeTable, $grid: $xeTable.xegrid, isEdit: false, seq, rowid, row, rowIndex, $rowIndex, _rowIndex, column, columnIndex, $columnIndex, _columnIndex, fixed: fixedType, type: renderType, isHidden: fixedHiddenColumn, level: rowLevel, visibleData: afterFullData, data: tableData, items }
+      const params: VxeTableDefines.CellRenderBodyParams = {
+        $table: $xeTable,
+        $grid: $xeTable.xegrid,
+        isEdit: false,
+        seq,
+        rowid,
+        row,
+        rowIndex,
+        $rowIndex,
+        _rowIndex,
+        column,
+        columnIndex,
+        $columnIndex,
+        _columnIndex,
+        fixed: fixedType,
+        type: renderType,
+        isHidden: fixedHiddenColumn,
+        level: rowLevel,
+        visibleData: afterFullData,
+        data: tableData,
+        items
+      }
       // 虚拟滚动不支持动态高度
       if (scrollYLoad && !hasEllipsis) {
         showEllipsis = hasEllipsis = true

package/packages/table/src/cell.ts

@@ -268,14 +268,15 @@ export const Cell = {
     return [
       h('span', {
         class: 'vxe-cell--label'
-      }, editRender && eqEmptyValue(cellValue)
-        ? [
-            // 如果设置占位符
-            h('span', {
-              class: 'vxe-cell--placeholder'
-            }, formatText(getFuncText(cellPlaceholder), 1))
-          ]
-        : formatText(cellValue, 1))
+      }, [
+        // 如果设置占位符
+        editRender && eqEmptyValue(cellValue)
+          ? h('span', {
+            class: 'vxe-cell--placeholder'
+          }, formatText(getFuncText(cellPlaceholder), 1))
+          : h('span', formatText(cellValue, 1))
+      ]
+      )
     ]
   },
   renderTreeCell (params: VxeTableDefines.CellRenderBodyParams) {

package/packages/table/src/column.ts

@@ -1,6 +1,6 @@
-import { defineComponent, h, onUnmounted, inject, ref, Ref, PropType, provide, onMounted } from 'vue'
-import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from '../../table/src/util'
-import Cell from '../../table/src/cell'
+import { defineComponent, h, onUnmounted, inject, ref, PropType, provide, onMounted, createCommentVNode } from 'vue'
+import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from './util'
+import Cell from './cell'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods, VxeColumnPropTypes, VxeColumnProps } from '../../../types'
 
@@ -20,7 +20,10 @@ export const columnProps = {
   // 列最大宽度
   maxWidth: [Number, String] as PropType<VxeColumnPropTypes.MaxWidth>,
   // 是否允许拖动列宽调整大小
-  resizable: { type: Boolean as PropType<VxeColumnPropTypes.Resizable>, default: null },
+  resizable: {
+    type: Boolean as PropType<VxeColumnPropTypes.Resizable>,
+    default: null
+  },
   // 将列固定在左侧或者右侧
   fixed: String as PropType<VxeColumnPropTypes.Fixed>,
   // 列对其方式
@@ -30,11 +33,20 @@ export const columnProps = {
   // 表尾列的对齐方式
   footerAlign: String as PropType<VxeColumnPropTypes.FooterAlign>,
   // 当内容过长时显示为省略号
-  showOverflow: { type: [Boolean, String] as PropType<VxeColumnPropTypes.ShowOverflow>, default: null },
+  showOverflow: {
+    type: [Boolean, String] as PropType<VxeColumnPropTypes.ShowOverflow>,
+    default: null
+  },
   // 当表头内容过长时显示为省略号
-  showHeaderOverflow: { type: [Boolean, String] as PropType<VxeColumnPropTypes.ShowHeaderOverflow>, default: null },
+  showHeaderOverflow: {
+    type: [Boolean, String] as PropType<VxeColumnPropTypes.ShowHeaderOverflow>,
+    default: null
+  },
   // 当表尾内容过长时显示为省略号
-  showFooterOverflow: { type: [Boolean, String] as PropType<VxeColumnPropTypes.ShowFooterOverflow>, default: null },
+  showFooterOverflow: {
+    type: [Boolean, String] as PropType<VxeColumnPropTypes.ShowFooterOverflow>,
+    default: null
+  },
   // 给单元格附加 className
   className: [String, Function] as PropType<VxeColumnPropTypes.ClassName>,
   // 给表头单元格附加 className
@@ -52,9 +64,15 @@ export const columnProps = {
   // 排序的字段类型，比如字符串转数值等
   sortType: String as PropType<VxeColumnPropTypes.SortType>,
   // 配置筛选条件数组
-  filters: { type: Array as PropType<VxeColumnPropTypes.Filters>, default: null },
+  filters: {
+    type: Array as PropType<VxeColumnPropTypes.Filters>,
+    default: null
+  },
   // 筛选是否允许多选
-  filterMultiple: { type: Boolean as PropType<VxeColumnPropTypes.FilterMultiple>, default: true },
+  filterMultiple: {
+    type: Boolean as PropType<VxeColumnPropTypes.FilterMultiple>,
+    default: true
+  },
   // 自定义筛选方法
   filterMethod: Function as PropType<VxeColumnPropTypes.FilterMethod<any>>,
   // 筛选重置方法
@@ -66,7 +84,10 @@ export const columnProps = {
   // 指定为树节点
   treeNode: Boolean as PropType<VxeColumnPropTypes.TreeNode>,
   // 是否可视
-  visible: { type: Boolean as PropType<VxeColumnPropTypes.Visible>, default: null },
+  visible: {
+    type: Boolean as PropType<VxeColumnPropTypes.Visible>,
+    default: null
+  },
   // 表头单元格数据导出方法
   headerExportMethod: Function as PropType<VxeColumnPropTypes.HeaderExportMethod>,
   // 单元格数据导出方法
@@ -95,11 +116,14 @@ export default defineComponent({
   name: 'VxeColumn',
   props: columnProps,
   setup (props, { slots }) {
-    const refElem = ref() as Ref<HTMLDivElement>
-    const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTablePrivateMethods)
-    const parentColgroup = inject('$xeColgroup', null as XEColumnInstance | null)
-    const column = Cell.createColumn($xeTable, props as VxeColumnProps)
-    column.slots = slots
+    const refElem = ref<HTMLDivElement>()
+    const $xeTable = inject<(VxeTableConstructor & VxeTablePrivateMethods) | null>('$xeTable', null)
+    const $xeColgroup = inject<XEColumnInstance | null>('$xeColgroup', null)
+    if (!$xeTable) {
+      return () => createCommentVNode()
+    }
+    const columnConfig = Cell.createColumn($xeTable, props as VxeColumnProps)
+    columnConfig.slots = slots
 
     const renderVN = () => {
       return h('div', {
@@ -108,19 +132,22 @@ export default defineComponent({
     }
 
     const $xeColumn = {
-      column,
+      columnConfig,
 
       renderVN
-    }
+    } as XEColumnInstance
 
-    watchColumn($xeTable, props, column)
+    watchColumn($xeTable, props, columnConfig)
 
     onMounted(() => {
-      assembleColumn($xeTable, refElem.value, column, parentColgroup)
+      const elem = refElem.value
+      if (elem) {
+        assembleColumn($xeTable, elem, columnConfig, $xeColgroup)
+      }
     })
 
     onUnmounted(() => {
-      destroyColumn($xeTable, column)
+      destroyColumn($xeTable, columnConfig)
     })
 
     provide('$xeColumn', $xeColumn)

package/packages/table/src/footer.ts

@@ -23,10 +23,22 @@ function mergeFooterMethod (mergeFooterList: VxeTableDefines.MergeItem[], _rowIn
 export default defineComponent({
   name: 'VxeTableFooter',
   props: {
-    footerTableData: { type: Array as PropType<any[][]>, default: () => [] },
-    tableColumn: { type: Array as PropType<VxeTableDefines.ColumnInfo[]>, default: () => [] },
-    fixedColumn: { type: Array as PropType<VxeTableDefines.ColumnInfo[]>, default: () => [] },
-    fixedType: { type: String as PropType<VxeColumnPropTypes.Fixed>, default: null }
+    footerTableData: {
+      type: Array as PropType<any[][]>,
+      default: () => []
+    },
+    tableColumn: {
+      type: Array as PropType<VxeTableDefines.ColumnInfo[]>,
+      default: () => []
+    },
+    fixedColumn: {
+      type: Array as PropType<VxeTableDefines.ColumnInfo[]>,
+      default: () => []
+    },
+    fixedType: {
+      type: String as PropType<VxeColumnPropTypes.Fixed>,
+      default: null
+    }
   },
   setup (props) {
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)

package/packages/table/src/group.ts

@@ -1,7 +1,7 @@
-import { defineComponent, h, onUnmounted, provide, inject, ref, Ref, onMounted, Slot } from 'vue'
+import { defineComponent, h, onUnmounted, provide, inject, ref, onMounted, Slot, createCommentVNode } from 'vue'
 import { columnProps } from './column'
-import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from '../../table/src/util'
-import Cell from '../../table/src/cell'
+import { XEColumnInstance, watchColumn, assembleColumn, destroyColumn } from './util'
+import Cell from './cell'
 
 import type { VxeTableConstructor, VxeTablePrivateMethods } from '../../../types'
 
@@ -9,10 +9,13 @@ export default defineComponent({
   name: 'VxeColgroup',
   props: columnProps,
   setup (props, { slots }) {
-    const refElem = ref() as Ref<HTMLDivElement>
-    const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTablePrivateMethods)
-    const parentColgroup = inject('$xeColgroup', null as XEColumnInstance | null)
-    const column = Cell.createColumn($xeTable, props)
+    const refElem = ref<HTMLDivElement>()
+    const $xeTable = inject<(VxeTableConstructor & VxeTablePrivateMethods) | null>('$xeTable', null)
+    const $xeParentColgroup = inject<XEColumnInstance | null>('$xeColgroup', null)
+    if (!$xeTable) {
+      return () => createCommentVNode()
+    }
+    const columnConfig = Cell.createColumn($xeTable, props)
     const columnSlots: {
       header?: Slot;
     } = {}
@@ -21,17 +24,20 @@ export default defineComponent({
       columnSlots.header = slots.header
     }
 
-    column.slots = columnSlots
-    column.children = []
+    columnConfig.slots = columnSlots
+    columnConfig.children = []
 
-    watchColumn($xeTable, props, column)
+    watchColumn($xeTable, props, columnConfig)
 
     onMounted(() => {
-      assembleColumn($xeTable, refElem.value, column, parentColgroup)
+      const elem = refElem.value
+      if (elem) {
+        assembleColumn($xeTable, elem, columnConfig, $xeParentColgroup)
+      }
     })
 
     onUnmounted(() => {
-      destroyColumn($xeTable, column)
+      destroyColumn($xeTable, columnConfig)
     })
 
     const renderVN = () => {
@@ -40,7 +46,7 @@ export default defineComponent({
       }, slots.default ? slots.default() : [])
     }
 
-    const $xeColgroup = { column }
+    const $xeColgroup = { columnConfig } as XEColumnInstance
 
     provide('$xeColgroup', $xeColgroup)
     provide('$xeGrid', null)

package/packages/table/src/header.ts

@@ -14,7 +14,10 @@ export default defineComponent({
     tableColumn: Array as PropType<VxeTableDefines.ColumnInfo[]>,
     tableGroupColumn: Array as PropType<VxeTableDefines.ColumnInfo[]>,
     fixedColumn: Array as PropType<VxeTableDefines.ColumnInfo[]>,
-    fixedType: { type: String as PropType<VxeColumnPropTypes.Fixed>, default: null }
+    fixedType: {
+      type: String as PropType<VxeColumnPropTypes.Fixed>,
+      default: null
+    }
   },
   setup (props) {
     const $xeTable = inject('$xeTable', {} as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods)

package/packages/table/src/props.ts

@@ -13,39 +13,85 @@ export default {
   // 表格的高度
   height: [Number, String] as PropType<VxeTablePropTypes.Height>,
   // 表格的最小高度
-  minHeight: { type: [Number, String] as PropType<VxeTablePropTypes.MinHeight>, default: () => getConfig().table.minHeight },
+  minHeight: {
+    type: [Number, String] as PropType<VxeTablePropTypes.MinHeight>,
+    default: () => getConfig().table.minHeight
+  },
   // 表格的最大高度
   maxHeight: [Number, String] as PropType<VxeTablePropTypes.MaxHeight>,
   // 已废弃，被 column-config.resizable 替换
-  resizable: { type: Boolean as PropType<VxeTablePropTypes.Resizable>, default: () => getConfig().table.resizable },
+  resizable: {
+    type: Boolean as PropType<VxeTablePropTypes.Resizable>,
+    default: () => getConfig().table.resizable
+  },
   // 是否带有斑马纹
-  stripe: { type: Boolean as PropType<VxeTablePropTypes.Stripe>, default: () => getConfig().table.stripe },
+  stripe: {
+    type: Boolean as PropType<VxeTablePropTypes.Stripe>,
+    default: () => getConfig().table.stripe
+  },
   // 是否带有边框
-  border: { type: [Boolean, String] as PropType<VxeTablePropTypes.Border>, default: () => getConfig().table.border },
+  border: {
+    type: [Boolean, String] as PropType<VxeTablePropTypes.Border>,
+    default: () => getConfig().table.border
+  },
   // 是否圆角边框
-  round: { type: Boolean as PropType<VxeTablePropTypes.Round>, default: () => getConfig().table.round },
+  round: {
+    type: Boolean as PropType<VxeTablePropTypes.Round>,
+    default: () => getConfig().table.round
+  },
   // 表格的尺寸
-  size: { type: String as PropType<VxeTablePropTypes.Size>, default: () => getConfig().table.size || getConfig().size },
+  size: {
+    type: String as PropType<VxeTablePropTypes.Size>,
+    default: () => getConfig().table.size || getConfig().size
+  },
   // 列的宽度是否自撑开（可能会被废弃的参数，不要使用）
-  fit: { type: Boolean as PropType<VxeTablePropTypes.Fit>, default: () => getConfig().table.fit },
+  fit: {
+    type: Boolean as PropType<VxeTablePropTypes.Fit>,
+    default: () => getConfig().table.fit
+  },
   // 表格是否加载中
   loading: Boolean as PropType<VxeTablePropTypes.Loading>,
   // 所有的列对其方式
-  align: { type: String as PropType<VxeTablePropTypes.Align>, default: () => getConfig().table.align },
+  align: {
+    type: String as PropType<VxeTablePropTypes.Align>,
+    default: () => getConfig().table.align
+  },
   // 所有的表头列的对齐方式
-  headerAlign: { type: String as PropType<VxeTablePropTypes.HeaderAlign>, default: () => getConfig().table.headerAlign },
+  headerAlign: {
+    type: String as PropType<VxeTablePropTypes.HeaderAlign>,
+    default: () => getConfig().table.headerAlign
+  },
   // 所有的表尾列的对齐方式
-  footerAlign: { type: String as PropType<VxeTablePropTypes.FooterAlign>, default: () => getConfig().table.footerAlign },
+  footerAlign: {
+    type: String as PropType<VxeTablePropTypes.FooterAlign>,
+    default: () => getConfig().table.footerAlign
+  },
   // 是否显示表头
-  showHeader: { type: Boolean as PropType<VxeTablePropTypes.ShowHeader>, default: () => getConfig().table.showHeader },
+  showHeader: {
+    type: Boolean as PropType<VxeTablePropTypes.ShowHeader>,
+    default: () => getConfig().table.showHeader
+  },
   // （即将废弃）是否要高亮当前选中行
-  highlightCurrentRow: { type: Boolean as PropType<VxeTablePropTypes.HighlightCurrentRow>, default: () => getConfig().table.highlightCurrentRow },
+  highlightCurrentRow: {
+    type: Boolean as PropType<VxeTablePropTypes.HighlightCurrentRow>,
+    default: () => getConfig().table.highlightCurrentRow
+  },
   // （即将废弃）鼠标移到行是否要高亮显示
-  highlightHoverRow: { type: Boolean as PropType<VxeTablePropTypes.HighlightHoverRow>, default: () => getConfig().table.highlightHoverRow },
+  highlightHoverRow: {
+    type: Boolean as PropType<VxeTablePropTypes.HighlightHoverRow>,
+    default: () => getConfig().table.highlightHoverRow
+  },
   // （即将废弃）是否要高亮当前选中列
-  highlightCurrentColumn: { type: Boolean as PropType<VxeTablePropTypes.HighlightCurrentColumn>, default: () => getConfig().table.highlightCurrentColumn },
+
+  highlightCurrentColumn: {
+    type: Boolean as PropType<VxeTablePropTypes.HighlightCurrentColumn>,
+    default: () => getConfig().table.highlightCurrentColumn
+  },
   // （即将废弃）鼠标移到列是否要高亮显示
-  highlightHoverColumn: { type: Boolean as PropType<VxeTablePropTypes.HighlightHoverColumn>, default: () => getConfig().table.highlightHoverColumn },
+  highlightHoverColumn: {
+    type: Boolean as PropType<VxeTablePropTypes.HighlightHoverColumn>,
+    default: () => getConfig().table.highlightHoverColumn
+  },
   // （即将废弃）激活单元格编辑时是否高亮显示
   highlightCell: Boolean as PropType<VxeTablePropTypes.HighlightCell>,
   // 是否显示表尾合计
@@ -87,11 +133,20 @@ export default {
   // 表尾合并行或列
   footerSpanMethod: Function as PropType<VxeTablePropTypes.FooterSpanMethod>,
   // 设置所有内容过长时显示为省略号
-  showOverflow: { type: [Boolean, String] as PropType<VxeTablePropTypes.ShowOverflow>, default: () => getConfig().table.showOverflow },
+  showOverflow: {
+    type: [Boolean, String] as PropType<VxeTablePropTypes.ShowOverflow>,
+    default: () => getConfig().table.showOverflow
+  },
   // 设置表头所有内容过长时显示为省略号
-  showHeaderOverflow: { type: [Boolean, String] as PropType<VxeTablePropTypes.ShowHeaderOverflow>, default: () => getConfig().table.showHeaderOverflow },
+  showHeaderOverflow: {
+    type: [Boolean, String] as PropType<VxeTablePropTypes.ShowHeaderOverflow>,
+    default: () => getConfig().table.showHeaderOverflow
+  },
   // 设置表尾所有内容过长时显示为省略号
-  showFooterOverflow: { type: [Boolean, String] as PropType<VxeTablePropTypes.ShowFooterOverflow>, default: () => getConfig().table.showFooterOverflow },
+  showFooterOverflow: {
+    type: [Boolean, String] as PropType<VxeTablePropTypes.ShowFooterOverflow>,
+    default: () => getConfig().table.showFooterOverflow
+  },
 
   /** 高级属性 */
   // （即将废弃）columnKey 已废弃，被 column-config.useKey 替换
@@ -99,12 +154,24 @@ export default {
   // （即将废弃）rowKey 已废弃，被 row-config.useKey 替换
   rowKey: Boolean as PropType<VxeTablePropTypes.RowKey>,
   // （即将废弃）rowId 已废弃，被 row-config.keyField 替换
-  rowId: { type: String as PropType<VxeTablePropTypes.RowId>, default: () => getConfig().table.rowId },
+  rowId: {
+    type: String as PropType<VxeTablePropTypes.RowId>,
+    default: () => getConfig().table.rowId
+  },
   zIndex: Number as PropType<VxeTablePropTypes.ZIndex>,
-  emptyText: { type: String as PropType<VxeTablePropTypes.EmptyText>, default: () => getConfig().table.emptyText },
-  keepSource: { type: Boolean as PropType<VxeTablePropTypes.KeepSource>, default: () => getConfig().table.keepSource },
+  emptyText: {
+    type: String as PropType<VxeTablePropTypes.EmptyText>,
+    default: () => getConfig().table.emptyText
+  },
+  keepSource: {
+    type: Boolean as PropType<VxeTablePropTypes.KeepSource>,
+    default: () => getConfig().table.keepSource
+  },
   // 是否自动监听父容器变化去更新响应式表格宽高
-  autoResize: { type: Boolean as PropType<VxeTablePropTypes.AutoResize>, default: () => getConfig().table.autoResize },
+  autoResize: {
+    type: Boolean as PropType<VxeTablePropTypes.AutoResize>,
+    default: () => getConfig().table.autoResize
+  },
   // 是否自动根据状态属性去更新响应式表格宽高
   syncResize: [Boolean, String, Number],
   // 响应式布局配置项
@@ -166,9 +233,15 @@ export default {
   // 纵向虚拟滚动配置项
   scrollY: Object as PropType<VxeTablePropTypes.ScrollY>,
   // （即将废弃）优化相关
-  animat: { type: Boolean as PropType<VxeTablePropTypes.Animat>, default: () => getConfig().table.animat },
+  animat: {
+    type: Boolean as PropType<VxeTablePropTypes.Animat>,
+    default: () => getConfig().table.animat
+  },
   // （可能会被废弃的参数，不要使用）
-  delayHover: { type: Number as PropType<VxeTablePropTypes.DelayHover>, default: () => getConfig().table.delayHover as number },
+  delayHover: {
+    type: Number as PropType<VxeTablePropTypes.DelayHover>,
+    default: () => getConfig().table.delayHover as number
+  },
   // 额外的参数
   params: Object as PropType<VxeTablePropTypes.Params>
 }

package/packages/table/src/table.ts

@@ -6968,9 +6968,7 @@ export default defineComponent({
       globalEvents.on($xeTable, 'mousewheel', handleGlobalMousewheelEvent)
       globalEvents.on($xeTable, 'keydown', handleGlobalKeydownEvent)
       globalEvents.on($xeTable, 'resize', handleGlobalResizeEvent)
-      if ($xeTable.handleGlobalContextmenuEvent) {
-        globalEvents.on($xeTable, 'contextmenu', $xeTable.handleGlobalContextmenuEvent)
-      }
+      globalEvents.on($xeTable, 'contextmenu', $xeTable.handleGlobalContextmenuEvent)
       tablePrivateMethods.preventEvent(null, 'mounted', { $table: $xeTable })
     })
 
@@ -7176,7 +7174,7 @@ export default defineComponent({
           })
           : createCommentVNode(),
         /**
-         * 导出/导出
+         * 导出
          */
         initStore.export && (props.exportConfig || props.printConfig)
           ? h(TableExportPanelComponent, {

package/packages/table/src/util.ts

@@ -120,7 +120,7 @@ export function getRowid ($xeTable: VxeTableConstructor, row: any) {
 }
 
 export interface XEColumnInstance {
-  column: ColumnInfo;
+  columnConfig: ColumnInfo;
 }
 
 export const handleFieldOrColumn = ($xeTable: VxeTableConstructor, fieldOrColumn: string | VxeTableDefines.ColumnInfo | null) => {
@@ -294,7 +294,7 @@ export function assembleColumn ($xeTable: VxeTableConstructor & VxeTablePrivateM
   const { reactData } = $xeTable
   const { staticColumns } = reactData
   const parentElem = elem.parentNode
-  const parentColumn = colgroup ? colgroup.column : null
+  const parentColumn = colgroup ? colgroup.columnConfig : null
   const parentCols = parentColumn ? parentColumn.children : staticColumns
   if (parentElem && parentCols) {
     parentCols.splice(XEUtils.arrayIndexOf(parentElem.children, elem), 0, column)