chore(merge): Merge master branch and fix conflicts

oceanbase · Sep 24, 2024 · f552c7f · f552c7f
2 parents 4653bfc + fd2e776
commit f552c7f
Show file tree

Hide file tree

Showing 17 changed files with 661 additions and 370 deletions.
diff --git a/docs/charts/charts-CHANGELOG.md b/docs/charts/charts-CHANGELOG.md
@@ -8,6 +8,12 @@ group: 可视化图表
 
 ---
 
+## 0.3.3
+
+`2024-09-23`
+
+- 🐞 修复 `tooltip` 无法换行、导致内容溢出的问题。[#684](https://github.com/oceanbase/oceanbase-design/pull/684)
+
 ## 0.3.1
 
 `2024-04-12`

diff --git a/docs/codemod/codemod-CHANGELOG.md b/docs/codemod/codemod-CHANGELOG.md
@@ -8,6 +8,14 @@ group: 自动化迁移工具
 
 ---
 
+## 0.3.7
+
+`2024-09-23`
+
+- 🆕 新增 `techui-and-pro-components-to-oceanbase-ui` 迁移能力。[#706](https://github.com/oceanbase/oceanbase-design/pull/706)
+- ⭐️ 支持从 `pro-components` 和 `tech-ui` 迁移更多的组件和类型。[#718](https://github.com/oceanbase/oceanbase-design/pull/718)
+- 🐞 修复普通函数和匿名函数自动改写成 Design Token 时，应该使用 `token` 对象而不是 `useToken()` 的问题。[#685](https://github.com/oceanbase/oceanbase-design/pull/685)
+
 ## 0.3.6
 
 `2024-07-26`

diff --git a/docs/design/design-CHANGELOG.md b/docs/design/design-CHANGELOG.md
@@ -8,6 +8,16 @@ group: 基础组件
 
 ---
 
+## 0.3.8
+
+`2024-09-23`
+
+- 🔥 新增 `设计` 和 `博客` 模块，并上线 10 篇设计规范文档和 2 篇博客。[#682](https://github.com/oceanbase/oceanbase-design/pull/682)
+- 📖 主题文档新增 Design Token 列表，便于开发侧查阅。[#701](https://github.com/oceanbase/oceanbase-design/pull/701)
+- 💄 升级 [@oceanbase/aliyun-theme](https://www.npmjs.com/package/@oceanbase/aliyun-theme) 主题包，并更新阿里云主题的 less 样式文件。[#668](https://github.com/oceanbase/oceanbase-design/pull/668)
+- 🐞 修复 Space 在新版浏览器下可能出现的间距抖动问题。[#722](https://github.com/oceanbase/oceanbase-design/pull/722)
+- 🐞 修复 Tag 同时设置 `icon` 和 `ellipsis` 时省略样式异常的问题。[#687](https://github.com/oceanbase/oceanbase-design/pull/687) [@linhf123](https://github.com/linhf123)
+
 ## 0.3.7
 
 `2024-07-26`

diff --git a/docs/ui/ui-CHANGELOG.md b/docs/ui/ui-CHANGELOG.md
@@ -8,6 +8,15 @@ group: 业务组件
 
 ---
 
+## 0.3.8
+
+`2024-09-23`
+
+- 📖 新增 @oceanbase/ui 在 Vite 中的使用文档和项目模板。[#673](https://github.com/oceanbase/oceanbase-design/pull/673)
+- 🆕 Action.Group 新增 `buttonSize` 属性，用于设置按钮大小。[#719](https://github.com/oceanbase/oceanbase-design/pull/719)
+- 🆕 Action.Button 新增 `size` 属性，用于设置按钮大小。[#719](https://github.com/oceanbase/oceanbase-design/pull/719)
+- 💄 优化 PageContainer 仅设置 title 属性时页头和内容区的间距。[#721](https://github.com/oceanbase/oceanbase-design/pull/721)
+
 ## 0.3.6
 
 `2024-07-10`

diff --git a/packages/charts/package.json b/packages/charts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/charts",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "The Chart library for OceanBase",
   "homepage": "https://github.com/oceanbase/oceanbase-design/packages/charts",
   "repository": {

diff --git a/packages/codemod/package.json b/packages/codemod/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/codemod",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "description": "Codemod for OceanBase Design upgrade",
   "keywords": [
     "oceanbase",

diff --git a/packages/design/package.json b/packages/design/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/design",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "The Design System of OceanBase",
   "keywords": [
     "oceanbase",

diff --git a/packages/design/src/_util/useFlexGapSupport.ts b/packages/design/src/_util/useFlexGapSupport.ts
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { detectFlexGapSupported } from './styleChecker';
 
 export default () => {
-  const [flexible, setFlexible] = React.useState(false);
+  const [flexible, setFlexible] = React.useState(true);
   React.useEffect(() => {
     setFlexible(detectFlexGapSupported());
   }, []);

diff --git a/packages/icons/package.json b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/icons",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "The Icon Library for OceanBase",
   "keywords": [
     "oceanbase",

diff --git a/packages/ui/package.json b/packages/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/ui",
-  "version": "0.3.7",
+  "version": "0.3.8",
   "description": "The UI library based on OceanBase Design",
   "keywords": [
     "oceanbase",

diff --git a/packages/ui/src/PageContainer/__tests__/__snapshots__/index.test.tsx.snap b/packages/ui/src/PageContainer/__tests__/__snapshots__/index.test.tsx.snap
@@ -982,3 +982,217 @@ exports[`PageContainer > extra and footer 1`] = `
   </div>
 </div>
 `;
+
+exports[`PageContainer > title 1`] = `
+<div
+  class="ant-pro-page-container ant-pro-page-container-with-footer"
+>
+  <div
+    class="ant-page-header ant-pro-page-container-warp-page-header ant-page-header-ghost"
+  >
+    <div
+      class="ant-page-header-heading "
+    >
+      <div
+        class="ant-page-header-heading-left"
+      >
+        <span
+          class="ant-page-header-heading-title"
+          title="页面标题"
+        >
+          页面标题
+        </span>
+      </div>
+    </div>
+  </div>
+  <div
+    class="ant-pro-grid-content"
+  >
+    <div
+      class="ant-pro-grid-content-children"
+    >
+      <div
+        class="ant-pro-page-container-children-container"
+      >
+        <div
+          class="ant-card"
+        >
+          <div
+            class="ant-card-body"
+          >
+            <div
+              class="ant-descriptions"
+            >
+              <div
+                class="ant-descriptions-header"
+              >
+                <div
+                  class="ant-descriptions-title"
+                >
+                  基本信息
+                </div>
+              </div>
+              <div
+                class="ant-descriptions-view"
+              >
+                <table>
+                  <tbody>
+                    <tr
+                      class="ant-descriptions-row"
+                    >
+                      <td
+                        class="ant-descriptions-item"
+                        colspan="1"
+                      >
+                        <div
+                          class="ant-descriptions-item-container"
+                        >
+                          <span
+                            class="ant-descriptions-item-label"
+                          >
+                            创建人
+                          </span>
+                          <span
+                            class="ant-descriptions-item-content"
+                          >
+                            <span
+                              class="ant-typography ant-typography-ellipsis ant-typography-ellipsis-single-line"
+                            >
+                              曲丽丽
+                            </span>
+                          </span>
+                        </div>
+                      </td>
+                      <td
+                        class="ant-descriptions-item"
+                        colspan="1"
+                      >
+                        <div
+                          class="ant-descriptions-item-container"
+                        >
+                          <span
+                            class="ant-descriptions-item-label"
+                          >
+                            电话号码
+                          </span>
+                          <span
+                            class="ant-descriptions-item-content"
+                          >
+                            <span
+                              class="ant-typography ant-typography-ellipsis ant-typography-ellipsis-single-line"
+                            >
+                              1810000000
+                            </span>
+                          </span>
+                        </div>
+                      </td>
+                      <td
+                        class="ant-descriptions-item"
+                        colspan="1"
+                      >
+                        <div
+                          class="ant-descriptions-item-container"
+                        >
+                          <span
+                            class="ant-descriptions-item-label"
+                          >
+                            地址
+                          </span>
+                          <span
+                            class="ant-descriptions-item-content"
+                          >
+                            <span
+                              class="ant-typography ant-typography-ellipsis ant-typography-ellipsis-single-line"
+                            >
+                              浙江省杭州市西湖区工专路
+                            </span>
+                          </span>
+                        </div>
+                      </td>
+                    </tr>
+                    <tr
+                      class="ant-descriptions-row"
+                    >
+                      <td
+                        class="ant-descriptions-item"
+                        colspan="1"
+                      >
+                        <div
+                          class="ant-descriptions-item-container"
+                        >
+                          <span
+                            class="ant-descriptions-item-label"
+                          >
+                            关联表单
+                          </span>
+                          <span
+                            class="ant-descriptions-item-content"
+                          >
+                            <span
+                              class="ant-typography ant-typography-ellipsis ant-typography-ellipsis-single-line"
+                            >
+                              <a>
+                                421421
+                              </a>
+                            </span>
+                          </span>
+                        </div>
+                      </td>
+                      <td
+                        class="ant-descriptions-item"
+                        colspan="1"
+                      >
+                        <div
+                          class="ant-descriptions-item-container"
+                        >
+                          <span
+                            class="ant-descriptions-item-label"
+                          >
+                            创建时间
+                          </span>
+                          <span
+                            class="ant-descriptions-item-content"
+                          >
+                            <span
+                              class="ant-typography ant-typography-ellipsis ant-typography-ellipsis-single-line"
+                            >
+                              2017-01-10
+                            </span>
+                          </span>
+                        </div>
+                      </td>
+                      <td
+                        class="ant-descriptions-item"
+                        colspan="1"
+                      >
+                        <div
+                          class="ant-descriptions-item-container"
+                        >
+                          <span
+                            class="ant-descriptions-item-label"
+                          >
+                            备注
+                          </span>
+                          <span
+                            class="ant-descriptions-item-content"
+                          >
+                            <span
+                              class="ant-typography ant-typography-ellipsis ant-typography-ellipsis-single-line"
+                            >
+                              这是备注
+                            </span>
+                          </span>
+                        </div>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/ui/src/PageContainer/__tests__/index.test.tsx b/packages/ui/src/PageContainer/__tests__/index.test.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { render } from '@testing-library/react';
 import BasicDemo from '../demo/basic';
 import ExtraAndFooterDemo from '../demo/extra-footer';
+import TitleCompatibleDemo from '../demo/title';
 
 describe('PageContainer', () => {
   it('basic', () => {
@@ -13,4 +14,9 @@ describe('PageContainer', () => {
     const { asFragment } = render(<ExtraAndFooterDemo />);
     expect(asFragment().firstChild).toMatchSnapshot();
   });
+
+  it('title', () => {
+    const { asFragment } = render(<TitleCompatibleDemo />);
+    expect(asFragment().firstChild).toMatchSnapshot();
+  });
 });
diff --git a/packages/ui/src/PageContainer/demo/title.tsx b/packages/ui/src/PageContainer/demo/title.tsx
@@ -0,0 +1,29 @@
+/**
+ * iframe: 600
+ */
+import React from 'react';
+import { Button, Card, Descriptions } from '@oceanbase/design';
+import { PageContainer } from '@oceanbase/ui';
+
+export default () => {
+  return (
+    <PageContainer
+      ghost={false}
+      title="页面标题"
+      footer={[<Button>重置</Button>, <Button type="primary">提交</Button>]}
+    >
+      <Card bordered={false}>
+        <Descriptions title="基本信息">
+          <Descriptions.Item label="创建人">曲丽丽</Descriptions.Item>
+          <Descriptions.Item label="电话号码">1810000000</Descriptions.Item>
+          <Descriptions.Item label="地址">浙江省杭州市西湖区工专路</Descriptions.Item>
+          <Descriptions.Item label="关联表单">
+            <a>421421</a>
+          </Descriptions.Item>
+          <Descriptions.Item label="创建时间">2017-01-10</Descriptions.Item>
+          <Descriptions.Item label="备注">这是备注</Descriptions.Item>
+        </Descriptions>
+      </Card>
+    </PageContainer>
+  );
+};
diff --git a/packages/ui/src/PageContainer/index.md b/packages/ui/src/PageContainer/index.md
@@ -19,12 +19,14 @@ nav:
 
 <code src="./demo/with-tabs.tsx" iframe="600" title="和 Tabs 组合使用"></code>
 
-<code src="./demo/extra-footer.tsx" title="页头和页脚操作区" description="位于页头和页脚操作区的组件尺寸为 `large`，字体大小为 `middle`。" debug></code>
-
 <code src="./demo/header-less.tsx" iframe="600" title="无 PageHeader" description="头部内容为空"></code>
 
 <code src="./demo/empty.tsx" title="空页面"></code>
 
+<code src="./demo/extra-footer.tsx" title="页头和页脚操作区" description="位于页头和页脚操作区的组件尺寸为 `large`，字体大小为 `middle`。" debug></code>
+
+<code src="./demo/title.tsx" title="title 属性" description="样式需要符合预期" debug></code>
+
 ## 与路由搭配使用
 
 由于 PageContainer 内置的面包屑导航跳转依赖路由能力，需要通过 ConfigProvider 全局注入 `navigate` 函数才会生效。