Skip to content
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

[NoticeIcon] Replace LoadMore with ViewMore button #3439

Merged
merged 17 commits into from
Mar 3, 2019
Merged

[NoticeIcon] Replace LoadMore with ViewMore button #3439

merged 17 commits into from
Mar 3, 2019

Conversation

imhele
Copy link
Contributor

@imhele imhele commented Jan 21, 2019

  • Remove prop name
  • Replace LoadMore with ViewMore

@chenshuai2144
Copy link
Collaborator

chenshuai2144 commented Jan 21, 2019

调整一下你的 loadmore 样式吧,现在太丑了
变成一个 tag,怎么样?

@netlify
Copy link

netlify bot commented Jan 21, 2019

Deploy preview for ant-design-pro ready!

Built with commit 11a22b6

https://deploy-preview-3439--ant-design-pro.netlify.com

@imhele
Copy link
Contributor Author

imhele commented Jan 21, 2019

调整一下你的 loadmore 样式吧,现在太丑了

我也这么觉得 🤐 我去想想咋改

@imhele imhele changed the title enhance LoadMore: debounce enhance NoticeIcon Jan 23, 2019
@imhele imhele closed this Jan 29, 2019
@imhele imhele reopened this Jan 29, 2019
@imhele
Copy link
Contributor Author

imhele commented Jan 29, 2019

手残 🤦‍♂️
本来想写成鼠标 hover 从底部浮出一个 <Button shape="circle" icon="arrow-down" /> ,但是一直没想出移动端怎么处理,还是先改成 Tag 再说

image

或者这样

image

showClearonLoadMore 其中一项置 false 时就是原先的单个操作项样式

如果要去掉 name 的话,需要在 NoticeIcon 引入 <FormattedMessage /> ,感觉在组件里用这个不太合适。

@chenshuai2144
Copy link
Collaborator

感觉加载更多可以去掉,变成 查看更多 什么的

@imhele
Copy link
Contributor Author

imhele commented Jan 30, 2019

感觉加载更多可以去掉,变成 查看更多 什么的

是去除之前的加载更多的逻辑吗?

@chenshuai2144
Copy link
Collaborator

是的,感觉这个地方没必要加载更多,真实的业务场景应该只需要 显示 count 就好了,别的可以跳转到专门的消息页面去看。

@chenshuai2144
Copy link
Collaborator

加个查看更多的按钮好了。

@chenshuai2144
Copy link
Collaborator

如果要去掉 name 的话,需要在 NoticeIcon 引入 ,感觉在组件里用这个不太合适

不能都用 title 吗?

@imhele
Copy link
Contributor Author

imhele commented Jan 31, 2019

是的,感觉这个地方没必要加载更多,真实的业务场景应该只需要 显示 count 就好了,别的可以跳转到专门的消息页面去看。

Ok,在 NoticeList 里滚动到底之后也会引发页面滚动,然后又需要滚动回顶部看通知,体验也不是很好

@imhele
Copy link
Contributor Author

imhele commented Jan 31, 2019

如果要去掉 name 的话,需要在 NoticeIcon 引入 ,感觉在组件里用这个不太合适

不能都用 title 吗?

可以,但是需要把国际化移到 locale 属性里面,用 title 标识 Tab ,从 locale[title] || title 取国际化文案

@imhele
Copy link
Contributor Author

imhele commented Jan 31, 2019

加个查看更多的按钮好了。

已经处理完毕

@xiaohuoni
Copy link
Member

@imhele 有冲突

@imhele
Copy link
Contributor Author

imhele commented Feb 27, 2019

这个pr处理一下?

对,差不多忙完了回来处理一下,我先合并一下 master

@imhele imhele changed the title enhance NoticeIcon [NoticeIcon] Replace LoadMore with ViewMore button Feb 27, 2019
@imhele
Copy link
Contributor Author

imhele commented Feb 27, 2019

@chenshuai2144 这里还有什么需要改动的吗?

@chenshuai2144
Copy link
Collaborator

这个 ci 总是挂的。

@chenshuai2144 chenshuai2144 merged commit 6f0e247 into ant-design:master Mar 3, 2019
chenshuai2144 pushed a commit that referenced this pull request Mar 5, 2019
* fix: error-processing-request (#3402)

* Close: #3398

* error authority is undefined

* feat: add new config "menu.enableLocale" (#3310)

* feat: add new config "layoutLocal"

* Use enableLayoutLocale instead of layoutLocale

* Use enableMenuLocale instead of enableMenuLocale

* use menu.disableLocal

* Fix an issue in list item Add (#3423)

* try fix test error (#3424)

* try fix test error

* try fix ci error in windows

* feat: Routing is in the root directory can also matchs. (#3364)

* fix viewport content

Error parsing a meta element's content: ';' is not a valid key-value pair separator. Please use ',' instead.

* Set up CI with Azure Pipelines (#3268)

* Set up CI with Azure Pipelines

* change some js filemod to 644 (#3447)

* fix #2851 (#3440)

* add responsive-table (#3472)

* remove PureComponent (#3470)

* remove PureComponent

* fix typo

* chore: upgrade jest-puppeteer and remove some puppeteer config

* html prettier (#3473)

* prettier html

* update dependencies

* centering icon

* set icon size

* edit text

* Removed redundant colon - zh-CN (#3480)

* Removed redundant colon - zh-CN

* Removed redundant colon - zh-TW

* Removed redundant colon - en-US

* fix: horizontal scroll bar appears on SiderMenu with light navTheme (#3381)

* fix: horizontal scroll bar appears on SiderMenu with light navTheme

* a better solution

* fix Badge error (#3488)

* fix tag error

* Move flags to badges in README

* Make "home" optional in breadcrumb (#3416)

* fixed submenu collapsed when refresh page (#3494)

* perf: add checkout config in azure (#3498)

* 🆙 upgrade deps (#3503)

* fix: unresponsive collapse btn on mobile (#3504)

* style: prettier SiderMenu.js (#3501)

* style: prettier SiderMenu.js

* new config file

* fix ci error

* feat: support pwa config (#3508)

* feat: support pwa config

* style: change code style

* reset ci (#3507)

* add actionsText prop to TagSelect, add locales to List page #3367 (#3442)

* add actionsText prop to TagSelect, add locales to List page

* add actionsText prop to TagSelect, add locales to List page

* 修正繁体中文文案 (#3511)

* Route authority attribute behavior (#3514)

* fix customize menu icon bug (#3509)

* fix customize menu icon bug

当采用自定义菜单图标(即通过url引用方式)且菜单折叠时,文字不隐藏

* fix customize menu icon bug

修改样式

* feat: add a demo that jump to details (#3502)

* feat: add a demo that jump to details

* feat: hide progress in coi

* remove trigger config

* remove fetchDepth: 1

* refactor: userinfo and application  from api

* style: fix code style

* Enhance stylelint rules, fix propTypes error of TagSelect (#3518)

* add stylelint shareable config for css modules

* fix CSS pseudo element with double colon

* support stylelint declaration-block-no-ignored-properties rule

* support sorted CSS properties order for readability and consistency

* autofix order of all styles by lint:fix script

* fix propTypes error of TagSelect component

* Revert "autofix order of all styles by lint:fix script"

This reverts commit 51cb9d0.

* Revert "support sorted CSS properties order for readability and consistency"

This reverts commit ff6c24d.

* make lint:fix work for stylelint

* Revert "Revert "autofix order of all styles by lint:fix script""

This reverts commit 946ed0a.

* Revert "Revert "support sorted CSS properties order for readability and consistency""

This reverts commit 31b557e.

* Update README.zh-CN.md

* doc: add umi-badge (#3538)

* doc: add umi-badge

* Update README.ru-RU.md (#3539)

add umi badge

* feat: Officially traded will use cdn to optimize bizchart (#3535)

* route authority attribute behavior no use while (#3522)

* route authority attribute behavior no use while

* i18n pt-BR: analysis & component (#3540)

* Translation of form and monitor (pt-BR)

* Change flag of Portugal (pt-PT) to Brazil (pt-BR)

* i18n pt-BR: analysis & component

* Fix missing export default  (#3525)

* fix types missing export default

* Update package.json

* Update index.d.ts

* Update index.d.ts

* Update index.d.ts

* 增加IconFont组件、菜单图标可以使用自己的IconFont项目图标 (#3517)

* feature:
1.add iconfont component;
2.menu can add iconfont icon.

* fix: 调整菜单引入iconfont的方式为String.
1. 新增IconFont组件,需在组件内配置自己的IconFont图标项目地址;
2. 然后,菜单图标可以引入自己的IconFont图标,图标字符串以icon-开头.

* ajust: put the IconFont Script Url into defaultSetting.js

* 调整iconfontUrl名称

* fix:注释更新

* 留空iconfontUrl

* Site title use defaultSettings (#3546)

* Site title od top use defaultSettings (#3551)

* pref: optimize performance (#3542)

* pref: optimize performance

* pref: use less img

* pref: use less img

* fix: Eslint warning of Mock dependence (#3554)

* perf: use requestAnimationFrame

* Fix: onPressEnter trigger twice login request in IE11

* Fix: onPressEnter trigger twice login request in IE11

* Login title (#3564)

* Added document title to UserLayout by identifying the current route object and using its name kaey to set the title

* Adjusment to document title

* feat: use same getPageTile function

* when select 3 item ,text branch

* style: use standard frontmatter

* doc: remove subtitle in en-Us

* better demo md

* fix PageHeader no title bug (#3583)

* fix PageHeader no title bug

* default value

* fix: React does not recognize the `staticContext` prop on a DOM element. (#3582)

* doc: better demo

* remove drawer onHandleClick, ant-design/ant-design#15051 (#3602)

* Use Umi Permission Routing (#3587)

Use Umi Permission Routing

* fix the problem that breadcrumbNameMap does not contain hidden menus. (#3606)

* Update enzyme to version 3.9.0

* Update package.json

* Update jest-puppeteer to version 4.0.0

* Update prettier to version 1.16.4

* Update package.json

* 🐛 fix TagCloud style override bug (#3632)

* Update stylelint-config-prettier to version 5.0.0

* Update index.md (#3644)

* dead code (#3639)

* dead code
Close: #3637

* delete dead props

* [NoticeIcon] Replace `LoadMore` with `ViewMore` button (#3439)

* enhance LoadMore: Debounce

* enhance LoadMore: debounce

* use Tag instead of div

* rewrite margin-right of Tag

* hide LoadMore in NoticeList without onLoadMore

* another style

* fix a mistake

* remove local config

* fix a bug

* user-select: none

* remover local config

* replace global/fetchMoreNotices with global/fetchNotices

* replace LoadMore with ViewMore

* remove prop `name` in NoticeIcon

* fix: tab title does not show correct text

* Fix margin top style error of Description List following Description List (#3653)

* fix login model statu
@imhele imhele deleted the enhance-LoadMore branch March 12, 2019 15:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants