mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-12-03 16:39:41 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity
7,907 Commits 19 Branches 732 Tags 446 MiB
1fc211629d
Commit Graph

594 Commits

Author SHA1 Message Date
afc163
d92a24d477 Improve overlay border design 2016-10-14 15:40:39 +08:00
feng zhi hao
4b9db4ff87 improve props interface in InputNumber and Table (#3360) 2016-10-10 22:38:47 +08:00
ddcat1115
c6e1d6febc 修复Table 带边框相关的样式问题 (#3340) 
close #3301
 2016-10-10 22:38:15 +08:00
kvetoslavnovak
7156956685 Table - basic - English translation (#3325) 
* Table - basic - English translation

Correction, to same as in line with other examplets

* Update basic.md

* Update basic.md
 2016-10-08 15:45:42 +08:00
afc163
20a310aa07 Merge branch 'master' of github.com:ant-design/ant-design 2016-10-06 18:54:50 +08:00
afc163
58d7741709 http => https, close #3303 2016-10-06 18:54:28 +08:00
Benjy Cui
64079f181a docs: update demos text 2016-10-02 08:55:40 +08:00
kvetoslavnovak
b3729806ef docs: Table - Fixed header - English Translation (#3278) 2016-10-02 08:47:42 +08:00
kvetoslavnovak
c2fb8f30a1 docs: Table - ajax - English Translation (#3270) 2016-10-02 08:47:13 +08:00
kvetoslavnovak
8128a94b71 docs: Table - Fixed Columns and Header - English Trans. (#3280) 2016-10-02 08:46:19 +08:00
kvetoslavnovak
d3667b8a58 docs: Table - Selection&operation - English Translation (#3267) 
* Table - Selection&operation - English Translation

* Table - Selection&operation - English Translation

* Update row-selection-and-operation.md

* Update row-selection-and-operation.md
 2016-10-02 08:41:53 +08:00
kvetoslavnovak
1ff8a020d1 docs: Table - Pagination - English Translation (#3268) 2016-10-02 08:41:41 +08:00
kvetoslavnovak
e76f604e25 docs: Table - Filter and sorter - English Translation (#3269) 2016-10-02 08:39:23 +08:00
kvetoslavnovak
a7b9266e10 docs: Table - size - English Translation (#3272) 2016-10-02 08:38:54 +08:00
kvetoslavnovak
27a53b5c6c docs: Table - No pagination - English Translation (#3271) 2016-10-02 08:38:34 +08:00
kvetoslavnovak
142227d3fa docs: Table - border, title and footer - English Trans. (#3273) 2016-10-02 08:38:16 +08:00
kvetoslavnovak
c0ee38b173 docs: Table - Expandable Row - English Translation (#3274) 2016-10-02 08:37:51 +08:00
kvetoslavnovak
5373f52d27 docs: Table - Loading - English Translation (#3276) 2016-10-02 08:37:14 +08:00
kvetoslavnovak
2e4e159ed8 docs: Table - colSpan and rowSpan - English Translation (#3275) 2016-10-02 08:36:10 +08:00
kvetoslavnovak
e246b99849 docs: Table - Tree data - English Translation (#3277) 2016-10-02 08:35:06 +08:00
kvetoslavnovak
54994bf136 docs: Table - Fixed columns - English Translation (#3279) 2016-10-02 08:32:27 +08:00
kvetoslavnovak
74ae8f4283 docs: Table - Grouping table head - English Translation (#3281) 
* Table - Grouping table head - English Translation

* Update grouping-columns.md
 2016-10-02 08:32:04 +08:00
kvetoslavnovak
e9ba1e83c7 docs: Table Basic usage - English Translation (#3256) 2016-10-01 08:03:20 +08:00
kvetoslavnovak
7a40f8f200 docs: Table selection - English Translation (#3257) 2016-10-01 08:02:18 +08:00
kvetoslavnovak
5d914d6ba3 docs: Reset filters and sorters - English Translation (#3259) 2016-10-01 08:02:01 +08:00
kvetoslavnovak
94f2d08978 docs: Table Checkbox props - English Translation (#3258) 2016-10-01 08:01:18 +08:00
ImJoeHs
ea5386994d fix table filter type (#3193) 
* fix table filter type

* 'fix'

* update
 2016-09-28 19:56:12 +08:00
广彬-梁
a7ba9004e1 fix: record key bug (#3166) 2016-09-27 13:41:57 +08:00
Benjy Cui
87753482bf style: update code style to please lint, close: #2811 2016-09-27 10:06:34 +08:00
Benjy Cui
10b24ed77c fix: should pass className to Wrapper, close: #3119 2016-09-22 14:36:22 +08:00
Benjy Cui
bd7e9f00c0 style: update code style 2016-09-21 11:54:53 +08:00
ddcat1115
602000f1a1 feat: Table suport indeterminate checkbox (#3074) 
* Table suport indeterminate checkbox

* Table support indeterminate Checkbox
 2016-09-20 15:29:31 +08:00
afc163
69cdf22b42 Allow indicate expandIconColumnIndex in Table, close #3055 2016-09-20 13:16:58 +08:00
feng zhi hao
2cf5dc0046 chore: improve declaration (#3078) 2016-09-19 17:35:17 +08:00
feng zhi hao
cad2d19be2 fix: complete loss declaration (#3068) 
* complete loss declaration

* fix error in ts-lint

* fix Icon name error
 2016-09-19 10:17:07 +08:00
偏右
354759cb17 Redesigned icons (#3041) 
* redesigned icons

* change iconfont content

* use same icons

* fix missing icons

* improve icon size
 2016-09-18 09:54:47 +08:00
afc163
9e5061acdc Merge branch "1.x-stable" 2016-09-15 01:25:28 +08:00
Benjy Cui
59093a6586 fix: should pass prefixCls correctly 2016-09-14 16:59:45 +08:00
马斯特
a25ec29fb8 refactor: 保证所有的tsx和less都正确使用prefix (#3024) 
* refactor: extract prefix cls as less variable

* refactor: apply ant icon prefix cls in less files

* refactor: all components support prefixCls props
 2016-09-14 16:18:33 +08:00
Benjy Cui
c754a3d3d4 chore: add warning for breaking changes 2016-09-14 11:42:06 +08:00
Benjy Cui
8db2b79505 chore: fix compile errors 2016-09-13 15:31:29 +08:00
afc163
0e6f677ff9 Fix doc headings 2016-09-10 13:43:30 +08:00
Benjy Cui
77a45f0b00 deps: upgrade rc-table (#2958) 
* feat: remove Table columns paging, close: #2883

* css: add style for table multi-header

* feat: multi-header supports fitler & sorter and so on

* feat: multi-heaader works with Table[scroll.y]

* feat: multi-header should works with Table[scroll.x]

* style: update code style to please lint
 2016-09-09 13:55:41 +08:00
afc163
3f1960f233 fix fixed columns align bug in small Table, close #2933 2016-09-08 21:27:38 +08:00
Benjy Cui
cb367f3f35 site: update site details 2016-09-08 16:53:50 +08:00
Andrew Murray
0d00c5fb6c docs: Fixed typos (#2921) 2016-09-01 18:12:12 +08:00
afc163
497ff0cabb Merge branch "1.x-stable" 2016-08-31 15:00:13 +08:00
ddcat1115
bffdf731cd fix #2812 (#2875) 2016-08-30 17:01:51 +08:00
afc163
e0eb9ae162 Merge branch "1.x-stable" 2016-08-29 21:02:59 +08:00
afc163
9ae07d5bc7 Fix defaultPageSize in Table.pagination, close #2874 2016-08-29 18:19:29 +08:00
afc163
96c9c11b55 Make children sort recursively 2016-08-26 15:04:19 +08:00
Liu Yang
fb66e9c7e3 apply sorter for children 2016-08-25 21:12:23 +08:00
DengYun
43d17eeb3a 补充Table组件缺少的columns的属性类型定义 (#2833) 
* 补充Table组件缺少的columns的属性类型定义

* `columns` is required.
 2016-08-25 10:58:10 +08:00
afc163
77949bb9e3 upgrade eslint-config, close #2811 2016-08-23 21:00:35 +08:00
afc163
ca906a0f9d Merge branch "1.x-stable" 2016-08-23 18:16:19 +08:00
afc163
37c3de6b83 remove indexForSort (#2501) until another stable sort problem is reported 2016-08-23 18:00:01 +08:00
Benjy Cui
5dcce12c2c fix: some tsc errors (#2804) 2016-08-22 17:26:14 +08:00
afc163
0670b05e50 Improve code style 2016-08-17 15:47:29 +08:00
afc163
6a86811e95 Fix table style, close #2723 2016-08-17 14:55:03 +08:00
afc163
24d2973c32 Merge branch "1.x-stable" 2016-08-16 17:54:59 +08:00
Benjy Cui
63941ae665 docs: fix table demo format 2016-08-15 08:07:03 +08:00
偏右
0b3186696c docs: Translate table (#2594) 2016-08-15 07:54:01 +08:00
afc163
ef23ee9d68 Make table styles more percise, fix DatePicker in Table 
close #2675
 2016-08-14 16:18:12 +08:00
ddcat1115
6b0a3e129c Fix 2663 有 title 时表格 empty 样式错位 (#2679) 
* fix #2663

* fix #2663
 2016-08-14 15:38:43 +08:00
Marius Ileana
bb0a30d926 docs: table/demo/reset-filter - A little more meaningful filter (#2700) 2016-08-13 09:06:32 +08:00
Benjy Cui
978b9f98e7 refactor: table ts (#2664) 
* refactor: table ts

* fix: should pass context to onChange correctly
 2016-08-11 15:38:03 +08:00
afc163
bb68245b7f Merge 1.x-stable 2016-08-04 14:06:09 +08:00
afc163
9726122904 selectedRows should match selectedRowKeys, close #2566 2016-08-03 21:27:45 +08:00
afc163
2536dbee78 Improve Table select perfermance 2016-08-03 21:08:13 +08:00
afc163
71d74c30c1 Merge 1.x-stable 2016-07-29 13:57:54 +08:00
afc163
fec500698e fix unknown props in Table dropdown 2016-07-26 17:02:30 +08:00
afc163
0eeca99f02 Merge 1.x-stable 2016-07-26 22:20:33 +08:00
Vincent Zhang
abecc44d38 fix improper prop 'dataSource' change in Table; close #2501 (#2503) 2016-07-26 14:17:41 +08:00
afc163
f4b10a9e7c Fix string rowKey in Table, close #2500 
ref #2058
 2016-07-26 21:14:13 +08:00
afc163
a72d9ec381 Merge 2016-07-21 18:10:13 +08:00
afc163
dd80613cd1 Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-07-21 18:08:35 +08:00
afc163
a458de0a88 fix prefer-const 2016-07-21 18:05:15 +08:00
ddcat1115
eba54529ca table-title style (#2452) 2016-07-21 15:14:42 +08:00
afc163
5eb52885d6 @background-color-base 2016-07-21 15:02:24 +08:00
afc163
2e41e35cc6 Fix more tslint problems 2016-07-13 17:22:23 +08:00
偏右
de359d2cf7 fix tslint problems (#2360) 2016-07-13 11:14:24 +08:00
afc163
5e5bd6af9e Merge branch '1.x-stable' 2016-07-12 21:36:23 +08:00
afc163
4b29e40089 Fix overflow current state in Table, close #2301 2016-07-12 18:45:45 +08:00
afc163
1029419e95 improve code style 2016-07-12 18:24:16 +08:00
afc163
6dad2b2987 Merge branch '1.x-stable' 2016-07-11 14:57:38 +08:00
afc163
7c595797c0 Improve fixed Table border style 2016-07-11 13:50:15 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
afc163
aac35a8757 Merge branch '1.x-stable' 2016-07-05 15:49:36 +08:00
afc163
5109362b04 remove old docs about dataSource 2016-07-05 15:19:22 +08:00
afc163
b42f5efea3 Fix table fixed header align, close #2227 2016-07-05 14:41:21 +08:00
afc163
d280cba481 Merge 1.x-stable 2016-07-04 15:19:35 +08:00
afc163
2780b100df Trigger Table onChange when selected filter items are changed, close #2228 2016-07-04 12:23:43 +08:00
afc163
95351bfffa Merge branch '1.x-stable' 2016-06-27 19:31:38 +08:00
afc163
089f1ae512 update components category name 2016-06-27 18:21:12 +08:00
afc163
cc4cab5b1e Merge 1.x-stable 2016-06-23 23:11:14 +08:00
afc163
c2942fa530 Fix stopImmediatePropagation in IE8, close #2154 2016-06-23 16:00:30 +08:00
yiminghe
9a0d751f94 refactor to typescript 2016-06-22 13:19:48 +08:00
afc163
2be285d236 remove nowrap in fixed Table, close #2130 2016-06-22 11:48:11 +08:00
afc163
7d06517846 Fix rowSelection null, close #2127 2016-06-21 19:35:29 +08:00
afc163
00e7eabd4e close #2058 via upgrading rc-table 2016-06-21 19:27:54 +08:00
afc163
f12d5aea9c improve Table header height and scrollbar style (#2107) 2016-06-21 12:18:25 +08:00
afc163
56f7f9926c fix fixed header height 2016-06-20 17:38:14 +08:00
afc163
d9f2b7ea32 Add filterDropdown for Table column, close #1736 2016-06-20 16:36:37 +08:00
afc163
f5c60541f3 improve code style 2016-06-20 16:25:35 +08:00
Benjy Cui
09bbd51551 refactor: rename table/index.jsx to table/Table.jsx 2016-06-19 10:56:42 +08:00
afc163
500f3e1b30 Improve getCheckboxProps perf via caches, close ant-design/ant-design#2086 2016-06-17 17:23:48 +08:00
afc163
e385b56821 Header can be scroll in fixed-columns Table, close ant-design/ant-design#2068 2016-06-16 21:56:13 +08:00
afc163
7d8a2e0612 Fix fixed-header small Table style, close #2023 2016-06-16 16:43:45 +08:00
afc163
dd0a4c7f22 Add paging columns table demo but hidden 2016-06-13 15:29:02 +08:00
afc163
ec21b8bb39 change way to fix #2013, without use table-layout:fixed 
also fix #2025
 2016-06-13 15:28:35 +08:00
afc163
9961605c5a fix pagination change bug in Table 2016-06-12 18:16:24 +08:00
afc163
a69b7b70a1 Fix Tabs nested in expanded Table, close #2013 2016-06-12 15:31:34 +08:00
afc163
5cc87ede0b Move stopPropagation to wrapper, fix #1470 again 2016-06-07 16:27:55 +08:00
afc163
57ab8dfdfe use arrow function 2016-06-07 16:16:34 +08:00
Benjy Cui
2144349741 style: enable react/jsx-closing-bracket-location 2016-06-06 13:54:10 +08:00
afc163
4a08e0188d Fix some wrap misplace issues in fixed table (#1829) 2016-06-02 17:35:25 +08:00
afc163
28d0cf86ea upgrade rc-table for nested dataIndex and fix #1898 
nested dataIndex https://github.com/react-component/table/issues/46
 2016-06-01 14:45:07 +08:00
afc163
af83b2aade fix some table style detail 2016-06-01 12:07:11 +08:00
afc163
1688a8724b Use Radio in filter menu filterMultiple=false, close #1880 2016-06-01 11:46:27 +08:00
afc163
680a5b7120 improve code style 2016-06-01 11:37:13 +08:00
afc163
d8ad0b1993 Fix extra Spin in Table 2016-05-27 21:06:45 +08:00
afc163
5a87d219d7 use remote api for demo 2016-05-27 13:35:49 +08:00
Leon Shi
dbdd5c5da0 fix: throws error when filtering data with pagination set to false, close #1842 2016-05-26 15:01:50 +08:00
RaoHai
25d996d666 fix rowSelection display while some columns fixed left 
+ close #1829
 2016-05-25 11:37:16 +08:00
afc163
3ee8c0b604 remove table layout fixed (#1819) 2016-05-23 18:59:27 +08:00
afc163
43cf39d9a0 put icon into emptyText, close #1759 2016-05-21 18:53:49 +08:00
afc163
6944a8e7c1 Fix fixed Table align and bordered style, close #1740 2016-05-21 18:08:09 +08:00
Leon Shi
0ff91b4135 Fix Table pagination after filter, close #1669 (#1715) 2016-05-17 10:58:01 +08:00
Benjy Cui
8842d9342a site: update components' type 2016-05-16 15:41:55 +08:00
afc163
22af4a9592 Fix Table data.length without specifing pagination, close #1683 2016-05-13 13:49:08 +08:00
afc163
f368fdda3b Fix table className and style wrapper node 2016-05-11 14:23:06 +08:00
RaoHai
f7c9e64416 repair radio type of rowSelection in Table 
close #1627
 2016-05-11 11:21:00 +08:00
Benjy Cui
ecaa6c56c3 style: enable comma-dangle 2016-05-11 09:32:33 +08:00
afc163
d84b92926c fix table spin debounce 2016-05-09 16:11:54 +08:00
afc163
0dbf42a59c update demo 2016-05-06 20:59:09 +08:00
afc163
a1058db8df fix bordered Table 2016-05-05 16:21:51 +08:00
afc163
300e2d3121 Merge branch master into develop-1.0.0 2016-05-05 16:02:03 +08:00
afc163
154d5e028a Add expandedRowKeys for docs 2016-05-03 17:35:21 +08:00
afc163
26785a4c7d improve code style 2016-05-03 14:15:29 +08:00
Leon Shi
2228e201cc fix typo (#1548) 2016-04-29 12:15:16 +08:00
afc163
03cb74ead5 upgrade eslint-config-airbnb version and fix some problems 2016-04-29 12:13:27 +08:00
afc163
0ca6a1c24a css modularize (#1448) 
* css modularize

* Add alert style

* Move more component style

* Move iconfont to common style

* Move layout style

* Move more component style

* Move all components

* Fix lots of mixin deps

* remove css-prefix from less

* fix a button icon style bug

* restructure

* fix index

* add dist

* fix jest

* fix some components style

* clean webpack config

* check more components style

* update tabs

* update scripts

* update scripts

* fix form style

* fix more style

* Fix select width

* Fix form and tabs style
 2016-04-27 20:44:36 +08:00
Leon Shi
baac12d1c4 fix lint (#1513) 
* fix lint `prefer-stateless-function`

* fix lint `arrow-body-style`
 2016-04-26 14:09:19 +08:00
afc163
293812098a Merge branch master into develop-1.0.0 2016-04-25 19:34:01 +08:00
afc163
14f857b7ac prevent propagation of Table rowSelection controls, close #1470, close #1507 2016-04-25 17:55:45 +08:00
afc163
f9153e7b88 Merge branch master into develop-1.0.0 2016-04-25 13:51:18 +08:00
afc163
d7ee4bffa1 Fix initial selectedRowKeys, close #1501 2016-04-25 13:47:08 +08:00
Benjy Cui
12331ea57c style: enable react/prefer-stateless-function in demo 2016-04-21 11:36:51 +08:00
afc163
d2ffb0978f Merge branch master into develop-1.0.0 2016-04-16 17:10:10 +08:00
afc163
6a14de411d Fix uncontrolled table issue 
close #1433 #1434
 2016-04-16 17:07:39 +08:00
afc163
8a9a1d2334 fix checkbox style 2016-04-15 23:34:40 +08:00
afc163
4835471210 update Table initial current page 2016-04-14 14:47:39 +08:00
Benjy Cui
3677339646 fix: revert 2016-04-14 14:20:18 +08:00
Benjy Cui
9d95313d03 chore: suppress warning 2016-04-14 11:22:53 +08:00
Benjy Cui
0ebf6c2ecc style: enable react/prefer-es6-class 2016-04-13 17:23:14 +08:00
afc163
87f8d1f334 Change current to defaultCurrent 2016-04-13 11:39:56 +08:00
afc163
960ea425b9 Merge branch master into develop-1.0.0 2016-04-12 19:44:38 +08:00
afc163
9a7a620ec7 Fix filter menu value type 2016-04-12 19:43:10 +08:00
afc163
9774181979 Fix Table pagination.size, close #1396 2016-04-12 18:19:27 +08:00
afc163
76935c9630 a little perfermance 2016-04-09 16:30:53 +08:00
afc163
0a55eb8c43 reuse getColumnKey 2016-04-09 15:30:24 +08:00
afc163
e46d60cc2a Merge branch master into develop-1.0.0 2016-04-06 23:58:14 +08:00
afc163
79f817466e fix(table): radio selection can not be controlled 
close #1346
 2016-04-06 23:29:32 +08:00
Benjy Cui
df3ba36720 docs: remove useless newline in documentation 2016-04-01 10:08:19 +08:00
afc163
84b731df0f Merge branch master into develop-1.0.0 2016-04-01 01:09:24 +08:00
afc163
29ceb8862d fix: controlled pagination.current should not respond user interaction 
ref #1311
 2016-04-01 00:57:03 +08:00
Benjy Cui
d5a6932c15 docs: update documentation format 2016-03-31 14:17:09 +08:00
Benjy Cui
03d09b66e8 docs: update demo format 2016-03-31 09:40:55 +08:00
afc163
578605f230 Merge pull request #1294 from ant-design/feat-controlled-filter-and-soter 
Feat controlled filters and sorter
 2016-03-30 18:51:51 +08:00
afc163
b4a75ddcc9 fix sort and filter perf 2016-03-30 17:56:37 +08:00
afc163
2651d80fc2 Individual controlled filter 2016-03-30 17:49:36 +08:00
Benjy Cui
fd3406bd03 style: enable react/jsx-no-bind 2016-03-30 17:06:19 +08:00
afc163
ae9f8d0365 Add docs for sortOrder & filteredValue 2016-03-30 14:39:21 +08:00
afc163
137d57da08 controlled filters 2016-03-30 14:39:21 +08:00
afc163
0dbc69ea8e sorted => sortOrder 2016-03-30 14:39:21 +08:00
afc163
94234a7749 Fix sort state 2016-03-30 14:39:21 +08:00
afc163
6d2b9b249c Make column.sorted be a controlled prop 2016-03-30 14:39:21 +08:00
afc163
5ce99d7c07 get initial sorted state from columns 2016-03-30 14:39:21 +08:00
afc163
4ee09de3b9 Add demo, confirm related API 2016-03-30 14:39:21 +08:00
afc163
ba8d9b7dc3 Merge branch 'master' into develop-1.0.0 2016-03-29 17:36:58 +08:00
afc163
ec6ac78e15 simplify table demo 2016-03-29 17:32:03 +08:00
afc163
7692bf3d42 update site style 2016-03-28 19:12:51 +08:00
afc163
fbda3c7b88 Merge master into develop-1.0.0 2016-03-28 16:15:36 +08:00
afc163
bc2bafff54 update table demo code style 2016-03-28 16:00:58 +08:00
afc163
127f893619 Add Table rowClassName into document 2016-03-28 13:44:50 +08:00
Benjy Cui
5e4786440d deps: remove object-assign 2016-03-25 18:16:48 +08:00
afc163
61f9ba1fd7 Fix table footer style 2016-03-25 16:12:29 +08:00
afc163
4760d0b54c Add scroll and column.fixed document 2016-03-25 16:12:29 +08:00
afc163
0243afb7c5 fix scroll bar style 2016-03-25 16:12:29 +08:00
afc163
15f576020b Add fixed columns demos 2016-03-25 16:12:29 +08:00
afc163
0534c53db5 Merge master into develop-1.0.0 2016-03-25 12:18:51 +08:00
afc163
963d073f1d improve api table style 2016-03-24 21:30:33 +08:00
Bruce Mitchener
11c0a6a203 Name classes without Ant* prefix. 
Where necessary, prefix the classes imported from react-component
with 'Rc' rather than prefixing the Ant classes with 'Ant'.

The prefixing of Ant classes wasn't consistent and isn't necessary
in many cases.
 2016-03-21 20:16:38 +07:00
Benjy Cui
1f7a30c99c Merge branch 'master' of github.com:ant-design/ant-design into spa-new-design-language 2016-03-18 11:12:51 +08:00
afc163
60cd7ed85e Fix current page when Table pageSize changed 2016-03-17 15:13:48 +08:00
afc163
f247297f01 Fix children row selection, close #1212 2016-03-16 16:39:53 +08:00
afc163
0a1d3bdd3b fix onChange argument 2016-03-16 16:35:41 +08:00
afc163
5e1f0960a2 Fix rowSelection.onChange selectedRows when specify rowKey 2016-03-16 16:03:16 +08:00
afc163
884c92d7ec pageSize change should trigger Table.onChange, close #1206 2016-03-16 14:26:21 +08:00
afc163
50fd241648 Fix missing code of a222b38 2016-03-15 19:31:56 +08:00