@@ -66,6 +66,23 @@ function getItemProps (renderOpts: VxeGlobalRendererHandles.RenderOptions, param
6666 return XEUtils . assign ( { } , defaultProps , renderOpts . props , { [ getModelProp ( renderOpts ) ] : value } )
6767}
6868
69+ function formatText ( cellValue : any ) {
70+ return '' + ( isEmptyValue ( cellValue ) ? '' : cellValue )
71+ }
72+
73+ function getCellLabelVNs ( renderOpts : VxeColumnPropTypes . EditRender , params : VxeGlobalRendererHandles . RenderCellParams , cellLabel : any ) {
74+ const { placeholder } = renderOpts
75+ return [
76+ h ( 'span' , {
77+ class : 'vxe-cell--label'
78+ } , isEmptyValue ( cellLabel ) ? [
79+ h ( 'span' , {
80+ class : 'vxe-cell--placeholder'
81+ } , formatText ( placeholder ) )
82+ ] : formatText ( cellLabel ) )
83+ ]
84+ }
85+
6986function getOns ( renderOpts : VxeGlobalRendererHandles . RenderOptions , params : VxeGlobalRendererHandles . RenderParams , inputFunc ?: Function , changeFunc ?: Function ) {
7087 const { events } = renderOpts
7188 const modelEvent = getModelEvent ( renderOpts )
@@ -183,7 +200,7 @@ function getSelectCellValue (renderOpts: VxeColumnPropTypes.EditRender, params:
183200 }
184201 return selectlabel
185202 }
186- return null
203+ return ''
187204}
188205
189206function getCascaderCellValue ( renderOpts : VxeGlobalRendererHandles . RenderOptions , params : VxeGlobalRendererHandles . RenderCellParams ) {
@@ -339,7 +356,7 @@ function renderOptions (options: any[], optionProps: VxeGlobalRendererHandles.Re
339356}
340357
341358function cellText ( cellValue : any ) : string [ ] {
342- return [ '' + ( isEmptyValue ( cellValue ) ? '' : cellValue ) ]
359+ return [ formatText ( cellValue ) ]
343360}
344361
345362function createFormItemRender ( defaultProps ?: { [ key : string ] : any } ) {
@@ -530,7 +547,7 @@ export const VXETablePluginElement = {
530547 ]
531548 } ,
532549 renderCell ( renderOpts , params ) {
533- return cellText ( getSelectCellValue ( renderOpts , params ) )
550+ return getCellLabelVNs ( renderOpts , params , getSelectCellValue ( renderOpts , params ) )
534551 } ,
535552 renderFilter ( renderOpts , params ) {
536553 const { options = [ ] , optionGroups, optionProps = { } , optionGroupProps = { } } = renderOpts
@@ -642,15 +659,15 @@ export const VXETablePluginElement = {
642659 ElCascader : {
643660 renderEdit : createEditRender ( ) ,
644661 renderCell ( renderOpts , params ) {
645- return cellText ( getCascaderCellValue ( renderOpts , params ) )
662+ return getCellLabelVNs ( renderOpts , params , getCascaderCellValue ( renderOpts , params ) )
646663 } ,
647664 renderItemContent : createFormItemRender ( ) ,
648665 exportMethod : createExportMethod ( getCascaderCellValue )
649666 } ,
650667 ElDatePicker : {
651668 renderEdit : createEditRender ( ) ,
652669 renderCell ( renderOpts , params ) {
653- return cellText ( getDatePickerCellValue ( renderOpts , params ) )
670+ return getCellLabelVNs ( renderOpts , params , getDatePickerCellValue ( renderOpts , params ) )
654671 } ,
655672 renderFilter ( renderOpts , params ) {
656673 const { column } = params
@@ -698,9 +715,7 @@ export const VXETablePluginElement = {
698715 ElTimePicker : {
699716 renderEdit : createEditRender ( ) ,
700717 renderCell ( renderOpts , params ) {
701- return [
702- getTimePickerCellValue ( renderOpts , params )
703- ]
718+ return getCellLabelVNs ( renderOpts , params , getTimePickerCellValue ( renderOpts , params ) )
704719 } ,
705720 renderItemContent : createFormItemRender ( ) ,
706721 exportMethod : createExportMethod ( getTimePickerCellValue )
0 commit comments