mirror of
https://gitee.com/nocobase/nocobase.git
synced 2025-05-06 05:59:25 +08:00
Merge branch 'next' into develop
This commit is contained in:
commit
601329825b
@ -89,7 +89,7 @@ const toMoment = (val: any, options?: Str2momentOptions) => {
|
||||
}
|
||||
|
||||
if (dayjs.isDayjs(val)) {
|
||||
return val.utcOffset(offsetFromString(offset));
|
||||
return offset ? val.utcOffset(offsetFromString(offset)) : val;
|
||||
}
|
||||
if (gmt) {
|
||||
return dayjs(val).utcOffset(0);
|
||||
|
Loading…
x
Reference in New Issue
Block a user