feat: 日历支持footer的children定义，增加日历+datepicker的demo #1277
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 @@
## next #1277 +/- ##
=======================================
Coverage 70.60% 70.60%
=======================================
Files 198 198
Lines 7776 7776
Branches 2217 2217
=======================================
Hits 5490 5490
Misses 2085 2085
Partials 201 201
|
oasis-cloud
requested changes
Aug 3, 2023
| @@ -167,7 +167,7 @@ const App = () => { | |||
|
|
|||
| return ( | |||
| <> | |||
| <Cell title="选择周" description={ date3 && date3.length ? `${date3[0]}${translated['8dab2f66']}${date3[1]}` : '请选择' } onClick={ openSwitch3 } /> | |||
src/packages/calendar/calendar.scss
Outdated
| @@ -211,13 +207,14 @@ | |||
| // 底部导航 | |||
| &-footer { | |||
| display: flex; | |||
| height: 62px; | |||
| // height: 62px; | |||
src/packages/calendar/demo.scss
Outdated
| display: flex; | ||
| } | ||
|
|
||
| .desc { |
There was a problem hiding this comment.
建议 demo.scss 中的 class 也符合 bem 规范，避免和其他 demo 的冲突
| @@ -333,6 +357,26 @@ const CalendarDemo = () => { | |||
| ) | |||
| } | |||
|
|
|||
| const [show1, setShow1] = useState(false) | |||
| const [dpAbled, setDatePickerAbled] = useState([false, false]) | |||
| const [desc1, setDesc1] = useState('10:00:00') | |||
There was a problem hiding this comment.
开始和结束时间是2位的，选择时间后，现实的是1位的，例如显示 4:0:0，建议和初试时间的格式保持一致
This was
linked to
issues
Aug 3, 2023
xiaoyatong
added a commit
that referenced
this pull request
Aug 9, 2023
* fix(Address): 修复Address组件通过点击CloseIcon和Overlay关闭后，无法再次打开的问题 (#1233) * fix(button): 渐变色导致边框出现重叠 (#1250) * chore(release): v2.0.6 * feat: uploader 添加上传的响应数据 (#1251) * feat: formitem label 支持 reactnode (#1254) * chore: 优化 any 类型 (#1222) * docs(SearchBar): 补充 onClear 属性说明 (#1256) * chore(release): v2.0.7 * feat: 增加了space组件 (#1259) * refactor: tabs 去除 console (#1261) Remove console log * chore(script): 简化开发环境启动逻辑 (#1264) * chore(scriptt): 简化开发环境启动逻辑 * chore(script): 调整 taro demo 生成逻辑 * chore(release): v2.0.8 * fix: space 版本号修改为 2.0 (#1265) * chore(config): 优化 taro demo 环境配置文件 (#1266) * docs: cascader 文档更新 (#1270) * feat(notify): 支持函数调用的展开和关闭 (#1271) * docs: 升级文档更新 (#1274) * docs: tag 文档和 demo 同步 (#1275) * docs: tag 文档和 demo 同步 * docs: tag 文档和 demo 同步 * chore(release): v2.0.9 * feat: 日历组件支持在 footer 部分的children自定义，增加demo 日历+datepicker的交互demo * docs: 补充文档 * fix: elevator 计算索引出现 -1，导致组件运行报错 (#1276) * fix: review * feat: loading 组件 (#1204) * feat: loading功能实现,目前由于taro环境在windows10下无法启动,所以只测试了h5版本的代码 * fix:修正eslint的一些错误 * fix: 修正测试用例用的问题, 坑: 使用npm run add后生成的模板,tsx里面会有引入scss,但是实际上并不能 引入这个文件,否则执行测试就报错 * fix: eslint格式规范修正 * fix: 排列方式的设置统一改成和其他组件一样, direction=horizontal|vertical * fix: 去掉一些可以用主题和样式来配置的属性,修正了对taro的支持 * fix: 根据规范,修改代码 * fix: 修正一个导出类型的路径bug * feat: 日历支持footer的children定义，增加日历+datepicker的demo (#1277) * feat: 日历组件支持在 footer 部分的children自定义，增加demo 日历+datepicker的交互demo * docs: 补充文档 * fix: review * fix: loading 组件导出 props 类型 (#1278) * feat: 修改名字，废弃-0 * chore(release): v2.0.10 * feat: 修订名称。 * docs: numberkeyboard 的 type 属性类型更新 (#1284) * feat: 新增 tour 引导组件 (#1279) * docs: step 组件的 description 属性示例改为节点的实现方式 (#1289) * docs: divider 组件的 styles 属性示例改为 style (#1290) * fix: numberkeyboard 设置标题后，完成按钮应该触发 onConfirm 事件 (#1285) * docs: numberkeyboard 的 type 属性类型更新 * fix: numberkeyboard 设置标题后，完成按钮应该触发 onConfirm 事件 * fix: input 组件点击清除图标无法清空内容 (#1292) * docs: 调整 image tao 文档中引入包名 (#1295) * fix: uploader taro-h5 上传状态样式错乱 (#1293) * fix: uploader h5/taro 增加校验 (#1297) * fix: 修改migrate文档 * fix: 调整文档 * fix: 修改v1升级到v2的兼容文档 * fix: 提交h5的uploader样式错乱的问题 * fix: 提交uploader校验判断 * fix: h5下多选上传时 uid 重复的问题 (#1269) Co-authored-by: liuqh <[email protected]> * feat: 通用字号。 * feat: 通用+button，button的样式展示逻辑做了修订。 * docs: button * feat: button 增加 rightIcon ，增加仅有icon的样式处理。 --------- Co-authored-by: Tralafalgar Wang <[email protected]> Co-authored-by: oasis-cloud <[email protected]> Co-authored-by: 逍遥 <[email protected]> Co-authored-by: junjun666 <[email protected]> Co-authored-by: ivan-My <[email protected]> Co-authored-by: vapao <[email protected]> Co-authored-by: Eiinu <[email protected]> Co-authored-by: mike8625 <[email protected]> Co-authored-by: Liuqh233 <[email protected]> Co-authored-by: liuqh <[email protected]>
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.
🤔 这个变动的性质是？
🔗 相关 Issue
💡 需求背景和解决方案
☑️ 请求合并前的自查清单