Commit Graph

1169 Commits

Author SHA1 Message Date
zombiej
5ef2e23bcf Merge remote-tracking branch 'origin/master' into feature 2018-11-20 16:36:18 +08:00
zombiej
8fbfa1f876 should check more strict to avoid shallow compare miss match
fix #13028
2018-11-15 23:34:13 +08:00
afc163
cdafee70f2 Merge branch 'master' into feature
* master:
  🔥 update less code style
  ⬆️ upgrade react-dnd version
  update
  Remove unused dependencies
  3.10.7 changelog
  🐛 Fix typo, #12978
  update changelog
   Release 3.10.6
  🚑 Fix Button[href] 1px align bug in another way
  tweak style
  💄 tweak button style
2018-11-12 12:06:24 +08:00
afc163
a616f89a1b 🔥 update less code style 2018-11-12 12:02:30 +08:00
afc163
11384384d0
Merge branch 'master' into feature 2018-11-10 22:10:07 +08:00
ztplz
6ad23c370e Fix CI 2018-11-10 22:09:29 +08:00
afc163
713b363a9b Merge branch 'master' into feature
* master:
  fix: extra space
  docs(table): generic type arguments in jsx elements demo
  revert webpackbar
2018-11-09 18:56:01 +08:00
muzea
0c5bbf04f4 fix: extra space 2018-11-09 18:35:34 +08:00
muzea
0760cb7ff7 docs(table): generic type arguments in jsx elements demo 2018-11-09 18:35:34 +08:00
zombiej
fac13e2e0b Merge remote-tracking branch 'origin/master' into feature 2018-11-09 10:50:20 +08:00
afc163
368468829f Fix nested Table style insider another wrapper
close #13025
2018-11-08 20:52:38 +08:00
afc163
2358cbef31 💄 improve table style 2018-11-08 14:45:16 +08:00
afc163
9b9f2ceaaf Fix nested small/middle size Table style 2018-11-08 14:21:39 +08:00
afc163
fa457c465d docs: explain tree table and childrenColumnName, close #13002 2018-11-07 17:37:58 +08:00
afc163
ad0f9b28ec Merge branch 'master' into feature
* master:
  site: add Community discusstion links
  🌐 site: transition component category, close #11629
  Fix Collapse Panel id definition, close #12357
  Fix style overlap with sorter when long text in Table column header
  Add more recommendation
  adjust datepick reset logic
  reset showDate when picker is closed fix #12929
2018-11-04 17:15:29 +08:00
afc163
213693e333 🌐 site: transition component category, close #11629 2018-11-04 16:20:35 +08:00
afc163
1784949e94 Fix style overlap with sorter when long text in Table column header
close #12650

ref #12552
2018-11-04 15:54:31 +08:00
picodoth
3b748981ba Merge branch 'master' into feature 2018-11-04 00:15:06 +08:00
yoyo837
41360cc4c8 update dataIndex description 2018-11-03 12:32:56 +08:00
afc163
2aefdda0ff Build in and improve UI of nested Table in expand-children Table
close #12877
2018-11-02 18:23:26 +08:00
afc163
0fc32da6ea Merge branch 'master' into feature
* master: (27 commits)
  Fix sort order broken issue when columns were put in render
  fix Modal docs typo
  Improve Alert
  update select props :onPopupScroll
  add transform-origin on dropdown as menu
  Update validate-other.md
  should not hide avatar in vertical item layout of List
  fix stylelint again by locking version :sad:
  Fix fixed-columns Table border issue, close #9687
  site: still need the fallback scrollIntoView, #12683
  use latest stylelint
  site: fix npm run site error
  Update jsdom requirement from ^12.1.0 to ^13.0.0
  🐛 dynamic form doc fix
  Fix button icon margin style bug
  remove babel-plugin deps
  clean up useless deps
  Use recomended babel-preset-env
  findDOMNode to refs, close #12843
  componentWillReceiveProps => getDerivedStateFromProps
  ...
2018-11-01 14:36:14 +08:00
afc163
a7f17b4cde Fix sort order broken issue when columns were put in render
will handle these situation

- with 'key'
- with function has same stringify value

close #12870
close #12737
2018-11-01 13:44:48 +08:00
afc163
08600adade Fix fixed-columns Table border issue, close #9687 2018-10-31 17:03:40 +08:00
Wei Zhu
af54f500eb Merge branch 'master' into feature 2018-10-29 19:40:08 +08:00
afc163
073ffd6503 fix typo selector, #12723 2018-10-26 23:59:57 +08:00
afc163
a835536dde Fix checkbox align of small/middle size table, close #12723 2018-10-26 23:49:13 +08:00
afc163
6f955681b8 Fix small size table header border missing in Firefox
close #12840

ref #12628
2018-10-26 23:22:41 +08:00
afc163
ba5409afa3 Merge branch 'master' into feature 2018-10-26 18:48:34 +08:00
yoyo837
512e85ec5f fix test case 2018-10-26 12:29:43 +08:00
yoyo837
da143a064f fix test case 2018-10-26 12:29:43 +08:00
yoyo837
49f4fdf9b6 update demo 2018-10-26 12:29:43 +08:00
yoyo837
722b903118 update docs react-component/table#222 2018-10-26 12:29:43 +08:00
zombiej
0235ba585f adjust small table placeholder style
fix #12682
2018-10-24 23:30:03 +08:00
Ivan Kravets
65f85257b0 Avoid static table backgrounds and use dynamically calculated
Tested with light/dark themes.
2018-10-23 12:30:59 +08:00
Li Chao
b92d4ed627 Update head.md
The parameters of the sorter method are rows
2018-10-18 11:09:59 +08:00
zombiej
0e1caae01d Table add expandIcon prop
close #10819, #11802
2018-10-17 21:22:40 +08:00
afc163
42e5b8b77e Fix Table th border missing in Firefox
close #12628

solution found at https://stackoverflow.com/a/16337203
2018-10-15 11:12:16 +08:00
afc163
68c177cdc1 update snapshot 2018-10-10 15:12:06 +08:00
afc163
f1d1d87de0 Fix unexpected column title in unsorted columns 2018-10-10 14:50:59 +08:00
afc163
46f4a3e9da Fix Table sort style of right-aligned column
when size is small
2018-10-10 14:45:56 +08:00
afc163
55a13a11fc Fix Table sort style of right-aligned column
close #12552
2018-10-10 13:52:33 +08:00
afc163
688f4ec8d6 Fix sort state not change when columns in render
close #12571
2018-10-10 11:23:44 +08:00
afc163
9e58e56e76 tweak sorter icon position 2018-10-09 18:53:32 +08:00
afc163
86b342545d Fix sorted column background in small size Table 2018-10-09 18:53:32 +08:00
afc163
419287de2b Fix sort event on every columns when sorter is true
close #12515
2018-10-06 18:21:30 +08:00
Wei Zhu
a9f7a2d38d tweak table sort icon size 2018-10-02 00:48:45 +08:00
Wei Zhu
a3ce6678cb Update snapshot 2018-10-01 23:57:45 +08:00
Wei Zhu
ff0595733f refactor: use instanceof instead typeof 2018-09-30 17:04:05 +08:00
Wei Zhu
2bf2bb5af4 fix: type error 2018-09-30 16:58:25 +08:00
Wei Zhu
1c1a67fe1d Merge branch 'feature' 2018-09-30 16:53:28 +08:00
Wei Zhu
fe677e2966 fix: type error of filterDropdown 2018-09-30 16:11:25 +08:00
zombieJ
2cd0ca3225 Get the filtered data after executing the filter function on the dataSource (#12369)
* update testcase

* rename as currentDataSource
2018-09-30 11:17:39 +08:00
Wei Zhu
fcb546ea57 Update snapshot 2018-09-29 16:41:56 +08:00
Wei Zhu
4ce3800de7 Merge branch 'master' into feature 2018-09-29 16:27:07 +08:00
KentonYu
5545342bd4 docs: 修改 Table 文档 (#12460)
RowSelection 中 onSelectAll、onSelect 说明中的 列 改为 行
2018-09-28 22:05:43 +08:00
Wei Zhu
306bce385b Improve type definition and doc of TableComponents 2018-09-25 19:48:50 +08:00
Xiaoyu Li
1f8ac3f697
fix filterIcon type
based on api [ReactNode|(filtered: boolean) => ReactNode]

https://ant.design/components/table-cn/#components-table-demo-dynamic-settings
2018-09-22 20:11:09 -05:00
ycjcl868
4d1e46e03d Merge master into feature 2018-09-23 01:43:35 +08:00
zombiej
2906b456ce update test case 2018-09-22 14:53:45 +08:00
zombiej
048a9020f3 adjust style 2018-09-22 14:53:45 +08:00
zombiej
50dc59e1ce adjust table style 2018-09-22 14:53:45 +08:00
afc163
8d3cb85142 fix sort state when toggle between multiple columns 2018-09-21 19:06:38 +08:00
afc163
a0b8637783 destructuring assignment 2018-09-21 19:06:38 +08:00
Wei Zhu
d5a77eff0b Update snapshot 2018-09-21 17:32:35 +08:00
偏右
85749c94fb
test: remove it.only 2018-09-21 15:55:00 +08:00
afc163
7c6299e12e Merge branch 'master' into feature 2018-09-21 14:03:04 +08:00
afc163
f0974e0da7 support column.title as render props
```jsx
columns={[{
  title: (filters, sortOrder) => <div>Title</div>,
}]}
```

close #11246
2018-09-21 13:41:08 +08:00
afc163
71316d6baa update table snapshot 2018-09-21 13:41:08 +08:00
afc163
8feb15ea72 fix test case 2018-09-21 13:41:08 +08:00
afc163
bcb06ec174 Add active style of filtered state 2018-09-21 13:41:08 +08:00
afc163
6530de2961 revert getPopupContainer 2018-09-21 13:41:08 +08:00
afc163
209e40508d fix sort 2018-09-21 13:41:08 +08:00
afc163
da33358e75 tweak icon active style 2018-09-21 13:41:08 +08:00
afc163
27e2654f0f sort by click column area 2018-09-21 13:41:08 +08:00
afc163
6f67c435c2 separate filter and sort into two click area 2018-09-21 13:41:08 +08:00
afc163
4c84dad106 move filter icon to end of column head 2018-09-21 13:41:08 +08:00
zombiej
954c7ecd8e fix #12284. confirmFilter is after set state 2018-09-19 18:33:09 +08:00
afc163
c65d6f6f36 Merge branch 'master' into feature 2018-09-17 15:01:53 +08:00
afc163
c935d53b71 Fix sorter icon align of Table 2018-09-17 14:53:21 +08:00
afc163
cd9b8b20b5 Merge branch 'master' into feature 2018-09-16 17:29:04 +08:00
zombiej
26c3ea4f4a fix #12233. Height should not in transition. 2018-09-13 20:42:45 +08:00
zombiej
2b22d6b19c bump rc-switch & update test case 2018-09-13 19:47:28 +08:00
Mikasa33
6833e767c6 Add defaultSortOrder (#12229)
添加默认排序参数说明
2018-09-13 19:40:43 +08:00
zombiej
526f10d5ff fix #12179. Remove transition of border in small table 2018-09-12 16:51:45 +08:00
zombiej
b1f9f03b3d fix #6515. Add opacity on the table header as fixing additional scroll bar workaround. 2018-09-08 21:24:35 +08:00
HeskeyBaozi
976f6969f4 update test snapshot 2018-09-07 14:14:23 +08:00
zombiej
0ea5d6af70 adjust time picker default width since font number to be laregr 2018-09-06 19:16:37 +08:00
包子熊
67024893ce Hotfix/icon issue (#12016)
* fix progress icon

* remove IconDisplay fields.js

* update progress test snapshot

* fix form item circle filled

* update form-item test snapshot

* fix close icon in upload item list

* fix alert icon theme

* update alert test snapshot

* fix time picker clear icon

* fix test snapshot

* fix rotate icon in the header

* update test snapshot

* update new tree test snapshot

* fix icon position

* fix old icon and new icon both display

* fix card actions icon position
2018-09-03 19:29:27 +08:00
HeskeyBaozi
24568f61ff use the whole svg icons 2018-09-02 23:39:58 +08:00
HeskeyBaozi
2f8a56fa78 fix test case & update test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
74798b8911 upgdate test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
359191abeb update test snapshot 2018-09-02 20:59:37 +08:00
HeskeyBaozi
d6131fe18d update test snapshot 2018-09-02 20:59:37 +08:00
afc163
207bad7b47 Merge branch 'master' into feature-3.9.0 2018-09-01 13:22:06 +08:00
afc163
b84d515969 site: add promote badge 2018-08-31 17:03:27 +08:00
Tom Xu
8ff9dc6bab Table added a new less variable @table-header-color 2018-08-31 10:42:50 +08:00
hongxuWei
698aa3a01a Fix the bug of edit cell demo 2018-08-30 10:42:43 +08:00
陈帅
c73ad8021d
Merge pull request #11894 from ant-design/feature/svg-icon
Hotfix(Icon) fix SVG element style
2018-08-29 18:40:04 +08:00
afc163
bf2f7e9c33 Merge branch 'master' into feature-3.9.0 2018-08-28 18:09:01 +08:00
carrie-tanminyi
c2e50610ff Update index.zh-CN.md (#11924) 2018-08-28 17:14:04 +08:00
HeskeyBaozi
0c9465aaf9 upgrade icons library 2018-08-27 20:40:11 +08:00
HeskeyBaozi
ee1d2469a8 upgrade test snapshot 2018-08-24 18:36:08 +08:00
HeskeyBaozi
0c751ca3b5 remove pseudo-class in pagination 2018-08-22 20:01:00 +08:00
HeskeyBaozi
3b598eafe1 update pagination test snapshot 2018-08-21 17:14:35 +08:00
HeskeyBaozi
9330aaec06 update table test snapshot 2018-08-20 15:37:55 +08:00
HeskeyBaozi
65600c8a95 upgrade to 3.8.2 2018-08-20 14:00:51 +08:00
afc163
838be31543 good looking table demo 2018-08-18 12:48:56 +08:00
HeskeyBaozi
f275f3090a update Icon api 2018-08-16 11:41:37 +08:00
HeskeyBaozi
796de6390b update test snapshot 2018-08-14 15:32:29 +08:00
HeskeyBaozi
35974d67b2 update test snap shot 2018-08-13 20:51:01 +08:00
HeskeyBaozi
0a8f964935 update test snap shot 2018-08-13 14:46:55 +08:00
HeskeyBaozi
3baec95628 Merge branch 'feature-3.9.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-08-13 09:26:33 +08:00
afc163
838abbd358 tweak table demo 2018-08-12 22:02:33 +08:00
HeskeyBaozi
bda65ddb1e update select snapshot 2018-08-09 16:07:57 +08:00
Wei Zhu
064bfaf554 Add @types/prop-types 2018-08-07 21:09:05 +08:00
HeskeyBaozi
b2ab727c89 resolve conflicts 2018-08-06 15:06:06 +08:00
afc163
bead75021b change and undocument onSelectMultiple cause it need more disscuss 2018-08-05 13:58:54 +08:00
afc163
aa2b1a4352 Merge branch 'master' into feature-3.8.0 2018-08-03 23:16:08 +08:00
Jackie.Ls
9b150d9246 update (#11597) 2018-08-03 17:13:50 +08:00
HeskeyBaozi
6c42d711e8 Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon 2018-07-31 15:36:23 +08:00
afc163
56fa8629b5 Merge branch 'master' into feature-3.8.0 2018-07-30 17:58:21 +08:00
Wei Zhu
d7ca64b95c docs: add resizable column table demo 2018-07-30 17:47:31 +08:00
afc163
636c343b16 Merge branch 'master' into feature-3.8.0 2018-07-29 15:06:36 +08:00
Ilan Hasanov
86398d910a 💬 misc typos and blank spaces fixes 2018-07-29 01:15:02 +08:00
littleLane
b23d742f1b feat: add rowSelection.columnTitle to Table 2018-07-28 14:57:00 +08:00
HeskeyBaozi
010bdebc28 update drawer 2018-07-25 12:04:26 +08:00
HeskeyBaozi
768af40c4c Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/drawer/__tests__/__snapshots__/Drawer.test.js.snap
#	components/drawer/__tests__/__snapshots__/DrawerEvent.test.js.snap
#	components/drawer/index.tsx
2018-07-25 12:03:00 +08:00
HeskeyBaozi
ee16585b6d update test cases 2018-07-25 11:51:19 +08:00
Wei Zhu
6199340b5f Merge branch 'master' into feature-3.8.0 2018-07-24 14:55:53 +08:00
Raphael Chauveau
08e83193f2 Multiple row selection (#11406)
This PR intends to solve issue #11404 (Multiple row selection in table component).

The Chinese documentation is missing from the PR. Could someone please add it ?
2018-07-24 14:49:23 +08:00
Andrzej Dybionka
968371b22a fix: table onChange event is fired every time when close filterDropdown
Close #11164
2018-07-24 12:02:01 +08:00
Will
e91f67b87c Update index.zh-CN.md (#11427)
First of all, thank you for your contribution! :-)

Please makes sure that these checkboxes are checked before submitting your PR, thank you!

* [ ] Make sure that you propose PR to right branch: bugfix for `master`, feature for latest active branch `feature-x.x`.
* [ ] Make sure that you follow antd's [code convention](https://github.com/ant-design/ant-design/wiki/Code-convention-for-antd).
* [ ] Run `npm run lint` and fix those errors before submitting in order to keep consistent code style.
* [ ] Rebase before creating a PR to keep commit history clear.
* [ ] Add some descriptions and refer relative issues for you PR.

Extra checklist:

**if** *isBugFix* **:**

  * [ ] Make sure that you add at least one unit test for the bug which you had fixed.

**elif** *isNewFeature* **:**

  * [ ] Update API docs for the component.
  * [ ] Update/Add demo to demonstrate new feature.
  * [ ] Update TypeScript definition for the component.
  * [ ] Add unit tests for the feature.
2018-07-24 11:29:30 +08:00
afc163
1c5f8f1901 update snapshots 2018-07-23 15:21:28 +08:00
HeskeyBaozi
bab50e6bed Merge branch 'feature-3.8.0' of https://github.com/ant-design/ant-design into feature/svg-icon
# Conflicts:
#	components/locale-provider/__tests__/__snapshots__/demo.test.js.snap
#	components/locale-provider/__tests__/__snapshots__/index.test.js.snap
#	components/transfer/__tests__/__snapshots__/demo.test.js.snap
#	components/transfer/__tests__/__snapshots__/index.test.js.snap
2018-07-23 09:58:55 +08:00
afc163
e2b9e5d832 update warning message 2018-07-20 12:10:43 +08:00
HeskeyBaozi
4a553a2006 upgrade test cases 2018-07-19 20:37:47 +08:00
Leo Yin
96d8fc45f1 Fix edit-row.md 2018-07-19 11:28:44 +08:00
HeskeyBaozi
8df086f022 update test cases 2018-07-18 13:39:02 +08:00
HeskeyBaozi
9338f33c1c update test cases 2018-07-18 10:33:54 +08:00
Eager Wei
9c792d52a8 fix table onChange pagination type (#11291)
Update interface.tsx TableProps onChange
2018-07-17 17:56:24 +08:00
陈帅
125d0df3e0 Merge branch 'master' into feature-3.7.0 2018-07-14 12:15:00 +08:00
Wei Zhu
c380186e79 fix: table custom components not change 2018-07-12 16:42:15 +08:00
afc163
8eb8c686ce Merge branch 'master' into feature-3.7.0 2018-07-11 22:21:01 +08:00
Wei Zhu
47884320ef docs: remove only 2018-07-11 10:36:24 +08:00
Wei Zhu
af49a1806b docs: rewrite editable demo 2018-07-10 21:11:50 +08:00
zhuyue
77af31da7d Merge branch master into feature-3.7.0 2018-07-10 11:49:57 +08:00
zombiej
903f3f6770 fix test case in react 15 2018-07-04 20:23:46 +08:00
afc163
6d7ac58550 Fix header overflow style of empty table in Firefox, close #11135 2018-07-04 12:09:28 +08:00
afc163
0c4d356e54 Merge branch 'master' into feature-3.7.0 2018-07-03 19:54:48 +08:00
Wei Zhu
d4c95e6f18 docs: remove obsolete snapshot and fix custom filter demo 2018-07-02 21:41:14 +08:00