Commit Graph

698 Commits

Author SHA1 Message Date
zombiej
300dddebbb chore: next merge feature 2022-05-30 19:11:21 +08:00
二货机器人
99c16aa8d6
refactor: Fix Dropdown nesting menu injection logic (#35810)
* refactor: Dependency Inversion

* test: update snapshot

* test: Update snapshot

* test: more

* fix: table dropdown logic

* fix: menu lint
2022-05-30 19:06:51 +08:00
二货机器人
0ecddfdb0d
refactor: Popconfirm cssinjs (#35683)
* chore: init

* chore: part of

* fix: Buttons style

* chore: refactor dom structure

* test: Update snapshot

* test: more coverage
2022-05-23 20:34:20 +08:00
zombiej
3a4d399248 chore: merge feature 2022-05-23 15:52:14 +08:00
zombiej
f58efe9b32 chore: merge master 2022-05-23 14:37:16 +08:00
zombiej
cd0ace3d40 chore: merge master 2022-05-21 22:14:15 +08:00
Bart Piotrowski
4bccb9985a
fix: Remove Grid row and cell aria roles (#35616)
close https://github.com/ant-design/ant-design/issues/35549
2022-05-19 10:05:40 +08:00
章鱼
7fd093bd0a
docs: feat components TS demo (#34742)
* docs: add general components TS demo

* docs: add layout components TS demo

* docs: add navigation components TS demo

* docs: add data entry components TS demo

* chore(deps): add types for qs

* docs: add data display TS demo

* docs: add feedback components TS demo

* docs: add other components TS demo

* chore(deps): add types

* docs: unified demo code style

* docs: fix lint error

* docs: add demo TS type

* docs: fix demo TS type

* test: update snapshot

* docs: fix TS demo

* feat: update Rate character type

* docs: fix lint error

* feat: update Rate character type

* feat: update Rate character type
2022-05-19 09:46:26 +08:00
二货机器人
aa9815303f
refactor: with empty token (#35606)
* refactor: with empty token

* chore: patch

* chore: more toke

* chore: add seedToken

* test: update snapshot
2022-05-18 15:37:27 +08:00
MadCcc
6817db7b52
feat: table rowSelection.onChange support type (#35598)
* feat: table rowSelection onChange support method

* docs: update

* chore: rename param

* test: update

* test: update
2022-05-18 11:59:00 +08:00
Karott
338ec7dad7
perf: refactor devWarning for production code size (#35411)
* pref: better code style for production

* refactor `devWarning`

* don't use `useEffect` only wrap `devWarning`

* chore: add 'noop' to coverage

* chore: add test cases for devWarning

* chore: add test case

* chore: update test cases for devWarning

* chore: restore test script command

* fix: remove 'throw new Error'

* should not use `throw` for browser

* chore: update test case for AutoComplete

* perf: add prefix for `devWarning`

* update RegExp for UMD

* add prefix for ES and CJS

* chore: better code style

* perf:

* upgrade antd-tools

* remove `injectWarningCondition`

* rename `devWarning` to `warning`

* chore: better code style

* chore: better code style

* chore: restore hasValidName
2022-05-10 15:43:29 +08:00
Tom Xu
1719748a29
chore: eslint add consistent-type-imports (#35419)
* chore: eslint add consistent-type-imports

* fix avatar

* Update Item.tsx
2022-05-07 14:31:54 +08:00
Karott Schu
d07dcd46b7
fix(<Row/>): wipe out unnecessary prop (#35409)
* fix: wipe out unnecessary prop

* wipe out unnecessary prop(`row-gap: 0px`) on <Row />

* add test case

* chore: remove unnecessary import

* chore: add  prop to Row and Col

* chore: update snapshot (Form/Grid/Card)

* chore: update snapshot

* chore: move  location
2022-05-07 11:44:48 +08:00
lalalazero
6c0f67e407
fix: table column filter reset is not working (#35226) (#35386) 2022-05-05 12:17:15 +08:00
afc163
5a6b3ccd98
fix: Table columns sorter a11y experience (#35269)
* Make table sortable columns focusable and keyboard accessible.

* Fix typo.

* Change focus style for sortable table column header from broken outline to color text.

* Update snapshots.

* Change order to fix lint error.

* Add unit test to test sorting with keypress.

* Update components/table/hooks/useSorter.tsx

* chore: improve code style

* style: use focus-visible

* fix: test case

* test: update snapshot

Co-authored-by: Katsiaryna Pustakhod <Katsiaryna_Pustakhod@epam.com>
2022-04-27 16:27:13 +08:00
Yuyao Nie
a9806a2be0
perf: optimize calculation of filteredKeysIsAllControlled (#35064)
* perf: optimize calculation of filteredKeysIsAllControlled

* fix: ci failure

* fix: modify codes by suggestion
2022-04-23 17:11:52 +08:00
二货机器人
f8d728161c
docs: Update demo with Space (#35172) 2022-04-22 13:35:27 +08:00
afc163
8f06430336
fix: DropDownProps => DropdownProps (#35161)
* fix: DropDown => Dropdown

* chore: leave DropDownProps for compatibility
2022-04-21 22:09:59 +08:00
二货机器人
1525ac47fb
chore: bump dropdown with inject mark (#35153) 2022-04-21 17:10:06 +08:00
afc163
12d98f9ed6
chore: update snapshot due to rc-trigger bumped (#35106) 2022-04-20 00:16:39 +08:00
afc163
30ac6bd4e4
test: wrap React.StrictMode for test cases (#35026)
* test: React StrictMode

* test: fix Spin test

* chore: wrapper enzyme

* test: fix setState

* test: more test cover

* test: more test cover

* test: more test cover

* test: more test cover

* test: more test cover

* test: more test case

* test: more test case

* test: more test case

* test: more test case

* test: more test case

* test: more test case

* test: more test case

* test: more test case

* test: more test case

* test: more test case

* test: more test case

* test: more test case

* test: disable part of it

* test: fix test & add placeholder

* test: Use orign enzyme mount

Co-authored-by: zombiej <smith3816@gmail.com>
2022-04-18 21:02:11 +08:00
二货机器人
67ccf39bd3
fix: Notification & message throw createRoot warning in React 18 (#35030)
* chore: bump notification version

* test: notification test case

* test: more test case

* test: part message test

* test: rest message test

* test: notification config test
2022-04-14 18:09:19 +08:00
zombiej
a0d1440050 chore: merge conflict 2022-04-11 17:41:54 +08:00
二货机器人
a67c0d28d3
fix: react 18 test fixing (#34787)
* fix: try fix

* chore: ci

* test: recover

* test: more test case

* test: more and mote

* test: btn test

* fix: react 18 compitable

* chore: more test

* test: all confirm test

* chore: tmp

* chore: test lib

* chore: tmp

* chore: tmp

* test: back of part

* test: back of menu index test

* test: more test

* test: form test

* test: rm IE11 test case

* chore: fix compatible

* chore: clean up

* chore: back of all test case

* test: ignore 18 lines

* chore: remove render test of enzyme in upload

* test: back of IE11 test case to fit 100% coverage

* chore: fix pkg deps
2022-04-06 11:07:15 +08:00
MadCcc
0de1e66ff1
refactor: move override code in form (#34694)
* refactor: move override code in form

* refactor: radio and checkbox

* chore: code clean

* test: fix lint

* test: fix lint
2022-03-24 21:54:20 +08:00
黑雨
d4acc661da
feat: add filterResetToDefaultFilteredValue api (#34355)
* feat: add filterResetToDefaultFilteredValue api

* feat: fix lint

* feat: update test case

* feat: update doc
2022-03-23 19:29:05 +08:00
黑雨
e45fa77eb8
feat: add aria-* to Spin (#34408)
* feat: add aria

* feat: update other snap

* feat: update logic
2022-03-11 15:49:33 +08:00
afc163
1df2ecd66e
fix: Tree filter select all behavior (#34295)
ref https://github.com/ant-design/ant-design/issues/34280
2022-03-04 15:36:18 +08:00
黑雨
2c56927ae9
feat: table filterSearch supports function (#34085)
* feat: table filterSearch supports function

* feat: update for test

* feat: update document
2022-02-25 16:05:18 +08:00
黑雨
086e5d8e60
feat: table FilterDropdown support clearFilters({ confirm: false, closeDropdown: false }) (#34120)
* feat: table FilterDropdown support `clearFilters({ confirm: boolean })`

* feat: update `clearFilters` and `confirm`

* feat: add FilterRestProps,update document

* feat: update onReset params order

* feat: add test case
2022-02-25 16:03:22 +08:00
afc163
34a63e6892 chore: merge feature into master 2022-02-23 17:11:11 +08:00
二货机器人
9f602aa710
fix: Table render twice on first mount (#34106)
* fix: Table render twice

* chore: clean up

* test: Fix test case
2022-02-17 18:11:33 +08:00
MadCcc
76ad890deb Merge branch 'master' into feature-merge-master 2022-02-15 14:05:33 +08:00
二货机器人
31fb55adf3
chore: btn default provide default cls (#34013) 2022-02-11 15:02:59 +08:00
MadCcc
222ee1f3ad Revert "revert: Revert "Merge branch 'feature' into master" (#33903)"
This reverts commit 6b1a48d5ed.
2022-01-30 15:49:24 +08:00
MadCcc
6b1a48d5ed
revert: Revert "Merge branch 'feature' into master" (#33903)
This reverts commit 40433f357d, reversing
changes made to 27a498e021.
2022-01-30 15:21:41 +08:00
MadCcc
40433f357d
Merge branch 'feature' into master 2022-01-30 14:46:13 +08:00
MadCcc
27a498e021
fix: update dropdown version to 3.2.5 (#33895)
* fix: update dropdown version to 3.2.5

* test: update snapshot
2022-01-30 12:31:35 +08:00
Dan Greene
a39ddcf798
feat: resolves issue 33572 re aria-sort on tables (#33603)
* feat: resolves issue 33572 re aria-sort on tables

* fixing snapshots

* removing code that can't be hit anyway
2022-01-11 13:18:42 +08:00
afc163
0976e9e6a4
test: add test case for #33487 (#33492) 2021-12-31 10:44:16 +08:00
afc163
9ec2709b16
Revert "fix: The current change of pagination triggers onChange (#33411)" (#33489)
This reverts commit 629caccaae.
2021-12-30 15:15:00 +08:00
2724635499
629caccaae
fix: The current change of pagination triggers onChange (#33411)
* fix: table pagination onChange error (#33374)

* test: add  test case for this (#33374)
2021-12-27 21:59:16 +08:00
zombiej
7ae451729f test: update snapshot 2021-12-27 10:58:29 +08:00
zombiej
6ed4d855b1 Merge remote-tracking branch 'origin/master' into feature-merge-master 2021-12-27 10:45:42 +08:00
二货机器人
2df11184f4
test: Demo check popup content (#33378)
* auto demo

* chore: update demo snapshot

* fix: trigger mock ref logic

* chore: try 2 test case

* chore: more snapshot

* chore: update snapshot

* chore: fix ts

* chore: split test

* test: Update test case

* chore: fix test order
2021-12-23 11:51:10 +08:00
二货机器人
ff88851c4c
chore: Bump Select related deps (#33364)
* chore: bump select related version

* test: Fix test case

* chore: bump rc-select version

* test: Update snapshot

* chore: Update Select ts

* test: Update snapshot

* test: Update snapshot

* test: Update snapshot

* chore: Update ts definition

* chore: fix internal ts def

* test: update auto complete snapshot

* chore: update snapshot

* chore: bump version

* chore: fix demo ts

* chore: Move ValueType to the first place

* test: Update test case
2021-12-21 21:38:11 +08:00
xrkffgg
a04a4efc8b
Merge pull request #33163 from ant-design/master
chore: merge master into feature
2021-12-05 15:22:48 +08:00
afc163
b34f72b1b6
test: fix ci warnings (#33160) 2021-12-04 17:06:36 +08:00
二货机器人
2b152b0c22
feat: Support Table.EXPAND_COLUMN & Table.SELECTION_COLUMN (#33026)
* feat: Table support Table.EXPAND_COLUMN & Table.SELECTION_COLUMN

* docs: Update docs
2021-11-26 17:50:41 +08:00
dependabot[bot]
20d5502193
chore(deps-dev): bump eslint-config-airbnb from 18.2.1 to 19.0.0 (#32824)
* chore(deps-dev): bump eslint-config-airbnb from 18.2.1 to 19.0.0

Bumps [eslint-config-airbnb](https://github.com/airbnb/javascript) from 18.2.1 to 19.0.0.
- [Release notes](https://github.com/airbnb/javascript/releases)
- [Commits](https://github.com/airbnb/javascript/compare/eslint-config-airbnb-v18.2.1...eslint-config-airbnb-v19.0.0)

---
updated-dependencies:
- dependency-name: eslint-config-airbnb
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* chore: code style

* memoize-one

* add comment

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* fix lint

* improve useMemo deps

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afc163 <afc163@gmail.com>
2021-11-26 12:18:21 +08:00
二货机器人
870b72af88
docs: 4.17.0 changelog (#32859)
* docs: 4.17.0 changelog

* test: Update snapshot

* docs: Update desc

* docs: merge changelog
2021-11-15 19:35:25 +08:00
renovate[bot]
94b21979e0
chore(deps): update dependency @typescript-eslint/parser to v5 (#32500)
* chore(deps): update dependency @typescript-eslint/parser to v5

* fix md lint

* fix eslint errors

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: afc163 <afc163@gmail.com>
2021-10-15 09:30:56 +08:00
二货机器人
ec9ecde052
fix: Table ts definition (#32358)
* fix: Table ts definition

* fix: backof default rowKey
2021-09-30 11:43:42 +08:00
JounQin
15d55bc3e9
feat: support ref for Table (#32136)
* feat: support ref/prefix/suffix for Table

close #25306

* docs: documentat Table prefix/suffix props

* chore: fix lint error

* refactor: remove prefix/suffix props
2021-09-17 11:17:29 +08:00
JounQin
a9951d8421
fix: preserve table pagination className (#32131)
close #32130
2021-09-11 21:44:03 +08:00
xrkffgg
3d81a10d61
Merge pull request #32036 from ant-design/master
branch: merge master into feature
2021-09-06 15:25:15 +08:00
二货机器人
04d140d7a6
fix: Table preset SELECTION can modify disabled record (#32027)
* fix: tbl select opt affact disabled

* test: add disabled test case
2021-09-03 19:47:23 +08:00
afc163
9c17f94cab
feat: Table filterMode and filterSearch functions (#31809)
* feat: Table supports filterMode="tree-select"

* add tree component

* fix detail

* use tree

* add @table-filter-dropdown-max-height

* feat: add check all to filter tree

* feat: add search

* feat: use filterTreeNode

* fix code style

* fix style

* style: tree node selected bg

* fix demo

* feat: add filterSearch

* fix: clear search value after close filter dropdown

* update snapshot

* code style

* fix test case

* chore: new FilterDropdown.tsx file

* chore: searchValueMatched function

* add test case

* test: add test cases

* feat: reset only works on dropdown state now

* chore: add table locales

* fix search input width

* tweak style

* style: update transfer search input style

* perf: improve table perf

* fix: filterMuiltiple={false}

* test: add test for selecting

* chore: fix table filter selection

* fix lint

* remove unused code

* fix: style dependencies

* test: turn off bail config for duplidated-package-plugin in feature branch

* Update components/table/hooks/useFilter/FilterSearch.tsx

Co-authored-by: Peach <scdzwyxst@gmail.com>

* fix locale link

* Apply suggestions from code review

* Apply suggestions from code review

Co-authored-by: Peach <scdzwyxst@gmail.com>
2021-09-01 10:49:52 +08:00
afc163
7085e22a96 merge feature into master 2021-08-31 13:35:13 +08:00
afc163
af805c098b
test: fix eslint errors (#31961)
* test: fix eslint errors

* test: fix eslint errors
2021-08-30 13:04:21 +08:00
xrkffgg
d3405a9add
Merge pull request #31243 from ant-design/master
chore: sync master to feature
2021-07-04 20:00:59 +08:00
Kermit
5ea0628f53
fix(table): selectedRows of rowSelection should always keep sync (#31224)
* fix(table): selectedRows of row selection should always keep sync

* chore: update comment
2021-07-02 13:37:55 +08:00
Ricardo Morais
d6b623633a
fix(Table): Fixed filtering in columns with children (#30815)
* Fixed filtering in columns with children.

* Added entries to the changelog files.

* Revert "Added entries to the changelog files."

This reverts commit 26a08bdc

Co-authored-by: moraispgsi <moraispgis@gmail.com>
2021-06-29 17:07:47 +08:00
github-actions[bot]
2cf0d23413
chore: auto merge branchs (#31001)
chore: merge master into feature
2021-06-16 05:29:20 +00:00
afc163
d1bd9093db fix: table resize demo snapshot 2021-06-16 12:04:17 +08:00
github-actions[bot]
827d34db1f
chore: auto merge branchs (#30926)
chore: sync master into feature
2021-06-09 06:18:09 +00:00
afc163
73102377af fix: demo snapshot 2021-06-09 12:09:53 +08:00
afc163
8fe1cc9da5 merge feature into master 2021-06-05 13:30:36 +08:00
Kermit
f6b09a79b0
chore(table): optimize select all checkbox display logic (#30811) 2021-06-02 12:15:00 +08:00
github-actions[bot]
6fa59e718c
chore: auto merge branchs (#30798)
chore: merge master into feature
2021-06-01 02:50:09 +00:00
zombiej
3d8dd54d02 test: Update snapshot 2021-05-31 14:46:33 +08:00
afc163
7427f52a64
fix: Table column align with sorter and filter (#30744)
* fix: Table column align with sorter and filter

close #30741

* update snapshot
2021-05-28 13:27:58 +08:00
zombiej
737c172c2b test: Update snapshot 2021-05-28 11:44:16 +08:00
二货机器人
5fc63ffafb
feat: Table.Summary support fixed top position (#30726)
* chore: bump rc-table

* docs: Update demo & snapshot
2021-05-27 16:51:14 +08:00
二货机器人
0a0fa61cb5
fix: Long text of menu ellipsis issue (#30682)
* fix: menu item long text ellipsis

* test: Update snapshot

* test: Update snapshot
2021-05-25 20:52:52 +08:00
二货机器人
17e863fc94
docs: Add Table.Summary desc (#30673)
* docs: Add summary desc

* test: Update snapshot
2021-05-25 16:12:41 +08:00
afc163
082f626a3e
style: redesign Table header action (#30651)
* feat: improve Table filter and sorter position

* fix: edge cases of th border

* fix lint

* style: apply new design

* fix css detail

* fix stylelint

* fix css error

* style: sorter icon hover color

* fix test cases

* update snapshot

* fix th padding

* fix calc

* style: fix dark theme
2021-05-24 22:16:06 +08:00
陈帅
0d1b1c40a6
merge featrue into master (#30636)
* feat: add Table expandable fixed (#29959)

* fix: Use flex gap of space (#30023)

* fix: use flex gap when supported

* test: update snapshot

* refactor: Use single hooks

* feat: Allow breadcrumb component in PageHeader (#30019)

* Allow breadcrumb component in PageHeader

* Allow breadcrumb component in PageHeader

* Allow breadcrumb component in PageHeader

* Rename variable

rename var from _breadcrumbRender to breadcrumbRenderDomFromProps

* feat: add onChange for Statistic.Countdown (#30265)

* feat: add onChange for countdown

* update the demo

* feat(upload): add onDrop (#30319)

* feat(upload): Add onDrop

* Replace "if prop" logic with existential operator

* Remove redundant conditional

* feat(upload): itemRender add actions params (#30236)

* feat(upload): itemRender add actions params

* chore: optimize type definition

* chore: update doc

* chore: rename actions

* chore: trigger ci

* chore: rename method name of actions

* feat: Add missing dutch translations (#30389)

* feat: Add missing dutch translations

* fix: Translate remaining english values

* fix: Update snapshot for ui tests

* test: increase code coverage to 100% (#30415)

* test: fix Space code coverage

* test: should use nl_BE locale for DatePicker

* fix: Switch tabIndex type (#30416)

* feat: updated Romanian internationalization (#30419)

* feat: updated Romanian internationalization

* fixed lint error

* feat: Menu support accessibility & keyboard access (#30382)

* chore: Use focus style

* fix: prefixCls

* fix: prefixCls

* fix: inline tooltip

* fix: inlineCollapse logic

* fix: ts definition

* test: Update snapshot

* test: Update snapshot

* fix: dropdown logic

* test: Update snapshot

* test: Fix some test  case

* bump rc-menu

* test: More test case

* fix test finder

* test: fix test case

* test: Update snapshot

* test: Update snapshot

* chore: Update ssr effect

* test: Update ConfigProvider snapshot

* test: Fix Table Filter test case

* test: Fix table test case

* chore: Update style

* chore: beauti css

* bump rc-menu

* test: update snapshot

* test: update snapshot

* test: Fix menu test

* test: Fix test case

* test: Coverage

* chore: clean up

* bump rc-menu

* ehance accessibility style

* feat(radioGroup): support data-* and aria-* props (#30507)

close #30501

* feat: Typography add italic type (#30458)

* Typography增加斜体字支持

* update snapshot

* 文档添加版本号

Co-authored-by: lidahao <lidahao@sisyphe.com.cn>

* chore: alpha Menu fix merge (#30546)

* chore: Update script

* bump alpha version

* chore: Update script desc

* chore: bump rc-tabs & rc-mentions

* chore: Adjust style

* chore: 4.16.0-alpha.1

* test: Fix mention test case

* fix: sider of layout width style

* chore: bump 4.16.0-alpha.2

* fix: Tabs tabBarGutter should work as expected (#30545)

close #30526

* feat: Table summary support sticky mode (#30631)

* chore: Bump rc-table

* feat: Patch summary fixed color

* fix: style className

* test: Update snapshot

Co-authored-by: xrkffgg <xrkffgg@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: gepd <guillermoepd@hotmail.com>
Co-authored-by: appleshell <appleshell@outlook.com>
Co-authored-by: Eric Bonow <ebonow@hotmail.com>
Co-authored-by: xrkffgg <xrkffgg@vip.qq.com>
Co-authored-by: Kermit <kermitlx@outlook.com>
Co-authored-by: Lewis <lewisfidlers@gmail.com>
Co-authored-by: afc163 <afc163@gmail.com>
Co-authored-by: Ștefan Filip <stefy.filip@gmail.com>
Co-authored-by: vldh <alwaysloseall@sina.com>
Co-authored-by: lidahao <lidahao@sisyphe.com.cn>
2021-05-24 16:24:00 +08:00
afc163
dd14752329
fix: Table filterDropdown confirm closeDropdown (#30457)
* fix: Table filterDropdown confirm closeDropdown

close #30454

* add test case

* improve demo
2021-05-10 16:19:56 +08:00
二货机器人
37c1c302b1
test: Update snapshot (#30267)
* test: Update snapshot

* test: fix open test case
2021-04-22 17:15:37 +08:00
二货机器人
33dbd3f4f1
fix: Table flex pagination (#30065)
* fix: Table flex pagination

* update style
2021-04-08 20:47:19 +08:00
kily zhou
59c3c71b72
feat: Table adds rowSelection.defaultSelectedRowKeys (#29879) 2021-03-25 09:11:39 +08:00
afc163
462c7fcdf8 fix snapshot 2021-03-12 17:23:27 +08:00
jinchaofs
cc38c07c6e
fix(table): pagination.current display error when result of filter is empty (#29386)
Co-authored-by: jinchao.li <jinchao.li@cyclone-robotics.com>
2021-02-26 21:51:35 +08:00
afc163
76434a15df
chore(🆙): upgrade devDeps (#29418)
* chore(🆙): upgrade devDeps

* prettier code

* fix dnd demo

* fix react-dnd demo

* fix npm start and demo tsx compile

* fix snapshot
2021-02-23 10:45:11 +08:00
诸岳
9a44a7e915 Merge branch 'master' of github.com:ant-design/ant-design into feature-merge-master-branch 2021-02-11 00:00:25 +08:00
叶枫
6e89866694
feat: 动画样式添加 prefix (#29268)
* feat: add prefix

* fix: 剩余

* fix: test

* fix: test

* fix: test

* fix: test

* fix: 传了 name 则使用传的

* fix: pop 添加 prefix

* fix: Ok OK ?

* fix: modal confirm

* fix: select

* fix: test
2021-02-08 17:09:13 +08:00
mumiao
d83e5fdd0a
fix: pagination componnet is not displayed at the position is none of… (#29256)
* fix: pagination componnet is not displayed at the position is none of array

* docs: update table/pagination position column typeValue

* fix: named invalid column

* fix: delete unless code

* refactor: refactor pagination position logic

* ci: fix lint error

* ci: fix lint error

* test: update snapshot
2021-02-07 20:23:40 +08:00
afc163
b69c3351b1
fix: Table pagination current change logic (#29184)
* refactor: code style

* fix: Table pagination current when pageSize changed

close #29175

* fix current when have pagination.total
2021-02-03 11:42:11 +08:00
陈帅
a4f0957576
docs: add 4.12.0 changelog (#29131)
* docs: add 4.11.3 changelog

* update docs

* Update CHANGELOG.zh-CN.md

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

* update docs

* add 4.12.0 changelog

* update docs

* fix typo

* Update CHANGELOG.zh-CN.md

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

* Update CHANGELOG.zh-CN.md

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

* Update CHANGELOG.en-US.md

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

* Update CHANGELOG.zh-CN.md

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

* Update CHANGELOG.en-US.md

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

* Update CHANGELOG.zh-CN.md

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

* Update CHANGELOG.en-US.md

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

* Update CHANGELOG.en-US.md

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

* fix changelog

* Update CHANGELOG.zh-CN.md

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

* update docs

* Update CHANGELOG.zh-CN.md

Co-authored-by: xrkffgg <xrkffgg@gmail.com>

* Update CHANGELOG.zh-CN.md

Co-authored-by: einq7 <50612752+AlanCutFlim@users.noreply.github.com>

* fix typo

* fix typo

* Update CHANGELOG.en-US.md

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

Co-authored-by: afc163 <afc163@gmail.com>
Co-authored-by: xrkffgg <xrkffgg@gmail.com>
Co-authored-by: einq7 <50612752+AlanCutFlim@users.noreply.github.com>
2021-02-02 22:05:31 +08:00
陈帅
40f9be9417
megre Feature into master (#29141)
* feat: Allow user to configure the Tooltip in the Table header (#29002)

* feat: Table header supports tooltipPlacement

* docs: add Table tooltipPlacement

* feat: Allow user to configure the Tooltip in the Table header

* fix: fix jsx and use old code style

* fix: replace if blocks with ternary operator

* docs: fix url

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

* docs: fix url

Co-authored-by: harrisoff <john@smith.kyon>
Co-authored-by: 偏右 <afc163@gmail.com>

* fix: Row with gutter has additional gap (#29059)

* chore: init gutter

* feat: col support gap

* chore: Update playground

* fix: Safari padding

* test: fix test case

* test: More test case

* docs: Update demo

* test: Update coverage

* test: Update test hack

* feat(input-number): add keyboard prop to support disable keyboard (#29110)

Co-authored-by: Ant Design GitHub Bot <yesmeck+ant-design-bot@gmail.com>
Co-authored-by: Harrison <stlebea@foxmail.com>
Co-authored-by: harrisoff <john@smith.kyon>
Co-authored-by: 偏右 <afc163@gmail.com>
Co-authored-by: 二货机器人 <smith3816@gmail.com>
Co-authored-by: Kermit <kermitlx@outlook.com>
2021-02-01 10:15:39 +08:00
xrkffgg
dcc0ffa016
chore : prettier code (#29123)
* style: prettier code

* update

* Update index.less
2021-01-30 19:39:02 +08:00
Kermit
47732b8a14
refactor: optimize calling sequence of onChange and onSelectAll in rowSelection of Table (#29079)
* chore: optimize order of onChange and onSelect in rowSelection of Table

* chore: add test case

* chore: trigger ci

* ci: trigger
2021-01-29 13:22:42 +08:00
Meowu
0f0dc1577f
fix: custom table filterDropdown (#28850)
* fix: get origin keys from nested filters.

* fix: unexpected transformed filteredKyes with custom filterDropdown.

* fix: simplify code.
2021-01-15 22:51:03 +08:00
偏右
ec6f198b0d
fix: Empty description validateDOMNesting warning (#28862)
* fix: Empty description validateDOMNesting warning

close #28860

* update snapshot
2021-01-14 16:29:48 +08:00
Meowu
3ed44114ac
fix: no need to filter filterdKeys for custom filterDropdown. (#28627)
* fix: no need to filter filterdKeys for custom filterDropdown.

* fix: only transform array of filterdValue to string.
2021-01-04 11:17:27 +08:00
不吃猫的鱼
5119d2a9e1
feat: add select none functionality (#28580) 2020-12-29 10:38:43 +08:00
Hossein Mohammadi
04bfa3c54f
chore: add prettier-plugin-jsdoc (#28551) 2020-12-28 15:30:18 +08:00
二货机器人
076f5f1f00
fix: Table childColumnName should support checkStrictly (#28568) 2020-12-28 15:18:04 +08:00
二货机器人
55e0d13234
chore: Add demo tsx check (#28389)
* chore: Add demo tsx check

* chore: Prettier

* chore: Fix lint

* fix: Upload ts definition

* chore: Demo onlt

* docs: Fix demo

* chore: Add CI action

* chore: Use real name

* chore: fix ts define

* chore: fix more ts

* chore: fix more ts

* chore: More ts

* chore: More ts

* chore: More ts

* chore: More ts

* chore: More ts

* chore: More ts

* chore: More ts

* chore: Update all rest TS demo

* fix test case
2020-12-17 15:09:18 +08:00
dependabot[bot]
775d1800bb
chore(deps-dev): bump eslint-config-prettier from 6.15.0 to 7.0.0 (#28253)
* chore(deps-dev): bump eslint-config-prettier from 6.15.0 to 7.0.0

Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 6.15.0 to 7.0.0.
- [Release notes](https://github.com/prettier/eslint-config-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-config-prettier/compare/v6.15.0...v7.0.0)

Signed-off-by: dependabot[bot] <support@github.com>

* chore: fix eslint style

* chore: prettier code style

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: afc163 <afc163@gmail.com>
2020-12-09 17:12:32 +08:00
Meowu
b3354d4581
fix: Table filter value type (#28220)
* fix: onChange event receives correct type of filters value.

* fix: related checkbox should be checked if any filters set as filterValue.

* fix: typing.
2020-12-09 14:34:49 +08:00
琚致远
d692d655c7
fix: typo in test (#28195) 2020-12-04 15:27:23 +08:00
yanguoyu
4790ef59a2
fix: 防止手动设置 selectedRowKeys 为 undefined 时,derivedSelectedKeys 为 undefined,导致 js crash。 (#28193)
* 1:防止手动设置 selectedRowKeys 为 undefined 时,derivedSelectedKeys 为 undefined,导致 js crash。

* fixed: 防止手动设置 selectedRowKeys 为 undefined 时,derivedSelectedKeys 为 undefined,导致 js crash。
2020-12-04 14:26:23 +08:00
偏右
e7bed7cff7
perf(📦): upgrade @ant-design/colors and remove rc-trigger from deps (#27761)
* perf(📦): upgrade @ant-design/colors

* move rc-trigger to devDeps

* fix lint

* update snapshot

* update snapshot

Co-authored-by: 二货机器人 <smith3816@gmail.com>
2020-11-14 00:43:12 +08:00
Yuan
d01aa2539e
fix: filters in column.children should render (#27435)
* fix: filters in column.children should render 

when a column has filter and it's children also have filters, all these filters in children can not render. this problem can not be found when use sorter.

* test: add test for this fix

* Update components/table/__tests__/Table.filter.test.js

Co-authored-by: 偏右 <afc163@gmail.com>
2020-11-04 15:44:13 +08:00
afc163
2a08383a22 test(): update table snapshot 2020-10-30 21:09:08 +08:00
偏右
cc8ec58ab1
fix: Table onShowSizeChange trigger twice (#27417)
close #26100
close #27392
2020-10-28 12:56:05 +08:00
二货机器人
39333253d9
fix: Not merge additional data (#27412) 2020-10-27 23:02:52 +08:00
骗你是小猫咪
6fba4d1136
test: demo -> ui test (#24475)
* test: demo -> ui test

* improve comment image width

* use argos-ci

* use by cicleci

* fix circle run

* rebase master

* try pipeline var

* use another branch var

* fix commit id

* ignore image test file

* remove useless report

* fix test coverage
2020-10-23 18:50:46 +08:00
Lim Shang Yi
fa3c00ce1a
fix: undefined in filterDropdown in Table should not render dropdown filter icon. (#27002)
close #26988
2020-10-04 21:56:29 +08:00
偏右
83ddfb807e
test: Enable transition and animation in jest (#26571)
* test:  add test cases to increase coverage

* test: fix snapshot

* fix: test node envioronment

* fix: test node envioronment

* fix test case

* test: refactor menu test cases

* test: update test code style

* test: add more menu test cases

* add comment

* test: update snapshot

* fix: alert test case

* fix: form onLeaveEnd test cov

* test: fix button click wave test cases

* chore: clean up snapshots
2020-09-18 16:53:18 +08:00
zombiej
780ada065b chore: Update snapshot 2020-09-16 12:10:18 +08:00
afc163
58a57224a8 test: fix test snapshot change 2020-09-14 18:19:36 +08:00
二货机器人
c58135fd46
fix: Align motion match (#26628)
* fix: Align motion match

* bump rc-motion

* lock rc-trigger version

* update snapshot
2020-09-08 11:34:29 +08:00
Alex
bf45c4c1b0
style: 💄 className prop ordering #26594 (#26602)
close #26594
2020-09-06 13:07:39 +08:00
偏右
a8dea916b2
fix: Search autocomplele list in Chrome (#26590)
* fix: 🆙 upgrade rc-select to 11.2.x

* style: fix input search clear button

* test: update snapshot
2020-09-05 00:38:39 +08:00
偏右
a409f3126f
test: add test cases to increase coverage (#26559)
* test:  add test cases to increase coverage

* chore: remove console
2020-09-03 13:36:23 +08:00
偏右
c88fd34e9a
chore: 🆙 upgrade react-resizable (#26524)
* chore: 🆙 upgrade react-resizable

* test: fix snapshot

* code style improve
2020-09-02 10:51:04 +08:00
xrkffgg
2005546d22
test: update snap (#26467) 2020-08-28 21:43:44 +08:00
zhangchen
c47bfb0c91
fix: Table topPaginationNode display logic should same with bottomPaginationNode (#26143)
* fix: Tree bottomPaginationNode display logic should same with bottomPaginationNode

* update: test
2020-08-28 15:48:19 +08:00
zombiej
55c1dd02c2 chore: Merge master 2020-08-20 17:31:03 +08:00
Kermit Xuan
f98e3eee25
refactor: optimize code stle (#26270) 2020-08-19 09:50:04 +08:00
xrkffgg
61e01e7c60
chore: merge master into feature 2020-08-13 09:06:53 +08:00
QoVoQ
f65013994f
fix: #26126 use mergedData instead of pageData to decide if render bottom pagination (#26133)
Co-authored-by: Zhongxian Liang <zhongxian.liang@shopee.com>
2020-08-11 16:18:34 +08:00
骗你是小猫咪
bd02b83da4
feat: Table new sticky prop (#25939)
* feat: Table new sticky prop

* add example

* update snapshots

* fix typo

* fix example and improve less

* rename to @zindex-table-fixed-column

* fix compile error

* fix header z-index

* upgrade rc-table and add active style

* improve less var

* upgrade rc-table and remove hover style

Co-authored-by: 二货机器人 <smith3816@gmail.com>
2020-08-07 17:53:23 +08:00
陈帅
f928baf52a
fix: Optimize the display of elements of the block type. (#25903)
* add flex style

* add new demo

* update snapshot

* Merge branch feature into fix-descriptions

* update snapshot

* update snapshot
2020-08-06 14:32:13 +08:00
偏右
9a67f3571d
fix: Table crash when dataSource contains number (#26042)
close #26039
2020-08-05 22:29:38 +08:00
xrkffgg
b0536c2a43
docs: update table demo action (#26010) 2020-08-04 17:49:31 +08:00
偏右
8d7cbbdb0f
fix: Table empty filters throw warning (#26001)
close #25979
2020-08-04 11:43:11 +08:00
Omri Grossman
8800b56e47
fix: The 'indentSize' in the Table component couldn't be zero value (#25890)
* - Fixed the indentSize prop of Table.tsx to also accept 0 values

* - Undo Cascader component test snapshots

* - Added test case
- Used check with typeof === number instead of `undefined` and `null`

Co-authored-by: omri.g <omri.g@alibaba-inc.com>
2020-07-30 10:16:44 +08:00
07akioni
29da624411
fix: Table getCheckboxProps indeterminate not working (#25649)
* fix: Table getCheckboxProps indeterminate not working

* feat: Table warn when set halfChecked using  getCheckboxProps

* chore: rename expand-chidren.md to tree-data.md
2020-07-24 18:46:56 +08:00
zombiej
c5f3ea7b62 chore: Remove useless test case
ref #25736
2020-07-22 13:53:27 +08:00
zombiej
2742596b46 chore: Update snapshot 2020-07-22 13:02:25 +08:00
偏右
8fa79d7eab
update pagination snapshot (#25656) 2020-07-16 14:02:00 +08:00
zhangchen
d04bd2fabc
fix: Table onChange event is triggered twice (#25520)
* fix: Table onChange event is triggered twice

* fix: Table onChange event is triggered twice

* test: should call onChange when change pagination size

* update: code style
2020-07-10 15:17:15 +08:00
偏右
9febbca3fe
docs: 📔 Update customize-theme.zh-CN.md (#25540)
* Update customize-theme.zh-CN.md

* test:  update snapshot
2020-07-09 15:16:49 +08:00
07akioni
0ba2f830ac
test: update snapshots (#25469) 2020-07-07 15:38:09 +08:00
afc163
61eb92f8d2 fix Table test snapshot 2020-07-03 12:07:00 +08:00
陈帅
523b74e3b6
merge master into Feature (#25262)
* 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

https://github.com/react-component/pagination/issues/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>
2020-06-28 22:41:59 +08:00
二货机器人
67513cc71b
fix: Select icon interactive (#25212)
* fix: Select icon interactive

* updat snasphot
2020-06-24 23:28:54 +08:00
偏右
1b64eb39bc
style: Add empty style for Table empty filters menu (#25073)
close #25068
2020-06-18 11:38:43 +08:00
xrkffgg
7392c7491a
docs: remove unnecessary (#25026)
* docs: remove unnecessary

* fix: div
2020-06-17 14:48:26 +08:00
07akioni
8dc16037d0
fix: nested unbordered table inside a bordered table has border. (#24995)
* fix: nested unbordered table inside a bordered table has border.

* docs: debug nested bordered table

* test: update snapshot

* fix: nested table border overlap

* test: update snapshot
2020-06-16 20:57:09 +08:00
Martin Cermak
638a37832b docs: Table sorting with handle using react-sortable-hoc 2020-06-15 18:37:20 +08:00
07akioni
f6c8f81484
fix: shoundn't keep table filterDropdown inner status in controlled mode (#24952)
* fix: shoundn't keep table filterDropdown inner status in controlled mode

* chore: remove useless code in table.filter.test
2020-06-12 18:05:46 +08:00
二货机器人
d6d3de8a1b
fix: table multiple sorter (#24852)
* fix sort callback

* add test case
2020-06-08 22:45:53 +08:00
Kermit Xuan
49533aafdc
feat(table): support hideSelectAll prop and (#24592)
remove hideDefaultSelections prop in rowSelection(#14581);
2020-05-29 23:50:56 +08:00
zefeng
cb2094265e
feat(tooltip): Tooltip support colour background (#23155)
* feat(tooltip): Tooltip support colour background

Closes #23127

* patch: update test case

* chore: repalce h1 tag to Divider

* chore: update demo
2020-05-25 18:59:00 +08:00
偏右
ae8603838a
Merge pull request #24371 from ant-design/master
chore: merge master into feature
2020-05-21 23:41:37 +08:00