vxe-table 4.2.8 → 4.3.0-beta.2

package/packages/edit/src/hook.ts

@@ -319,7 +319,7 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
         }
         // 如果当前行被激活编辑，则清除激活状态
         if (actived.row && $xetable.findRowIndexOf(rows, actived.row) > -1) {
-          editMethods.clearActived()
+          editMethods.clearEdit()
         }
         // 从新增中移除已删除的数据
         rows.forEach((row: any) => {
@@ -551,7 +551,14 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
           return $xetable.scrollToRow(row, column).then(() => {
             const cell = $xetable.getCell(row, column)
             if (cell) {
-              editPrivateMethods.handleActived({ row, rowIndex: $xetable.getRowIndex(row), column, columnIndex: $xetable.getColumnIndex(column), cell, $table: $xetable })
+              editPrivateMethods.handleActived({
+                row,
+                rowIndex: $xetable.getRowIndex(row),
+                column,
+                columnIndex: $xetable.getColumnIndex(column),
+                cell,
+                $table: $xetable
+              })
               internalData._lastCallTime = Date.now()
             }
             return nextTick()
@@ -564,14 +571,19 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
        */
       setSelectCell (row, fieldOrColumn) {
         const { tableData } = reactData
-        const { visibleColumn } = internalData
         const editOpts = computeEditOpts.value
         const column = XEUtils.isString(fieldOrColumn) ? $xetable.getColumnByField(fieldOrColumn) : fieldOrColumn
         if (row && column && editOpts.trigger !== 'manual') {
           const rowIndex = $xetable.findRowIndexOf(tableData, row)
           if (rowIndex > -1 && column) {
             const cell = $xetable.getCell(row, column)
-            const params = { row, rowIndex, column, columnIndex: visibleColumn.indexOf(column), cell }
+            const params = {
+              row,
+              rowIndex,
+              column,
+              columnIndex: $xetable.getColumnIndex(column),
+              cell
+            }
             $xetable.handleSelected(params, {})
           }
         }
@@ -608,7 +620,7 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
               }
               $xetable.closeTooltip()
               if (actived.column) {
-                editMethods.clearActived(evnt)
+                editMethods.clearEdit(evnt)
               }
               type = 'edit-actived'
               column.renderHeight = cell.offsetHeight
@@ -714,7 +726,7 @@ const editHook: VxeGlobalHooksHandles.HookOptions = {
         const selectMethod = () => {
           if (isMouseSelected && (selected.row !== row || selected.column !== column)) {
             if (actived.row !== row || (editOpts.mode === 'cell' ? actived.column !== column : false)) {
-              editMethods.clearActived(evnt)
+              editMethods.clearEdit(evnt)
               editMethods.clearSelected()
               if ($xetable.clearCellAreas) {
                 $xetable.clearCellAreas()

package/packages/export/src/export-panel.ts

@@ -153,7 +153,7 @@ export default defineComponent({
 
     const renderVN = () => {
       const { defaultOptions, storeData } = props
-      const { isAll, isIndeterminate } = reactData
+      const { isAll: isAllChecked, isIndeterminate: isAllIndeterminate } = reactData
       const { hasTree, hasMerge, isPrint, hasColgroup } = storeData
       const { isHeader } = defaultOptions
       const cols: any[] = []
@@ -164,12 +164,14 @@ export default defineComponent({
       XEUtils.eachTree(storeData.columns, (column: any) => {
         const colTitle = formatText(column.getTitle(), 1)
         const isColGroup = column.children && column.children.length
+        const isChecked = column.checked
+        const indeterminate = column.halfChecked
         cols.push(
           h('li', {
             class: ['vxe-export--panel-column-option', `level--${column.level}`, {
               'is--group': isColGroup,
-              'is--checked': column.checked,
-              'is--indeterminate': column.halfChecked,
+              'is--checked': isChecked,
+              'is--indeterminate': indeterminate,
               'is--disabled': column.disabled
             }],
             title: colTitle,
@@ -180,13 +182,7 @@ export default defineComponent({
             }
           }, [
             h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+              class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             }),
             h('span', {
               class: 'vxe-checkbox--label'
@@ -295,20 +291,14 @@ export default defineComponent({
                         }, [
                           h('li', {
                             class: ['vxe-export--panel-column-option', {
-                              'is--checked': isAll,
-                              'is--indeterminate': isIndeterminate
+                              'is--checked': isAllChecked,
+                              'is--indeterminate': isAllIndeterminate
                             }],
                             title: GlobalConfig.i18n('vxe.table.allTitle'),
                             onClick: allColumnEvent
                           }, [
                             h('span', {
-                              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-                            }),
-                            h('span', {
-                              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-                            }),
-                            h('span', {
-                              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+                              class: ['vxe-checkbox--icon', isAllIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
                             }),
                             h('span', {
                               class: 'vxe-checkbox--label'

package/packages/filter/src/panel.ts

@@ -121,14 +121,16 @@ export default defineComponent({
           }, compConf.renderFilter(filterRender, params))
         ]
       }
+      const isAllChecked = multiple ? filterStore.isAllSelected : !filterStore.options.some((item: any) => item._checked)
+      const isAllIndeterminate = multiple && filterStore.isIndeterminate
       return [
         h('ul', {
           class: 'vxe-table--filter-header'
         }, [
           h('li', {
             class: ['vxe-table--filter-option', {
-              'is--checked': multiple ? filterStore.isAllSelected : !filterStore.options.some((item: any) => item._checked),
-              'is--indeterminate': multiple && filterStore.isIndeterminate
+              'is--checked': isAllChecked,
+              'is--indeterminate': isAllIndeterminate
             }],
             title: GlobalConfig.i18n(multiple ? 'vxe.table.allTitle' : 'vxe.table.allFilter'),
             onClick: (evnt: MouseEvent) => {
@@ -136,13 +138,7 @@ export default defineComponent({
             }
           }, (multiple ? [
             h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+              class: ['vxe-checkbox--icon', isAllIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             })
           ] : []).concat([
             h('span', {
@@ -156,6 +152,8 @@ export default defineComponent({
             maxHeight: `${maxHeight}px`
           } : {}
         }, filterStore.options.map((item: any) => {
+          const isChecked = item._checked
+          const isIndeterminate = false
           return h('li', {
             class: ['vxe-table--filter-option', {
               'is--checked': item._checked
@@ -166,13 +164,7 @@ export default defineComponent({
             }
           }, (multiple ? [
             h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-            }),
-            h('span', {
-              class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+              class: ['vxe-checkbox--icon', isIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
             })
           ] : []).concat([
             h('span', {

package/packages/form/src/form-config-item.ts

@@ -3,10 +3,11 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
 import { getFuncText, isEnableConf } from '../../tools/utils'
+import { getSlotVNs } from '../../tools/vn'
 import { renderTitle } from './render'
 import { isActivetem } from './util'
 
-import { VxeFormConstructor, VxeFormDefines, VxeFormPrivateMethods } from '../../../types/all'
+import { VxeFormConstructor, VxeFormDefines, VxeFormPrivateMethods, SlotVNodeType } from '../../../types/all'
 
 const VxeFormConfigItem = defineComponent({
   name: 'VxeFormConfigItem',
@@ -68,11 +69,11 @@ const VxeFormConfigItem = defineComponent({
           class: ['vxe-form--gather vxe-row', item.id, span ? `vxe-col--${span} is--span` : '', className ? (XEUtils.isFunction(className) ? className(params) : className) : '']
         }, childVNs) : createCommentVNode()
       }
-      let contentVNs: any[] = []
+      let contentVNs: SlotVNodeType[] = []
       if (defaultSlot) {
         contentVNs = $xeform.callSlot(defaultSlot, params)
       } else if (compConf && compConf.renderItemContent) {
-        contentVNs = compConf.renderItemContent(itemRender, params)
+        contentVNs = getSlotVNs(compConf.renderItemContent(itemRender, params))
       } else if (field) {
         contentVNs = [XEUtils.toValueString(XEUtils.get(data, field))]
       }

package/packages/form/src/form-item.ts

@@ -3,10 +3,11 @@ import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
 import { getFuncText, isEnableConf } from '../../tools/utils'
+import { getSlotVNs } from '../../tools/vn'
 import { createItem, watchItem, destroyItem, assemItem, XEFormItemProvide, isActivetem } from './util'
 import { renderTitle } from './render'
 
-import { VxeFormConstructor, VxeFormDefines, VxeFormItemPropTypes, VxeFormPrivateMethods } from '../../../types/all'
+import { SlotVNodeType, VxeFormConstructor, VxeFormDefines, VxeFormItemPropTypes, VxeFormPrivateMethods } from '../../../types/all'
 
 export const formItemProps = {
   title: String as PropType<VxeFormItemPropTypes.Title>,
@@ -92,11 +93,11 @@ export default defineComponent({
           isRequired = itemRules.some((rule) => rule.required)
         }
       }
-      let contentVNs: any[] = []
+      let contentVNs: SlotVNodeType[] = []
       if (defaultSlot) {
         contentVNs = $xeform.callSlot(defaultSlot, params)
       } else if (compConf && compConf.renderItemContent) {
-        contentVNs = compConf.renderItemContent(itemRender, params)
+        contentVNs = getSlotVNs(compConf.renderItemContent(itemRender, params))
       } else if (field) {
         contentVNs = [`${XEUtils.get(data, field)}`]
       }

package/packages/form/src/form.ts

@@ -1,4 +1,4 @@
-import { defineComponent, h, ref, Ref, resolveComponent, ComponentOptions, createCommentVNode, provide, computed, reactive, watch, nextTick, PropType, VNode, onMounted } from 'vue'
+import { defineComponent, h, ref, Ref, resolveComponent, ComponentOptions, createCommentVNode, provide, computed, reactive, watch, nextTick, PropType, onMounted } from 'vue'
 import XEUtils from 'xe-utils'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import { VXETable } from '../../v-x-e-table'
@@ -9,6 +9,7 @@ import { createItem, handleFieldOrItem, isHiddenItem, isActivetem } from './util
 import { useSize } from '../../hooks/size'
 import VxeFormConfigItem from './form-config-item'
 import VxeLoading from '../../loading/index'
+import { getSlotVNs } from '../../tools/vn'
 
 import { VxeFormConstructor, VxeFormPropTypes, VxeFormEmits, FormReactData, FormMethods, FormPrivateRef, VxeFormPrivateMethods, VxeFormDefines, VxeFormItemPropTypes, VxeTooltipInstance, FormInternalData, VxeFormPrivateComputed } from '../../../types/all'
 
@@ -83,6 +84,7 @@ export default defineComponent({
     titleAsterisk: { type: Boolean as PropType<VxeFormPropTypes.TitleAsterisk>, default: () => GlobalConfig.form.titleAsterisk },
     titleOverflow: { type: [Boolean, String] as PropType<VxeFormPropTypes.TitleOverflow>, default: null },
     className: [String, Function] as PropType<VxeFormPropTypes.ClassName>,
+    readonly: Boolean as PropType<VxeFormPropTypes.Readonly>,
     items: Array as PropType<VxeFormPropTypes.Items>,
     rules: Object as PropType<VxeFormPropTypes.Rules>,
     preventSubmit: { type: Boolean as PropType<VxeFormPropTypes.PreventSubmit>, default: () => GlobalConfig.form.preventSubmit },
@@ -153,13 +155,13 @@ export default defineComponent({
       getComputeMaps: () => computeMaps
     } as unknown as VxeFormConstructor & VxeFormPrivateMethods
 
-    const callSlot = (slotFunc: ((params: any) => any) | string | null, params: any): VNode[] => {
+    const callSlot = (slotFunc: ((params: any) => any) | string | null, params: any) => {
       if (slotFunc) {
         if (XEUtils.isString(slotFunc)) {
           slotFunc = slots[slotFunc] || null
         }
         if (XEUtils.isFunction(slotFunc)) {
-          return slotFunc(params)
+          return getSlotVNs(slotFunc(params))
         }
       }
       return []
@@ -241,7 +243,7 @@ export default defineComponent({
             if (compConf && compConf.itemResetMethod) {
               compConf.itemResetMethod({ data, field, property: field, item, $form: $xeform })
             } else if (field) {
-              XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : resetValue)
+              XEUtils.set(data, field, resetValue === null ? getResetValue(XEUtils.get(data, field), undefined) : XEUtils.clone(resetValue, true))
             }
           }
         })

package/packages/grid/src/grid.ts

@@ -9,6 +9,7 @@ import tableComponentProps from '../../table/src/props'
 import tableComponentEmits from '../../table/src/emits'
 import { useSize } from '../../hooks/size'
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event'
+import { getSlotVNs } from '../../tools/vn'
 
 import { TableMethods, VxeGridConstructor, VxeGridEmits, GridReactData, VxeGridPropTypes, VxeToolbarPropTypes, GridMethods, GridPrivateMethods, VxeGridPrivateComputed, VxeGridPrivateMethods, VxePagerInstance, VxeToolbarInstance, GridPrivateRef, VxeFormInstance, VxeTableProps, VxeTableConstructor, VxeTableMethods, VxeTablePrivateMethods, VxeTableEvents, VxePagerEvents, VxeFormEvents, VxeTableDefines, VxeTableEventProps, VxeFormItemProps, VxeGridProps } from '../../../types/all'
 
@@ -1024,7 +1025,7 @@ export default defineComponent({
             slotFunc = slots[slotFunc] || null
           }
           if (XEUtils.isFunction(slotFunc)) {
-            return slotFunc(params)
+            return getSlotVNs(slotFunc(params))
           }
         }
         return []

package/packages/input/src/input.ts

@@ -1952,7 +1952,7 @@ export default defineComponent({
               onClick: datePrevEvent
             }, [
               h('i', {
-                class: 'vxe-icon--caret-left'
+                class: 'vxe-icon-caret-left'
               })
             ]),
             h('span', {
@@ -1960,7 +1960,7 @@ export default defineComponent({
               onClick: dateTodayMonthEvent
             }, [
               h('i', {
-                class: 'vxe-icon--dot'
+                class: 'vxe-icon-dot'
               })
             ]),
             h('span', {
@@ -1970,7 +1970,7 @@ export default defineComponent({
               onClick: dateNextEvent
             }, [
               h('i', {
-                class: 'vxe-icon--caret-right'
+                class: 'vxe-icon-caret-right'
               })
             ]),
             multiple && computeSupportMultiples.value ? h('span', {

package/packages/modal/src/modal.ts

@@ -8,6 +8,7 @@ import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event'
 import GlobalConfig from '../../v-x-e-table/src/conf'
 import VxeButtonConstructor from '../../button/src/button'
 import VxeLoading from '../../loading/index'
+import { getSlotVNs } from '../../tools/vn'
 
 import { VxeModalConstructor, VxeModalPropTypes, ModalReactData, VxeModalEmits, ModalEventTypes, VxeButtonInstance, ModalMethods, ModalPrivateRef, VxeModalMethods } from '../../../types/all'
 
@@ -687,7 +688,7 @@ export default defineComponent({
       const { slots: propSlots = {}, showClose, showZoom, title } = props
       const { zoomLocat } = reactData
       const titleSlot = slots.title || propSlots.title
-      const titVNs: VNode[] = titleSlot ? titleSlot({ $modal: $xemodal }) as VNode[] : [
+      const titVNs = titleSlot ? getSlotVNs(titleSlot({ $modal: $xemodal })) : [
         h('span', {
           class: 'vxe-modal--title'
         }, title ? getFuncText(title) : GlobalConfig.i18n('vxe.alert.title'))
@@ -736,7 +737,7 @@ export default defineComponent({
               'is--ellipsis': !isMsg && props.showTitleOverflow
             }],
             ...headerOns
-          }, headerSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : headerSlot({ $modal: $xemodal })) as VNode[] : renderTitles())
+          }, headerSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : getSlotVNs(headerSlot({ $modal: $xemodal }))) : renderTitles())
         )
       }
       return headVNs
@@ -762,7 +763,7 @@ export default defineComponent({
       contVNs.push(
         h('div', {
           class: 'vxe-modal--content'
-        }, defaultSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : defaultSlot({ $modal: $xemodal })) as VNode[] : getFuncText(content))
+        }, defaultSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : getSlotVNs(defaultSlot({ $modal: $xemodal }))) as VNode[] : getFuncText(content))
       )
       if (!isMsg) {
         /**
@@ -814,7 +815,7 @@ export default defineComponent({
         footVNs.push(
           h('div', {
             class: 'vxe-modal--footer'
-          }, footerSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : footerSlot({ $modal: $xemodal })) as VNode[] : renderBtns())
+          }, footerSlot ? (!reactData.inited || (props.destroyOnClose && !reactData.visible) ? [] : getSlotVNs(footerSlot({ $modal: $xemodal }))) as VNode[] : renderBtns())
         )
       }
       if (!isMsg && props.resize) {

package/packages/radio/src/radio.ts

@@ -100,10 +100,11 @@ export default defineComponent({
       const vSize = computeSize.value
       const isDisabled = computeDisabled.value
       const name = computeName.value
-      const checked = computeChecked.value
+      const isChecked = computeChecked.value
       return h('label', {
         class: ['vxe-radio', {
           [`size--${vSize}`]: vSize,
+          'is--checked': isChecked,
           'is--disabled': isDisabled
         }],
         title: props.title
@@ -112,13 +113,13 @@ export default defineComponent({
           class: 'vxe-radio--input',
           type: 'radio',
           name,
-          checked,
+          checked: isChecked,
           disabled: isDisabled,
           onChange: changeEvent,
           onClick: clickEvent
         }),
         h('span', {
-          class: 'vxe-radio--icon'
+          class: ['vxe-radio--icon', isChecked ? 'vxe-icon-radio-checked' : 'vxe-icon-radio-unchecked']
         }),
         h('span', {
           class: 'vxe-radio--label'

package/packages/select/src/select.ts

@@ -6,6 +6,7 @@ import { getEventTargetNode, getAbsolutePos } from '../../tools/dom'
 import { getLastZIndex, nextZIndex, getFuncText, formatText } from '../../tools/utils'
 import { GlobalEvent, hasEventKey, EVENT_KEYS } from '../../tools/event'
 import VxeInputComponent from '../../input/src/input'
+import { getSlotVNs } from '../../tools/vn'
 
 import { VxeSelectPropTypes, VxeSelectConstructor, SelectReactData, VxeSelectEmits, VxeInputConstructor, SelectMethods, SelectPrivateRef, VxeSelectMethods, VxeOptgroupProps, VxeOptionProps, VxeFormDefines, VxeFormConstructor, VxeFormPrivateMethods, VxeInputDefines } from '../../../types/all'
 
@@ -147,7 +148,7 @@ export default defineComponent({
           slotFunc = slots[slotFunc] || null
         }
         if (XEUtils.isFunction(slotFunc)) {
-          return slotFunc(params)
+          return getSlotVNs(slotFunc(params))
         }
       }
       return []

package/packages/table/src/cell.ts

@@ -5,8 +5,9 @@ import { VXETable } from '../../v-x-e-table'
 import { getFuncText, isEnableConf, formatText, eqEmptyValue } from '../../tools/utils'
 import { updateCellTitle } from '../../tools/dom'
 import { createColumn } from './util'
+import { getSlotVNs } from '../../tools/vn'
 
-import { VxeTableConstructor, VxeTableDefines, VxeTablePrivateMethods } from '../../../types/all'
+import { SlotVNodeType, VxeTableConstructor, VxeTableDefines, VxeTablePrivateMethods } from '../../../types/all'
 
 function renderHelpIcon (params: VxeTableDefines.CellRenderHeaderParams) {
   const { $table, column } = params
@@ -24,7 +25,7 @@ function renderHelpIcon (params: VxeTableDefines.CellRenderHeaderParams) {
   ] : []
 }
 
-function renderTitleContent (params: VxeTableDefines.CellRenderHeaderParams, content: VNode[] | string[] | string) {
+function renderTitleContent (params: VxeTableDefines.CellRenderHeaderParams, content: SlotVNodeType[]) {
   const { $table, column } = params
   const { props, internalData } = $table
   const { computeTooltipOpts } = $table.getComputeMaps()
@@ -81,7 +82,7 @@ function getFooterContent (params: VxeTableDefines.CellRenderFooterParams) {
   if (renderOpts) {
     const compConf = VXETable.renderer.get(renderOpts.name)
     if (compConf && compConf.renderFooter) {
-      return compConf.renderFooter(renderOpts, params)
+      return getSlotVNs(compConf.renderFooter(renderOpts, params))
     }
   }
   return [formatText(items[_columnIndex], 1)]
@@ -160,10 +161,10 @@ export const Cell = {
     if (renderOpts) {
       const compConf = VXETable.renderer.get(renderOpts.name)
       if (compConf && compConf.renderHeader) {
-        return renderTitleContent(params, compConf.renderHeader(renderOpts, params))
+        return renderTitleContent(params, getSlotVNs(compConf.renderHeader(renderOpts, params)))
       }
     }
-    return renderTitleContent(params, formatText(column.getTitle(), 1))
+    return renderTitleContent(params, [formatText(column.getTitle(), 1)])
   },
   renderDefaultHeader (params: VxeTableDefines.CellRenderHeaderParams) {
     return renderHelpIcon(params).concat(Cell.renderHeaderTitle(params))
@@ -181,7 +182,7 @@ export const Cell = {
       const compConf = VXETable.renderer.get(renderOpts.name)
       const compFn = compConf ? compConf[funName] : null
       if (compFn) {
-        return compFn(renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params))
+        return getSlotVNs(compFn(renderOpts, Object.assign({ $type: editRender ? 'edit' : 'cell' }, params)))
       }
     }
     const cellValue = $table.getCellLabel(row, column)
@@ -211,7 +212,7 @@ export const Cell = {
   /**
    * 树节点
    */
-  renderTreeIcon (params: VxeTableDefines.CellRenderBodyParams, cellVNodes: VNode[]) {
+  renderTreeIcon (params: VxeTableDefines.CellRenderBodyParams, cellVNodes: SlotVNodeType[]) {
     const { $table, isHidden } = params
     const { reactData } = $table
     const { computeTreeOpts } = $table.getComputeMaps()
@@ -272,7 +273,7 @@ export const Cell = {
     const { $table, column } = params
     const { slots } = column
     const headerSlot = slots ? slots.header : null
-    return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : formatText(column.getTitle(), 1))
+    return renderTitleContent(params, headerSlot ? $table.callSlot(headerSlot, params) : [formatText(column.getTitle(), 1)])
   },
   renderSeqCell (params: VxeTableDefines.CellRenderBodyParams) {
     const { $table, column } = params
@@ -342,10 +343,7 @@ export const Cell = {
     if (isVisible) {
       radioVNs.push(
         h('span', {
-          class: 'vxe-radio--icon vxe-radio--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-radio--icon vxe-radio--unchecked-icon'
+          class: ['vxe-radio--icon', isChecked ? GlobalConfig.icon.TABLE_RADIO_CHECKED : GlobalConfig.icon.TABLE_RADIO_UNCHECKED]
         })
       )
     }
@@ -416,13 +414,7 @@ export const Cell = {
         ...ons
       }, [
         h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', isAllCheckboxIndeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isAllCheckboxSelected ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       ].concat(titleSlot || headerTitle ? [
         h('span', {
@@ -471,13 +463,7 @@ export const Cell = {
     if (isVisible) {
       checkVNs.push(
         h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       )
     }
@@ -542,13 +528,7 @@ export const Cell = {
     if (isVisible) {
       checkVNs.push(
         h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--checked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--unchecked-icon'
-        }),
-        h('span', {
-          class: 'vxe-checkbox--icon vxe-checkbox--indeterminate-icon'
+          class: ['vxe-checkbox--icon', indeterminate ? GlobalConfig.icon.TABLE_CHECKBOX_INDETERMINATE : (isChecked ? GlobalConfig.icon.TABLE_CHECKBOX_CHECKED : GlobalConfig.icon.TABLE_CHECKBOX_UNCHECKED)]
         })
       )
       if (defaultSlot || labelField) {
@@ -626,7 +606,7 @@ export const Cell = {
     if (contentRender) {
       const compConf = VXETable.renderer.get(contentRender.name)
       if (compConf && compConf.renderExpand) {
-        return compConf.renderExpand(contentRender, params)
+        return getSlotVNs(compConf.renderExpand(contentRender, params))
       }
     }
     return []
@@ -792,7 +772,10 @@ export const Cell = {
       if (editSlot) {
         return $table.callSlot(editSlot, params)
       }
-      return compConf && compConf.renderEdit ? compConf.renderEdit(editRender, Object.assign({ $type: 'edit' }, params)) : []
+      if (compConf && compConf.renderEdit) {
+        return getSlotVNs(compConf.renderEdit(editRender, Object.assign({ $type: 'edit' }, params)))
+      }
+      return []
     }
     if (defaultSlot) {
       return $table.callSlot(defaultSlot, params)