Commit Graph

97 Commits

Author SHA1 Message Date
muxin
fc24f382fc
style: remove fixed height in badge.ribbon (#41661)
* style: remove fixed height in badge.ribbon

* docs: update demo

* test: update snapshot
2023-04-06 16:41:03 +08:00
二货爱吃白萝卜
6770b7fb22
test: Use render for demo-extends test (#41242)
* test: update snapshot

* test: use render

* test: fix skip

* test: fix skip
2023-03-15 00:08:31 +08:00
dependabot[bot]
1df1034f20
chore(deps-dev): bump glob from 8.1.0 to 9.2.1 (#41109)
* chore(deps-dev): bump glob from 8.1.0 to 9.2.1

Bumps [glob](https://github.com/isaacs/node-glob) from 8.1.0 to 9.2.1.
- [Release notes](https://github.com/isaacs/node-glob/releases)
- [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md)
- [Commits](https://github.com/isaacs/node-glob/compare/v8.1.0...v9.2.1)

---
updated-dependencies:
- dependency-name: glob
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix: update api

* fix

* fix

* fix path

* fix path

* update snap

* update snap

* update snap

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: 栗嘉男 <574980606@qq.com>
2023-03-10 11:50:12 +08:00
kiner-tang(文辉)
16e90b2301
fix: optimize badge preset color code & fix color display unexpected (#40848) 2023-02-21 18:22:49 +08:00
lijianan
eb77c5a7e6
fix: fix Badge Wave borderColor error (#39182)
* fix: fix Badge borderColor error

* update demo

* fix

* update demo

* fix

* fix
2022-12-02 14:42:39 +08:00
Wuxh
8cd63a4d89
fix(badge): fix Badge and showZero can't be used with custom color (#38967)
* test(badge): add case

* fix(badge): fix `Badge` and `showZero` can't be used with custom color

issue: https://github.com/ant-design/ant-design/issues/38965

* test: update snapshots

* docs(badge): update demos

* test: update snapshot
2022-11-24 23:53:22 +08:00
HzLin
f11d628be6
docs(Badge): change file name (#38801) 2022-11-21 18:18:04 +08:00
Wuxh
d225c56c31
docs: improve component demo style (#38643)
* chore: examine badge

* chore: examine button

* chore: examine alert

* test: update snapshot
2022-11-17 23:19:28 +08:00
Wuxh
34a277cdaa
docs: improve component demo style (#38598)
* docs: delete redundant codes

repetitive examples that can make it difficult for developers to read

* chore: update snapshot

* docs(badge): wrapping documents with `Space`

* chore: update snapshot

* chore(space): optimize documents

easy to read

* chore: update badge demo

* chore: update demo

* Revert "chore(space): optimize documents"

This reverts commit 88a4378f16cede5b628f885a48a341d507fd53e3.

* chore: update snapshots

* chore(button): add debug demo

* test(button): update snapshots

* docs(button): example document beautify

* test(button): update snapshots

commit by af04705c8f

* test(alert): update snapshots

* chore: Reverse format
2022-11-17 13:20:58 +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
MadCcc
0a0f96798d chore: snapshot 2022-10-14 12:11:43 +08:00
MadCcc
2471bf88aa test: fix test 2022-10-11 21:33:29 +08:00
MadCcc
03a1ae427d Merge branch 'feature' into next-merge-feature 2022-10-11 20:29:55 +08:00
二货机器人
5f28b2e5a4 chore: merge maaster 2022-10-11 14:54:30 +08:00
二货爱吃白萝卜
b7634968d7
test: Use SSR for testing demo (#37890)
* test: Use SSR for testing demo

* chore: fix lint

* test: align with react 18
2022-10-08 16:17:20 +08:00
MadCcc
150da4a2cb Merge branch 'master' into next-merge-master 2022-09-29 10:59:03 +08:00
二货机器人
069e44bcc3 chore: merge master 2022-09-28 12:01:20 +08:00
Wuxh
a70ef1b8da
fix(Badge): fix accidentally rendering an empty element when text props is empty (#37681)
* test(badge): add case

* fix(badge): fix accidentally rendering an empty element when text props is empty

* chore(badge): update demo

* test(badge): update snapshot

* docs: beautify docs

Add several supported ways to describe colors

* test(badge): update snapshot

* chore: update snapshot

* test: update snapshots

* Revert "test: update snapshots"

This reverts commit 2bd11650aea3b3a447a891f09708032f9c41cb3d.

* test: update snapshot
2022-09-24 23:15:22 +08:00
MadCcc
c61f283487
feat: switch motion (#37658)
* feat: switch motion

* chore: code clean

* feat: active text offset

* chore: update snapshot
2022-09-20 21:51:28 +08:00
二货机器人
cdc20027b5 chore: merge master 2022-09-19 17:09:36 +08:00
kiner-tang(文辉)
2415c0f636
feat: Badge support colorful custom count style (#37609)
Co-authored-by: tangwenhui <tangwenhui@rd.netease.com>
2022-09-19 11:52:17 +08:00
黑雨
01ca7c7821
test: convert demo to testing-lib (#37381)
* test: replace testing-lib

* test: replace testing-lib

* test: replace testing-lib

* test: update snap

* test: replace testing-lib

* test: replace testing-lib

* test: update for lint

* merge: merge

* test: testing-lib

* test: replace testing-lib

* test: testing-lib

* test: testing-lib

* test: replace testing-lib

* test: replace testing-lib

* test: Replace test aria replacment logic

* test: Update snapshot

* chore: hack for id

* test: clean up

* test: clean demo

* chore: update

* test: snapshot update

* test: fix snapshot rep logic

* test: fix snapshot rep logic

* test: fix snapshot rep logic

* chore: update demo

* test: fix snapshot rep logic

* test: Update snapshot

* test: rest snapshot

* test: update snapshot

* test: Update test case

* test: config env

* chore: clean up

* chore: Use renderServer instead

* test: adjust testing logic

* test: modify test logic

* test: split ssr test

* test: skip if need skip

* chore: ignore test file covv

Co-authored-by: 二货机器人 <smith3816@gmail.com>
2022-09-09 15:51:35 +08:00
Yuki Zhang
6195376bd0
test: move test cases to testing lib for Badge (#36033) 2022-06-15 10:43:56 +08:00
二货机器人
31fb55adf3
chore: btn default provide default cls (#34013) 2022-02-11 15:02:59 +08:00
二货机器人
2df11184f4
test: Demo check popup content (#33378)
* auto demo

* chore: update demo snapshot

* fix: trigger mock ref logic

* chore: try 2 test case

* chore: more snapshot

* chore: update snapshot

* chore: fix ts

* chore: split test

* test: Update test case

* chore: fix test order
2021-12-23 11:51:10 +08:00
afc163
b34f72b1b6
test: fix ci warnings (#33160) 2021-12-04 17:06:36 +08:00
afc163
06dff86287
fix: Badge count style when customize color (#31617)
* fix: Badge count style when customize color

close #31590
close #31591

* add demo for debug

* update badge demos

* create ribbon.test.tsx
2021-08-02 12:22:30 +08:00
afc163
cded822aa5 docs: update Badge.Ribbon demo 2021-07-14 12:35:03 +08:00
netcon
6ee413c604
fix: span element should not contains p element in Badge (#31042)
fixes #30916
2021-06-22 22:53:55 +08:00
afc163
9f0dbf2b4d
chore: upgrade to jest 27 (#30783)
* chore: upgrade devDeps

* upgrade @ant-design/tools

* support  CSS Minification

* test: jsdom as testEnvironment

* fix setImmediate

* update snapshot

* fix test

* fix test

* fix test

* fix test
2021-06-01 10:11:24 +08:00
二货机器人
f1568a656a
Badge number (#29100)
* init number component

* use single nodes

* clean up

* add current class

* clean up

* fallback

* fix: Safari render issue

* test: fix test case

* test: fix test case

* test: fix test case

* test: fix test case

* test: fix test case

* test: fix test case

* test : Update snaposhot

* test : Update cp snaposhot
2021-01-29 14:27:36 +08:00
Kermit
86b149bdbd
chore: update badge snapshot (#29098) 2021-01-28 21:13:40 +08:00
二货机器人
600fc0a9fe
fix: Standalone Badge motion style (#28240)
* fix: badge motion style

* chore: Clean up related code

* test: Update test case
2020-12-07 21:23:42 +08:00
二货机器人
20788d870c
fix: Badge should not do motion when appear (#28003)
* fix: Badge no need appear motion

* test: Update snapshot
2020-11-25 19:49:44 +08:00
二货机器人
507b596926
refactor: Replace Badge with rc-motion (#27848)
* refactor: Replace Badge with rc-motion

* fix: Cache for hidden

* fix: Dot style

* revert demo

* fix demo snapshot

* test: Update snapshot

* test: Update snapshot
2020-11-18 18:32:00 +08:00
二货机器人
5ea58857f9
test: Update snapshot (#27854)
* chore: Update badge snapshot

* test: Update snapshot
2020-11-18 17:23:46 +08:00
偏右
e7bed7cff7
perf(📦): upgrade @ant-design/colors and remove rc-trigger from deps (#27761)
* perf(📦): upgrade @ant-design/colors

* move rc-trigger to devDeps

* fix lint

* update snapshot

* update snapshot

Co-authored-by: 二货机器人 <smith3816@gmail.com>
2020-11-14 00:43:12 +08:00
偏右
3ef6ea3ead
refactor: 📦 some styles to reduce css bundle size (#27129)
* refactor: some styles to reduce css bundle size

* test: update snapshot

* fix snapshot

* fix test case

* fix addonAfter

* fix firefox style

* reduce riddon css size

* fix Input.Group border radius

* remove unused css selectors

* fix test cov

* fix search button hover border

* fix rtl textarea clear icon style

* update demos

* fix search rtl style

* fix input search style
2020-10-13 21:16:20 +08:00
Alex
bf45c4c1b0
style: 💄 className prop ordering #26594 (#26602)
close #26594
2020-09-06 13:07:39 +08:00
moonrailgun
74d13f48b1
feat: Add size props for Badge (#25851)
* feat: add badge size

* test: add doc and testcase for badge size

* doc: update demo doc of Badge

* doc: update demo doc of Badge

* test: fix test case

* docs: add badge new props size addition version

* style: modify size of small badge
2020-07-28 15:27:50 +08:00
07akioni
a73abb9487
feat: Badge.Ribbon (#25456)
* feat: Badge.Ribbon, wip

* feat: Badge.Ribbon

* test: Badge.Ribbon

* chore

* test: update snapshot

* fix: Badge.RibbonStyle IE 11

* chore

* docs

* chore

* chore

* refactor

* docs

* refactor: remove placement left & right

* Update components/badge/index.zh-CN.md

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

* Update components/badge/index.en-US.md

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

* docs: demo change

* docs

* refactor: use css

* refactor: use css rtl

* refactor

Co-authored-by: xrkffgg <xrkffgg@gmail.com>
2020-07-08 14:47:07 +08:00
xrkffgg
955fa520f1
fix: badge offset in rtl (#24724)
* fix: badge offset in rtl

* fix: update snap

* add test

* fix: offset

* fix: snap
2020-06-06 13:20:09 +08:00
Tom Xu
162b6979af
refactor(badge): 🛠 improve code (#24601)
* refactor(badge): improve code

* refactor(badge): improve code

* increase coverage
2020-05-31 12:38:32 +08:00
zefeng
cb2094265e
feat(tooltip): Tooltip support colour background (#23155)
* feat(tooltip): Tooltip support colour background

Closes #23127

* patch: update test case

* chore: repalce h1 tag to Divider

* chore: update demo
2020-05-25 18:59:00 +08:00
二货机器人
75b090aff3
fix: Switch trigger motion (#24254)
* init fix

* fix rtl

* clean up

* update snapshot

* fix style lint

* add motion of inner

* update un-checked focus style
2020-05-18 17:31:46 +08:00
偏右
ef36e17bb6
🐛 fix Badge color not working when contains children (#21333)
close #21331
2020-02-11 12:56:18 +08:00
二货机器人
52a1600a01
fix: Badge number style (#21235)
* fix css priority

* update snapshot

* update snapshot
2020-02-05 13:52:26 +08:00
Saeed Rahimi
676de29eb4 feat: added rtl direction to all of ant-design components (#19380)
* rtl demo change en-us description

* change bundlesize css limit

* RTL: modal component (exclude confirm)

* RTL: table component

* RTL: pagination component

* cleanup rtl demo

* fix pagination.tsx compile error

* RTL: button and button-group

* RTL: Steps component

* fix rtl demo style

* fix input suffix icon alignment

* fix select component arrow issue

* RTL: form component

* add pagination rtl test

* fix test lint error

* RTL: rate component

* RTL: radio and radio group components

* RTL: tree-select component

* some fixes to RTL components

* RTL: badge component

* fix rtl issue in inline form

* fix input component rtl padding issue

* fix switch component text rtl issue

* fix table grouped header text-align

* add rtl support to whole demo with RTL button

* Update rtl demo responsive

* RTL: page-header component

* RTL: typography component

* RTL: Dropdown (Partial)

* update config-provider doc

* RTL: input component

* RTL: select component

* RTL: switch component

* RTL: tree component

* fix rtl demo lint

* rtl demo change en-us description

* RTL: modal component (exclude confirm)

* RTL: table component

* RTL: pagination component

* cleanup rtl demo

* RTL: button and button-group

* RTL: Steps component

* fix rtl demo style

* fix input suffix icon alignment

* RTL: form component

* RTL: rate component

* RTL: radio and radio group components

* RTL: tree-select component

* RTL: badge component

* fix rtl issue in inline form

* fix input component rtl padding issue

* add rtl support to whole demo with RTL button

* fix lost changes after rebase

* fix lint errors

* RTL: Transfer Component

* RTL: upload component

* RTL: update avatar demo

* RTL: comment component

* RTL: collapse component

* RTL: carousel component

* update snapshots

* RTL: Card component

* RTL: descriptions component

* RTL:  Empty component

* RTL: list component

* RTL: slider component

* slider component import/order

* add shared rtlTest

* RTL: Statistic component

* RTL: tooltip components

* RTL: popover component

* RTL: timeline component

* RTL: tag component

* RTL: alert component

* RTL: drawer component

* RTL: Tab component

* change direction definition

* RTL: progress component

* input.tsx, remove duplicate after rebase

* fix demo.less after rebase

* fix ant-row-rtl after rebase

* fix upload issues in rtl

* badge rtl demo margin fix

* fix: tabs with icon margin

* fix: radio-wrapper margin

* fix: table component after rebase

* fix: centered modal text-align

* update slider snapshot

* RTL: popconfirm component

* RTL: back-top component

* RTL: spin component

* RTL: result component

* RTL: skeleton component

* RTL: menu component

* RTL: time-picker component

* RTL: calendar component

* RTL: date-picker component

* RTL: home page

* update snapshots

* test: add auto-complete rtl test

* test: add avatar component rtl tests

* test: add badge component rtl tests

* test: add breadcrumb component rtl tests

* test: add button components rtl tests

* test: add card component rtl tests

* test: add carousel component rtl tests

* test: add cascader component rtl tests

* test: add checkbox component rtl tests

* test: add collapse component rtl tests

* test: add comment component rtl tests

* test: add dropdown component rtl tests

* test: add empty component rtl tests

* test: add form component rtl tests

* test: add grid component rtl tests

* test: add input component rtl tests

* test: add search component rtl tests

* test: add input-number component rtl tests

* test: add layout component rtl tests

* test: add list component rtl tests

* test: add mentions component rtl tests

* test: add modal component rtl tests

* test: add page-header component rtl tests

* test: add pagination component rtl tests

* test: add radio component rtl tests

* test: add rate component rtl tests

* test: add select component rtl tests

* test: add slider component rtl tests

* test: add steps component rtl tests

* test: add switch component rtl tests

* test: add table component rtl tests

* test: add transfer component rtl tests

* test: add tree component rtl tests

* test: add tree-select component rtl tests

* test: add typography component rtl tests

* test: add upload component rtl tests

* test: add affix component rtl tests

* update calendar tests

* increase css file maxSize

* update snapshots

* remove workflows to allow push

* remove duplicate reverse prop from slider

* fix: remove table demo from config-provider

* fix: remove table demo from config-provider

* fix lint error

* Added direction property to ConfigProvider

* cascader rtl tests added

* update config-provider doc

* RTL: grid system

* RTL: input component

* RTL: switch component

* fix rtl demo lint

* RTL: modal component (exclude confirm)

* RTL: table component

* RTL: pagination component

* cleanup rtl demo

* fix pagination.tsx compile error

* RTL: button and button-group

* RTL: Steps component

* fix rtl demo style

* RTL: form component

* add pagination rtl test

* RTL: rate component

* RTL: radio and radio group components

* RTL: tree-select component

* RTL: badge component

* fix rtl issue in inline form

* fix input component rtl padding issue

* add rtl support to whole demo with RTL button

* RTL: input component

* RTL: select component

* RTL: switch component

* RTL: tree component

* fix rtl demo lint

* rtl demo change en-us description

* RTL: modal component (exclude confirm)

* RTL: table component

* RTL: pagination component

* cleanup rtl demo

* RTL: button and button-group

* RTL: Steps component

* fix rtl demo style

* fix input suffix icon alignment

* RTL: form component

* RTL: rate component

* RTL: radio and radio group components

* RTL: tree-select component

* RTL: badge component

* fix rtl issue in inline form

* fix input component rtl padding issue

* add rtl support to whole demo with RTL button

* input.tsx, remove duplicate after rebase

* fix ant-row-rtl after rebase

* update snapshots

* test: add cascader component rtl tests

* test: add pagination component rtl tests

* update calendar tests

* update snapshots

* fix: remove table demo from config-provider

* fix: remove table demo from config-provider

* fix lint error

* update direction.md icons

* dropdown and cascader default placement in rtl

* update snapshots

* fix lint errors

* remove duplicate import

* update snapshots

* update snapshot

* update calendar snapshot

* update snapshots

* integrate with new rc-picker

* update snapshots

* fix lint errors

* update snapshot

* update snapshots

* update snapshots

* update snapshots :|

* update snapshots

* fix compile error.

* fix typo after rebase

* update snapshots

* remove workflows to allow push

* update snapshots

* update snapshots

* fix dist error

* front-page css fix

* update snapshots

* fix lint and test issues

* restore cascader index.less

* update snapshots

* fix logo in rtl and demo controls

* ci errors

* resolve steps/index.tsx conflicts

* tooltip family demo remove inline style

* resolve table/Table.tsx conflicts

* resolve modal/Modal.tsx conflicts

* resolve cascader/index.tsx conflicts

* add workflows from upstream

* update snapshots

* revert logo to default

* fix codebox demo direction of placements

* resolve tooltip overlayClassName conflicts

* update snapshots

* update popover test

* fix: cascader miss popupClassName

* fix: fix select missing dropdownClassName

* chore: Update snapshot

* chore: Adjust menu use rtl logic

* docs: Update demo line color

Co-authored-by: 二货机器人 <smith3816@gmail.com>
2020-01-02 19:10:16 +08:00
ycjcl868
0306096356 chore: update snapshot 2019-12-26 15:15:46 +08:00
zombiej
3d8a4f3612 merge master 2019-08-29 23:41:46 +08:00