Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Feature Branch] feat(design): Result and Empty components adapt to the latest design #348

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4554c80
feat(design): 新增 Empty component
Vanleehao Nov 30, 2023
9894ff2
feat(desgin): New Add Result component
Vanleehao Dec 4, 2023
62f8f13
merge master
Vanleehao Dec 4, 2023
1fa86a7
merge master
Vanleehao Dec 4, 2023
5671c64
feat(design): Result and Empty components adapt to the latest design
Vanleehao Dec 7, 2023
66b97cd
imporve(design): Empty update style
Vanleehao Dec 7, 2023
52e96be
merge master
Vanleehao Dec 7, 2023
c219949
Modify CI
Vanleehao Dec 7, 2023
21cc444
Modify CI
Vanleehao Dec 7, 2023
6f975d0
fix(build): antd/es/Empty => antd/es/empty, antd/es/Result => antd/es…
dengfuping Dec 7, 2023
31f8728
Modify CI
Vanleehao Dec 8, 2023
46af1f4
Merge branch 'master' of github.com:oceanbase/oceanbase-design into h…
Vanleehao Dec 8, 2023
8f4e1fd
imporve(design): Modify Empty CR
Vanleehao Dec 15, 2023
f0d49f6
Merge branch 'master' of github.com:oceanbase/oceanbase-design into h…
Vanleehao Dec 15, 2023
01431c9
imporve(design): Modify Result CR
Vanleehao Dec 15, 2023
5745d39
imporve(design): Modify CI
Vanleehao Dec 15, 2023
d9fe9b8
imporve(ui): Passward intl
Vanleehao Jan 2, 2024
be97168
Merge branch 'master' of github.com:oceanbase/oceanbase-design into h…
Vanleehao Jan 2, 2024
f203da8
Merge branch 'master' of github.com:oceanbase/oceanbase-design into h…
Vanleehao Jan 11, 2024
b5dac62
imporve(desgin): Empty design restoration
Vanleehao Jan 12, 2024
6d864f9
Merge branch 'master' of github.com:oceanbase/oceanbase-design into h…
Vanleehao Jan 12, 2024
973e3fc
chore(): merge master
Vanleehao Feb 4, 2024
8604e44
Merge branch 'feature' of github.com:oceanbase/oceanbase-design into …
Vanleehao Feb 4, 2024
f871f39
Merge branch 'feature' of github.com:oceanbase/oceanbase-design into …
dengfuping Feb 5, 2024
a0484a4
feat(design): New Empty
dengfuping Feb 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .dumirc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,7 @@ export default defineConfig({
{ title: 'Notification 通知提醒框', link: '/components/notification' },
{ title: 'Spin 加载中', link: '/components/spin' },
{ title: 'Badge 徽标数', link: '/components/badge' },
{ title: 'Result 结果', link: '/components/result' },
],
},
{
Expand Down
6 changes: 6 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,11 @@
"editor.defaultFormatter": "esbenp.prettier-vscode",
"files.associations": {
"*.svg": "html"
},
"[typescriptreact]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
},
"[typescript]": {
"editor.defaultFormatter": "vscode.typescript-language-features"
Vanleehao marked this conversation as resolved.
Show resolved Hide resolved
}
}
6 changes: 6 additions & 0 deletions packages/design/src/config-provider/assest/no-data.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions packages/design/src/config-provider/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import React from 'react';
import { App, ConfigProvider as AntConfigProvider } from 'antd';
import { DatabaseOutlined } from '@oceanbase/icons';
import { Empty } from '@oceanbase/design';
import type {
ConfigProviderProps as AntConfigProviderProps,
ConfigConsumerProps as AntConfigConsumerProps,
Expand Down Expand Up @@ -106,6 +108,9 @@
},
mergedTheme
)}
renderEmpty={() => {

Check failure on line 111 in packages/design/src/config-provider/index.tsx

View workflow job for this annotation

GitHub Actions / build (16.x, ubuntu-latest)

Type '() => void' is not assignable to type 'RenderEmptyHandler'.

Check failure on line 111 in packages/design/src/config-provider/index.tsx

View workflow job for this annotation

GitHub Actions / build (16.x, ubuntu-latest)

Type '() => void' is not assignable to type 'RenderEmptyHandler'.
<Empty image={<DatabaseOutlined />} />;

Check failure on line 112 in packages/design/src/config-provider/index.tsx

View workflow job for this annotation

GitHub Actions / build (16.x, ubuntu-latest)

Type '{ image: Element; }' is not assignable to type 'IntrinsicAttributes & EmptyProps & RefAttributes<HTMLSpanElement>'.

Check failure on line 112 in packages/design/src/config-provider/index.tsx

View workflow job for this annotation

GitHub Actions / build (16.x, ubuntu-latest)

Type '{ image: Element; }' is not assignable to type 'IntrinsicAttributes & EmptyProps & RefAttributes<HTMLSpanElement>'.
}}
{...restProps}
>
<ExtendedConfigContext.Provider
Expand Down
72 changes: 72 additions & 0 deletions packages/design/src/empty/assets/empty.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading