vxe-table 4.17.0-beta.0 → 4.17.0-beta.10

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

@@ -1,4 +1,4 @@
-import { h, inject, ref, Ref, provide, VNode, PropType, nextTick, TransitionGroup, createCommentVNode, reactive, onUnmounted } from 'vue'
+import { h, inject, ref, Ref, provide, VNode, PropType, nextTick, TransitionGroup, reactive, onUnmounted } from 'vue'
 import { defineVxeComponent } from '../../../ui/src/comp'
 import { VxeUI } from '../../../ui'
 import { formatText } from '../../../ui/src/utils'
@@ -490,7 +490,7 @@ export default defineVxeComponent({
               }
             }
 
-            $xeTable.dispatchEvent('column-dragend', {
+            const csParams = {
               oldColumn: dragColumn,
               newColumn,
               dragColumn,
@@ -500,7 +500,9 @@ export default defineVxeComponent({
                 newIndex: nafIndex,
                 oldIndex: oafIndex
               }
-            }, evnt)
+            }
+            $xeTable.dispatchEvent('custom-sort-change', csParams, evnt)
+            $xeTable.dispatchEvent('column-dragend', csParams, evnt)
 
             if (immediate) {
               tableReactData.customColumnList = collectColumn.slice(0)
@@ -678,7 +680,7 @@ export default defineVxeComponent({
                     class: ['vxe-checkbox--icon', isIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
                   })
                 ])
-                : createCommentVNode(),
+                : renderEmptyElement($xeTable),
               h('div', {
                 class: 'vxe-table-custom--name-option'
               }, [
@@ -703,7 +705,7 @@ export default defineVxeComponent({
                       })
                     ])
                   ])
-                  : createCommentVNode(),
+                  : renderEmptyElement($xeTable),
                 column.type === 'html'
                   ? h('div', {
                     key: '1',
@@ -730,7 +732,7 @@ export default defineVxeComponent({
                         changeFixedOption(column, 'left', $event)
                       }
                     })
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeTable),
                   VxeUIButtonComponent
                     ? h(VxeUIButtonComponent, {
                       mode: 'text',
@@ -742,9 +744,9 @@ export default defineVxeComponent({
                         changeFixedOption(column, 'right', $event)
                       }
                     })
-                    : createCommentVNode()
+                    : renderEmptyElement($xeTable)
                 ])
-                : createCommentVNode()
+                : renderEmptyElement($xeTable)
             ])
           )
         }
@@ -850,7 +852,7 @@ export default defineVxeComponent({
                               disabled: !isCustomStatus,
                               onClick: resetCustomEvent
                             })
-                            : createCommentVNode(),
+                            : renderEmptyElement($xeTable),
                           immediate
                             ? (VxeUIButtonComponent
                                 ? h(VxeUIButtonComponent, {
@@ -858,16 +860,16 @@ export default defineVxeComponent({
                                   content: customOpts.closeButtonText || getI18n('vxe.table.customClose'),
                                   onClick: cancelCloseEvent
                                 })
-                                : createCommentVNode())
+                                : renderEmptyElement($xeTable))
                             : (VxeUIButtonComponent
                                 ? h(VxeUIButtonComponent, {
                                   mode: 'text',
                                   content: customOpts.cancelButtonText || getI18n('vxe.table.customCancel'),
                                   onClick: cancelCustomEvent
                                 })
-                                : createCommentVNode()),
+                                : renderEmptyElement($xeTable)),
                           immediate
-                            ? createCommentVNode()
+                            ? renderEmptyElement($xeTable)
                             : (VxeUIButtonComponent
                                 ? h(VxeUIButtonComponent, {
                                   mode: 'text',
@@ -875,7 +877,7 @@ export default defineVxeComponent({
                                   content: customOpts.confirmButtonText || getI18n('vxe.table.customConfirm'),
                                   onClick: confirmCustomEvent
                                 })
-                                : createCommentVNode())
+                                : renderEmptyElement($xeTable))
                         ])
                       ])
                   : null
@@ -984,7 +986,7 @@ export default defineVxeComponent({
                     })
                   ])
                 ])
-                : createCommentVNode(),
+                : renderEmptyElement($xeTable),
               h('td', {
                 class: 'vxe-table-custom-popup--column-item col--name'
               }, [
@@ -1012,7 +1014,7 @@ export default defineVxeComponent({
                         : h('div', {
                           class: 'vxe-table-custom-popup--column-sort-placeholder'
                         }))
-                    : createCommentVNode(),
+                    : renderEmptyElement($xeTable),
                   column.type === 'html'
                     ? h('div', {
                       key: '1',
@@ -1052,10 +1054,10 @@ export default defineVxeComponent({
                               changeColumnWidth(column)
                             }
                           })
-                          : createCommentVNode()
+                          : renderEmptyElement($xeTable)
                       )
                 ])
-                : createCommentVNode(),
+                : renderEmptyElement($xeTable),
               allowFixed
                 ? h('td', {
                   class: 'vxe-table-custom-popup--column-item col--fixed'
@@ -1078,10 +1080,10 @@ export default defineVxeComponent({
                               changeFixedOption(column, label, $event)
                             }
                           })
-                          : createCommentVNode()
+                          : renderEmptyElement($xeTable)
                       )
                 ])
-                : createCommentVNode()
+                : renderEmptyElement($xeTable)
             ])
           )
         }
@@ -1112,7 +1114,7 @@ export default defineVxeComponent({
                           ? h('col', {
                             class: 'vxe-table-custom-popup--table-col-seq'
                           })
-                          : createCommentVNode(),
+                          : renderEmptyElement($xeTable),
                         h('col', {
                           class: 'vxe-table-custom-popup--table-col-title'
                         }),
@@ -1120,12 +1122,12 @@ export default defineVxeComponent({
                           ? h('col', {
                             class: 'vxe-table-custom-popup--table-col-width'
                           })
-                          : createCommentVNode(),
+                          : renderEmptyElement($xeTable),
                         allowFixed
                           ? h('col', {
                             class: 'vxe-table-custom-popup--table-col-fixed'
                           })
-                          : createCommentVNode()
+                          : renderEmptyElement($xeTable)
                       ]),
                       h('thead', {}, [
                         h('tr', {}, [
@@ -1147,14 +1149,14 @@ export default defineVxeComponent({
                                 }, getI18n('vxe.toolbar.customAll'))
                               ])
                             ])
-                            : createCommentVNode(),
+                            : renderEmptyElement($xeTable),
                           h('th', {}, getI18n('vxe.custom.setting.colTitle')),
                           allowResizable
                             ? h('th', {}, getI18n('vxe.custom.setting.colResizable'))
-                            : createCommentVNode(),
+                            : renderEmptyElement($xeTable),
                           allowFixed
                             ? h('th', {}, getI18n(`vxe.custom.setting.${maxFixedSize ? 'colFixedMax' : 'colFixed'}`, [maxFixedSize]))
-                            : createCommentVNode()
+                            : renderEmptyElement($xeTable)
                         ])
                       ]),
                       h(TransitionGroup, {
@@ -1193,29 +1195,29 @@ export default defineVxeComponent({
                 disabled: !isCustomStatus,
                 onClick: resetCustomEvent
               })
-              : createCommentVNode(),
+              : renderEmptyElement($xeTable),
             immediate
               ? (VxeUIButtonComponent
                   ? h(VxeUIButtonComponent, {
                     content: customOpts.closeButtonText || getI18n('vxe.table.customClose'),
                     onClick: cancelCloseEvent
                   })
-                  : createCommentVNode())
+                  : renderEmptyElement($xeTable))
               : (VxeUIButtonComponent
                   ? h(VxeUIButtonComponent, {
                     content: customOpts.cancelButtonText || getI18n('vxe.table.customCancel'),
                     onClick: cancelCustomEvent
                   })
-                  : createCommentVNode()),
+                  : renderEmptyElement($xeTable)),
             immediate
-              ? createCommentVNode()
+              ? renderEmptyElement($xeTable)
               : (VxeUIButtonComponent
                   ? h(VxeUIButtonComponent, {
                     status: 'primary',
                     content: customOpts.confirmButtonText || getI18n('vxe.custom.cstmConfirm'),
                     onClick: confirmCustomEvent
                   })
-                  : createCommentVNode())
+                  : renderEmptyElement($xeTable))
           ])
         }
       }
@@ -1240,7 +1242,7 @@ export default defineVxeComponent({
               customStore.visible = value
             }
           }, scopedSlots)
-          : createCommentVNode()
+          : renderEmptyElement($xeTable)
       }
       return VxeUIModalComponent
         ? h(VxeUIModalComponent, {
@@ -1266,7 +1268,7 @@ export default defineVxeComponent({
             customStore.visible = value
           }
         }, scopedSlots)
-        : createCommentVNode()
+        : renderEmptyElement($xeTable)
     }
 
     const renderVN = () => {

package/packages/table/module/export/export-panel.ts

@@ -1,4 +1,4 @@
-import { h, createCommentVNode, ref, Ref, computed, reactive, inject, nextTick } from 'vue'
+import { h, ref, Ref, computed, reactive, inject, nextTick } from 'vue'
 import { defineVxeComponent } from '../../../ui/src/comp'
 import { VxeUI } from '../../../ui'
 import XEUtils from 'xe-utils'
@@ -7,7 +7,7 @@ import { errLog } from '../../../ui/src/log'
 
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods } from '../../../../types'
 
-const { getI18n, getIcon } = VxeUI
+const { getI18n, getIcon, renderEmptyElement } = VxeUI
 
 export default defineVxeComponent({
   name: 'VxeTableExportPanel',
@@ -260,7 +260,7 @@ export default defineVxeComponent({
                 ? h('div', {
                   class: 'vxe-table-export--panel-top'
                 }, $xeTable.callSlot(topSlot, params))
-                : createCommentVNode(),
+                : renderEmptyElement($xeTable),
               h('div', {
                 class: 'vxe-table-export--panel-body'
               }, defaultSlot
@@ -275,7 +275,7 @@ export default defineVxeComponent({
                       h('tbody', [
                         [
                           isPrint
-                            ? createCommentVNode()
+                            ? renderEmptyElement($xeTable)
                             : h('tr', [
                               h('td', getI18n('vxe.export.expName')),
                               h('td', [
@@ -290,11 +290,11 @@ export default defineVxeComponent({
                                       defaultOptions.filename = value
                                     }
                                   })
-                                  : createCommentVNode()
+                                  : renderEmptyElement($xeTable)
                               ])
                             ]),
                           isPrint
-                            ? createCommentVNode()
+                            ? renderEmptyElement($xeTable)
                             : h('tr', [
                               h('td', getI18n('vxe.export.expType')),
                               h('td', [
@@ -306,7 +306,7 @@ export default defineVxeComponent({
                                       defaultOptions.type = value
                                     }
                                   })
-                                  : createCommentVNode()
+                                  : renderEmptyElement($xeTable)
                               ])
                             ]),
                           isPrint || showSheet
@@ -324,10 +324,10 @@ export default defineVxeComponent({
                                       defaultOptions.sheetName = value
                                     }
                                   })
-                                  : createCommentVNode()
+                                  : renderEmptyElement($xeTable)
                               ])
                             ])
-                            : createCommentVNode(),
+                            : renderEmptyElement($xeTable),
                           h('tr', [
                             h('td', getI18n('vxe.export.expMode')),
                             h('td', [
@@ -344,7 +344,7 @@ export default defineVxeComponent({
                                     defaultOptions.mode = value
                                   }
                                 })
-                                : createCommentVNode()
+                                : renderEmptyElement($xeTable)
                             ])
                           ]),
                           h('tr', [
@@ -400,7 +400,7 @@ export default defineVxeComponent({
                                         defaultOptions.isHeader = value
                                       }
                                     })
-                                    : createCommentVNode(),
+                                    : renderEmptyElement($xeTable),
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
                                       modelValue: isHeader ? defaultOptions.isTitle : false,
@@ -411,7 +411,7 @@ export default defineVxeComponent({
                                         defaultOptions.isTitle = value
                                       }
                                     })
-                                    : createCommentVNode(),
+                                    : renderEmptyElement($xeTable),
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
                                       modelValue: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
@@ -422,7 +422,7 @@ export default defineVxeComponent({
                                         defaultOptions.isColgroup = value
                                       }
                                     })
-                                    : createCommentVNode()
+                                    : renderEmptyElement($xeTable)
                                 ]),
                                 h('div', {
                                   class: 'vxe-table-export--panel-option-row'
@@ -437,7 +437,7 @@ export default defineVxeComponent({
                                         defaultOptions.original = value
                                       }
                                     })
-                                    : createCommentVNode(),
+                                    : renderEmptyElement($xeTable),
                                   VxeUICheckboxComponent
                                     ? h(VxeUICheckboxComponent, {
                                       modelValue: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
@@ -448,9 +448,9 @@ export default defineVxeComponent({
                                         defaultOptions.isMerge = value
                                       }
                                     })
-                                    : createCommentVNode(),
+                                    : renderEmptyElement($xeTable),
                                   isPrint || !VxeUICheckboxComponent
-                                    ? createCommentVNode()
+                                    ? renderEmptyElement($xeTable)
                                     : h(VxeUICheckboxComponent, {
                                       modelValue: supportStyle ? defaultOptions.useStyle : false,
                                       disabled: !supportStyle,
@@ -470,7 +470,7 @@ export default defineVxeComponent({
                                         defaultOptions.isAllExpand = value
                                       }
                                     })
-                                    : createCommentVNode()
+                                    : renderEmptyElement($xeTable)
                                 ]),
                                 h('div', {
                                   class: 'vxe-table-export--panel-option-row'
@@ -485,7 +485,7 @@ export default defineVxeComponent({
                                         defaultOptions.isFooter = value
                                       }
                                     })
-                                    : createCommentVNode()
+                                    : renderEmptyElement($xeTable)
                                 ])
                               ])
                           ])
@@ -497,7 +497,7 @@ export default defineVxeComponent({
                 ? h('div', {
                   class: 'vxe-table-export--panel-bottom'
                 }, $xeTable.callSlot(bottomSlot, params))
-                : createCommentVNode()
+                : renderEmptyElement($xeTable)
             ])
           },
           footer () {
@@ -522,7 +522,7 @@ export default defineVxeComponent({
                         content: getI18n('vxe.export.expCancel'),
                         onClick: cancelEvent
                       })
-                      : createCommentVNode(),
+                      : renderEmptyElement($xeTable),
                     VxeUIButtonComponent
                       ? h(VxeUIButtonComponent, {
                         ref: xButtonConfirm,
@@ -530,12 +530,12 @@ export default defineVxeComponent({
                         content: getI18n(isPrint ? 'vxe.export.expPrint' : 'vxe.export.expConfirm'),
                         onClick: confirmEvent
                       })
-                      : createCommentVNode()
+                      : renderEmptyElement($xeTable)
                   ])
                 ])
           }
         })
-        : createCommentVNode()
+        : renderEmptyElement($xeTable)
     }
 
     nextTick(() => {

package/packages/table/module/export/import-panel.ts

@@ -1,4 +1,4 @@
-import { h, ref, Ref, computed, inject, reactive, nextTick, createCommentVNode } from 'vue'
+import { h, ref, Ref, computed, inject, reactive, nextTick } from 'vue'
 import { defineVxeComponent } from '../../../ui/src/comp'
 import { VxeUI } from '../../../ui'
 import XEUtils from 'xe-utils'
@@ -7,7 +7,7 @@ import { errLog } from '../../../ui/src/log'
 
 import type { VxeTablePrivateMethods, VxeTableConstructor, VxeTableMethods } from '../../../../types'
 
-const { getI18n, getIcon } = VxeUI
+const { getI18n, getIcon, renderEmptyElement } = VxeUI
 
 export default defineVxeComponent({
   name: 'VxeTableImportPanel',
@@ -142,7 +142,7 @@ export default defineVxeComponent({
                 ? h('div', {
                   class: 'vxe-table-export--panel-top'
                 }, $xeTable.callSlot(topSlot, params))
-                : createCommentVNode(),
+                : renderEmptyElement($xeTable),
               h('div', {
                 class: 'vxe-table-export--panel-body'
               }, defaultSlot
@@ -191,7 +191,7 @@ export default defineVxeComponent({
                                   defaultOptions.mode = value
                                 }
                               })
-                              : createCommentVNode()
+                              : renderEmptyElement($xeTable)
                           ])
                         ])
                       ])
@@ -202,7 +202,7 @@ export default defineVxeComponent({
                 ? h('div', {
                   class: 'vxe-table-export--panel-bottom'
                 }, $xeTable.callSlot(bottomSlot, params))
-                : createCommentVNode()
+                : renderEmptyElement($xeTable)
             ])
           },
           footer () {
@@ -226,7 +226,7 @@ export default defineVxeComponent({
                         content: getI18n('vxe.import.impCancel'),
                         onClick: cancelEvent
                       })
-                      : createCommentVNode(),
+                      : renderEmptyElement($xeTable),
                     VxeUIButtonComponent
                       ? h(VxeUIButtonComponent, {
                         status: 'primary',
@@ -234,13 +234,13 @@ export default defineVxeComponent({
                         content: getI18n('vxe.import.impConfirm'),
                         onClick: importEvent
                       })
-                      : createCommentVNode()
+                      : renderEmptyElement($xeTable)
                   ])
                 ]
             )
           }
         })
-        : createCommentVNode()
+        : renderEmptyElement($xeTable)
     }
 
     nextTick(() => {

package/packages/table/module/filter/hook.ts

@@ -9,7 +9,7 @@ import type { TableFilterMethods, TableFilterPrivateMethods, VxeTableDefines } f
 
 const { renderer, hooks } = VxeUI
 
-const tableFilterMethodKeys: (keyof TableFilterMethods)[] = ['openFilter', 'setFilter', 'clearFilter', 'saveFilterPanel', 'saveFilterPanelByEvent', 'resetFilterPanel', 'resetFilterPanelByEvent', 'getCheckedFilters', 'updateFilterOptionStatus']
+const tableFilterMethodKeys: (keyof TableFilterMethods)[] = ['openFilter', 'setFilter', 'clearFilter', 'saveFilter', 'saveFilterByEvent', 'saveFilterPanel', 'saveFilterPanelByEvent', 'resetFilter', 'resetFilterByEvent', 'resetFilterPanel', 'resetFilterPanelByEvent', 'getCheckedFilters', 'updateFilterOptionStatus']
 
 hooks.add('tableFilterModule', {
   setupTable ($xeTable) {

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

@@ -136,7 +136,7 @@ export default defineVxeComponent({
       const { filterMultiple, filters, slots } = column
       const filterOptions = (filters || []) as VxeTableDefines.FilterOption[]
       const filterSlot = slots ? slots.filter : null
-      const params = Object.assign({}, tableInternalData._currFilterParams, { $panel: $xeFilterPanel, $table: $xeTable })
+      const params = Object.assign({}, tableInternalData._currFilterParams, { option: filterOptions[0], $panel: $xeFilterPanel, $table: $xeTable })
       const rtFilter = compConf ? (compConf.renderTableFilter || compConf.renderFilter) : null
       if (filterSlot) {
         return [

package/packages/table/module/keyboard/hook.ts

@@ -1,36 +1,12 @@
 import XEUtils from 'xe-utils'
 import { VxeUI } from '../../../ui'
 import { getRefElem } from '../../src/util'
-import { hasClass, getAbsolutePos, addClass, removeClass, hasControlKey } from '../../../ui/src/dom'
+import { getAbsolutePos, addClass, removeClass, hasControlKey } from '../../../ui/src/dom'
 
 import type { TableKeyboardPrivateMethods, VxeTableDefines } from '../../../../types'
 
 const { hooks } = VxeUI
 
-const browseObj = XEUtils.browse()
-
-function getTargetOffset (target: any, container: any) {
-  let offsetTop = 0
-  let offsetLeft = 0
-  const triggerCheckboxLabel = !browseObj.firefox && hasClass(target, 'vxe-checkbox--label')
-  if (triggerCheckboxLabel) {
-    const checkboxLabelStyle = getComputedStyle(target)
-    offsetTop -= XEUtils.toNumber(checkboxLabelStyle.paddingTop)
-    offsetLeft -= XEUtils.toNumber(checkboxLabelStyle.paddingLeft)
-  }
-  while (target && target !== container) {
-    offsetTop += target.offsetTop
-    offsetLeft += target.offsetLeft
-    target = target.offsetParent
-    if (triggerCheckboxLabel) {
-      const checkboxStyle = getComputedStyle(target)
-      offsetTop -= XEUtils.toNumber(checkboxStyle.paddingTop)
-      offsetLeft -= XEUtils.toNumber(checkboxStyle.paddingLeft)
-    }
-  }
-  return { offsetTop, offsetLeft }
-}
-
 hooks.add('tableKeyboardModule', {
   setupTable ($xeTable) {
     const { props, reactData, internalData } = $xeTable
@@ -119,6 +95,7 @@ hooks.add('tableKeyboardModule', {
         if (!bodyWrapperElem) {
           return
         }
+        const bodyRect = bodyWrapperElem.getBoundingClientRect()
         const el = refElem.value
         const disX = evnt.clientX
         const disY = evnt.clientY
@@ -127,9 +104,8 @@ hooks.add('tableKeyboardModule', {
         const selectRecords = $xeTable.getCheckboxRecords()
         let lastRangeRows: any[] = []
         const marginSize = 1
-        const offsetRest = getTargetOffset(evnt.target, bodyWrapperElem)
-        const startTop = offsetRest.offsetTop + evnt.offsetY
-        const startLeft = offsetRest.offsetLeft + evnt.offsetX
+        const startTop = evnt.clientY - bodyRect.y + bodyWrapperElem.scrollTop
+        const startLeft = evnt.clientX - bodyRect.x + bodyWrapperElem.scrollLeft
         const startScrollTop = bodyWrapperElem.scrollTop
         const rowHeight = trElem.offsetHeight
         const trRect = trElem.getBoundingClientRect()

package/packages/table/render/index.ts

@@ -646,30 +646,39 @@ function oldSelectEditRender (renderOpts: VxeGlobalRendererHandles.RenderTableEd
 }
 
 function getSelectCellValue (renderOpts: VxeGlobalRendererHandles.RenderTableEditOptions, { row, column }: any) {
-  const { options, optionGroups, optionProps = {}, optionGroupProps = {} } = renderOpts
+  const { options, optionGroups, optionProps = {}, optionGroupProps = {}, props = {} } = renderOpts
   const cellValue = XEUtils.get(row, column.field)
   let selectItem: any
   const labelProp = optionProps.label || 'label'
   const valueProp = optionProps.value || 'value'
   if (!(cellValue === null || cellValue === undefined)) {
-    return XEUtils.map(XEUtils.isArray(cellValue) ? cellValue : [cellValue],
-      optionGroups
-        ? (value) => {
-            const groupOptions = optionGroupProps.options || 'options'
-            for (let index = 0; index < optionGroups.length; index++) {
-              /* eslint-disable eqeqeq */
-              selectItem = XEUtils.find(optionGroups[index][groupOptions], item => item[valueProp] == value)
-              if (selectItem) {
-                break
-              }
-            }
-            return selectItem ? selectItem[labelProp] : value
-          }
-        : (value) => {
+    let vals = []
+    if (XEUtils.isArray(cellValue)) {
+      vals = cellValue
+    } else {
+      if (props.multiple && `${cellValue}`.indexOf(',') > -1) {
+        vals = `${cellValue}`.split(',')
+      } else {
+        vals = [cellValue]
+      }
+    }
+    return XEUtils.map(vals, optionGroups
+      ? (value) => {
+          const groupOptions = optionGroupProps.options || 'options'
+          for (let index = 0; index < optionGroups.length; index++) {
             /* eslint-disable eqeqeq */
-            selectItem = XEUtils.find(options, item => item[valueProp] == value)
-            return selectItem ? selectItem[labelProp] : value
+            selectItem = XEUtils.find(optionGroups[index][groupOptions], item => item[valueProp] == value)
+            if (selectItem) {
+              break
+            }
           }
+          return selectItem ? selectItem[labelProp] : value
+        }
+      : (value) => {
+          /* eslint-disable eqeqeq */
+          selectItem = XEUtils.find(options, item => item[valueProp] == value)
+          return selectItem ? selectItem[labelProp] : value
+        }
     ).join(', ')
   }
   return ''

package/packages/table/src/body.ts

@@ -330,8 +330,6 @@ export default defineVxeComponent({
         tcStyle.minHeight = `${cellHeight}px`
       }
 
-      // console.log(lastScrollTime)
-
       const tdVNs: VxeComponentSlotType[] = []
       if (fixedHiddenColumn && isAllOverflow) {
         tdVNs.push(
@@ -520,7 +518,18 @@ export default defineVxeComponent({
             seq = rowRest._tIndex + 1
           }
         }
-        const params = { $table: $xeTable, seq, rowid, fixed: fixedType, type: renderType, level: rowLevel, row, rowIndex, $rowIndex, _rowIndex }
+        const params = {
+          $table: $xeTable,
+          seq,
+          rowid,
+          fixed: fixedType,
+          type: renderType,
+          level: rowLevel,
+          row,
+          rowIndex,
+          $rowIndex,
+          _rowIndex
+        }
         // 行是否被展开
         const isExpandRow = expandColumn && !!rowExpandedFlag && !!rowExpandedMaps[rowid]
         // 树节点是否被展开

package/packages/table/src/emits.ts

@@ -81,6 +81,7 @@ export const tableEmits: VxeTableEmits = [
   'custom-visible-change',
   'custom-visible-all',
   'custom-fixed-change',
+  'custom-sort-change',
 
   'change-fnr', // 废弃
 
@@ -106,6 +107,7 @@ export const tableEmits: VxeTableEmits = [
   'cell-area-extension-start',
   'cell-area-extension-drag',
   'cell-area-extension-end',
+  'cell-area-extension-fill',
   'cell-area-selection-all-start',
   'cell-area-selection-all-end',
   'cell-area-arrows-start',