test/ant-design
1
0
Fork 0
mirror of https://gitee.com/ant-design/ant-design.git synced 2024-12-01 03:29:39 +08:00
Code Issues Actions 69 Packages Projects Releases Wiki Activity
11,501 Commits 18 Branches 731 Tags 205 MiB
4bf9114ee9
Commit Graph

1608 Commits

Author SHA1 Message Date
Cam Song
1af1534592 Add hideOnSinglePage to Pagination (#8615) 2017-12-29 20:14:53 +08:00
愚道
7b1f09a216 Merge branch 'feature-3.1' 2017-12-29 18:57:57 +08:00
Wei Zhu
642f8b20ec Add open in CodeSandbox (#8747) 2017-12-29 17:02:45 +08:00
Wei Zhu
2026b80ae2 Merge branch 'master' into feature-3.1 2017-12-28 16:31:25 +08:00
Wei Zhu
5881621f01 Add @babel/types to devDependencies 
Temporary fix for https://github.com/babel/babel-eslint/issues/530
 2017-12-28 16:02:57 +08:00
Rohan Malhotra
58536ec23e changed ^ to ~ in package.json 2017-12-28 12:49:45 +05:30
Rohan Malhotra
c6a1861887 updated rc-dialog and docs for destroyOnClose 2017-12-28 12:49:33 +05:30
afc163
ca41bda610 upgrade babel-eslint to fix lint error 2017-12-26 10:58:49 +08:00
valleykid
926f07a609 Add changelog for 3.0.3 2017-12-22 18:33:56 +08:00
nikogu
5252de9209 Merge branch 'master' into feature-3.1 2017-12-22 11:43:54 +08:00
Benjy Cui
d7d39aa9fb site: fix windows compatibility 2017-12-19 12:11:26 +08:00
偏右
f0234375d9
Add changelog for 3.0.2 (#8643) 
* Add changelog for 3.0.2

* Fix 2.x changelog links

* fix typo

* lock react-virtualized for ssr test
 2017-12-18 10:51:43 +08:00
afc163
a827553604 upgrade deps 2017-12-17 22:03:47 +08:00
愚指导-TZ
c30ac8d138 update rate to 2.4.0 for support allowClear (#8627) 2017-12-15 15:30:38 +08:00
Dane David
5a94236c30 Version fix for rc-select. Update docs to add onInputKeyDown (#8552) 2017-12-13 04:34:54 -06:00
Wei Zhu
d1568c959c Lock babel-eslint version 
https://travis-ci.org/ant-design/ant-design/jobs/314603504
 2017-12-11 16:28:24 +08:00
afc163
d7dcb56dfc upgrade react-slick, close #8455 2017-12-11 16:19:41 +08:00
Benjy Cui
1a0301bc08 bump 3.0.1 2017-12-11 10:04:59 +08:00
Wei Zhu
28d13e2539 Add missing v2-compatible-reset.less 2017-12-05 15:12:14 +08:00
Wei Zhu
49e036e9a6 Bump 3.0.0 2017-12-04 19:55:39 +08:00
afc163
85416ce577 site: highlight anchor of article 2017-12-03 16:13:04 +08:00
Wei Zhu
45815d1148
Refactor confirm (#8409) 
* Refactor confirm

* Add okCancel test

* Only test React 16

* Upgrade rc-dialog
 2017-12-02 22:10:27 +08:00
Wei Zhu
ee93047bad Update rc-slider 2017-12-01 17:18:57 +08:00
Wei Zhu
1b9b92f67d Update lint-staged 2017-12-01 16:17:10 +08:00
Wei Zhu
01f4b4e713 Merge branch 'master' into antd-3.0 2017-12-01 11:50:07 +08:00
afc163
dfc6ca49a6 Fix npm run site 2017-11-30 22:07:21 +08:00
Sam Maxwell
378084376a update moment package number (#8388) 2017-11-30 20:06:00 +08:00
afc163
b8b591c593 bump 3.0.0-rc.4 2017-11-29 21:25:05 +08:00
偏右
b531de3fee
Upgrade dev deps and fix lints (#8358) 
* upgrade devDeps and fix lint

* Fix stylelint problems
 2017-11-29 21:00:16 +08:00
niko
be1cbd4eae upgrade rc-calendar dependency to 9.3.0 (#8353) 2017-11-29 11:23:15 +08:00
Wei Zhu
57d80c0c70 Upgrade rc-rate 2017-11-28 10:49:56 +08:00
Wei Zhu
c8a49c45fc Upgrade rc-select 2017-11-28 09:51:29 +08:00
afc163
e6940ad721 Fix enquire.js dep 
close ant-design/ant-design-pro#280
 2017-11-24 09:04:30 +08:00
afc163
1c7eb398d7 bump rc 2017-11-22 17:29:58 +08:00
afc163
b2b60fdac4 3.0.0-rc.2 2017-11-22 16:59:43 +08:00
afc163
b90b04f3fe upgrade rc-form 2017-11-22 15:38:27 +08:00
Benjy Cui
09fd564af9 feat: upgrade rc-menu (#8235) 2017-11-20 10:33:34 +08:00
Wei Zhu
5e0dd59e5c Bump 3.0.0-rc.1 2017-11-19 22:03:31 +08:00
Wei Zhu
cd67045e11 Update rc-time-picker 2017-11-19 21:35:46 +08:00
Wei Zhu
ca44eb9cd9 Remove react@0.14 and react@15 from peerDependencies 2017-11-19 20:39:35 +08:00
Wei Zhu
5d38ccf892 Oops. 2017-11-19 20:38:05 +08:00
Wei Zhu
4a97ed4bf0 Update rc-scroll-anim 2017-11-19 20:33:59 +08:00
Wei Zhu
409959e7c7 Update rc-scroll-admin 2017-11-19 20:25:59 +08:00
Wei Zhu
bf4ad93f2c Update rc-select 2017-11-19 20:14:53 +08:00
Wei Zhu
076c40ac31 Update rc-rate 2017-11-19 20:00:12 +08:00
Wei Zhu
816226ff92 Update rc-input-number 2017-11-19 19:59:26 +08:00
Wei Zhu
d5b56e522e Merge branch 'master' into antd-3.0 2017-11-19 14:26:05 +08:00
Wei Zhu
9fb590fe9d Stick eslint-plugin-react to 7.4.0 
https://github.com/yannickcr/eslint-plugin-react/issues/1543
 2017-11-19 14:25:17 +08:00
Wei Zhu
9678d3fcfd
Focus && blur support (#8204) 
* Add test for select

* Add focus() and blur() for AutoComplete

* Add focus() and blur() to Cascader

* Add focus test for input

* Add focus() and blur() for Checkbox

* Add focus() and blur() for Radio

* Add focus() and blur() for Switch

* Add blur() for TimePicker

* Add focus() and blur() to TreeSelect
 2017-11-19 01:41:40 +08:00
afc163
a4213c22af bump beta 2017-11-18 17:53:06 +08:00
Benjy Cui
ac463a10f2 deps: upgrade form to 2.0.0 (#8207) 2017-11-17 21:19:10 +08:00
jiang
a5bf187271 update menu responsive, ref #4682 (#8226) 
* update menu responsive, ref #4682

* update popover menu style
 2017-11-17 19:17:37 +08:00
Wei Zhu
f78d33ed59
Update rc-table (#8187) 
* Update rc-table

* Add table drag sorting demo
 2017-11-17 18:53:07 +08:00
Wei Zhu
8fcb214100 3.0.0-beta.8 2017-11-17 14:50:18 +08:00
Wei Zhu
479a5cb743
Remove allowSyntheticDefaultImports (#8218) 2017-11-17 14:38:54 +08:00
afc163
e3da638b53 bump 2017-11-13 21:15:32 +08:00
afc163
65b5769abd bump 2.13.10 2017-11-12 15:22:12 +08:00
Wei Zhu
55c85f77a1
Update dependendies (#8150) 
* deps: upgrade rc-menu, and close: #2837

* test: update snapshots

* Update rc-calendar

* Update rc-cascader

* Update rc-dialog

* Update dropdown

* Update rc-select@7.1.0

* Update rc-slider

* Update rc-time-picker

* Update rc-tooltip

* Update rc-tree-select

* Mock rc-trigger and Portal

* Fix animation warning when inlineCollapsed changes

* fix: should use SubMenu[popupClassName]

* Fix typescript error

* Fix lint

* fix: style for menu

* Mock rc-trigger for React 15

* Remvoe allow_failures
 2017-11-11 00:07:03 +08:00
Benjy Cui
fe7386746c site: clean cached before start, close: benjycui/bisheng#113 2017-11-10 17:47:48 +08:00
afc163
198d033e21 upgrade @types/react to 16 2017-11-08 15:42:57 +08:00
Wei Zhu
67fee48c6a Run test against multiple react versions 2017-11-07 10:51:25 +08:00
afc163
1338c4f4f8 bump new beta 2017-11-06 21:29:21 +08:00
afc163
714b4ae06a Merge branch 'master' into antd-3.0 2017-11-06 10:35:41 +08:00
Benjy Cui
6bedfb6a5c bump 2.13.9 2017-11-06 10:18:53 +08:00
Benjy Cui
de0493d82b docs: translate, ref: #8100 2017-11-03 15:02:26 +08:00
afc163
3cef86ece5 bump 2017-11-01 20:31:54 +08:00
afc163
cfb871cf58 bump 2017-11-01 18:34:32 +08:00
Benjy Cui
51785aa6eb deps: upgrade TypeScript to 2.6, close #8018 2017-11-01 11:47:22 +08:00
afc163
dbe451a199 bump 2017-10-31 19:40:21 +08:00
afc163
0c44489cb3 bump 2017-10-31 15:15:51 +08:00
afc163
4c20b49db3 bump beta 2017-10-31 15:15:51 +08:00
Benjy Cui
7ff7519207 fix: upgrade rc-form and refactor to be compatible with react@16 2017-10-31 01:33:56 -05:00
nikogu
4166474d07 bump 2.13.8 - change version 2017-10-28 18:52:06 +08:00
afc163
23caba1b65 Upgrade rc-time-picker to 3.0.0 
Add `hourStep` `minuteStep` `secondStep`
 2017-10-28 15:01:54 +08:00
afc163
d96284c798 Merge branch 'master' into antd-3.0 2017-10-27 20:22:17 +08:00
ddcat1115
978a0cbc64 bump 2017-10-27 15:37:15 +08:00
afc163
3c4cc688a1 Fix install warning, close #8030 2017-10-27 10:02:08 +08:00
afc163
3729304166 bump 2017-10-26 19:40:26 +08:00
Benjy Cui
53906a2f0b deps: upgrade deps 2017-10-26 17:25:33 +08:00
afc163
c44f9528be Tweak list style 2017-10-26 15:07:01 +08:00
afc163
ec30f15dc6 bump 2017-10-26 13:38:39 +08:00
afc163
ed41f697e3 bump 2017-10-26 11:59:37 +08:00
Benjy Cui
e641638c33 deps: upgrade bisheng (#7985) 2017-10-24 22:05:32 -05:00
Wei Zhu
7776cf62a7 Merge branch 'master' into antd-3.0 2017-10-25 10:25:02 +08:00
afc163
695bd8a6c0 bump 2017-10-24 15:29:35 +08:00
monkindey
2a92b7a9fa feat: add sort api table script 2017-10-24 11:21:04 +08:00
ddcat1115
1f57cf4e51 version 2.13.7 2017-10-22 17:44:23 +08:00
afc163
f18c8a4ecf bump 2017-10-19 20:35:55 +08:00
Wei Zhu
4431c5d70d Upgrade antd-tools 2017-10-19 19:10:03 +08:00
afc163
839703bb55 bump 2017-10-19 17:09:57 +08:00
afc163
91b2d9ab9a bump 2017-10-18 21:36:50 +08:00
afc163
6e78ffd0a6 Fix react externals 2017-10-12 20:29:12 +08:00
afc163
94c6c910ff Merge branch 'master' into antd-3.0 2017-10-12 20:07:31 +08:00
afc163
d650c1bf50 use bisheng 0.25 for react 15 2017-10-12 20:05:35 +08:00
afc163
6b609aa5da bump 3.0.0-alpha.15 2017-10-12 18:14:47 +08:00
afc163
73c9be2f40 bump 2.13.6 2017-10-12 14:52:39 +08:00
Wei Zhu
3c0103f8c5 Bump 2.13.5 2017-10-11 20:11:19 +08:00
afc163
627e94fa5a upgrade some devDependencies 2017-10-11 18:20:05 +08:00
Benjy Cui
0bce5c83f9 deps: upgrade rc-notification to support react@16 (#7844) 2017-10-11 12:03:19 +08:00
Wei Zhu
c5487ad1eb React 16 + Enzyme 3 2017-10-09 19:18:04 +08:00
afc163
172a9ede10 bump alpha 2017-10-09 13:48:22 +08:00
afc163
4eb9d5ef56 Merge branch 'master' into antd-3.0 2017-10-09 13:33:59 +08:00
afc163
475e4ff23d upgrade eslint-config-airbnb 2017-10-09 13:27:35 +08:00
afc163
22860b9e87 2.13.4 2017-09-29 22:40:43 +08:00
nikogu
02b69f482d bump 3.0.0-alpha.13 2017-09-28 17:57:07 +08:00
nikogu
1f2425615e bump alpha.12 2017-09-28 09:55:06 +08:00
nikogu
83533660db bump 3.0.0-alpha.11 2017-09-27 14:48:37 +08:00
Benjy Cui
829b5f87bf feat: make default locale to enUS (#7553) 
* feat: make default locale to enUS

* test: fix CI

* docs: update getting started
 2017-09-26 23:12:47 +08:00
转二
20dae8f33e feat: Add option for component: 'mention' 2017-09-25 21:12:43 +08:00
niko
91b97d7b25 List virtualized (#7692) 
* add virtualized & infinite demo
* change `children render` to `renderItem`
 2017-09-25 15:24:16 +08:00
afc163
40e43a80e7 Merge branch 'master' into antd-3.0 2017-09-25 11:14:46 +08:00
Guan Yu Pan (Jacky)
c30c156c56 upgrade rc-animate to 2.4.1 (#7724) 2017-09-25 11:06:25 +08:00
Benjy Cui
bdecb4ebd9 bump 2.13.3 2017-09-22 17:49:16 +08:00
afc163
2f7b75562c Merge branch 'master' into antd-3.0 2017-09-20 17:13:32 +08:00
偏右
0ffccf8b0f Provide a debug way of preact compatibility (#7670) 
* try preact

* Add start:preact to scripts

* fix webpack.config.js
 2017-09-20 14:57:48 +08:00
afc163
fe7c85fece Merge branch 'master' into antd-3.0 2017-09-19 16:12:18 +08:00
Wei Zhu
ed2303a5da Change primary color in browser (#7516) 2017-09-18 17:31:48 +08:00
Benjy Cui
72845f55ec deps: upgrade rc-steps 2017-09-18 16:12:55 +08:00
nikogu
61dcdae271 merge master 2017-09-18 10:49:28 +08:00
nikogu
abf18b9ec4 merge master 2017-09-18 10:13:48 +08:00
afc163
43d14f8517 upgrade rc-slider, improve accessibility 2017-09-17 17:42:24 +08:00
nikogu
b651579c1b update version 2.13.2 2017-09-17 01:15:41 +08:00
Shubham Kanodia
989b2e2041 Added react and react-dom as peerDeps (#7592) 
* Added react and react-dom as peerDeps

* Added react ~0.14.0 as a valid peerDependency
 2017-09-16 23:44:20 +08:00
afc163
2e8e9ccf61 Merge branch 'master' into antd-3.0 2017-09-13 14:29:01 +08:00
afc163
f321596e04 Revert empty style of table 
ref #7142

close https://github.com/react-component/table/issues/163
 2017-09-13 14:26:02 +08:00
jiang
2570ba8fe6 Menu anim (#7567) 
* update menu icon animate

* add padding !important, restore menu retraction animate

* update dropdown arrow
 2017-09-12 16:46:33 +08:00
Wei Zhu
2a4adeef46 Upgrade antd-tools 2017-09-12 11:51:43 +08:00
ddcat1115
d5b6cc70cd 2.13.1 CHANGELOG 2017-09-11 00:02:05 +08:00
afc163
13a11d6fc3 update default font-size 2017-09-08 15:32:10 +08:00
afc163
fe12d8d579 Merge branch 'master' into antd-3.0 2017-09-06 21:44:47 +08:00
afc163
b8f6185abc Fix simple pagination style, close #7500 2017-09-06 21:44:26 +08:00
nikogu
025ea8ede9 bump 3.0.0-alpha.9 2017-09-06 16:05:23 +08:00
afc163
abdf14c8a3 bump 2017-09-06 14:15:38 +08:00
afc163
78c1bebd7a Merge branch 'master' into antd-3.0 2017-09-06 13:43:00 +08:00
afc163
053054bc65 bump 2017-09-06 13:19:09 +08:00
paranoidjk
a73d0504ca site: dev use uncompressed bundle. close #7383 (#7472) 2017-09-06 09:19:35 +08:00
afc163
c0df7f4142 bump 2017-09-05 20:03:21 +08:00
偏右
a933961aae upgrade rc-steps to 3.0 (#7473) 
* upgrade rc-steps to 3.0

* update snapshot
 2017-09-05 19:57:59 +08:00
afc163
dca17bcc12 Fix package.json 2017-09-05 16:29:25 +08:00
afc163
0f778d2a4a Merge from master 2017-09-05 16:19:34 +08:00
afc163
cb1e0bfe8e Fix table empty data scroll style 
close #7457
 2017-09-05 15:57:34 +08:00
Wei Zhu
319fa7c82d Bump 2.13.0 2017-09-03 22:55:41 +08:00
Wei Zhu
ad3e49e397 docs: Add backfill to AutoComplete 2017-09-01 11:33:11 +08:00
偏右
81f16cb2e0 Merge pull request #7400 from ant-design/feature-2.13 
Feature 2.13
 2017-08-31 16:02:04 +08:00
afc163
a3e723648b upgrade react-slick to 0.15.0 2017-08-31 12:20:10 +08:00
afc163
81048aafb2 Improve itemRender of Pagination 2017-08-30 14:03:37 +08:00
afc163
9c477bf8fd fix conflict 2017-08-27 19:32:45 +08:00
afc163
5a971b24ad Merge from master 2017-08-27 19:32:02 +08:00
偏右
156ce90a8e 2.12.8 (#7346) 
* 2.12.8

* use emoji
 2017-08-27 18:57:24 +08:00
afc163
6527f9cdb0 More elegant empty style for fixed-columns Table 
close #7298

close #7142
 2017-08-27 17:30:29 +08:00
ddcat1115
7714926be5 bump 3.0.0-alpha.5 2017-08-24 11:48:03 +08:00
ddcat1115
b10f7726c3 Merge remote-tracking branch 'origin/master' into antd-3.0 2017-08-23 23:12:38 +08:00
ddcat1115
e2d6488f1c bump 3.0.0-alpha.4 2017-08-23 19:25:12 +08:00
afc163
ef43be1c67 remove incompatiable jsdom version 2017-08-23 17:08:45 +08:00
afc163
036aeb333d fix jsdom in devDeps 2017-08-23 16:31:15 +08:00
afc163
640fcc51e8 upgrade rc-pagination, no new API for antd 2017-08-23 13:46:55 +08:00
ddcat1115
2666eef671 fix package.json 2017-08-22 15:27:45 +08:00
Benjy Cui
2620318172 feat: support controlled panels for DatePicker and RangePicker, close: #5190 (#7049) 2017-08-21 21:15:44 +08:00
afc163
dc7dfd38c6 Merge from master 2017-08-21 21:02:57 +08:00
Benjy Cui
55f58cf59f bump 2.12.7 2017-08-21 10:00:00 +08:00
afc163
ff7ba0fb6f upgrade antd-tools and use next over beta, ant-design/antd-tools#57 2017-08-19 12:26:25 +08:00
afc163
c28c2f6b1e Merge branch 'master' into antd-3.0 2017-08-18 19:18:26 +08:00
Benjy Cui
f089d1852d chore: remove useless deps, and close: #4451 2017-08-18 15:00:21 +08:00
afc163
7b8090d279 upgrade antd-tools 2017-08-18 12:10:53 +08:00
afc163
b84b17d981 Merge branch 'master' into antd-3.0 2017-08-17 18:03:28 +08:00
jiang
7a5e11c799 fix: tabs show scroll anim and tag anim ease (#7218) 
* fix: tabs show scroll anim and tag anim ease

* update snapshot
 2017-08-16 21:05:52 +08:00
nikogu
3c5e0d4fb8 bump 3.0.0-alpha.2 2017-08-15 17:27:56 +08:00
nikogu
ecef5887b6 merge master 2017-08-15 17:26:56 +08:00
afc163
dc209c20f9 upgrade rc component version 2017-08-15 14:41:28 +08:00
乐仪
6e49d02a07 bump 3.0.0-alpha.2 2017-08-14 21:54:37 +08:00
nikogu
9a7c369af6 bump 2.12.6 2017-08-11 22:18:16 +08:00
nikogu
33e822b0c8 revert to 3.0.0-alpha.1 & bump 3.0.0-alpha.1 2017-08-11 09:37:24 +08:00
nikogu
bd1e9a0182 bump 3.0.0-alpha.2 2017-08-10 18:53:03 +08:00
nikogu
bab429d838 bump 3.0.0-alpha.1 2017-08-10 18:10:40 +08:00
afc163
b48f749e26 Merge branch 'feature-2.13' into antd-3.0 2017-08-10 16:33:18 +08:00
Vemund Santi
b69a6886d7 Locale/nb-NO (#7122) 
* locale: Add Norwegian Bokmål locales to Ant Design

* Add Vemund Santi to authors.

* docs: add Norwegian to list of i18n language examples

* test: add tests for Norwegian Bokmål

* Update dependencies. Use locales from rc-pagination.
 2017-08-09 20:36:01 +08:00
乐仪
5b85d7019c bump 3.0.0-alpha.0 2017-08-09 16:47:12 +08:00
乐仪
bf7814452f bump 3.0.0-alpha0 2017-08-09 16:09:57 +08:00
afc163
acf58de807 2.12.5 2017-08-07 21:29:24 +08:00
afc163
4c52ccaff9 Fix Dropdown menu width, close #7124 2017-08-07 21:27:08 +08:00
乐仪
c8eec8c56f bump 2.12.4 2017-08-06 20:21:57 +08:00
偏右
cb8f6a6ef5 Fix tabs extra content (#7090) 
* Fix tabBarExtraContent style in vertical tabs

close #6578

* update snap

* fix rc-tabs
 2017-08-05 23:01:28 +08:00
afc163
6a17efcbf1 upgrade some devDeps and fix stylelint 2017-08-04 18:01:40 +08:00
Wei Zhu
12bf17b166 Bump version 2017-07-31 01:26:28 +08:00
Wei Zhu
bef7db465e Revert "Revert "Revert "feat: upgrade rc-slider, support keyboard accessibility""" 
This reverts commit 0b8b0d2deb.
 2017-07-30 16:07:41 +08:00
Wei Zhu
0b8b0d2deb Revert "Revert "feat: upgrade rc-slider, support keyboard accessibility"" 
This reverts commit 551807cd91.
 2017-07-30 16:06:53 +08:00
Wei Zhu
551807cd91 Revert "feat: upgrade rc-slider, support keyboard accessibility" 
This reverts commit ef339a32ac.
 2017-07-30 16:05:37 +08:00
paranoidjk
ef339a32ac feat: upgrade rc-slider, support keyboard accessibility 
https://github.com/react-component/slider/pull/282
 2017-07-28 14:02:45 +08:00
Benjy Cui
fff756ff5f deps: upgrade rc-tree 2017-07-28 11:38:39 +08:00
paranoidjk
bcb82a518b feat: upgrade rc-calendar. 2017-07-28 11:18:40 +08:00
Benjy Cui
455ea58b10 deps: upgrade rc-tree 2017-07-27 16:43:11 +08:00
Confiks
e93d24021f Upgrade create-react-class to 15.6.0 2017-07-25 01:53:53 +02:00
afc163
4513019abc 2.12.2 2017-07-22 15:32:37 +08:00
infeng
d19bfcbf74 fix onChange ts definition of Input 2017-07-19 13:52:55 +08:00
Benjy Cui
02670cb174 bump 2.12.1 2017-07-17 09:36:53 +08:00
乐仪
60f9ba5b33 bump 2.12.0 2017-07-08 12:48:43 +08:00
偏右
b653a2c055 Merge branch 'master' into feature-2.12 2017-07-07 19:41:37 +08:00
afc163
25a60322e5 Add Pagination[itemRender] 2017-07-06 19:17:36 +08:00
paranoidjk
48ec77222f feat: upgrade rc-slider 
https://github.com/react-component/slider/pull/292
 2017-07-04 18:49:24 +08:00
paranoidjk
ba168b826f refactor: use spread operator replace object-assign (#6677) 2017-07-03 16:57:11 +08:00