Commit Graph

591 Commits

Author SHA1 Message Date
afc163
fd6fc86b21 improve form validating style 2017-01-14 20:59:37 +08:00
偏右
6e3565b983 Add Form[hideRequiredMark] (#4500)
* Add Form[hideRequiredMark]

* omit hideRequiredMark

* Add test case for Form[hideRequiredMark]
2017-01-13 21:52:48 +08:00
偏右
3423d27493 When form layout is vertical, keep the colon inside label, close #4593 (#4599) 2017-01-13 21:12:31 +08:00
Hans Chan
3d58a3f608 docs: add property colon for Form.Item (#4505)
* docs: 修改错别字

* docs: add property `colon` for Form.Item

`colon` is available since 2.0.0-beta.1
2017-01-13 19:03:59 +08:00
Hans Chan
927581bb84 docs: add property colon for Form.Item (#4505)
* docs: 修改错别字

* docs: add property `colon` for Form.Item

`colon` is available since 2.0.0-beta.1
2017-01-13 18:05:24 +08:00
Benjy Cui
eeae03d681 docs: remove useless code 2017-01-13 15:14:06 +08:00
Tao Zhang
477fde8b7f docs: Updated form description (#4574) 2017-01-12 09:09:59 +08:00
afc163
4654db312f Fix some lesshint problems 2017-01-11 21:45:09 +08:00
Benjy Cui
3fa5d10da3 Merge branch 'master' into feature-2.7 2017-01-10 10:50:40 +08:00
wallverb
a47c200f7c Fix validateTrigger type (#4536)
* Update validateTrigger type

* Update validateTrigger doc for en-US

* Update validateTrigger doc for zh-CN
2017-01-09 21:20:40 +08:00
Benjy Cui
5fd3baaff0 docs: update outdated docs 2017-01-09 18:00:30 +08:00
Benjy Cui
f436b5c2f4 deps: upgrade rc-form, close: #4374 2017-01-09 17:40:01 +08:00
Hans Chan
ef6c19e97b docs: add property colon for Form.Item (#4505)
* docs: 修改错别字

* docs: add property `colon` for Form.Item

`colon` is available since 2.0.0-beta.1
2017-01-09 11:03:35 +08:00
afc163
0187384445 refactor for code style 2017-01-06 01:33:09 +08:00
afc163
e2b8aee202 fix snapshot 2017-01-05 17:24:14 +08:00
afc163
657c707a79 Hide useless prop Form[horizontal] 2017-01-05 16:57:41 +08:00
afc163
53371dfe3e Add plain text form item in demo, close #4465 2017-01-05 16:40:21 +08:00
afc163
9df1eb91db Add form layout demo and fix vertical form style 2017-01-05 16:32:50 +08:00
afc163
fb6858c3cc Fix hasFeedback and Select style detail for #4436 2017-01-01 17:39:27 +08:00
Jesper We
d258ace146 Fix #4431 Overlapping graphics with<Select> in <Form.Item ... hasFeedback={true} (#4436) 2017-01-01 17:20:08 +08:00
偏右
e4bee3425a Upgrade rc form (#4430)
* support nested form item name by upgrade rc-form

react-component/form#48

* Fix dynamic form demo
2016-12-31 23:47:07 +08:00
afc163
d570d03698 improve document for Form setFields, close #4370 2016-12-27 21:14:00 +08:00
Edd Hannay
8382023409 docs: fix typo in Form demo (#4313)
- Rename checkPassowrd function checkPassword
2016-12-20 20:28:44 +08:00
afc163
e1d73eb424 update form documentation 2016-12-18 14:54:12 +08:00
afc163
48de73b721 Fix a FormItem mis-align bug, close #4271 2016-12-16 20:24:50 +08:00
Pierre
827aa2f94c style: remove hardcoded inputs height (#4175)
* remove hardcoded inputs height

* revert pagination input height

* revert pagination input heights bis
2016-12-15 11:17:09 +08:00
Wei Zhu
07103b9fb6 Don't ignore test files. 2016-12-14 14:48:09 +08:00
Wei Zhu
17a0a33283 Restructure tests. 2016-12-14 14:41:39 +08:00
afc163
303fc113c2 Add coordinated form demo 2016-12-13 13:28:16 +08:00
afc163
5815ce514a Add Radio in form demo, close #3910 2016-12-04 16:19:55 +08:00
Benjy Cui
c4d8c4770c Add upgrade warning (#4028)
* chore: add upgrade warning for time related value

* chore: update warning

* chore: update demo url
2016-12-02 15:07:33 +08:00
Benjy Cui
01dbcbe4af css: should not reset fieldset style, close: #4090 2016-12-01 16:46:05 +08:00
Benjy Cui
75c09cb481 css: Form.Item[extra] should be block, close: #4089 2016-12-01 11:25:34 +08:00
Andrey G
a307a7acf7 refactor: remove unnecessary computed props for classNames (#4055)
* remove unnecessary computed props for classNames

* rollback autocomplete optimization for possible css style order issue

* update snapshots

* remove more unnecessary computed props at Input
2016-11-30 10:20:23 +08:00
afc163
7d75f6e3de Fix focus style of Form Controls, close #4035 2016-11-28 19:01:14 +08:00
afc163
2260701865 improve demo detail 2016-11-23 20:17:44 +08:00
Benjy Cui
f250bdcc98 docs: update demo for form 2016-11-21 18:29:36 +08:00
afc163
34f353deb0 update form API doc 2016-11-21 14:28:20 +08:00
afc163
33ad640b0f feedback icon should not affect user operation (#3891) 2016-11-17 17:33:00 +08:00
Bruce Mitchener
36508ffabd Typo fixes. 2016-11-16 20:33:37 +07:00
afc163
4f7eff39fd fix error controls style 2016-11-16 20:13:00 +08:00
afc163
0d63e5f6b5 Fix select[combobox] vertical align, close #3855 2016-11-15 21:54:22 +08:00
afc163
be9ed0388c Fix form controls focused error style 2016-11-11 15:08:02 +08:00
Benjy Cui
e7cf2a4f3f docs: update demos for Form, close: #3558 2016-11-10 16:11:22 +08:00
afc163
88d470220b Fix wrong error style for Form Validation 2016-11-09 22:25:39 +08:00
afc163
51dae474cc fix form demo align 2016-11-09 22:12:21 +08:00
ddcat1115
0baef0627e docs: 调整组件导航结构 (#3758)
- Layout 更名为 Grid
2016-11-09 14:43:32 +08:00
Benjy Cui
4d2bdfd93d docs: update docs for form 2016-11-09 10:16:36 +08:00
afc163
0ec4276eab @font-size-lg (#1752) 2016-11-08 21:07:01 +08:00
afc163
0a48c62dcb use @text-color 2016-11-08 20:50:59 +08:00
afc163
9b81fe86d9 clear less variables and add @text-color-secondary 2016-11-08 20:48:03 +08:00
Benjy Cui
5782253a0f fix: infinite loop, ref: #3759 2016-11-08 16:22:36 +08:00
Benjy Cui
9360c02129 docs: update docs about resetFields, close: #3746 2016-11-07 11:55:58 +08:00
afc163
d0c34380d4 simplify form demo code 2016-11-02 18:08:48 +08:00
Benjy Cui
59805843e5 docs: merge mix demo into validate-other 2016-11-02 12:13:52 +08:00
Benjy Cui
d198c63a68 docs: update demo, close: #3673 2016-11-02 11:42:12 +08:00
Benjy Cui
7372893b8e docs: add demo for without Form.create, ref: #3594 2016-11-02 11:24:52 +08:00
Benjy Cui
1eb3d68656 docs: simplify demo 2016-11-02 10:47:50 +08:00
afc163
f40ba76ba7 Merge branch 'master' of github.com:ant-design/ant-design 2016-11-01 16:11:43 +08:00
afc163
7e73725c68 update form demo 2016-11-01 16:11:06 +08:00
Benjy Cui
29a732e3a9 docs: fix typo, close: #3672 2016-11-01 15:30:02 +08:00
Benjy Cui
60ecb3c628 refactor: each message should warn just once 2016-11-01 11:10:11 +08:00
Benjy Cui
048e3c9246 docs: update demo for time-relate controls 2016-11-01 10:11:02 +08:00
Benjy Cui
4b5353b457 docs: add demo for mapPropsToFields, close: #3493 2016-10-31 16:33:25 +08:00
Benjy Cui
037d739fa4 docs: update demo order 2016-10-31 15:42:57 +08:00
Benjy Cui
49e5bfa7ca docs: add demo for customized form control, close: #3585, ref: #3594 2016-10-31 15:03:48 +08:00
feng zhi hao
edb41f4420 update types in Tabs and FormItem (#3653)
* update types in Tabs and FormItem

* remove children prop in FormItem and Tabs
2016-10-31 13:15:13 +08:00
Benjy Cui
a7d335ec7a docs: update docs detail 2016-10-30 12:43:59 +08:00
Benjy Cui
2cb147f96d docs: should not expose prefixCls to developer 2016-10-30 10:40:33 +08:00
Wei Zhu
f8d2aeefc3 refactor: Replace react-addons-pure-render-mixin with rc-util/lib/PureRenderMixin (#3627) 2016-10-28 13:56:23 +08:00
Benjy Cui
52e3511192 docs: add demo for using time-related in form, close: #3610 2016-10-28 11:30:25 +08:00
Benjy Cui
d57827f87c fix: empty string should be treat as inexisting, close: #3613 2016-10-28 10:50:55 +08:00
Benjy Cui
7860d74725 docs: update advance search form demo, ref: #3558 2016-10-27 17:14:53 +08:00
Benjy Cui
55c22a7232 fix: style bug in slider 2016-10-27 11:57:46 +08:00
Benjy Cui
835dc2fb52 docs: update form in modal demo, ref: #3594 2016-10-27 11:44:45 +08:00
Benjy Cui
6bf99c1819 docs: update advanced search demo, ref: #3594 2016-10-27 10:26:12 +08:00
Benjy Cui
6cd841ef31 docs: add demo for registration, ref: #3594 2016-10-27 09:45:53 +08:00
Benjy Cui
7b76906924 docs: add normal login form, ref: #3594 2016-10-26 17:15:30 +08:00
Benjy Cui
3c49a90980 docs: update demo, ref: #3594 2016-10-26 16:42:57 +08:00
Benjy Cui
f599a24228 docs: update demo style 2016-10-26 15:33:45 +08:00
Benjy Cui
4878258f6c refactor: ref: #3490 2016-10-24 12:04:26 +08:00
Benjy Cui
6343e6b763 docs: update demo 2016-10-21 15:18:13 +08:00
Benjy Cui
1ed434a695 fix: should support Input[addon] in Form[inline], close: #3524 2016-10-21 15:04:55 +08:00
Benjy Cui
0aca663092 fix: should throw warning only once, ref: #3491 2016-10-21 11:17:59 +08:00
Benjy Cui
d5edcb9ef0 feat: support deep-level form control, close: #3212 (#3491) 2016-10-20 16:24:48 +08:00
Benjy Cui
3c99097bc8 fix: allow override fileNameProp, close: #3497 2016-10-20 11:28:05 +08:00
yiminghe
8afe3965c1 upgrade ts 2.0 2016-10-19 17:52:23 +08:00
afc163
9fe859a31f typo #3473 2016-10-19 11:29:14 +08:00
afc163
55c2223366 update form docs, #3473 2016-10-18 21:12:52 +08:00
yiminghe
58e0228e86 optimize getFieldProps warning 2016-10-18 12:22:26 +08:00
Albert Zheng
23dd825afd 【Please review】Fixes for supporting TypeScript 2.0.3 (#3439)
* Fixes for supporting TypeScript 2.0.3

* Fixes for supporting TypeScript 2.0.3. Issue is #3358
2016-10-18 11:55:00 +08:00
偏右
62a53e75b8 refactor: Downsize some style code (#3421)
* remove fieldset disabled style

* improve button style mixins
2016-10-14 09:12:10 +08:00
kvetoslavnovak
c9258fc483 Form controls - Eng. correction (#3381) 2016-10-12 11:04:59 +08:00
kvetoslavnovak
1dad6653c4 Mix - Eng. correction (#3382) 2016-10-12 11:04:52 +08:00
kvetoslavnovak
125331a023 Form validation - Translazion correction (#3387) 2016-10-12 11:03:49 +08:00
afc163
fd76b0cc6c fix long label overflow style 2016-10-07 14:34:25 +08:00
afc163
847e40eac0 Adjust site layout 2016-10-07 14:33:08 +08:00
Shawn Sit
4548b9521f update customized validation demo (#3242) 2016-09-30 12:11:13 +08:00
Benjy Cui
949907231b docs: udpate demo detail, close: #3111 2016-09-22 10:09:22 +08:00
afc163
44372760a1 update form demo style 2016-09-21 22:27:26 +08:00
afc163
1bd39692e9 adjust error message margin style in FormItem 2016-09-21 22:26:53 +08:00
Benjy Cui
bd7e9f00c0 style: update code style 2016-09-21 11:54:53 +08:00
Benjy Cui
3f67fd3f9f docs: update docs details 2016-09-21 11:28:38 +08:00
feng zhi hao
a4be70334d chore: fix some error declaration (#3099) 2016-09-21 09:27:58 +08:00
ddcat1115
3958eb4771 fix #3076 (#3086)
fix demolint
2016-09-20 13:49:38 +08:00
feng zhi hao
2cf5dc0046 chore: improve declaration (#3078) 2016-09-19 17:35:17 +08:00
Shawn Sit
7ce12fe36a doc: demo translation enhancement (#3033)
* doc enhancement

* keep chinese simplified demo
2016-09-18 14:30:37 +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
马斯特
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
feng zhi hao
7a7395329b chore: 完善Form组件的声明 (#3043) 2016-09-14 16:07:28 +08:00
Benjy Cui
37e8474714 fix: withRef should work, close: #2843 (#2992) 2016-09-14 10:25:44 +08:00
afc163
be81b360fd Merge branch '1.x-stable' of github.com:ant-design/ant-design into 1.x-stable 2016-09-13 18:27:49 +08:00
afc163
0f986c07a2 update form index.md 2016-09-13 18:26:52 +08:00
ddcat1115
e19a0d500c fix: time-picker style, close #2973 (#3028) 2016-09-13 17:06:11 +08:00
Benjy Cui
8db2b79505 chore: fix compile errors 2016-09-13 15:31:29 +08:00
Benjy Cui
1dac1370de deps: replace obejct.omit with omit.js, close: #2988 (#2994) 2016-09-10 17:17:55 +08:00
Benjy Cui
44d5fc6fd2 fix: both of undefined and null means no input, close: #2959 2016-09-10 14:28:40 +08:00
Benjy Cui
090fb16c77 docs: update the doc of Form, ref: #2985 2016-09-10 10:05:26 +08:00
Benjy Cui
14fb2c78ba chore: remove deprecated code (#2920)
* chore: remove deprecated code

* chore: add warning for Breadcrumb
2016-09-09 13:55:46 +08:00
Benjy Cui
4026221d45 deps: hello moment (#2887)
* deps: upgrade TimePicker

* deps: upgrade DatePicker

* deps: upgrade Calendar

* fix: moment should work with LocaleProvider

* feat: update API of TimePicker

* feat: update Calendar's APIs

* feat: update DatePicker's APIs

* doc: update demo

* revert: add dateString and timeString and so on

* feat: add Calendar[defaultValue]

* feat: add defaultPickerValue

* docs: update docs about date picker

* feat: set moment locale to zh-cn automatically
2016-09-09 13:55:21 +08:00
afc163
bab669d17d Merge branch "1.x-stable" 2016-09-08 15:17:39 +08:00
Andrew Murray
0d00c5fb6c docs: Fixed typos (#2921) 2016-09-01 18:12:12 +08:00
afc163
7c99d5fb9e fix selector order, close #2916 2016-09-01 16:48:22 +08:00
Benjy Cui
5a4ebe535f deps: update rc-form and form's docs (#2873) 2016-09-01 11:48:38 +08:00
afc163
b798a228e6 Add less variables about outline 2016-08-31 17:04:24 +08:00
Benjy Cui
50c4367a15 docs: update docs for Form.Item, close: #2835 2016-08-25 13:54:53 +08:00
afc163
363f610d8b Fix tsc errors beside DatePicker 2016-08-24 16:09:55 +08:00
afc163
77949bb9e3 upgrade eslint-config, close #2811 2016-08-23 21:00:35 +08:00
Benjy Cui
5dcce12c2c fix: some tsc errors (#2804) 2016-08-22 17:26:14 +08:00
Benjy Cui
4e0ae95e1e chore: export form's interface 2016-08-19 16:53:27 +08:00
陆离
ff765002fa refactor: rewrite form and dropdown in ts (#2683) 2016-08-19 16:43:32 +08:00
afc163
da6b65f7f0 Merge 1.x-stable 2016-08-12 14:47:01 +08:00
afc163
8ae2936342 Fix nested Forms style 2016-08-10 14:38:35 +08:00
Marius Ileana
725ca31939 docs: Small correction (#2637) 2016-08-08 15:43:21 +08:00
ddcat1115
c9e26ecab9 docs: treeSelect translation (#2582) 2016-08-05 11:47:31 +08:00
Benjy Cui
4cf04c5799 docs: update form demo 2016-08-05 11:28:34 +08:00
Marius Ileana
6bb29a1774 docs: Review of form / demo / advanced-search-form.md (#2574) 2016-08-05 11:25:39 +08:00
Benjy Cui
7d9585377e feat: Form[vertical], close: #2449 2016-08-04 17:45:15 +08:00
afc163
d140108656 Fix typo
close #2602
2016-08-03 19:56:27 +08:00
Benjy Cui
5b5439208c docs: update docs for Form, ref: #2591 2016-08-03 10:55:15 +08:00
Benjy Cui
eaebebf425 docs: fix docs 2016-08-02 09:34:04 +08:00
Marius Ileana
23e5912384 docs: Review (#2573)
Please excuse any mistake. I just discovered this library the other day, I felt in love with it and I really like to contribute. :-)
2016-08-02 09:32:50 +08:00
Marius Ileana
be181a7cc7 docs: review of form / demo / form-in-modal.md (#2575) 2016-08-02 09:25:14 +08:00
Marius Ileana
40498e7f01 chore: small typo to form / Form.tsx (#2576) 2016-08-02 09:24:15 +08:00
Benjy Cui
e5e7a9ac33 docs: update documentation of form 2016-07-31 10:01:58 +08:00
Gray Choi
d07b73fec0 docs: translation of form (#2555) 2016-07-31 09:53:51 +08:00
afc163
57f08259db Merge 1.x-stable 2016-07-30 14:36:49 +08:00
Benjy Cui
1d2111db02 chore: add warning 2016-07-29 14:02:24 +08:00
afc163
71d74c30c1 Merge 1.x-stable 2016-07-29 13:57:54 +08:00
Benjy Cui
d1364ac038 feat: pass this.props.form as context automatically (#2534) 2016-07-29 11:18:31 +08:00
yeliex
14d6bd80da fix: label should align left when it occupy the whole line (#2517) 2016-07-28 08:39:03 +08:00
afc163
b8c64f8b6c Merge branch 'master' of github.com:ant-design/ant-design 2016-07-26 22:30:40 +08:00
afc163
0eeca99f02 Merge 1.x-stable 2016-07-26 22:20:33 +08:00
Benjy Cui
11660c128b docs: update demo, close: #1872 2016-07-25 16:08:18 +08:00
afc163
ca57794ae7 better implement for a2804cb 2016-07-25 14:03:56 +08:00
afc163
32ab285886 Merge branch '1.x-stable' 2016-07-24 13:49:42 +08:00
afc163
a2804cbff5 Make clear icon more clear 2016-07-21 20:57:44 +08:00
afc163
497cc1f65a improve FormItem colon (#2311) 2016-07-21 15:51:37 +08:00
afc163
1138b69c6d Merge branch 'master' of github.com:ant-design/ant-design 2016-07-21 14:40:11 +08:00
afc163
42d34a5db3 Merge branch '1.x-stable' 2016-07-21 14:34:37 +08:00
RaoHai
1ccfad13f7 Mention Component fix
- 现在只输入一个 @ 符号,dropdown 也会弹出。
 - 输入框失去焦点后,dropdown 会消失。
 - 添加受控模式示例
 - 添加 `getMentions(editorState: EditorState): Array<String>` Api,
   可以获取当前提到的人。
 - 添加了校验样式
 - 其他样式修正
2016-07-20 19:01:11 +08:00
afc163
e2cc2838fd Fix lesshint 2016-07-18 22:24:53 +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
6dad2b2987 Merge branch '1.x-stable' 2016-07-11 14:57:38 +08:00
afc163
8e9768fb4a Fix form button align 2016-07-10 17:04:03 +08:00
afc163
5856bb1b30 Fix key warning 2016-07-10 15:16:24 +08:00
afc163
158b594526 Merge branch '1.x-stable' 2016-07-09 17:46:11 +08:00
Benjy Cui
4a6ff6f053 fix: Form.Item should support responsive layout, close: #2305 (#2313) 2016-07-09 17:44:28 +08:00
yeliex
147e06a837 Add colon props to Form (#2311) 2016-07-09 15:10:07 +08:00
yiminghe
94706f1d2c fix ts 2016-07-07 20:25:03 +08:00
afc163
d68d42f69b Merge 1.x-stable 2016-07-07 17:26:16 +08:00
yiminghe
c667144943 fix form warning
Conflicts:
	components/cascader/index.jsx
	components/form/index.jsx
2016-07-07 17:23:51 +08:00
yiminghe
3d9ae9833e fix form warning 2016-07-07 16:59:47 +08:00
afc163
487b40815f Merge 1.x-stable 2016-07-07 15:13:01 +08:00
afc163
e27d6c3097 Form react-unknown-prop (#2258) 2016-07-07 12:06:05 +08:00
afc163
b0c05e3f29 tweak style (#2234) 2016-07-06 17:54:05 +08:00
afc163
d280cba481 Merge 1.x-stable 2016-07-04 15:19:35 +08:00
Benjy Cui
d9b4eb4aa3 fix: add missing ant-row 2016-07-04 15:18:05 +08:00
Benjy Cui
766988735b docs: update demo 2016-07-04 15:17:42 +08:00
afc163
1f0c26b25a Fix label colon with whitespace: label="xx: " 2016-07-04 14:39:20 +08:00
Benjy Cui
0a73886a9c docs: update demo 2016-07-04 12:13:29 +08:00
Benjy Cui
df2f672dd9 fix: add missing ant-row 2016-07-04 11:29:56 +08:00
afc163
21fb73d4f2 Merge branch '1.x-stable' 2016-06-28 18:46:23 +08:00
afc163
4a40399522 fix feedback position 2016-06-28 18:32:03 +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
ef4c1a4749 Merge branch '1.x-stable' 2016-06-27 17:58:16 +08:00
afc163
0eaf940672 Fix Radio & Checkbox margin again 2016-06-27 17:22:03 +08:00
afc163
cc4cab5b1e Merge 1.x-stable 2016-06-23 23:11:14 +08:00
afc163
e50953390e update docs 2016-06-23 16:17:00 +08:00
yiminghe
9a0d751f94 refactor to typescript 2016-06-22 13:19:48 +08:00
Benjy Cui
5a4805d691 style: update code style to please lint 2016-06-19 10:57:28 +08:00
Benjy Cui
49b944617c style: update code style to please lint 2016-06-19 09:55:03 +08:00
afc163
ff8d855cc6 fix lints 2016-06-17 15:16:45 +08:00
afc163
2be1577b32 Improve demo code style 2016-06-16 22:18:00 +08:00
afc163
81276e43ea upgrade deps 2016-06-16 22:16:17 +08:00
偏右
09db9f2436 Revert "Remove react-addons-pure-render-mixin, use rc-util's PureRenderMixin instead" (#2074) 2016-06-16 22:06:06 +08:00
ddcat1115
fade8d7017 fix #1927 addon support Select (#2070) 2016-06-16 21:15:59 +08:00