Pre Merge pull request !390 from dhb52/N/A
commit
67e036d8a7
|
|
@ -1,4 +1,5 @@
|
||||||
import dayjs from 'dayjs'
|
import dayjs from 'dayjs'
|
||||||
|
import type { TableColumnCtx } from 'element-plus'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 日期快捷选项适用于 el-date-picker
|
* 日期快捷选项适用于 el-date-picker
|
||||||
|
|
@ -199,8 +200,7 @@ export function formatPast2(ms) {
|
||||||
* @param column 字段
|
* @param column 字段
|
||||||
* @param cellValue 字段值
|
* @param cellValue 字段值
|
||||||
*/
|
*/
|
||||||
// @ts-ignore
|
export const dateFormatter = (_row: any, _column: TableColumnCtx<any>, cellValue: any): string => {
|
||||||
export const dateFormatter = (row, column, cellValue): string => {
|
|
||||||
if (!cellValue) {
|
if (!cellValue) {
|
||||||
return ''
|
return ''
|
||||||
}
|
}
|
||||||
|
|
@ -214,10 +214,9 @@ export const dateFormatter = (row, column, cellValue): string => {
|
||||||
* @param column 字段
|
* @param column 字段
|
||||||
* @param cellValue 字段值
|
* @param cellValue 字段值
|
||||||
*/
|
*/
|
||||||
// @ts-ignore
|
export const dateFormatter2 = (_row: any, _column: TableColumnCtx<any>, cellValue: any): string => {
|
||||||
export const dateFormatter2 = (row, column, cellValue) => {
|
|
||||||
if (!cellValue) {
|
if (!cellValue) {
|
||||||
return
|
return ''
|
||||||
}
|
}
|
||||||
return formatDate(cellValue, 'YYYY-MM-DD')
|
return formatDate(cellValue, 'YYYY-MM-DD')
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue