ice
696c9dde02
fix(button): type=link error token & add prefix cls (color/variant) & specificity too high ( #50962 )
2024-09-24 23:52:50 +08:00
renovate[bot]
863f61d908
chore(deps): update dependency eslint to v9 ( #50690 )
...
Co-authored-by: afc163 <afc163@gmail.com>
2024-09-19 03:30:19 +08:00
𝑾𝒖𝒙𝒉
b6edef3af8
fix(Upload): should support name
prop drilling ( #50652 )
...
Co-authored-by: afc163 <afc163@gmail.com>
2024-09-14 14:38:51 +08:00
lijianan
fa5d758e21
feat: CP should support Splitter className & style ( #50855 )
2024-09-14 13:57:23 +08:00
afc163
884baa1fad
fix: Modal a11y warning issue ( #50823 )
...
close #50170
2024-09-12 10:17:33 +08:00
ice
badfbe3cfe
feat(Button): support variant and color ( #50051 )
...
* feat(button): variant & color types
* feat: type -> color/variant
* feat: type -> color/variant
* feat: add variant filled
* test: snap
* refactor(button): rename type -> variant
* docs: add demo
* feat: add danger ghost style
* refactor: remove deprecated
* refactor: eslint
* docs: change color&variant
* test: updated snap
* docs: color-variant
* docs: add debug color&variant
* feat: global token
* refactor: remove comment
* docs: add color&variant docs
* docs: remove default
* docs: add space
* docs: code
* test: update snap
* test: fix snap
* test: btn querySelect
* feat: change filled hoverStyle
* test: fix
* feat: support grey wave
* refactor: enhance
* docs: color/variant -> v 5.21
* test: snap
* feat: add token
* test: to do
* test: fix test
* ci: rebuild
* style: remove
* style: space
* docs: add note & FQA
* feat: add componentsToken
* refactor: remove isNotGrey
* test: add case
* docs: tile button
* test: snap
* docs: site & snap
* Update components/button/index.en-US.md
Co-authored-by: lijianan <574980606@qq.com>
Signed-off-by: ice <49827327+coding-ice@users.noreply.github.com>
* fix: token color & undef
* docs: site
* docs: responsive
* docs: enhance FAQ
* docs: gap middle
* test: snap
* Update components/theme/interface/maps/colors.ts
Co-authored-by: MadCcc <1075746765@qq.com>
Signed-off-by: ice <49827327+coding-ice@users.noreply.github.com>
* Update components/theme/interface/maps/colors.ts
Co-authored-by: MadCcc <1075746765@qq.com>
Signed-off-by: ice <49827327+coding-ice@users.noreply.github.com>
* Update components/theme/interface/maps/colors.ts
Co-authored-by: MadCcc <1075746765@qq.com>
Signed-off-by: ice <49827327+coding-ice@users.noreply.github.com>
* Update components/button/style/token.ts
Co-authored-by: MadCcc <1075746765@qq.com>
Signed-off-by: ice <49827327+coding-ice@users.noreply.github.com>
* Update components/button/style/token.ts
Co-authored-by: MadCcc <1075746765@qq.com>
Signed-off-by: ice <49827327+coding-ice@users.noreply.github.com>
* refactor: rename
* docs: prettier
* chore: eslint
* refactor: cls
* test: add solidTextColor case
* refactor: genVariantButtonStyle
* refactor: genVariantButtonStyle
* refactor: genVariantButtonStyle
* fix: rename
* docs: text
* fix: remove border
* feat: add token colorErrorBgFilledHover
* chore: add size-limit
* refactor: rename
---------
Signed-off-by: ice <49827327+coding-ice@users.noreply.github.com>
Co-authored-by: lijianan <574980606@qq.com>
Co-authored-by: MadCcc <1075746765@qq.com>
2024-09-03 17:39:02 +08:00
Nicolò Zandarin
1cd79e3b0a
fix: Disable the Rate component within Form.Item when the form is disabled ( #50594 )
...
Co-authored-by: Nicolò Zandarin <nicolo.zandarin@atroos.com>
2024-08-27 18:56:54 +08:00
renovate[bot]
7fdfb299eb
chore(deps): update dependency @typescript-eslint/parser to v8 ( #50228 )
...
* chore(deps): update dependency @typescript-eslint/parser to v8
* Update package.json
Signed-off-by: afc163 <afc163@gmail.com>
* fix eslint errors
---------
Signed-off-by: afc163 <afc163@gmail.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: afc163 <afc163@gmail.com>
2024-08-04 12:24:35 +08:00
栗嘉男
d5207c1e23
Merge branch 'master' into feature-merge-master
2024-07-26 10:18:06 +08:00
🏎️ Yumo
64f26bd970
refactor(theme): migrate and refactor type GlobalToken
by @ant-design/cssinjs-utils
2024-07-23 16:45:02 +08:00
github-actions[bot]
0681d6c7a2
chore: auto merge branches ( #50005 )
...
chore: merge master into feature
2024-07-22 08:39:11 +00:00
lijianan
2584ce6d50
chore: replace "ant" with defaultPrefixCls ( #49985 )
...
* chore: replace ant with defaultPrefixCls
* chore: fix lint
2024-07-20 14:17:11 +08:00
红
800c3fcbdb
feat(table-filter): support custom Empty ( #49613 )
...
* fix: Table empty node in filter dropdown not following ConfigProvider renderEmpty (#49548 )
* 修复自定义全局组件,过滤里面没有生效
* 新增测试用例
* 重新提交测试用例
* 测试用例添加断言判断
* update Table.filter.test.tsx
* commit snapshot
* update Table.filter.test.tsx
* update Table.filter.test.tsx
* update Table.filter.test.tsx
(cherry picked from commit 7790934b0b
)
* chore: update case
* feat(table-filter): support custom Empty
* chore(type): improve TS type definition (#49602 )
(cherry picked from commit a15fcfa1dc
)
* fixup! feat(table-filter): support custom Empty
* Squashed commit of the following:
commit 1b9706f22d
Merge: e76e386966
cc54bef826
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed Jun 26 10:10:48 2024 +0000
chore: auto merge branches (#49609 )
chore: sync master to feature
commit cc54bef826
Author: 照明胧 <25151442+mmmml-zhao@users.noreply.github.com>
Date: Wed Jun 26 14:19:22 2024 +0800
fix: The emptyText field of the table (#49599 )
* fix: The emptyText field of the table
when emptyText is null
* test: update test case(#49599 )
commit ff7fea18f3
Author: afc163 <afc163@gmail.com>
Date: Wed Jun 26 12:40:24 2024 +0800
Revert "bug: fix-table-bug ref filters" (#49600 )
This reverts commit 7790934b0b
.
commit a15fcfa1dc
Author: 红 <wxh1220@gmail.com>
Date: Wed Jun 26 12:40:11 2024 +0800
chore(type): improve TS type definition (#49602 )
commit 9ce5cbcf64
Author: Andrey <aaa144855@gmail.com>
Date: Wed Jun 26 06:05:39 2024 +0300
fix: remove redundant transformations in ```UploadList```, which led to decrease in performance (#49598 )
* fix: remove unnecessary transformations for upload list with previews
* chore: revert miss convert
---------
Co-authored-by: 二货机器人 <smith3816@gmail.com>
commit 4145305b16
Author: MadCcc <madccc@foxmail.com>
Date: Tue Jun 25 16:59:30 2024 +0800
docs: fix site FOUC (#49595 )
commit 44e96b7b06
Author: enhongchen <106970098+enhongchen@users.noreply.github.com>
Date: Tue Jun 25 14:24:14 2024 +0800
docs: Update use-with-rsbuild.zh-CN.md (#49592 )
https://ant.design/docs/react/use-with-rsbuild-cn?theme=happy-work#%E5%AE%89%E8%A3%85%E5%92%8C%E5%88%9D%E5%A7%8B%E5%8C%96
Signed-off-by: enhongchen <106970098+enhongchen@users.noreply.github.com>
commit 6a0af781d1
Author: 红 <wxh1220@gmail.com>
Date: Tue Jun 25 13:34:28 2024 +0800
chore: improve tabs demo (#49590 )
ref: https://docs.dndkit.com/presets/sortable#collision-detection-algorithm
commit 7127603b76
Author: Tantatorn Suksangwarn <timefear007@gmail.com>
Date: Tue Jun 25 12:32:59 2024 +0700
fix: add missing Thai translations (#49588 )
commit 7790934b0b
Author: duqigit <916475145@qq.com>
Date: Tue Jun 25 10:44:43 2024 +0800
fix: Table empty node in filter dropdown not following ConfigProvider renderEmpty (#49548 )
* 修复自定义全局组件,过滤里面没有生效
* 新增测试用例
* 重新提交测试用例
* 测试用例添加断言判断
* update Table.filter.test.tsx
* commit snapshot
* update Table.filter.test.tsx
* update Table.filter.test.tsx
* update Table.filter.test.tsx
commit b09913db06
Author: lijianan <574980606@qq.com>
Date: Tue Jun 25 10:42:19 2024 +0800
test: update test case code (#49585 )
commit b420c57354
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue Jun 25 10:39:47 2024 +0800
chore(deps): bump oven-sh/setup-bun from 1 to 2 (#49578 )
Bumps [oven-sh/setup-bun](https://github.com/oven-sh/setup-bun ) from 1 to 2.
- [Release notes](https://github.com/oven-sh/setup-bun/releases )
- [Commits](https://github.com/oven-sh/setup-bun/compare/v1...v2 )
---
updated-dependencies:
- dependency-name: oven-sh/setup-bun
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
commit a81603d720
Author: afc163 <afc163@gmail.com>
Date: Mon Jun 24 13:33:56 2024 +0800
docs: fix nav menu cannot click (#49569 )
* chore: remove
* test: add more unit test
* chore: lint
* chore: fix legacy16 bug
* chore: update logic
* test: update unit test
---------
Co-authored-by: duqigit <916475145@qq.com>
2024-07-01 17:47:59 +08:00
github-actions[bot]
1b9706f22d
chore: auto merge branches ( #49609 )
...
chore: sync master to feature
2024-06-26 10:10:48 +00:00
lijianan
b09913db06
test: update test case code ( #49585 )
2024-06-25 10:42:19 +08:00
github-actions[bot]
05d107ce4d
chore: auto merge branches ( #49556 )
...
chore: sync master to feature
2024-06-22 15:30:17 +00:00
afc163
59ad48476b
refactor: add boime lint and fix lint errrors ( #49536 )
...
* chore: add boime lint
* fix lint
* use files ignore
* revert change
* ignore clarity.js
* fix some errors
* fix some errors
* fix some errors
* fix some errors
* add yml file
* Update clarity.js
Signed-off-by: afc163 <afc163@gmail.com>
* add npm run lint:biome
* add npm run lint:biome
* fix test case
* fix ts errors
* fix ts errors
* fix lint and add .lintstagedrc
* shorten prop name
* chore: update package.json
* update biome.json
* chore: remove stylelint
* chore: useOptionalChain
* fix lint
* biome format
* prettier all code
* prettier all code
* fix site test
---------
Signed-off-by: afc163 <afc163@gmail.com>
2024-06-22 21:59:12 +08:00
MadCcc
010f82bd1a
feat: ConfigProvider support variant ( #49535 )
...
* feat: ConfigProvider support variant
* docs: add docs for variant
* feat: support config all components variant
* chore: fix lint
* chore: add test
* test: add test
2024-06-21 17:47:09 +08:00
afc163
fad1497ef7
fix: RangePicker missing arrow ( #49333 )
...
* bump rc-picker
* chore: update snapshot
* chore: update snapshot
* fix: arrow style
* fix: arrow transition style
* Update package.json
Signed-off-by: afc163 <afc163@gmail.com>
* Update package.json
Signed-off-by: afc163 <afc163@gmail.com>
* Update package.json
Signed-off-by: afc163 <afc163@gmail.com>
* Update package.json
Signed-off-by: afc163 <afc163@gmail.com>
* fix: rtl style
* Update package.json
Signed-off-by: afc163 <afc163@gmail.com>
* fix rtl style
* chore: update snapshot
* fix rtl style
* Update package.json
Signed-off-by: afc163 <afc163@gmail.com>
* Update package.json
Co-authored-by: 叶枫 <7971419+crazyair@users.noreply.github.com>
Signed-off-by: afc163 <afc163@gmail.com>
---------
Signed-off-by: afc163 <afc163@gmail.com>
Co-authored-by: 叶枫 <7971419+crazyair@users.noreply.github.com>
2024-06-18 23:59:23 +08:00
Wanpan
329a346473
fix: Collapse expandIcon aria-label adds semantic attribute value ( #49395 )
...
* fix: Collapse expandIcon aria-label adds semantic attribute value
* test: update snap
* test: update test case
* test: update snap
2024-06-13 15:14:48 +08:00
二货爱吃白萝卜
0352b2fd2e
feat: Spin support percent ( #48657 )
...
* feat: spin support ptg
* chore: ptg
* chore: update demo
* chore: popout component
* chore: adjust logic
* test: update snapshot
* test: update snapshot
* docs: update docs
* test: update snapshot
* test: update snapshot
* test: update snapshot
* chore: back of snapshot
* chore: clean up
* test: fix test case
* chore: fix types
* test: update snapshot
* chore: opt
* test: update testcase
* test: coverage
* test: update snapshot
2024-06-03 11:30:27 +08:00
LonelySnowman
5098e6e209
feat: progress add inside and bottom text position ( #48157 )
...
* feat: progress add inside and bottom text position
* feat: change progress percent position api
* fix: change to follow coding standards
* docs: reset i18n zh file
* fix: change to follow coding standards
* fix: change to follow coding standards
* docs: reset i18n file
* fix: change to follow coding standards
* docs: reset i18n file
* feat: progress inner text get brighten color
* feat: update progress snapshots
* fix: progress bottom layout center
* feat: update steps snapshots
* feat: update progress snapshots
* feat: update config provider snapshots
* feat: progress inner text add negate color
* feat: update progress snapshots
* feat: progress inner text add light bg color
* feat: progress inner text add light bg color
* feat: change progress percentPosition api
* feat: change progress component test
* feat: update progress line component snapshot
* feat: progress component outer start layout text adapt
* feat: progress line change to flex layout
* feat: update progress snapshots
* feat: update progress line style
* feat: update progress line style
* fix: progress line reset height use inline block
* fix: change progress is line type
* fix: change progress is line type
* fix: delete progress outer styles
* fix: change progress line type layout
* fix: progress add outer style
* feat: update progress snapshots
* fix: change progress text bright color
* fix: optimized code volume
* fix: progress delete after style on inner layout
* fix: update progress test file
---------
Co-authored-by: lijianan <574980606@qq.com>
Co-authored-by: afc163 <afc163@gmail.com>
2024-05-10 10:22:32 +08:00
lijianan
ba5f9fe2f8
Merge pull request #48677 from ant-design/master
...
chore: merge master into feature
2024-04-28 14:02:49 +08:00
lijianan
029cb1dff0
test: rm legacy react-dom/test-utils
for compatible React-18.3.1 ( #48667 )
...
* test: rm legacy react-dom/test-utils for compatible React-18.3.0
* fix: fix
* chore: cls
* chore: update
* fix: fix
2024-04-28 09:52:54 +08:00
Cooper
c7f2760007
feat: add Tabs more props ( #48321 )
...
* feat: add Tabs more props
* fix
* fix
* Compatible with moreIcon
* compatible ConfigProvider with the moreIcon
* update site snap
* fix
* fix
* fix
* fix
* fix
---------
Co-authored-by: afc163 <afc163@gmail.com>
2024-04-17 12:05:43 +08:00
lijianan
6a7945d2fd
feat: Button support autoInsertSpace prop ( #48348 )
...
* feat: Button support autoInsertSpaceInButton prop
* demo: update demo
* fix: fix
* test: add test case
* docs: update docs
* chore: deprecated autoInsertSpaceInButton prop
* Update components/button/button.tsx
Co-authored-by: MadCcc <madccc@foxmail.com>
Signed-off-by: lijianan <574980606@qq.com>
* fix: fix
* fix: fix
* Update components/button/button.tsx
Co-authored-by: MadCcc <madccc@foxmail.com>
Signed-off-by: lijianan <574980606@qq.com>
* fix: fix
* Update components/button/button.tsx
Signed-off-by: lijianan <574980606@qq.com>
* fix: fix
* fix: fix
---------
Signed-off-by: lijianan <574980606@qq.com>
Co-authored-by: MadCcc <madccc@foxmail.com>
2024-04-11 15:29:10 +08:00
叶枫
502dac12aa
docs: format code ( #48309 )
...
* docs: fix code
* feat: lint
* feat: prettier
* feat: test
* feat: review
* feat: format html
* feat: format html
2024-04-08 14:04:08 +08:00
kiner-tang
506753c3ef
feat: Tag support aria-* in closable ( #47678 )
...
* feat: Tag support aria-* in closable
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* refactor: useClosable
* chore: modal
* fix: check logic
* chore: clean up
* feat: optimize code
* feat: optimize code
---------
Signed-off-by: kiner-tang <1127031143@qq.com>
Co-authored-by: 二货机器人 <smith3816@gmail.com>
2024-03-31 11:56:55 +08:00
lijianan
5fbfecd5b2
feat: CP support FloatButton.Group closeIcon ( #47953 )
2024-03-19 17:14:22 +08:00
kiner-tang
6928fbc06d
feat: Modal support aria-* in closable ( #47650 )
...
* feat: Modal support aria-* in closable
* feat: Modal support aria-* in closable
* feat: Modal support aria-* in closable
* chore: bump rc-image
* feat: update snap
* feat: update snap
2024-03-01 10:58:50 +08:00
kiner-tang
15216614ed
feat: Drawer support aria in closable ( #47543 )
...
* feat: drawer support aria in closable prop
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
* feat: optimize code
2024-02-28 14:11:15 +08:00
lijianan
271daafa39
feat: CP support Input.TextArea allowClear、autoComplete、className、classNames、style、styles ( #47589 )
...
* feat: CP support Input allowClear
* feat: CP support Input allowClear
* fix: fix
* fix: fix
* revert
* revert
* Update Input.tsx
Signed-off-by: lijianan <574980606@qq.com>
* Update getAllowClear.tsx
Signed-off-by: lijianan <574980606@qq.com>
* Update getAllowClear.tsx
Signed-off-by: lijianan <574980606@qq.com>
* test: add test case
---------
Signed-off-by: lijianan <574980606@qq.com>
2024-02-28 09:54:48 +08:00
lijianan
6c0d3e46c4
feat: CP support Input allowClear ( #47602 )
2024-02-27 10:25:35 +08:00
lijianan
b28b0d883f
feat: CP support Menu expandIcon ( #47561 )
...
* feat: CP support Menu expandIcon
* fix: test case fix
* fix: test case fix
* fix: fix
* fix: fix
* chore: rename
* type: add type
---------
Signed-off-by: lijianan <574980606@qq.com>
2024-02-26 09:55:08 +08:00
lijianan
cf51b5f34d
feat: CP support collapse expandIcon ( #47473 )
...
* feat: CP support Avatar icon
* fix: fix
* fix: fix
* test: fix test case
* fix: fix
* fix: fix type
* Update avatar.tsx
Signed-off-by: lijianan <574980606@qq.com>
* Update avatar.tsx
Signed-off-by: lijianan <574980606@qq.com>
---------
Signed-off-by: lijianan <574980606@qq.com>
2024-02-20 14:02:43 +08:00
MadCcc
b96f4c8003
feat: css var prefix follow prefixCls by default ( #47481 )
...
* feat: css var prefix follow prefixCls by default
* docs: update
2024-02-20 09:47:21 +08:00
kiner-tang
23cb9c5fd6
feat: Alert support aria-* in closable ( #47474 )
...
* feat: Alert support aria-* in closable
* feat: Alert support aria-* in closable
* feat: Alert support aria-* in closable
2024-02-19 13:40:19 +08:00
afc163
39e7bc5d2f
Merge pull request #47383 from ant-design/master
...
chore: merge master into feature
2024-02-07 13:30:01 +08:00
MadCcc
2f6218a0f3
fix: inherit should not affect hashed and cssVar ( #47360 )
...
* fix: inherit should not affect hashed and cssVar
* chore: update
* chore: add test case
2024-02-06 17:38:03 +08:00
lijianan
cfe722667a
feat: Tabs support removeIcon prop ( #47334 )
...
* feat: Tabs support removeIcon prop
* feat: Tabs support removeIcon prop
* Update components/config-provider/index.zh-CN.md
Signed-off-by: lijianan <574980606@qq.com>
* fix: fix
---------
Signed-off-by: lijianan <574980606@qq.com>
2024-02-05 11:45:24 +08:00
lijianan
0e28360622
feat: CP support Transfer selectionsIcon ( #47301 )
2024-02-02 10:48:05 +08:00
lijianan
326ae986b9
Merge pull request #47297 from ant-design/master
...
chore: merge master into feature
2024-02-01 23:59:16 +08:00
lijianan
e009ca9d4a
feat: CP support Tabs addIcon & moreIcon ( #47274 )
...
* feat: CP support Tabs addIcon & moreIcon
* fix: fix
* fix: fix
* fix: fix
---------
Signed-off-by: lijianan <574980606@qq.com>
2024-02-01 19:14:54 +08:00
lijianan
a206593d28
feat: CP support Image closeIcon ( #47252 )
...
* feat: CP support Image closeIcon
* type: update type
* type: update type
* fix: fix
2024-02-01 17:43:00 +08:00
mr-chenguang
f1f4788e38
fix: use flex to correct avatar child position ( #47236 )
...
* fix: remove avatar border when height less then 16
* fix: 使用 flex 完成子元素居中布局
* fix: fix avatar tests snapshot
* fix: fix avatar tests snapshot
* Update components/avatar/style/index.ts
Co-authored-by: afc163 <afc163@gmail.com>
Signed-off-by: mr-chenguang <37072324+lcgash@users.noreply.github.com>
* fix: changealign
* fix: update avatar snapshots
* fix:update snapshot
* fix: update snapshot
* fix: update snapshot
---------
Signed-off-by: mr-chenguang <37072324+lcgash@users.noreply.github.com>
Co-authored-by: afc163 <afc163@gmail.com>
2024-01-31 18:20:21 +08:00
lijianan
651914c46d
feat: CP support Tag closeIcon ( #47250 )
2024-01-31 10:07:16 +08:00
lijianan
b233f27ba0
feat: CP support Notification closeIcon ( #47244 )
...
* feat: CP support Notification closeIcon
* fix: fix
2024-01-30 20:13:22 +08:00
lijianan
231e873b3f
Merge pull request #47238 from ant-design/master
...
chore: merge master into feature
2024-01-30 20:00:58 +08:00
lijianan
aa36678a29
feat: CP support Alert closeIcon ( #47235 )
2024-01-30 16:47:42 +08:00
zhoulixiang
6ed0254ad5
feat: Add classNames and styles prop for card ( #46811 )
...
* feat: support classNames and styles for card
* feat: add lost info
* docs: update context of card
* feat: optimize classNames and styles code of card
* test: update card test case
* feat: remove headWrapper
* test: correct test
* feat: remove redundant snapshot
* feat: update config provider for card
* feat: update classNames and styles of card
* feat: add warning for headStyle and bodyStyle of card
* test: replace bodyStyle to styles.body in demo of flex
* docs: add jsDoc about deprecated for headStyle and bodyStyle
* snap: update table counts of card from 3 to 4
* docs: update version for styles and classnames of card
---------
Signed-off-by: zhoulixiang <18366276315@163.com>
Co-authored-by: vagusX <vagusxl@gmail.com>
2024-01-30 15:00:25 +08:00