feat:日历组件展示日程 #3058
Merged
feat:日历组件展示日程 #3058
Conversation
This file contains hidden or 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
added 3 commits
November 25, 2021 17:30
ucasliyuan
reviewed
Nov 26, 2021
| | clearable | `boolean` | `true` | 是否可清除 | | ||
| | embed | `boolean` | `false` | 是否内联模式 | | ||
| | timeConstraints | `object` | `true` | 请参考： [react-datetime](https://github.com/YouCanBookMe/react-datetime) | | ||
| | schedules | `object` | | 日历中展示日程 | |
| | timeConstraints | `object` | `true` | 请参考： [react-datetime](https://github.com/YouCanBookMe/react-datetime) | | ||
| | schedules | `object` | | 日历中展示日程 | | ||
| | scheduleColors | `Array<string>` | `['#0bc286', '#ffb200', '#ea2e2e', '#343a40']` | 日历中展示日程的颜色 | | ||
| | scheduleAction | `object` | | 自定义日程展示 | |
src/components/DatePicker.tsx
Outdated
| schedules?: Array<{ | ||
| startTime: Date, | ||
| endTime: Date, | ||
| content: string, |
Contributor
There was a problem hiding this comment.
content 可以支持传reactnode吗
src/components/DatePicker.tsx
Outdated
| content: string, | ||
| color?: string | ||
| }>; | ||
| scheduleColors?: Array<string>; |
Collaborator
Author
There was a problem hiding this comment.
为了用户使用的时候方便，用color比较好
Member
There was a problem hiding this comment.
统一叫 level?: 'primary' | 'success' | 'danger' 之类的？
2betop
reviewed
Nov 30, 2021
| /** | ||
| * 日程 | ||
| */ | ||
| schedules?: Array<{ |
Member
There was a problem hiding this comment.
schedules 需要支持字符串格式比如 schedules: '${xxxData}' 从上下文中取数据，这个数据可能是form initApi 拉取过来的，也可能是上层 service 拉取的。
added 2 commits
December 1, 2021 15:12
2betop
reviewed
Dec 1, 2021
src/components/DatePicker.tsx
Outdated
| className?: string | ||
| }>; | ||
| scheduleClassNames?: Array<string>; | ||
| scheduleAction?: React.ReactElement; |
2betop
reviewed
Dec 1, 2021
src/components/DatePicker.tsx
Outdated
| this.handlePopOverClick = this.handlePopOverClick.bind(this); | ||
| this.renderShortCuts = this.renderShortCuts.bind(this); | ||
|
|
||
| if (props.schedules) { |
Member
There was a problem hiding this comment.
props 发生变化，并没有同步到 state 里面，那这个属性就不是一个外部可控制的属性了。
另外并没有看到 setState 语句，意思是后续不需要变动，为何不是直接用 props 就够了。
2betop
reviewed
Dec 1, 2021
src/components/calendar/Calendar.tsx
Outdated
| content: string | React.ReactElement; | ||
| color?: string; | ||
| }>; | ||
| scheduleAction?: React.ReactElement; |
Member
There was a problem hiding this comment.
+1 component 不应该处理 Action 相关逻辑，只有渲染器才需要考虑
2betop
reviewed
Dec 1, 2021
src/components/calendar/DaysView.tsx
Outdated
| content: any, | ||
| className?: string | ||
| }>; | ||
| scheduleAction?: React.ReactElement; |
2betop
reviewed
Dec 1, 2021
src/components/calendar/DaysView.tsx
Outdated
| if (showSchedule.length > 3) { | ||
| break; | ||
| } | ||
| if (moment(schedule[i].startTime).date() === currentDate.date()) { |
Member
There was a problem hiding this comment.
最好用 moment 的 api isSame 什么的，维度设置成 天，目前这样可能不准
2betop
reviewed
Dec 1, 2021
src/components/calendar/DaysView.tsx
Outdated
| <div className={cx('ScheduleCalendar-large-day-wrap')}> | ||
| <div className={cx('ScheduleCalendar-large-schedule-header')}>{currentDate.date()}</div> | ||
| {scheduleDiv} | ||
| {schedule.length > 3 && <div className={cx('ScheduleCalendar-large-schedule-footer')}>{schedule.length - 3} more</div>} |
2betop
reviewed
Dec 6, 2021
src/renderers/Form/InputDate.tsx
Outdated
| strictMode: false, | ||
| scheduleAction: { | ||
| actionType: 'dialog', | ||
| dialog: { |
2betop
reviewed
Dec 6, 2021
src/renderers/Form/InputDate.tsx
Outdated
| }); | ||
| } | ||
|
|
||
| if (anyChanged(['schedules'], prevProps, props) || |
movemoving
pushed a commit
to movemoving/amis
that referenced
this pull request
Dec 20, 2021
* feat:日历组件展示日程 * fix: 修改schema * fix: schedule参数说明修改 * fix: 修改schedules参数描述 * fix: 代码调整 * fix: 参数color改为classname * fix: readme文档补充 * feat: 日历组件支持从上下文中获取数据 * fix: 日历组件data获取条件修改 Co-authored-by: hongyang03 <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
这个变动的性质是？
需求背景和解决方案
http://wiki.baidu.com/pages/viewpage.action?pageId=1744160651
更新日志
请求合并前的自查清单