chore: auto merge branchs (#35729)

chore: next merge feature
ant-design · May 25, 2022 · 948ac78 · 948ac78
2 parents 8b802bb + 8ae2786
commit 948ac78
Show file tree

Hide file tree

Showing 13 changed files with 6,018 additions and 1,123 deletions.
diff --git a/.github/workflows/issue-open-check.yml b/.github/workflows/issue-open-check.yml
@@ -59,7 +59,8 @@ jobs:
             * Ant Motion: https://motion.ant.design
 
             ## 国内镜像
-            * Ant Design: http://ant-design.gitee.io
+            * 官方镜像: https://ant-design.antgroup.com/
+            * Gitee 镜像: http://ant-design.gitee.io
             * Ant Design 3.x: http://ant-design-3x.gitee.io
             * Ant Design 2.x: http://ant-design-2x.gitee.io
             * Ant Design 1.x: http://ant-design-1x.gitee.io

diff --git a/.github/workflows/pr-check-ci.yml b/.github/workflows/pr-check-ci.yml
@@ -3,7 +3,7 @@ name: PR Check CI
 
 on:
   schedule:
-    - cron: "*/10 * * * *"
+    - cron: "*/5 * * * *"
 
 permissions:
   contents: read

diff --git a/components/collapse/index.en-US.md b/components/collapse/index.en-US.md
@@ -36,7 +36,7 @@ A content area which can be collapsed and expanded.
 | --- | --- | --- | --- | --- |
 | collapsible | Specify whether the panel be collapsible or the trigger area of collapsible | `header` \| `disabled` | - | 4.9.0 |
 | extra | The extra element in the corner | ReactNode | - |  |
-| forceRender | Forced render of content on panel, instead of lazy rending after clicking on header | boolean | false |  |
+| forceRender | Forced render of content on panel, instead of lazy rendering after clicking on header | boolean | false |  |
 | header | Title of the panel | ReactNode | - |  |
 | key | Unique key identifying the panel from among its siblings | string \| number | - |  |
 | showArrow | If false, panel will not show arrow icon | boolean | true |  |