Skip to content

perf(upgrade dayjs's version): upgrade dayjs's version and set default timezone for dayjs #103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Cythia828 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

perf(upgrade dayjs's version): upgrade dayjs's version and set default timezone for dayjs #103

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"vitepress": "^1.6.3"
},
"dependencies": {
"dayjs": "^1.10.6",
"dayjs": "^1.11.13",
"idb": "^8.0.0",
"js-base64": "^3.7.7",
"js-cookie": "^3.0.5",
Expand Down
2 changes: 1 addition & 1 deletion pnpm-lock.yaml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 17 additions & 3 deletions src/formatDateTime/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
import dayjs from 'dayjs';
import baseDayJs from 'dayjs';
import timezone from 'dayjs/plugin/timezone'; // ES 2015
import utc from 'dayjs/plugin/utc'; // ES 2015

baseDayJs.extend(utc);
baseDayJs.extend(timezone);
// 默认时区
const DEFAULT_TIMEZONE = 'Asia/Shanghai';
/**
* 将时间转换为默认时区
* @param {string | number | Date} time - 输入时间
* @return {dayjs.Dayjs} 带时区的Dayjs对象
*/
const dayjs = (...args) => baseDayJs(...args).tz(DEFAULT_TIMEZONE);

/**
* @category 枚举
* 日期和时间格式模式的枚举
Expand Down Expand Up @@ -74,7 +88,7 @@ export enum DateTimeFormat {
FULL_DATETIME_ISO = 'YYYY-MM-DDTHH:mm:ssZ',
}

type DateTimeInput = string | number | Date | dayjs.Dayjs;
type DateTimeInput = string | number | Date | baseDayJs.Dayjs;
type FormatPattern = DateTimeFormat | string;
/**
* 一个日期时间格式化工具，可处理各种输入类型和格式化模式。
Expand Down Expand Up @@ -120,7 +134,7 @@ type FormatPattern = DateTimeFormat | string;
export const formatDateTime = (
date: DateTimeInput,
format: FormatPattern = DateTimeFormat.STANDARD
): string | dayjs.Dayjs => {
): string | baseDayJs.Dayjs => {
const isValidFormat = Object.values<string>(DateTimeFormat).includes(format);

if (!isValidFormat) {
Expand Down
Loading