Commit Graph

534 Commits

Author SHA1 Message Date
JarvisArt
c55180341e
demo: form advanced-search beautification style (#40180) 2023-01-12 10:15:40 +08:00
JarvisArt
6129ea1216
demo: form global-state demo supports dark mode (#40143)
* chore: form global-state demo supports dark mode

* test: update snapshot
2023-01-11 10:40:35 +08:00
lijianan
80498afea6
test: refactor test case CC => FC (#40068) 2023-01-06 16:48:44 +08:00
Peach
6236e356b5
docs: update all site anchors (#39687)
* docs: update all site anchors

* docs: handle hash change from Link component
2022-12-22 14:12:26 +08:00
二货爱吃白萝卜
b04b759597
docs: Add Form prefix demo (#39580)
* docs: Add prefix demo

* test: update snapshot
2022-12-15 16:01:52 +08:00
Sonu Sharma
7728eec447
docs: spelling and grammar fix (#38743) 2022-11-19 22:56:58 +08:00
Tom Xu
77ea4038d1
chore: remo format and remove prettierrc arrowParens (#38722) 2022-11-19 13:47:33 +08:00
二货爱吃白萝卜
cbcfd38ca7
docs: v5 site upgrade (#38328)
* build: try to use dumi as doc tool

* docs: migrate demo structure to dumi way

* refactor: use type export & import

* docs: migrate demo previewer to dumi

* docs: create empty layout & components

* docs: apply custom rehype plugin

* docs: create empty extra pages

* docs: Add Banner component

* chore: move theme tsconfig.json

* docs: home page init

* docs: migrate header (#37896)

* docs: header

* docs: update

* docs: home init

* clean up

* test: fix site lint

* chore: tsc ignore demo

* chore: dumi demo migrate script

* chore: cards

* docs: home layout

* docs: Update locale logic

* docs: fix getLink logic

* chore: fix ci (#37899)

* chore: fix ci

* ci: remove check-ts-demo

* ci: preview build

* test: ignore demo.tsx

* chore: update script

* test: update snapshot

* test: update node and image test

* chore: add .surgeignore

* docs: layout providers (#37908)

* docs: add components sidebar (#37923)

* docs: sidebar

* docs: update docs title

* docs: update design doc

* chore: code clean

* docs: handle changelog page

* docs: add title

* docs: add subtitle

* docs: active header nav

* chore: code clean

* docs: overview

* chore: code clean

* docs: update intl (#37918)

* docs: update intl

* chore: code clean

* docs: update favicons

* chore: update testPathIgnorePatterns

* chore: code clean

* chore: code clean

* chore: copy 404.html (#37996)

* docs: Home page theme picker

* chore: Update migrate script

* docs: home page update

* docs: theme editor style

* docs: theme lang

* chore: update migrate.js

* docs: fix demo (#38094)

* chore: update migrate.js

* docs: update md

* docs: update demo

* test: fix snapshot

* chore: move debug to code attr in migrate script

* chore: update md

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

* feat: overview page

* feat: Migrate `404` page (#38118)

* feat: migrate IconSearch component (#37916)

* feat<site/IconSearch>: copy IconDisplay from site to .dumi

* feat<site/IconSearch>: change docs of icon

* feat<site/IconSearch>: tweak

* feat<site/IconSearch>: use useIntl instead of injectIntl

* feat<site/IconSearch>: fix ts type error

* feat<site/IconSearch>: use intl.formatMessage to render text

* docs: Adjust home btn sizw

* docs: Update doc

* feat: v5 site overview page (#38131)

* feat: site

* fix: fix

* feat: v5 site overview page

* fix: fix path

* fix: fix

* fix: fix

* docs: fix margin logic

* feat: v5 site change-log page (#38137)

* feat: v5 site change-log page (#38162)

* docs: site redirect to home pag

* docs: theme picker

* docs: use react-intl from dumi (#38183)

* docs: Theme Picker

* docs: update dumi config

* docs: home back fix

* docs: picker colorful

* docs: locale of it

* docs: update components desc

* docs: site of links

* docs: update components list

* docs: update desc

* feat: Migrate `DemoWrapper` component (#38166)

* feat: Migrate `DemoWrapper` component

* feat: remove invalid comments and add comment for `key` prop

* docs: FloatButton pure panel

* chore: update demo

* chore: update dumi config

* Revert "chore: update demo"

This reverts commit 028265d3ba.

* chore: test logic adjust to support cnpm modules

* chore: add locale alias

* docs: /index to /

* docs: add locale redirect head script

* chore: adjust compact

* docs: fix missing token

* feat: compact switch

* chore: code clean

* docs: update home

* docs: fix radius token

* docs: hash of it

* chore: adjust home page

* docs: Add background map

* docs: site theme bac logic

* docs: avatar

* docs: update logo color

* docs: home banner

* docs: adjust tour size

* docs: purepanl update

* docs: transfooter

* docs: update banner gif

* docs: content (#38361)

* docs: title & EditButton

* docs: content

* chore: fix toc

* docs: resource page

* docs: transform resource data from hast

* docs: filename & Resource Card

* chore: enable prerender

* chore: remove less

* docs: toc style

* chore: fix lint

* docs: fix Layout page

* docs: fix CP page

* chore: update demos

* docs: workaround for export dynamic html

* chore: enable demo eslint

* docs: table style

* fix: header shadow

* chore: update snapshot

* fix: toc style

* docs: add title

* docs: Adjust site

* feat: helmet

* docs: site css

* fix: description

* feat: toc debug

* docs: update config-provider

* feat: use colorPanel

* fix: colorPanel value

* feat: anchor ink ball style

* feat: apply theme editor

* fix: code block style

* chore: update demo

* chore: fix lint

* chore: code clean

* chore: update snapshot

* feat: ts2js

* chore: description

* docs: site ready for ssr

includes:
- move client render logic to useEffect in site theme
- extract antd cssinjs to a single css file like bisheng
- workaround to support react@18 pipeableStream for emotion

* chore: bump testing lib

* docs: font size of title

* chore: remove react-sortable-hoc

* chore: update snapshot

* chore: update script

Co-authored-by: PeachScript <scdzwyxst@gmail.com>
Co-authored-by: MadCcc <1075746765@qq.com>
Co-authored-by: zqran <uuxnet@gmail.com>
Co-authored-by: TrickyPi <530257315@qq.com>
Co-authored-by: lijianan <574980606@qq.com>
2022-11-09 12:28:04 +08:00
二货机器人
d5cfd195dd chore: merge master 2022-11-07 23:32:46 +08:00
二货爱吃白萝卜
4a1622cd66
docs: unique id (#38422)
* docs: unique id

* test: Update snapshot
2022-11-07 16:45:16 +08:00
二货机器人
d9a9fdc509 chore: merge next 2022-08-23 17:48:00 +08:00
yykoypj
3d8cd0b451
feat: switch visible to open for Modal (#37084)
* feat: switch visible to open for Modal

* test: depcated check

* docs: site api update

Co-authored-by: 二货机器人 <smith3816@gmail.com>
2022-08-23 16:55:57 +08:00
二货机器人
fa4f7f089d chore: merge master 2022-08-01 17:12:27 +08:00
二货机器人
ffb3a4da90
fix: Form vertical with span row (#36800)
* fix: form vertical with span

* test: update snapshot
2022-07-30 21:00:00 +08:00
MadCcc
c5668a7e34
docs: Form disabled version (#36760)
* docs: Form disabled version

* test: update snapshot
2022-07-29 15:54:36 +08:00
zombiej
c71ce67e14 chore: next merge feature 2022-07-19 17:51:35 +08:00
fairyland
8c9ad9b1b6
fix: form disabeld support Upload (#36573)
Co-authored-by: ranrui.cwj <ranrui.cwj@alibaba-inc.com>
2022-07-18 14:21:52 +08:00
zombiej
17f020f0a7 chore: merge master 2022-07-13 17:52:42 +08:00
二货机器人
6599c2780e
fix: Select with percent width leaves unexpected height in Form (#36484) 2022-07-12 18:01:05 +08:00
zombiej
5bd221ad39 chore: merge master 2022-07-12 17:09:43 +08:00
Sg
6ada28cce2
docs: fix typo (#36457)
fix typo in useWatch.md
2022-07-11 14:40:35 +08:00
iamkun
9cab0f3322
docs: update Day.js doc (#35935)
* docs: update dayjs doc

* docs: update dayjs doc

* chore: update doc

* chore: update doc

* chore: update doc

* chore: update doc
2022-06-13 14:03:43 +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
章鱼
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
MadCcc
1f5e271eb6 Merge branch 'master' into next-merge-master 2022-05-09 21:26:25 +08:00
afc163
594f138760 resolve conflict between feature and master 2022-05-08 17:01:54 +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
zombiej
84662ce774 chore: next merge feature 2022-05-06 18:46:16 +08:00
黑雨
b0a652580a
feat: Form disabled (#35210)
* feat: add form disabled

* feat: add form disabled

* feat: add radio disabled

* feat: update snap

* feat: add test case
2022-04-29 20:48:10 +08:00
afc163
756f06c2fe chore: sync master into next branch 2022-04-20 11:30:55 +08:00
zombiej
61a6083adf docs: Update useWatch docs 2022-04-18 10:37:12 +08:00
github-actions[bot]
e3d8689643
chore: auto merge branchs (#35053)
chore: sync master into feature
2022-04-17 15:03:29 +00:00
github-actions[bot]
16fb0e88a3
chore: auto merge branchs (#35054)
chore: sync master into next
2022-04-17 15:03:21 +00:00
afc163
0f0e2f9f43
docs: simplify demo code, #30853 (#35050) 2022-04-15 16:20:56 +08:00
zombiej
c86e8fa0a2 chore: next merge feature 2022-04-15 15:54:13 +08:00
二货机器人
beeaf2d221
docs: More info about useWatch (#35039)
* docs: more about useWatch

* test: Update test case

* docs: more info

* docs: more & more

* feat: add useFormInstance

* chore: add version info
2022-04-15 15:51:09 +08:00
二货机器人
b62e409ad5
feat: Form support useWatch (#35036)
* feat: Support useWatch

* test: update test case

* chore: update snapshot
2022-04-14 20:46:57 +08:00
zombiej
d907338d79 chore: merge feature 2022-04-12 15:59:36 +08:00
afc163
77b6a86656
fix: Form layout span 24 usage in responsive mode (#34907)
close #34903
2022-04-11 12:30:47 +08:00
MadCcc
6776bb8916
docs: demo support react18 (#34843)
* docs: update demo

* chore: add script

* test: fix demo test

* docs: convert demos

* chore: move script

* test: remove react-dom import

* chore: update deps

* docs: update riddle js

* test: fix image test

* docs: fix riddle demo
2022-04-03 23:27:45 +08:00
MadCcc
833ff22728
refactor: form cssinjs (#34679)
* refactor: form cssinjs

* fix: use rootPrefixCls

* feat: enhance

* test: update snapshot

* chore: code clean

* refactor: code enhance

* chore: code clean

* feat: add feedback icon style

* fix: padding

* feat: add motion easeout

* fix: explain padding

* fix: style

* chore: code clean

* test: update snapshot
2022-03-30 14:13:36 +08:00
MadCcc
ed651f450d
fix: missing status style for RangePicker (#34509)
* fix: range picker should has status style

* chore: code clean

* chore: code clean

* chore: code clean
2022-03-15 18:38:22 +08:00
afc163
34a63e6892 chore: merge feature into master 2022-02-23 17:11:11 +08:00
afc163
386ede9297
fix: Form layout when Select has long text (#34117)
* fix: Form layout when Select has long text

close #33773

* chore: update snapshot
2022-02-18 15:46:59 +08:00
MadCcc
533bc8740a
feat: cascader support status (#34086)
* feat: cascader support status

* chore: code clean

* chore: raise bundle size limitation

* chore: code clean
2022-02-17 15:08:13 +08:00
MadCcc
65bf6550b1
feat: mentions support status (#34071)
* test: skip form deps-lint

* perf: remove useless has-feedback classname

* test: raise test coverage

* style: recover import arrangement
2022-02-16 21:14:05 +08:00
MadCcc
37e042358d
feat: Input support status (#33995)
* feat: remove form status style && input support status

* test: update snapshot

* feat: update status prop in config provider

* fix: form item validateStatus support

* chore: code clean

* feat: status classname change

* test: update snapshot

* refactor: move formItemStatusContext to form folder

* refactor: merge utils

* refactor: rename statusUtils

* chore: code clean

* test: fix coverage

* chore: remove status prop of Form.Item

* chore: code clean

* docs: update demo

* test: fix lint

* feat: status only success and warning

* test: fix lint

* docs: update deamo
2022-02-14 17:09:35 +08:00
afc163
e7f23592bc
feat: support Form labelWrap (#33048)
* feat: form label can be wrap

* fix api doc

* fix ts
2021-11-26 18:15:59 +08:00
zombiej
dd1670a3b4 chore: merge master 2021-11-26 15:19:31 +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
zombiej
24ec3ba662 chore: merge master 2021-11-26 10:15:39 +08:00
afc163
37442ae0d5
fix: Form layout span 24 usage (#32981)
close #32980
2021-11-23 13:15:06 +08:00
github-actions[bot]
bac876a14d
chore: auto merge branchs (#32839)
chore: sync master to feature
2021-11-12 07:15:31 +00:00
二货机器人
ce006bd44e
docs: Version Robin (#32830) 2021-11-12 11:46:42 +08:00
afc163
5360722e5c chore: update form demo 2021-11-05 15:51:50 +08:00
二货机器人
184402a9bc
feat: Form.Item no longer need fieldKey anymore (#32689)
* chore:Update Form to remove fieldKey

* fix: fieldKey cache logic

* test: Update snapshot

* chore: clean up
2021-10-29 18:24:50 +08:00
WeijieChen
4d9b6dc74e
docs: form register demo add textarea item (#32669)
Co-authored-by: machixian <machixian@myweimai.com>
2021-10-28 12:26:18 +08:00
afc163
d361537748
fix: Mentions error style in Form (#32385) 2021-10-05 15:56:31 +08:00
Austaras
d86e1b5153
feat: InputNumber support addon (#31432)
* feat: InputNumber support addon

* docs: Update InputNumber doc

* chore: Update snapshot and fix lint

* chore: Add release version

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

Co-authored-by: afc163 <afc163@gmail.com>
2021-08-31 13:09:03 +08:00
afc163
8416e31821 chore: resolve conflict between master and feature 2021-08-23 17:48:23 +08:00
Han Han
c9bf113b39
chore: fix form demo (#31871)
子节点的值的属性,如 Switch 的是 'checked'。
2021-08-22 21:34:32 +08:00
afc163
5306d5b614
fix: Form label ellipsis should work (#31838) 2021-08-18 19:17: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
c671b4e3f1
fix: Input.Password border color (#30999)
* chore: form demo style

* fix: Input.Password hover border color in Form
2021-06-16 13:05:55 +08:00
afc163
2142180090
fix: form control-ref.md typescript error (#30885)
https://github.com/ant-design/ant-design/pull/30829#issuecomment-855211477
2021-06-07 12:09:44 +08:00
二货机器人
7a3bf8287f
feat: Form rule support warningOnly that not block form submit (#30829)
* chore: bump rc-field-form

* docs: Demo driven

* refactor: Use event instead

* chore: collection logic update

* chore: clean up

* chore: show warning

* chore: warning no need required mark

* feat: warning example

* docs: mix error

* chore: tmp list

* chore: magic code

* chore: fix motion

* chore: fix style

* chore: clean up useless code

* chore: RM useless import

* chore: RM useless file

* test: Update snapshot

* chore: Should reset

* fix: Memo logic

* fix: Form basic test case

* fix: lint

* chore: back of ref

* test: Update snapshot

* test: RM ueseless test case

* chore: RM useless code
2021-06-04 14:44:41 +08:00
afc163
25549cd388
fix: Form Input prefix style in error status (#30640)
close https://github.com/ant-design/ant-design/issues/30629
2021-05-24 18:18:44 +08:00
琚致远
2c68352367
docs: fix typo on the normal-login page (#30132)
* fix: fix typo on the normal-login page

* Update advanced-search.md

* Update form-in-modal.md
2021-04-14 19:00:01 +08:00
afc163
077443696b docs: fix Form requiredMark demo
close #29921
2021-03-28 16:22:00 +08:00
yaoweiprc
ed37b80d11
docs: Update dynamic-form-items.md (#29807)
* Update dynamic-form-items.md

原来的代码只有在使用Space包裹多个Form.Item的时候可以跑起来,如果把Space换成div或者其它组件,点击Add Field之后,因为多个Form.Item 通过 {...restField} 指定了相同的key,浏览器会报 Encountered two children with the same key, `0`. Keys should be unique so that components maintain their identity across updates.
换成这种restField的写法可以避免这个问题,让不使用Space包裹多个Form.Item的场景也能跑通不报错。

* Update components/form/demo/dynamic-form-items.md

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

Co-authored-by: afc163 <afc163@gmail.com>
2021-03-24 12:24:22 +08:00
afc163
165477175d
chore: update Form and TreeSelect demo (#29656)
* chore: update Form and TreeSelect demo

* fix eslint
2021-03-08 18:06:49 +08:00
limingxin
d719f16487
docs: update link (#29558) 2021-03-01 18:22:03 +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
afc163
99c2c2ff0b
refactor: use optional chaining instead of if (#29368)
* refactor: use optional chaining instead of if

* revert some code
2021-02-19 18:26:53 +08:00
xrkffgg
dcc0ffa016
chore : prettier code (#29123)
* style: prettier code

* update

* Update index.less
2021-01-30 19:39:02 +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
arange
d372028476
docs: Update complex-form-control.md (#28311)
Fixing some typos and grammar issues.
2020-12-11 10:30:40 +08:00
陈帅
4f811cbe82
docs: add a little pro-compents advertising (#28043)
* docs: add a little pro-compents advertising

* docs: add a little pro-compents advertising
2020-11-27 18:29:21 +08:00
Shivam Modi
3d04e5d3fb
docs: fixed nested ternary operator in Form (#27724) 2020-11-12 23:20:13 +08:00
Shivam Modi
5818fdb1a2
fix Specific Note for option other for Gender in Form (#27704) 2020-11-12 11:30:56 +08:00
Muhammad Sameer
87dfa411bc
docs: Update nest-messages.md (#27620)
Fixed grammatical errors.
2020-11-07 02:49:30 +08:00
Tom Xu
0822ac618f
chore: add prettier ignore and format demo (#27270) 2020-10-21 11:06:07 +08:00
afc163
f80828bfd6 docs: 🎬 refactor Form demo code 2020-10-20 13:29:04 +08:00
zombiej
40c8fb8363 chore: merge master 2020-09-24 15:26:37 +08:00
Dmytro Gorelik
efc304c55a
style: fix RadioGroup validation error highlight (#26849) 2020-09-22 17:04:48 +08:00
zombiej
358c7fa4c4 chore: feature merge master 2020-09-22 10:56:04 +08:00
Tom Xu
dcdb8f5587
docs: improve from list (#26813) 2020-09-19 23:21:25 +08:00
Régis Foucault
e849c94b48 docs: 📝 fix typo in complex-form-control.md (#26771) 2020-09-18 13:06:19 +08:00
二货机器人
b08b759ff4
feat: Form.Item support tooltip (#26780)
* feat: Support tooltip

* update test case

* update snapshot

* update doc

* fix lint

* support icon

* tmp use @text-color-secondary
2020-09-17 17:11:45 +08:00
Régis Foucault
bb11f82ed2
docs: 📝 fix typo in complex-form-control.md (#26771) 2020-09-17 11:57:52 +08:00
二货机器人
1faabb219d
feat: Form.List support rules (#26676)
* Add ErrorList component

* move class to ErrorList

* support cache of status

* update doc

* update snapshot

* patch test case

* clean up

* docs: add faq
2020-09-11 21:27:51 +08:00
Long Nguyen
7b55f112ce
docs: fix typos (#26598) 2020-09-05 12:40:38 +08:00
偏右
24a86df257
style: 💄 fix Upload picture-card button style (#26367)
* style: fix Upload picture-card button style

close https://github.com/ant-design/ant-design/issues/26317
close #23339

* style: tweak Upload list animation

close #22386

* fix snapshot change

* docs: update Upload demos

* add test case

* update form demo

* fix test case
2020-08-24 16:33:24 +08:00
二货机器人
60771a0f61
feat: Support requiredMarkType (#26309)
* feat: support requreidMarkType

* docs: Update doc desc

* fix lint

* use requiredMark instead

* not change className

* fix ts

* update test case

* rtl style

* fix rtl

Co-authored-by: xrkffgg <xrkffgg@vip.qq.com>
2020-08-21 12:58:14 +08:00
zoomdong
39f1126315
feat: Form.List add() support index param (#26081)
* feat: Form.List add() support index param

* update test case

* update
2020-08-12 19:13:44 +08:00
07akioni
504d51477a
docs: Form add debug true on dep-debug (#26103) 2020-08-10 09:41:45 +08:00
07akioni
9951e583b6
Merge branch 'master' into resolve-conflict-1 2020-07-26 20:14:11 +08:00
二货机器人
2803ccf658
docs: Update DatePicker docs and add legacy notice (#25768)
* docs: Update DatePicker docs and add legacy notice

* clean up

* only warning for QuarterPicker

* update docs

* fix lint

* note to warning
2020-07-23 11:25:17 +08:00
afc163
508cecd0a7 merge feature into master-to-merge-feature 2020-07-21 16:23:13 +08:00