Feat(date picker) support month type #1202
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov Report
@@ Coverage Diff @@
## main #1202 +/- ##
==========================================
- Coverage 50.39% 50.09% -0.31%
==========================================
Files 518 519 +1
Lines 12834 12919 +85
Branches 3649 3675 +26
==========================================
+ Hits 6468 6472 +4
- Misses 5270 5349 +79
- Partials 1096 1098 +2
Continue to review full report at Codecov.
|
doom-9-zz
force-pushed
the
feat(date-picker)-support-month-type
branch
from
f0f491c to
b388449
Compare
doom-9-zz
changed the title
07akioni
reviewed
Sep 22, 2021
src/date-picker/src/panel/month.tsx
Outdated
| {{ | ||
| default: () => [ | ||
| ...this.monthArray.map((monthItem, i) => ( | ||
| <div |
There was a problem hiding this comment.
我感觉 item render 的重复好像比较多，月份和年份有很多重复代码。把公共的部分抽象一下。
07akioni
reviewed
Sep 22, 2021
doom-9-zz
force-pushed
the
feat(date-picker)-support-month-type
branch
from
dc23e55 to
fac9c2d
Compare
07akioni
reviewed
Sep 23, 2021
src/date-picker/src/DatePicker.tsx
Outdated
| @@ -448,6 +469,7 @@ export default defineComponent({ | |||
| function openCalendar (): void { | |||
| if (mergedDisabledRef.value || mergedShowRef.value) return | |||
| doUpdateShow(true) | |||
| void nextTick(scrollTimer) | |||
There was a problem hiding this comment.
if (props.type === 'month')
src/date-picker/src/DatePicker.tsx
Outdated
| ) : ( | ||
| <DatePanel {...commonPanelProps} /> | ||
| ), | ||
|
|
src/date-picker/src/interface.ts
Outdated
Comment on lines
46
to
47
| monthScrollRef?: ScrollbarInst | ||
| yearScrollRef?: VirtualListInst |
There was a problem hiding this comment.
Suggested change
| monthScrollRef?: ScrollbarInst | |
| yearScrollRef?: VirtualListInst | |
| monthScrollRef: ScrollbarInst | null | |
| yearScrollRef: VirtualListInst | null |
类型表现要尽量和 runtime 一致
src/date-picker/src/panel/month.tsx
Outdated
| }, | ||
| render () { | ||
| const { mergedClsPrefix, mergedTheme, shortcuts } = this | ||
| const itemRenderer = (item: YearItem | MonthItem, i: number): VNode => { |
There was a problem hiding this comment.
这个看看能不提到 setup 里面，在 render 里面不好看
src/date-picker/src/utils.ts
Outdated
| @@ -59,6 +85,28 @@ export interface DateItem { | |||
| ts: number | |||
| } | |||
|
|
|||
| export interface MonthItem { | |||
| type: string | |||
There was a problem hiding this comment.
type: 'month'
这种地方要精确，type guard 才会生效，不然 if else 分支都拿不到正确的类型
src/date-picker/src/utils.ts
Outdated
| inCurrentMonth: boolean | ||
| selected: boolean | ||
| ts: number | ||
| showText?: string |
There was a problem hiding this comment.
Suggested change
| showText?: string | |
| formattedText?: string |
doom-9-zz
force-pushed
the
feat(date-picker)-support-month-type
branch
from
d0c70dc to
9e8d7b8
Compare
07akioni
reviewed
Sep 25, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.