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

feat: table row check strictly #24931

Merged
merged 37 commits into from
Jun 23, 2020
Merged

feat: table row check strictly #24931

merged 37 commits into from
Jun 23, 2020

Conversation

07akioni
Copy link
Contributor

@07akioni 07akioni commented Jun 11, 2020

[中文版模板 / Chinese template]

🤔 This is a ...

  • New feature
  • Bug fix
  • Site / documentation update
  • Demo update
  • Component style update
  • TypeScript definition update
  • Bundle size optimization
  • Perfermance optimization
  • Refactoring
  • Code style optimization
  • Test Case
  • Branch merge
  • Other (about what?)

🔗 Related issue link

💡 Background and solution

📝 Changelog

Language Changelog
🇺🇸 English 1. Table supports rowSelection.checkStrictly.
2. Fix Table onSelectAll's changeRows parameter is incorrect.
3. Fix Table expand buttons of leaf rows in tree data can still be clicked.
🇨🇳 Chinese 1. Table 支持 rowSelection.checkStrictly
2 修复 Table onSelectAllchangeRows 参数不正确的问题。
3. 修复 Table 树形数据叶节点行的展开按钮仍能被点击的问题。

☑️ Self Check before Merge

⚠️ Please check all items below before review. ⚠️

  • Doc is updated/provided or not needed
  • Demo is updated/provided or not needed
  • TypeScript definition is updated/provided or not needed
  • Changelog is provided or not needed

View rendered components/table/demo/expand-children.md

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Jun 11, 2020

@ant-design-bot
Copy link
Contributor

ant-design-bot commented Jun 11, 2020

@lgtm-com
Copy link

lgtm-com bot commented Jun 11, 2020

This pull request introduces 1 alert when merging 8f96404 into 2be08b8 - view on LGTM.com

new alerts:

  • 1 for Superfluous trailing arguments

@codesandbox-ci
Copy link

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 8f96404:

Sandbox Source
antd reproduction template Configuration

@codesandbox-ci
Copy link

codesandbox-ci bot commented Jun 11, 2020

This pull request is automatically built and testable in CodeSandbox.

To see build info of the built libraries, click here or the icon next to each commit SHA.

Latest deployment of this branch, based on commit 1e3d4aa:

Sandbox Source
antd reproduction template Configuration

@codecov
Copy link

codecov bot commented Jun 11, 2020

Codecov Report

Merging #24931 into feature will increase coverage by 0.02%.
The diff coverage is 100.00%.

Impacted file tree graph

@@             Coverage Diff             @@
##           feature   #24931      +/-   ##
===========================================
+ Coverage    99.46%   99.49%   +0.02%     
===========================================
  Files          368      368              
  Lines         7245     7274      +29     
  Branches      2025     2039      +14     
===========================================
+ Hits          7206     7237      +31     
+ Misses          39       37       -2     
Impacted Files Coverage Δ
components/table/Table.tsx 99.25% <100.00%> (+0.01%) ⬆️
components/table/hooks/useSelection.tsx 99.55% <100.00%> (+1.08%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 0313f97...a1cfe86. Read the comment docs.

@07akioni 07akioni force-pushed the feat-table-row-check-strictly branch from 7021630 to 8306ed2 Compare June 16, 2020 09:46
@07akioni 07akioni changed the title [WIP] feat: table row check strictly feat: table row check strictly Jun 16, 2020
@07akioni 07akioni changed the title feat: table row check strictly [WIP] feat: table row check strictly Jun 16, 2020
@07akioni 07akioni force-pushed the feat-table-row-check-strictly branch from b75fa85 to a348bbc Compare June 16, 2020 10:59
@07akioni 07akioni force-pushed the feat-table-row-check-strictly branch from c5abde0 to 86db753 Compare June 19, 2020 11:29
@07akioni 07akioni changed the title [WIP] feat: table row check strictly feat: table row check strictly Jun 19, 2020
@07akioni
Copy link
Contributor Author

醉了,test 又挂

@07akioni
Copy link
Contributor Author

我印象里 eslint 应该是有能解决 x ? true : y 这种的规则,相比之下人还是不老可靠的

@zombieJ
Copy link
Member

zombieJ commented Jun 19, 2020

截屏2020-06-19 下午9 54 44

顺道

@07akioni 07akioni force-pushed the feat-table-row-check-strictly branch 2 times, most recently from 29ce73b to d071339 Compare June 22, 2020 06:11
@lgtm-com
Copy link

lgtm-com bot commented Jun 22, 2020

This pull request introduces 1 alert when merging 71eb4cb into f61afbb - view on LGTM.com

new alerts:

  • 1 for Useless assignment to local variable

@lgtm-com
Copy link

lgtm-com bot commented Jun 22, 2020

This pull request introduces 1 alert when merging 6db5a6f into f61afbb - view on LGTM.com

new alerts:

  • 1 for Useless assignment to local variable

@lgtm-com
Copy link

lgtm-com bot commented Jun 23, 2020

This pull request introduces 1 alert when merging b801e45 into f61afbb - view on LGTM.com

new alerts:

  • 1 for Useless assignment to local variable

@lgtm-com
Copy link

lgtm-com bot commented Jun 23, 2020

This pull request introduces 1 alert when merging cc64d81 into f61afbb - view on LGTM.com

new alerts:

  • 1 for Useless assignment to local variable

@lgtm-com
Copy link

lgtm-com bot commented Jun 23, 2020

This pull request introduces 1 alert when merging 1e3d4aa into f61afbb - view on LGTM.com

new alerts:

  • 1 for Useless assignment to local variable

@07akioni 07akioni force-pushed the feat-table-row-check-strictly branch from a1cfe86 to ed162f3 Compare June 23, 2020 11:24
@zombieJ zombieJ merged commit 50ae190 into feature Jun 23, 2020
@zombieJ zombieJ deleted the feat-table-row-check-strictly branch June 23, 2020 14:19
@yoyo837
Copy link
Contributor

yoyo837 commented Jun 23, 2020

豆酱隐退不主力输出了?😂

@zombieJ
Copy link
Member

zombieJ commented Jun 24, 2020

豆酱隐退不主力输出了?😂

最近比较忙,你这么盯着我压力略大呐 😂

chenshuai2144 added a commit that referenced this pull request Jun 28, 2020
* feat: add successColor for Progress (#24655)

* feat: add successColor for Progress

* feat: update

* fix: update test

* remove snap

* feat: add test case

* refactor success

* feat: adjust styyle

* feat: add DevWarning

* feat: Support rowSelection.dirty (#24718)

* feat: Support rowSelection.dirty

* rename to reserveKeys

* preserveKeys will keep record also

* to preserveSelectedRowKeys

* feat: add ghost prop for collapse (#24734)

* feat: add ghost prop for collapse

* doc: version of collapse's ghost prop

* refactor: make ghost collapse's less code to a nested style

* chore: remove redundant codes in ghost collapse's less & doc

* doc: add a background wrapper for ghost collapse demo

* doc: dark-theme wrapper bg-color for ghost collapse demo

* test: update snapshot of ghost collapse

* doc: use softer bg-color on ghost collapse demo

* doc: remove disabled panel in ghost collapse demo

* feat: form instance support getFieldInstance (#24711)

* support getFieldInstance

* update doc

* fix lint

* move func

* move into hooks

* update ref logic

* fix lint

* rm only

* fix docs

* feat: dropdown support arrow (#23869)

* feat: dropdown support arrow prop

close #22758

* test: update snapshot

* fix: fix dropdown cls names

* test: update snapshot

* test: update snapshot

* doc: update demo

* test: update demo snapshot

* demo

* fix: snapshot

* chore: change the style of ghost collapse & demo modified (#24762)

* refactor: reduce content padding in ghost collapse

* doc: remove the wrapper outside ghost collapse

Designer want the demo differs from other demos

* refactor: remove redundant .less code in collapse

* feat: cascader dropdown-render prop (#24812)

* feat: cascader dropdown-render prop

* fix: update Cascader dropdownRender type annotation

* fix: set rc-cascader semver from ^ to ~

* docs: fix coding style in cascader/custom-dropdown

* feat: 🆕 support Drawer closeIcon (#24842)

* feat: 🆕 support Drawer closeIcon

close #19283
close #19153

* add test case

* update docs

* feat: 🆕 Cascader expandIcon (#24865)

* feat: cascader expandIcon

* fix: snap

* refactor: reduce CSS size (#24846)

* refactor: reduce button css size

* refactor: remove redundant button .less code

* feat: add Table onChange an action param (#24697)

* Working on tests

* created TableAction type

* changed TableActions to tuple

* removed chinese documentation line

* refactor TableActions

* fix documentation

* Moved action into extra param

* minor doc change

* feat: add closeIcon customize tag close (#24885)

* feat: add closeIcon customize tag close

* docs fix

* update snap

* fix: css name

* update snapshot

* snapshot

* feat: add radio `optionType` api to set radio option type (#24809)

* feat: radio component

* docs: update md

* fix: snap

* test components

* fix: use optionType

* fix name

* add warning

* fix

* feat: expand rate character (#24903)

* feat: expand rate character

* fix: demo

* fix: snap

* Update components/rate/index.zh-CN.md

Co-authored-by: 偏右 <afc163@gmail.com>

* fix

Co-authored-by: 偏右 <afc163@gmail.com>

* Refactor demo code box actions (#24887)

* refactor: refine the styling of actions part of demo code-box

* fix: lint style

* refactor: move Result children to end (#24945)

* feat: remove content max-width on dot-step (#24907)

* feat: add Skeleton-Image (#24805)

* feat: add Skeleton-Image

* feat: add docs

* fix: adjust skeleton

* feat: adjust Image Component

* feat: rebase

* feat: adjust style

* fix: lint

* feat: remove size

* feat: delete md

* feat: fix style

* ✨ feat: Mentions support autoSize (#24961)

close #17746

* chore: replace textarea with rc-textarea (#24966)

* feat: update pagination@2.3.0 support onChange called when pageSize change (#24964)

* feat: update pagination@2.5.0 and add test case to relative component

* fix: lint

* delete

* feat: add test case for pagination

* adjust test case

* feat: Implement centered prop in Tabs (#24958)

* Implement centered in Tabs along with its tests and docs

* Fix build error

* Add Chinese translations and remove test case

Co-authored-by: Ashkan Pourghasem <ashkan.pourghasem@gmail.com>

* feat: Add modal style parameter (#24773)

* add some paramters in default.less

* Update components/style/themes/default.less

Co-authored-by: Amumu <yoyo837@hotmail.com>

* change parameter in compact.less

Co-authored-by: Crystal Gao <jinggao@ebay.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>

* feat: export Tabs addIcon (#25006)

* feat: export Tabs addIcon

* update snapshot

* feat: showNow on timepicker and datetimepicker (#25032)

* feat: update rc-picker@1.7.1 and fix icons of month and quarter picker in DatePicker Component (#25035)

* feat: update rc-picker@1.7.1

* delete

* add

* feat: expand rate support props (#24993)

* docs: 📝 Add Form.Item hidden in doc (#25108)

close #25101

* fix: ⌨️ Improve Pagination accessibility issue (#25119)

* ⌨️ Improve Pagination a11y by fixing a W3C error

react-component/pagination#280

* update snapshot

* 🆙 rc-pagination to 2.4.1

* feat: support triggerSubMenuAction for <Menu /> (#25127)

* feat(menu): add triggerSubMenuAction for Menu

* feat(menu): test cases

* chore: Adjust picker logic (#25135)

* chore: update rc-picker 1.10.0 (#25174)

* feat: table row check strictly (#24931)

* feat: add checkStrictly on Table.rowSelection

* fix: LGTM warnings

* test: table rowSelection.checkStrictly

* test: add cov [wip]

* refactor: tree.rowSelection.checkStrictly [wip]

* test: table.rowSelection.checkStrictly basic case

* feat: support rowKey on checkStrictly table

* feat: Table checkStrictly support getCheckboxProps

* docs: Table checkStrictly

* chore: typo

* chore: remove useless comment

* chore: update snapshot

* chore: update snapshot

* fix: fire selectAll on selection dropdown menu & changeRows incorrect in selectAll callback

* docs: typo

* chore

* chore

* fix: expand buttons of leaf rows in tree data are not hidden

* feat: Table warning about rowKey index parameter

* perf: only generate keyEntities when not checkStrictly

* refactor: remove useless parseCheckedKeys

* refactor: get derived selected & half selected keys from selectedRowKeys

* chore: remove env condition stmt

* chore: revert index usage & code formatting

* chore: rerun ci

* docs: table tree-data checkstrictly

* test: update snapshots

* refactor: use useMergedState hook

* chore: rerun ci

* chore: rerun ci 2

* chore: revert selection select all behavior

* refactor: refactor code based on feature

* chore: revert table code format

* chore: revert table code format

* fix: useMemo deps

* fix: useMemo deps

* fix: useMemo deps

* feat: support preserve (#25186)

* docs: add responsibly order for Col (#25139)

* feat: add type

* feat: add responsibly order cols

* feat: add docs

* feat: add test case

* fix test

Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: 偏右 <afc163@gmail.com>
Co-authored-by: zoomdong <1344492820@qq.com>
Co-authored-by: 07akioni <07akioni2@gmail.com>
Co-authored-by: wendellhu <wendellhu95@gmail.com>
Co-authored-by: xrkffgg <xrkffgg@gmail.com>
Co-authored-by: Neto Braghetto <netow93@gmail.com>
Co-authored-by: Kermit Xuan <kermitlx@outlook.com>
Co-authored-by: Ashkan Pourghasem <64011067+ashkan-pm@users.noreply.github.com>
Co-authored-by: Ashkan Pourghasem <ashkan.pourghasem@gmail.com>
Co-authored-by: hicrystal <295247343@qq.com>
Co-authored-by: Crystal Gao <jinggao@ebay.com>
Co-authored-by: Amumu <yoyo837@hotmail.com>
Co-authored-by: Li Ming <armyiljfe@gmail.com>
@chenshuai2144 chenshuai2144 mentioned this pull request Jun 29, 2020
13 tasks
tomvothecoder added a commit to esgf2-us/metagrid that referenced this pull request Jul 14, 2020
tomvothecoder added a commit to esgf2-us/metagrid that referenced this pull request Jul 14, 2020
…d update their carts using the MetaGrid database

Back-end
- Add Cart app, along with associated models, serializers, admin registration, viewsets, and viewset url register
- Add IsOwner permission to allow only owner (the user that created the object) to perform operations on the object
- Add tests for 100% coverage
Front-end
- Add TypeScript custom types for RawUserAuth, RawUserInfo, RawUserCart
- Add API routes matching the urls of the Cart API for testing with server-handlers
- Add AuthContext with API functions fetchUserAuth() and fetchUserInfo(), which provide MetaGrid auth tokens and the PK of the user
- Fix Search Table component method onSelectAll
- Related to Ant Design issue: ant-design/ant-design#24931
- Add fetchUserCart() and updateUserCart() API functions
- Add call to fetchUserCart() function in App component with a React.useEffect
- Update React.useEffect for storing cart in localStorage only for anonymous users
- Update App component handleCart() to handle authenticated users adding/removing items from their cart
- Update handleCart() in App to run updateUserCart()
- Add and update tests for 100% coverage
tomvothecoder added a commit to esgf2-us/metagrid that referenced this pull request Jul 14, 2020
…r carts using the MetaGrid database

Back-end
- Add Cart app, along with associated models, serializers, admin registration, viewsets, and viewset url register
- Add IsOwner permission to allow only owner (the user that created the object) to perform operations on the object
- Add tests for 100% coverage
Front-end
- Add TypeScript custom types for RawUserAuth, RawUserInfo, RawUserCart
- Add API routes matching the urls of the Cart API for testing with server-handlers
- Add AuthContext with API functions fetchUserAuth() and fetchUserInfo(), which provide MetaGrid auth tokens and the PK of the user
- Fix Search Table component method onSelectAll
- Related to Ant Design issue: ant-design/ant-design#24931
- Add fetchUserCart() and updateUserCart() API functions
- Add call to fetchUserCart() function in App component with a React.useEffect
- Update React.useEffect for storing cart in localStorage only for anonymous users
- Update App component handleCart() to handle authenticated users adding/removing items from their cart
- Update handleCart() in App to run updateUserCart()
- Add and update tests for 100% coverage
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.

5 participants