chore: Merge feature branch to master branch

.dumirc.ts

@@ -144,6 +144,7 @@ export default defineConfig({
           children: [
             { title: 'Card 卡片', link: '/components/card' },
             { title: 'Descriptions 描述列表', link: '/components/descriptions' },
+            { title: 'Empty 空状态', link: '/components/empty' },
             { title: 'List 列表', link: '/components/list' },
             { title: 'Table 表格', link: '/components/table' },
             { title: 'Tabs 标签页', link: '/components/tabs' },
@@ -163,6 +164,7 @@ export default defineConfig({
             { title: 'Modal 对话框', link: '/components/modal' },
             { title: 'Drawer 抽屉', link: '/components/drawer' },
             { title: 'Notification 通知提醒框', link: '/components/notification' },
+            { title: 'Result 结果', link: '/components/result' },
             { title: 'Spin 加载中', link: '/components/spin' },
             { title: 'Badge 徽标数', link: '/components/badge' },
           ],
@@ -178,6 +180,7 @@ export default defineConfig({
           children: [
             { title: 'BasicLayout 导航和布局', link: '/biz-components/basic-layout' },
             { title: 'PageContainer 页容器', link: '/biz-components/page-container' },
+            { title: 'PageLoading 页面级加载', link: '/biz-components/page-loading' },
             { title: 'FooterToolbar 底部操作栏', link: '/biz-components/footer-toolbar' },
             { title: 'Login 登录页', link: '/biz-components/login' },
             // { title: 'NavMenu', link: '/biz-components/nav-menu' },

.eslintrc.js

@@ -14,6 +14,7 @@ module.exports = {
     'no-unused-expressions': 'off',
     'jsx-a11y/mouse-events-have-key-events': 'off',
     'react/require-default-props': 'off',
+    'react/self-closing-comp': 'off',
     'no-shadow': 'off',
     '@typescript-eslint/no-use-before-define': 'off',
     'global-require': 'warn',

.prettierignore

@@ -15,4 +15,5 @@ dist
 /server
 /public
 __testfixtures__
+packages/design/src/spin/assets
 

docs/codemod/codemod-CHANGELOG.md

@@ -8,6 +8,18 @@ group: 自动化迁移工具
 
 ---
 
+## 0.3.0
+
+`2024-03-22`
+
+- ⭐️ 支持更多颜色值到 Design Token 的自动改写。[#511](https://github.com/oceanbase/oceanbase-design/pull/511) [#519](https://github.com/oceanbase/oceanbase-design/pull/519)
+  - `rgb(250,250,250)` => `colorBgLayout`
+  - `rgb(255 255 255 / 100%)` => `colorBgContainer`
+  - `rgb(0 0 0 / 85%)` => `colorText`
+  - `rgb(0 0 0 / 65%)` => `colorTextSecondary`
+  - `rgb(0 0 0 / 45%)` => `colorTextTertiary`
+  - `rgb(0 0 0 / 25%)` => `colorTextQuaternary`
+
 ## 0.2.10
 
 `2023-11-09`

docs/design/design-CHANGELOG.md

@@ -8,6 +8,31 @@ group: 基础组件
 
 ---
 
+## 0.3.0
+
+`2024-03-22`
+
+- ⭐️ 去掉所有组件的重置样式，避免被 Tooltip、Popover、Space、Dropdown 等组件包裹时字体大小、颜色被覆盖。[#450](https://github.com/oceanbase/oceanbase-design/pull/450)
+- ⭐️ 组件的样式加载顺序改为 -900，保证自定义样式的优先级高于 antd。[#464](https://github.com/oceanbase/oceanbase-design/pull/464)
+- 🌈 更新中性色板，包括 Design Token 以及 less 主题变量。[#484](https://github.com/oceanbase/oceanbase-design/pull/484)
+- 🔥 新版 Empty 组件 [#465](https://github.com/oceanbase/oceanbase-design/pull/465)
+  - 💄 定制插图、主题和样式，以符合 OceanBase Design 设计规范。
+  - 🆕 新增 `title` 属性，用于设置空状态标题。
+  - 🆕 新增 `steps` 属性，用于设置步骤引导。
+  - 🆕 新增 `layout` 属性，用于设置空状态布局，默认为 vertical。
+  - 🆕 通过 ConfigProvider `renderEmpty` 定制全局组件的空状态。[#467](https://github.com/oceanbase/oceanbase-design/pull/467)
+- 🔥 新版 Result 组件 [#476](https://github.com/oceanbase/oceanbase-design/pull/476)
+  - 💄 定制插图、主题和样式，以符合 OceanBase Design 设计规范。
+  - 🆕 `status` 属性新增 `processing` 枚举值，用于设置进行中的状态。
+- Spin
+  - 💄 更新 Spin 的加载动画，包括灰色和彩色动画。[#512](https://github.com/oceanbase/oceanbase-design/pull/512)
+  - 💄 Spin 的默认加载指示符从彩色动画改为灰色动画。[#491](https://github.com/oceanbase/oceanbase-design/pull/491)
+- Table
+  - 🐞 修复 Table 的 loading 动画没有水平和垂直居中的问题。[#518](https://github.com/oceanbase/oceanbase-design/pull/518)
+  - 💄 Table 处于 `loading` 时隐藏空状态。[#518](https://github.com/oceanbase/oceanbase-design/pull/518)
+- 💄 优化 Badge default 状态的颜色，并更新 default 状态和 warning 状态的图标。[#500](https://github.com/oceanbase/oceanbase-design/pull/500)
+- [Icon] 🆕 新增 `EllipsisCircleFilled` 图标。[#499](https://github.com/oceanbase/oceanbase-design/pull/499)
+
 ## 0.2.37
 
 `2024-01-30`

docs/ui/ui-CHANGELOG.md

@@ -8,6 +8,14 @@ group: 业务组件
 
 ---
 
+## 0.3.0
+
+`2024-03-22`
+
+- 🆕 新增 PageLoading 页面级加载组件。[#497](https://github.com/oceanbase/oceanbase-design/pull/497)
+- 🐞 修复 Password 部分英文文案不正确的问题。[#469](https://github.com/oceanbase/oceanbase-design/pull/469)
+- 💄 优化 PageContainer 加载样式，保证页面内垂直居中。[#497](https://github.com/oceanbase/oceanbase-design/pull/497)
+
 ## 0.2.38
 
 `2024-01-30`

package.json

@@ -22,9 +22,9 @@
     "site:deploy": "gh-pages -d site",
     "postpublish": "npm run sync:other-npm",
     "sync:other-npm": "node -e 'require(\"./scripts/sync-cnpm-and-tnpm\")()'",
-    "test": "NODE_OPTIONS=--max_old_space_size=4096 cross-env TZ=UTC jest",
-    "test:coverage": "NODE_OPTIONS=--max_old_space_size=4096 cross-env TZ=UTC TEST_LOG=none jest --coverage",
-    "test:update": "NODE_OPTIONS=--max_old_space_size=4096 cross-env TZ=UTC jest --updateSnapshot",
+    "test": "cross-env vitest",
+    "test:coverage": "cross-env TEST_LOG=none vitest --coverage",
+    "test:update": "cross-env vitest -u",
     "lint": "eslint --cache --ext .js,.jsx,.ts,.tsx",
     "lint:fix": "eslint --cache --ext .js,.jsx,.ts,.tsx --fix --format=pretty",
     "prettier": "prettier --write \"**/*.{js,jsx,ts,tsx,less,md,json}\"",
@@ -42,86 +42,79 @@
   },
   "devDependencies": {
     "@ant-design/colors": "^7.0.2",
-    "@ant-design/cssinjs": "^1.17.2",
-    "@ant-design/icons": "^5.2.6",
-    "@babel/cli": "^7.23.0",
-    "@babel/preset-env": "^7.23.6",
+    "@ant-design/cssinjs": "^1.18.4",
+    "@ant-design/icons": "^5.3.4",
+    "@babel/cli": "^7.23.9",
+    "@babel/preset-env": "^7.24.0",
     "@chenshuai2144/less2cssinjs": "^1.0.7",
-    "@ctrl/tinycolor": "^4.0.2",
+    "@ctrl/tinycolor": "^4.0.3",
     "@emotion/babel-preset-css-prop": "^11.11.0",
     "@emotion/css": "^11.11.2",
-    "@emotion/react": "^11.11.3",
+    "@emotion/react": "^11.11.4",
     "@emotion/server": "^11.11.0",
-    "@qixian.cs/github-contributors-list": "^1.1.0",
-    "@rc-component/trigger": "^1.18.2",
+    "@qixian.cs/github-contributors-list": "^2.0.1",
+    "@rc-component/trigger": "^2.0.0",
     "@stackblitz/sdk": "^1.9.0",
-    "@testing-library/dom": "^9.3.3",
-    "@testing-library/jest-dom": "^6.2.0",
-    "@testing-library/react": "^14.1.0",
+    "@testing-library/dom": "^9.3.4",
+    "@testing-library/jest-dom": "^6.4.2",
+    "@testing-library/react": "^14.2.1",
     "@testing-library/react-hooks": "^8.0.1",
     "@testing-library/user-event": "^14.5.2",
-    "@types/jest": "^29.5.10",
     "@types/lodash": "^4.14.202",
-    "@types/node": "^20.10.5",
-    "@types/react": "^18.2.47",
+    "@types/node": "^20.11.25",
+    "@types/react": "^18.2.64",
     "@umijs/fabric": "^4.0.1",
-    "@umijs/test": "^4.1.0",
-    "@vercel/analytics": "^1.1.1",
-    "antd": "^5.13.2",
-    "antd-style": "3.5.2",
-    "antd-token-previewer": "^2.0.5",
+    "@umijs/test": "^4.1.2",
+    "@vercel/analytics": "^1.2.2",
+    "antd": "^5.15.3",
+    "antd-style": "^3.6.1",
+    "antd-token-previewer": "^2.0.8",
     "babel-jest": "^29.7.0",
     "classnames": "^2.5.1",
     "copy-to-clipboard": "^3.3.3",
     "cross-env": "^7.0.3",
     "dayjs": "^1.11.10",
-    "dumi": "^2.2.16",
-    "eslint-plugin-jest": "^27.6.1",
+    "dumi": "^2.2.17",
+    "eslint-plugin-jest": "^27.9.0",
     "execa": "^5.1.1",
-    "father": "^4.3.8",
+    "father": "^4.4.0",
     "fs-extra": "^11.2.0",
-    "gh-pages": "^6.1.0",
+    "gh-pages": "^6.1.1",
     "glob": "^10.3.10",
     "html2sketch": "^1.0.2",
-    "husky": "^8.0.3",
+    "husky": "^9.0.11",
     "identity-obj-proxy": "^3.0.0",
     "isomorphic-fetch": "^3.0.0",
-    "jest": "^29.7.0",
-    "jest-canvas-mock": "^2.5.2",
     "jest-environment-jsdom": "^29.7.0",
-    "jest-fetch-mock": "^3.0.3",
-    "jest-svg-transformer": "^1.0.0",
     "jsonml-to-react-element": "^1.1.11",
     "jsonml.js": "^0.1.0",
-    "lerna": "^8.0.0",
-    "lint-staged": "^15.2.0",
+    "lerna": "^8.1.2",
+    "lint-staged": "^15.2.2",
     "lodash": "^4.17.21",
-    "lz-string": "^1.5.0",
     "mockdate": "^3.0.5",
-    "prettier": "^3.2.4",
+    "prettier": "^3.2.5",
     "prismjs": "^1.29.0",
-    "rc-checkbox": "^3.1.0",
-    "rc-drawer": "^7.0.0",
+    "rc-checkbox": "^3.2.0",
+    "rc-drawer": "^7.1.0",
     "rc-footer": "^0.6.8",
     "rc-resize-observer": "^1.4.0",
-    "rc-segmented": "^2.2.2",
-    "rc-tabs": "^12.13.1",
-    "rc-util": "^5.38.1",
+    "rc-segmented": "^2.3.0",
+    "rc-tabs": "^14.1.1",
+    "rc-util": "^5.39.1",
     "react": "^18.2.0",
     "react-color": "^2.19.3",
     "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.2.0",
-    "react-fast-marquee": "^1.6.2",
-    "react-intl": "^6.5.1",
-    "react-router-dom": "^6.19.0",
-    "runscript": "^1.5.3",
-    "svg-jest": "^1.0.1",
-    "sylvanas": "^0.6.1",
-    "ts-jest": "^29.1.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3",
-    "vanilla-jsoneditor": "^0.21.2",
-    "web-vitals": "^3.5.0",
-    "yorkie": "^2.0.0"
+    "react-fast-marquee": "^1.6.4",
+    "react-intl": "^6.6.2",
+    "react-router-dom": "^6.22.3",
+    "runscript": "^1.6.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.4.2",
+    "vanilla-jsoneditor": "^0.23.0",
+    "vitest": "^1.4.0",
+    "vitest-canvas-mock": "^0.3.3",
+    "vitest-fetch-mock": "^0.2.2",
+    "web-vitals": "^3.5.2"
   }
 }

packages/charts/package.json

@@ -27,7 +27,7 @@
     "build": "NODE_OPTIONS=--max_old_space_size=4096 father build"
   },
   "dependencies": {
-    "@ant-design/charts": "^1.4.2",
+    "@ant-design/charts": "^1.4.3",
     "@oceanbase/util": "workspace:^",
     "classnames": "^2.5.1",
     "lodash": "^4.17.21",