Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
phsl
/
admin
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
9e86e47c
authored
Feb 27, 2024
by
dhb52
Committed by
芋道源码
Feb 27, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
!391 perf: utils/formatDate.ts更好的ts类型
* perf: utils/formatDate.ts更好的ts类型
parent
c0eaad3a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
22 deletions
+12
-22
src/utils/formatTime.ts
+12
-22
No files found.
src/utils/formatTime.ts
View file @
9e86e47c
import
dayjs
from
'dayjs'
import
dayjs
from
'dayjs'
import
type
{
TableColumnCtx
}
from
'element-plus'
/**
/**
* 日期快捷选项适用于 el-date-picker
* 日期快捷选项适用于 el-date-picker
...
@@ -68,10 +69,7 @@ export function formatDate(date: Date, format?: string): string {
...
@@ -68,10 +69,7 @@ export function formatDate(date: Date, format?: string): string {
return
''
return
''
}
}
// 日期存在,则进行格式化
// 日期存在,则进行格式化
if
(
format
===
undefined
)
{
return
date
?
dayjs
(
date
).
format
(
format
??
'YYYY-MM-DD HH:mm:ss'
)
:
''
format
=
'YYYY-MM-DD HH:mm:ss'
}
return
dayjs
(
date
).
format
(
format
)
}
}
/**
/**
...
@@ -171,7 +169,7 @@ export function formatAxis(param: Date): string {
...
@@ -171,7 +169,7 @@ export function formatAxis(param: Date): string {
* @param ms 毫秒
* @param ms 毫秒
* @returns {string} 字符串
* @returns {string} 字符串
*/
*/
export
function
formatPast2
(
ms
)
{
export
function
formatPast2
(
ms
:
number
):
string
{
const
day
=
Math
.
floor
(
ms
/
(
24
*
60
*
60
*
1000
))
const
day
=
Math
.
floor
(
ms
/
(
24
*
60
*
60
*
1000
))
const
hour
=
Math
.
floor
(
ms
/
(
60
*
60
*
1000
)
-
day
*
24
)
const
hour
=
Math
.
floor
(
ms
/
(
60
*
60
*
1000
)
-
day
*
24
)
const
minute
=
Math
.
floor
(
ms
/
(
60
*
1000
)
-
day
*
24
*
60
-
hour
*
60
)
const
minute
=
Math
.
floor
(
ms
/
(
60
*
1000
)
-
day
*
24
*
60
-
hour
*
60
)
...
@@ -199,12 +197,8 @@ export function formatPast2(ms) {
...
@@ -199,12 +197,8 @@ export function formatPast2(ms) {
* @param column 字段
* @param column 字段
* @param cellValue 字段值
* @param cellValue 字段值
*/
*/
// @ts-ignore
export
function
dateFormatter
(
_row
:
any
,
_column
:
TableColumnCtx
<
any
>
,
cellValue
:
any
):
string
{
export
const
dateFormatter
=
(
row
,
column
,
cellValue
):
string
=>
{
return
cellValue
?
formatDate
(
cellValue
)
:
''
if
(
!
cellValue
)
{
return
''
}
return
formatDate
(
cellValue
)
}
}
/**
/**
...
@@ -214,12 +208,8 @@ export const dateFormatter = (row, column, cellValue): string => {
...
@@ -214,12 +208,8 @@ export const dateFormatter = (row, column, cellValue): string => {
* @param column 字段
* @param column 字段
* @param cellValue 字段值
* @param cellValue 字段值
*/
*/
// @ts-ignore
export
function
dateFormatter2
(
_row
:
any
,
_column
:
TableColumnCtx
<
any
>
,
cellValue
:
any
):
string
{
export
const
dateFormatter2
=
(
row
,
column
,
cellValue
)
=>
{
return
cellValue
?
formatDate
(
cellValue
,
'YYYY-MM-DD'
)
:
''
if
(
!
cellValue
)
{
return
}
return
formatDate
(
cellValue
,
'YYYY-MM-DD'
)
}
}
/**
/**
...
@@ -227,7 +217,7 @@ export const dateFormatter2 = (row, column, cellValue) => {
...
@@ -227,7 +217,7 @@ export const dateFormatter2 = (row, column, cellValue) => {
* @param param 传入日期
* @param param 传入日期
* @returns 带时间00:00:00的日期
* @returns 带时间00:00:00的日期
*/
*/
export
function
beginOfDay
(
param
:
Date
)
{
export
function
beginOfDay
(
param
:
Date
)
:
Date
{
return
new
Date
(
param
.
getFullYear
(),
param
.
getMonth
(),
param
.
getDate
(),
0
,
0
,
0
)
return
new
Date
(
param
.
getFullYear
(),
param
.
getMonth
(),
param
.
getDate
(),
0
,
0
,
0
)
}
}
...
@@ -236,7 +226,7 @@ export function beginOfDay(param: Date) {
...
@@ -236,7 +226,7 @@ export function beginOfDay(param: Date) {
* @param param 传入日期
* @param param 传入日期
* @returns 带时间23:59:59的日期
* @returns 带时间23:59:59的日期
*/
*/
export
function
endOfDay
(
param
:
Date
)
{
export
function
endOfDay
(
param
:
Date
)
:
Date
{
return
new
Date
(
param
.
getFullYear
(),
param
.
getMonth
(),
param
.
getDate
(),
23
,
59
,
59
)
return
new
Date
(
param
.
getFullYear
(),
param
.
getMonth
(),
param
.
getDate
(),
23
,
59
,
59
)
}
}
...
@@ -245,7 +235,7 @@ export function endOfDay(param: Date) {
...
@@ -245,7 +235,7 @@ export function endOfDay(param: Date) {
* @param param1 日期1
* @param param1 日期1
* @param param2 日期2
* @param param2 日期2
*/
*/
export
function
betweenDay
(
param1
:
Date
,
param2
:
Date
)
{
export
function
betweenDay
(
param1
:
Date
,
param2
:
Date
)
:
number
{
param1
=
convertDate
(
param1
)
param1
=
convertDate
(
param1
)
param2
=
convertDate
(
param2
)
param2
=
convertDate
(
param2
)
// 计算差值
// 计算差值
...
@@ -257,7 +247,7 @@ export function betweenDay(param1: Date, param2: Date) {
...
@@ -257,7 +247,7 @@ export function betweenDay(param1: Date, param2: Date) {
* @param param1 日期
* @param param1 日期
* @param param2 添加的时间
* @param param2 添加的时间
*/
*/
export
function
addTime
(
param1
:
Date
,
param2
:
number
)
{
export
function
addTime
(
param1
:
Date
,
param2
:
number
)
:
Date
{
param1
=
convertDate
(
param1
)
param1
=
convertDate
(
param1
)
return
new
Date
(
param1
.
getTime
()
+
param2
)
return
new
Date
(
param1
.
getTime
()
+
param2
)
}
}
...
@@ -266,7 +256,7 @@ export function addTime(param1: Date, param2: number) {
...
@@ -266,7 +256,7 @@ export function addTime(param1: Date, param2: number) {
* 日期转换
* 日期转换
* @param param 日期
* @param param 日期
*/
*/
export
function
convertDate
(
param
:
Date
|
string
)
{
export
function
convertDate
(
param
:
Date
|
string
)
:
Date
{
if
(
typeof
param
===
'string'
)
{
if
(
typeof
param
===
'string'
)
{
return
new
Date
(
param
)
return
new
Date
(
param
)
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment