Merge branch 'main' into release

DouyinFE · Jul 16, 2024 · 818a1c8 · 818a1c8
2 parents f7cce1f + a7887e3
commit 818a1c8
Show file tree

Hide file tree

Showing 24 changed files with 349 additions and 197 deletions.
diff --git a/content/show/table/index.md b/content/show/table/index.md
@@ -45,6 +45,7 @@ function App() {
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/figma-icon.png',
             size: '2M',
             owner: '姜鹏志',
+            status: 'success',
             updateTime: '2020-02-02 05:13',
             avatarBg: 'grey',
         },
@@ -54,6 +55,7 @@ function App() {
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '2M',
             owner: '郝宣',
+            status: 'pending',
             updateTime: '2020-01-17 05:31',
             avatarBg: 'red',
         },
@@ -62,6 +64,7 @@ function App() {
             name: '设计文档',
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '34KB',
+            status: 'wait',
             owner: 'Zoey Edwards',
             updateTime: '2020-01-26 11:01',
             avatarBg: 'light-blue',
@@ -106,6 +109,19 @@ function App() {
             title: '大小',
             dataIndex: 'size',
         },
+        {
+            title: '交付状态',
+            dataIndex: 'status',
+            render: (text) => {
+                const tagConfig = {
+                    success: { color: 'green', prefixIcon: <IconTickCircle />, text: '已交付' },
+                    pending: { color: 'pink', prefixIcon: <IconClear />, text: '已延期' },
+                    wait: { color: 'cyan', prefixIcon: <IconComment />, text: '待评审' },
+                };
+                const tagProps = tagConfig[text];
+                return <Tag shape='circle' {...tagProps} style={{ userSelect: 'text' }}>{tagProps.text}</Tag>
+            }
+        },
         {
             title: '所有者',
             dataIndex: 'owner',
@@ -133,12 +149,13 @@ function App() {
         },
     ];
     const data = [
-        {
+         {
             key: '1',
             name: 'Semi Design 设计稿.fig',
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/figma-icon.png',
             size: '2M',
             owner: '姜鹏志',
+            status: 'success',
             updateTime: '2020-02-02 05:13',
             avatarBg: 'grey',
         },
@@ -148,6 +165,7 @@ function App() {
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '2M',
             owner: '郝宣',
+            status: 'pending',
             updateTime: '2020-01-17 05:31',
             avatarBg: 'red',
         },
@@ -156,6 +174,7 @@ function App() {
             name: '设计文档',
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '34KB',
+            status: 'wait',
             owner: 'Zoey Edwards',
             updateTime: '2020-01-26 11:01',
             avatarBg: 'light-blue',
@@ -192,6 +211,7 @@ function App() {
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/figma-icon.png',
             size: '2M',
             owner: '姜鹏志',
+            status: 'success',
             updateTime: '2020-02-02 05:13',
             avatarBg: 'grey',
         },
@@ -201,6 +221,7 @@ function App() {
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '2M',
             owner: '郝宣',
+            status: 'pending',
             updateTime: '2020-01-17 05:31',
             avatarBg: 'red',
         },
@@ -209,6 +230,7 @@ function App() {
             name: '设计文档',
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '34KB',
+            status: 'wait',
             owner: 'Zoey Edwards',
             updateTime: '2020-01-26 11:01',
             avatarBg: 'light-blue',
@@ -292,6 +314,19 @@ function App() {
             title: '大小',
             dataIndex: 'size',
         },
+        {
+            title: '交付状态',
+            dataIndex: 'status',
+            render: (text) => {
+                const tagConfig = {
+                    success: { color: 'green', prefixIcon: <IconTickCircle />, text: '已交付' },
+                    pending: { color: 'pink', prefixIcon: <IconClear />, text: '已延期' },
+                    wait: { color: 'cyan', prefixIcon: <IconComment />, text: '待评审' },
+                };
+                const tagProps = tagConfig[text];
+                return <Tag shape='circle' {...tagProps} style={{ userSelect: 'text' }}>{tagProps.text}</Tag>
+            }
+        },
         {
             title: '所有者',
             dataIndex: 'owner',
@@ -326,6 +361,7 @@ function App() {
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/figma-icon.png',
             size: '2M',
             owner: '姜鹏志',
+            status: 'success',
             updateTime: '2020-02-02 05:13',
             avatarBg: 'grey',
         },
@@ -335,6 +371,7 @@ function App() {
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '2M',
             owner: '郝宣',
+            status: 'pending',
             updateTime: '2020-01-17 05:31',
             avatarBg: 'red',
         },
@@ -343,6 +380,7 @@ function App() {
             name: '设计文档',
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '34KB',
+            status: 'wait',
             owner: 'Zoey Edwards',
             updateTime: '2020-01-26 11:01',
             avatarBg: 'light-blue',
@@ -353,6 +391,7 @@ function App() {
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/figma-icon.png',
             size: '2M',
             owner: '姜鹏志',
+            status: 'wait',
             updateTime: '2020-02-02 05:13',
             avatarBg: 'grey',
         },
@@ -362,6 +401,7 @@ function App() {
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '2M',
             owner: '郝宣',
+            status: 'pending',
             updateTime: '2020-01-17 05:31',
             avatarBg: 'red',
         },
@@ -370,6 +410,7 @@ function App() {
             name: 'Semi D2C 设计文档',
             nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
             size: '34KB',
+            status: 'success',
             owner: 'Zoey Edwards',
             updateTime: '2020-01-26 11:01',
             avatarBg: 'light-blue',
@@ -424,6 +465,7 @@ const raw = [
         nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/figma-icon.png',
         size: '2M',
         owner: '姜鹏志',
+        status: 'success',
         updateTime: '2020-02-02 05:13',
         avatarBg: 'grey',
     },
@@ -433,6 +475,7 @@ const raw = [
         nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
         size: '2M',
         owner: '郝宣',
+        status: 'pending',
         updateTime: '2020-01-17 05:31',
         avatarBg: 'red',
     },
@@ -441,6 +484,7 @@ const raw = [
         name: '设计文档',
         nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
         size: '34KB',
+        status: 'wait',
         owner: 'Zoey Edwards',
         updateTime: '2020-01-26 11:01',
         avatarBg: 'light-blue',
@@ -450,6 +494,7 @@ const raw = [
         name: 'Semi D2C 设计文档可能也有点长所以也会显示Tooltip',
         nameIconSrc: 'https://lf3-static.bytednsdoc.com/obj/eden-cn/ptlz_zlp/ljhwZthlaukjlkulzlp/docs-icon.png',
         size: '34KB',
+        status: 'success',
         owner: '姜琪',
         updateTime: '2020-01-26 11:01',
         avatarBg: 'green',
@@ -502,6 +547,19 @@ function App() {
             dataIndex: 'size',
             width: 150,
         },
+        {
+            title: '交付状态',
+            dataIndex: 'status',
+            render: (text) => {
+                const tagConfig = {
+                    success: { color: 'green', prefixIcon: <IconTickCircle />, text: '已交付' },
+                    pending: { color: 'pink', prefixIcon: <IconClear />, text: '已延期' },
+                    wait: { color: 'cyan', prefixIcon: <IconComment />, text: '待评审' },
+                };
+                const tagProps = tagConfig[text];
+                return <Tag shape='circle' {...tagProps} style={{ userSelect: 'text' }}>{tagProps.text}</Tag>
+            }
+        },
         {
             title: '所有者',
             dataIndex: 'owner',
@@ -565,7 +623,6 @@ render(App);
 -   受控模式下，分页的状态完全由外部传入，依据为是否往 Table 传入了 `pagination.currentPage` 这个字段。一般情况下，受控模式适用于远程拉取数据并渲染。
 -   非受控模式下，Table 默认会将传入的 `dataSource` 长度作为 `total` 传给 Pagination 组件，当然你也可以传入一个 `total` 字段来覆盖 Table 组件的取值，不过我们并不推荐用户在非受控分页模式下传入这个字段。
 
-> 非受控时传入自定义的 `pagination.total` 字段在 >=0.25.0 版本后才支持
 
 ```jsx live=true noInline=true dir="column"
 import React, { useState, useMemo } from 'react';
@@ -604,6 +661,19 @@ const columns = [
         sorter: (a, b) => (a.size - b.size > 0 ? 1 : -1),
         render: text => `${text} KB`,
     },
+    {
+        title: '交付状态',
+        dataIndex: 'status',
+        render: (text) => {
+            const tagConfig = {
+                success: { color: 'green', prefixIcon: <IconTickCircle />, text: '已交付' },
+                pending: { color: 'pink', prefixIcon: <IconClear />, text: '已延期' },
+                wait: { color: 'cyan', prefixIcon: <IconComment />, text: '待评审' },
+            };
+            const tagProps = tagConfig[text] || {};
+            return <Tag shape='circle' {...tagProps} style={{ userSelect: 'text' }}>{tagProps.text}</Tag>
+        }
+    },
     {
         title: '所有者',
         dataIndex: 'owner',
@@ -657,6 +727,7 @@ function App() {
                 name: isSemiDesign ? `Semi Design 设计稿${i}.fig` : `Semi D2C 设计稿${i}.fig`,
                 owner: isSemiDesign ? '姜鹏志' : '郝宣',
                 size: randomNumber,
+                status: isSemiDesign ? 'success' : 'wait',
                 updateTime: new Date().valueOf() + randomNumber * DAY,
                 avatarBg: isSemiDesign ? 'grey' : 'red',
             });
@@ -724,6 +795,19 @@ const columns = [
         sorter: (a, b) => (a.size - b.size > 0 ? 1 : -1),
         render: text => `${text} KB`,
     },
+    {
+        title: '交付状态',
+        dataIndex: 'status',
+        render: (text) => {
+            const tagConfig = {
+                success: { color: 'green', prefixIcon: <IconTickCircle />, text: '已交付' },
+                pending: { color: 'pink', prefixIcon: <IconClear />, text: '已延期' },
+                wait: { color: 'cyan', prefixIcon: <IconComment />, text: '待评审' },
+            };
+            const tagProps = tagConfig[text] || {};
+            return <Tag shape='circle' {...tagProps} style={{ userSelect: 'text' }}>{tagProps.text}</Tag>
+        }
+    },
     {
         title: '所有者',
         dataIndex: 'owner',
@@ -758,6 +842,7 @@ const getData = () => {
             name: isSemiDesign ? `Semi Design 设计稿${i}.fig` : `Semi D2C 设计稿${i}.fig`,
             owner: isSemiDesign ? '姜鹏志' : '郝宣',
             size: randomNumber,
+            status: isSemiDesign ? 'success' : 'wait',
             updateTime: new Date().valueOf() + randomNumber * DAY,
             avatarBg: isSemiDesign ? 'grey' : 'red',
         });
@@ -1132,6 +1217,19 @@ const columns = [
         sorter: (a, b) => (a.size - b.size > 0 ? 1 : -1),
         render: text => `${text} KB`,
     },
+    {
+        title: '交付状态',
+        dataIndex: 'status',
+        render: (text) => {
+            const tagConfig = {
+                success: { color: 'green', prefixIcon: <IconTickCircle />, text: '已交付' },
+                pending: { color: 'pink', prefixIcon: <IconClear />, text: '已延期' },
+                wait: { color: 'cyan', prefixIcon: <IconComment />, text: '待评审' },
+            };
+            const tagProps = tagConfig[text];
+            return <Tag shape='circle' {...tagProps} style={{ userSelect: 'text' }}>{tagProps.text}</Tag>
+        }
+    },
     {
         title: '所有者',
         dataIndex: 'owner',
@@ -1183,6 +1281,7 @@ function App() {
                 name: isSemiDesign ? `Semi Design 设计稿${i}.fig` : `Semi D2C 设计稿${i}.fig`,
                 owner: isSemiDesign ? '姜鹏志' : '郝宣',
                 size: randomNumber,
+                status:  isSemiDesign ? 'success' : 'wait',
                 updateTime: new Date().valueOf() + randomNumber * DAY,
                 avatarBg: isSemiDesign ? 'grey' : 'red',
             });
@@ -1401,6 +1500,19 @@ function App() {
             sorter: (a, b) => (a.size - b.size > 0 ? 1 : -1),
             render: text => `${text} KB`,
         },
+        {
+            title: '交付状态',
+            dataIndex: 'status',
+            render: (text) => {
+                const tagConfig = {
+                    success: { color: 'green', prefixIcon: <IconTickCircle />, text: '已交付' },
+                    pending: { color: 'pink', prefixIcon: <IconClear />, text: '已延期' },
+                    wait: { color: 'cyan', prefixIcon: <IconComment />, text: '待评审' },
+                };
+                const tagProps = tagConfig[text];
+                return <Tag shape='circle' {...tagProps} style={{ userSelect: 'text' }}>{tagProps.text}</Tag>
+            }
+        },
         {
             title: '所有者',
             dataIndex: 'owner',
@@ -1435,6 +1547,7 @@ function App() {
                 name: isSemiDesign ? `Semi Design 设计稿${i}.fig` : `Semi D2C 首页${i}.fig`,
                 owner: isSemiDesign ? '姜鹏志' : '郝宣',
                 size: randomNumber,
+                status:  isSemiDesign ? 'success' : 'wait',
                 updateTime: new Date('2024-01-25').valueOf() + randomNumber * DAY,
                 avatarBg: isSemiDesign ? 'grey' : 'red',
             });

diff --git a/content/start/changelog/index-en-US.md b/content/start/changelog/index-en-US.md
@@ -16,6 +16,14 @@ Version：Major.Minor.Patch (follow the **Semver** specification)
 
 ---
 
+#### 🎉 2.62.0 (2024-07-12)
+- 【Fix】
+  - When the carousel has only one child and autoPlay is true, no switching operation is performed [#2334](https://github.com/DouyinFE/semi-design/pull/2334)
+  - Fixed the issue that Modal returns document.body exception in getPopupContainer
+  - Fix Table has unexpected borderRadius when dataSource is empty
+- 【Chore】
+  - Table Column support RecordType  [#2314](https://github.com/DouyinFE/semi-design/issues/2314)
+
 #### 🎉 2.62.0-beta.0 (2024-07-05)
 - 【New Component】
     - Added new verification code input component pinCode for quickly and conveniently entering verification codes  [#2130 ](https://github.com/DouyinFE/semi-design/issues/2130)

diff --git a/content/start/changelog/index.md b/content/start/changelog/index.md
@@ -12,7 +12,15 @@ Semi 版本号遵循 **Semver** 规范（主版本号-次版本号-修订版本
 -   次版本号（minor）：Semi 固定每两周发布一个 minor 版本，包括以下类型变更：添加了新组件/新 feature，或者设计规范样式更新，或者不合理交互的变更，但不会对组件 API 做删减或功能变更。
 -   修订版本号（patch）：仅会进行 bugfix，发布时间不限
 -   不同版本间的详细关系，可查阅 [FAQ](/zh-CN/start/faq)
-
+
+#### 🎉 2.62.0 (2024-07-12)
+- 【Fix】
+  - Carousel 仅有一个 children 且 autoPlay 为 true 时不执行任何切换操作 [#2334](https://github.com/DouyinFE/semi-design/pull/2334)
+  - 修复 Modal 在 getPopupContainer 中如果返回 document.body 异常的问题 [#2335](https://github.com/DouyinFE/semi-design/pull/2335)
+  - 修复 Table 在 dataSource 为空时，存在非预期的 borderRadius 的问题 [#2337](https://github.com/DouyinFE/semi-design/pull/2337)
+- 【Chore】
+  - Table Column jsx 写法支持传入 RecordType 泛型  [#2314](https://github.com/DouyinFE/semi-design/issues/2314) [#2320](https://github.com/DouyinFE/semi-design/pull/2320)  
+
 #### 🎉 2.62.0-beta.0 (2024-07-05)
 - 【New Component】
     - 新增验证码输入组件 PinCode 用于快速便捷输入验证码  [#2130](https://github.com/DouyinFE/semi-design/issues/2130) [#2209](https://github.com/DouyinFE/semi-design/pull/2209)

diff --git a/lerna.json b/lerna.json
@@ -1,5 +1,5 @@
 {
     "useWorkspaces": true,
     "npmClient": "yarn",
-    "version": "2.62.0-beta.0"
+    "version": "2.62.0"
 }
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
         "@douyinfe/semi-site-banner": "^0.1.5",
         "@douyinfe/semi-site-doc-style": "0.0.4",
         "@douyinfe/semi-site-header": "^0.0.29",
-        "@douyinfe/semi-site-markdown-blocks": "^0.0.14",
+        "@douyinfe/semi-site-markdown-blocks": "^0.0.17",
         "@mdx-js/mdx": "1.6.22",
         "@mdx-js/react": "^1.6.22",
         "@storybook/react-webpack5": "^7.0.7",