Merge branch 'next' into develop

This commit is contained in:
nocobase[bot] 2025-03-09 08:21:12 +00:00
commit 601329825b

View File

@ -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);