Skip to content

feat(calendar): 合并2.x功能,支持月面板、季面板,支持展示周号,鸿蒙适配 #3091

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.

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
wants to merge 15 commits into
base: feat_v3.x
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
11,914 changes: 6,008 additions & 5,906 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions scripts/harmony/update-taro-entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const createConfig = async () => {
}
})
}

co = { ...co, pages: co.pages.sort() }
configRef.push(co)
})
Expand Down
9 changes: 5 additions & 4 deletions src/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -477,20 +477,21 @@
"show": true,
"taro": true,
"v15": -1,
"author": "szg2008",
"dd": false
"author": "hanyuxinting",
"dd": true
},
{
"version": "2.0.0",
"version": "3.0.0",
"name": "CalendarItem",
"type": "component",
"cName": "日历",
"desc": "日历,可平铺/弹窗展示",
"sort": 10,
"show": false,
"taro": true,
"exportEmpty": true,
"author": "szg2008",
"dd": false
"dd": true
},
{
"version": "3.0.0",
Expand Down
4 changes: 4 additions & 0 deletions src/locales/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ export interface BaseLang {
start: string
confirm: string
title: string
week: string
month: string
year: string
quarter: string
// eslint-disable-next-line @typescript-eslint/ban-types
monthTitle: Function
today: string
Expand Down
4 changes: 4 additions & 0 deletions src/locales/en-US.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ const enUS: BaseLang = {
start: 'Start',
confirm: 'Confirm',
title: 'Calendar',
week: 'W',
month: 'M',
year: 'Y',
quarter: 'Q',
monthTitle: (year: number, month: number) =>
`${year}/${Number(month) < 10 ? `0${Number(month)}` : month}`,
today: 'Today',
Expand Down
4 changes: 4 additions & 0 deletions src/locales/id-ID.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ const idID: BaseLang = {
start: 'Mulai',
confirm: 'Mengonfirmasi',
title: 'Kalender',
week: 'Mg',
month: 'Bl',
year: 'Th',
quarter: 'Kt',
monthTitle: (year: number, month: number) =>
`${year}/${Number(month) < 10 ? `0${Number(month)}` : month}`,
today: 'Hari ini',
Expand Down
4 changes: 4 additions & 0 deletions src/locales/tr-TR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ const trTR: BaseLang = {
start: 'Başlangıç',
confirm: 'Onayla',
title: 'Takvim seçimi',
week: 'H',
month: 'A',
year: 'Y',
quarter: 'Ç',
monthTitle: (year: number, month: number) =>
`${year}/${Number(month) < 10 ? `0${Number(month)}` : month}`,
today: 'Bugün',
Expand Down
4 changes: 4 additions & 0 deletions src/locales/zh-CN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ const zhCN: BaseLang = {
start: '开始',
confirm: '确认',
title: '日历选择',
week: '周',
month: '月',
year: '年',
quarter: '季度',
monthTitle: (year: number, month: number) =>
`${year}年${Number(month) < 10 ? `0${Number(month)}` : month}月`,
today: '今天',
Expand Down
4 changes: 4 additions & 0 deletions src/locales/zh-TW.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ const zhCN: BaseLang = {
start: '開始',
confirm: '確認',
title: '日歷選擇',
week: '周',
month: '月',
year: '年',
quarter: '季度',
monthTitle: (year: number, month: number) =>
`${year}年${Number(month) < 10 ? `0${Number(month)}` : month}月`,
today: '今天',
Expand Down
4 changes: 4 additions & 0 deletions src/locales/zh-UG.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@ const zhUG: BaseLang = {
start: 'بېشى',
confirm: 'جەزملەشتۈرۈڭ',
title: 'تاللاڭ',
week: 'ھە',
month: 'ئا',
year: 'ي',
quarter: 'پە',
monthTitle: (year: number, month: number) =>
`${year} يىلى ${Number(month) < 10 ? `0${Number(month)}` : month} ئاي`,
today: 'بۈگۈن',
Expand Down

Large diffs are not rendered by default.

Loading
Loading