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

feat: New Component QRCode #38948

Merged
merged 73 commits into from Dec 5, 2022
Merged
Show file tree
Hide file tree
Changes from 71 commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
16e05ac
feat: qrcode
MadCcc Nov 22, 2022
c3b8b44
chore: code clean
MadCcc Nov 22, 2022
a974d94
feat: New Component Qr-Code (#38891)
li-jia-nan Nov 23, 2022
fe85505
remove dep
li-jia-nan Nov 24, 2022
581273f
update snap
li-jia-nan Nov 24, 2022
df04184
en docs
li-jia-nan Nov 24, 2022
93e7ae7
refactor: rename tests dir
MadCcc Nov 24, 2022
60ad00a
Update components/qr-code/demo/base.md
li-jia-nan Nov 24, 2022
2d391b5
Update components/qr-code/demo/base.md
li-jia-nan Nov 24, 2022
fbdc1f7
Update components/qr-code/demo/download.md
li-jia-nan Nov 24, 2022
6b678cd
Update components/qr-code/demo/download.md
li-jia-nan Nov 24, 2022
bc02ee4
Update components/qr-code/demo/download.tsx
li-jia-nan Nov 24, 2022
3a339e8
Update components/qr-code/demo/logo.md
li-jia-nan Nov 24, 2022
6623457
Update components/qr-code/index.tsx
li-jia-nan Nov 24, 2022
cd02097
Update components/qr-code/style/index.ts
li-jia-nan Nov 24, 2022
cb9eac8
Update components/qr-code/style/index.ts
li-jia-nan Nov 24, 2022
f70e419
Update components/qr-code/demo/logo.md
li-jia-nan Nov 24, 2022
8eee086
rename
li-jia-nan Nov 24, 2022
6a9a5e2
fix
li-jia-nan Nov 24, 2022
6e79cb8
adjust text
li-jia-nan Nov 24, 2022
e0c1b42
rename
li-jia-nan Nov 25, 2022
d284ec4
fix title
li-jia-nan Nov 25, 2022
dc49d1e
rename
li-jia-nan Nov 25, 2022
723ae85
rename
li-jia-nan Nov 25, 2022
21b7a31
fix: snap
li-jia-nan Nov 25, 2022
f060335
fix
li-jia-nan Nov 25, 2022
a489f3c
bundlesize
li-jia-nan Nov 25, 2022
c0dd3a7
update demo
li-jia-nan Nov 26, 2022
50a1a1e
update docs
li-jia-nan Nov 26, 2022
0c8abc0
add demo
li-jia-nan Nov 27, 2022
a08f611
add docs
li-jia-nan Nov 27, 2022
ed4b4e5
add docs
li-jia-nan Nov 28, 2022
e252a25
test: add warning
li-jia-nan Nov 28, 2022
0723550
update demo
Nov 28, 2022
dd3bfd9
bundlesize
li-jia-nan Nov 28, 2022
f0dcb20
update test case
li-jia-nan Nov 30, 2022
46b8dd8
update demo
li-jia-nan Nov 30, 2022
08ccf6d
feat: add onRefresh、add status
li-jia-nan Nov 30, 2022
df523cf
fix: fix demo
li-jia-nan Nov 30, 2022
9961346
fix: fix demo
li-jia-nan Nov 30, 2022
e5636b7
add locale
li-jia-nan Dec 1, 2022
55c6d04
add locale
li-jia-nan Dec 1, 2022
15c5404
add test case
li-jia-nan Dec 1, 2022
aa7082c
update snap
li-jia-nan Dec 1, 2022
92bbcbf
fix demo
li-jia-nan Dec 1, 2022
6c8c8b1
update demo
li-jia-nan Dec 1, 2022
8cd50fa
update demo
li-jia-nan Dec 1, 2022
2f08ac1
update demo
li-jia-nan Dec 1, 2022
8d23324
Update components/qrcode/style/index.ts
li-jia-nan Dec 2, 2022
ef4502d
Update components/qrcode/style/index.ts
li-jia-nan Dec 2, 2022
89c98b1
Update components/qrcode/style/index.ts
li-jia-nan Dec 2, 2022
a7f35d6
Update components/qrcode/style/index.ts
li-jia-nan Dec 2, 2022
39e17d2
Update components/qrcode/style/index.ts
li-jia-nan Dec 2, 2022
ac38139
Update components/qrcode/interface.ts
li-jia-nan Dec 2, 2022
5634cb9
Update components/qrcode/style/index.ts
li-jia-nan Dec 2, 2022
01983d6
fix
li-jia-nan Dec 2, 2022
6ae571c
resolve conflicts
li-jia-nan Dec 2, 2022
0995bea
Update components/qrcode/index.tsx
li-jia-nan Dec 2, 2022
865416b
fix
li-jia-nan Dec 2, 2022
7c630f7
fix
li-jia-nan Dec 2, 2022
0618809
fix
li-jia-nan Dec 2, 2022
5373f44
fix
li-jia-nan Dec 2, 2022
0f952fd
add decs
li-jia-nan Dec 2, 2022
8c4e484
fix
li-jia-nan Dec 2, 2022
6ea3df3
fix
li-jia-nan Dec 2, 2022
799ce52
fix type
li-jia-nan Dec 2, 2022
009c0d2
fix
li-jia-nan Dec 2, 2022
bb05a8e
fix demo
li-jia-nan Dec 3, 2022
c86712a
fix lint
li-jia-nan Dec 3, 2022
2b9fc58
fix lint
li-jia-nan Dec 3, 2022
0bb9d45
add test case for bordered
li-jia-nan Dec 3, 2022
bbc94a3
prettier-ignore
li-jia-nan Dec 5, 2022
ace5d61
fix
li-jia-nan Dec 5, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions components/__tests__/__snapshots__/index.test.ts.snap
Expand Up @@ -40,6 +40,7 @@ exports[`antd exports modules correctly 1`] = `
"Popconfirm",
"Popover",
"Progress",
"QRCode",
"Radio",
"Rate",
"Result",
Expand Down
2 changes: 2 additions & 0 deletions components/index.tsx
Expand Up @@ -149,4 +149,6 @@ export { default as Typography } from './typography';
export type { TypographyProps } from './typography';
export { default as Upload } from './upload';
export type { UploadFile, UploadProps } from './upload';
export { default as QRCode } from './qrcode';
export type { QRCodeProps, QRPropsCanvas } from './qrcode/interface';
export { default as version } from './version';
4 changes: 4 additions & 0 deletions components/locale-provider/index.tsx
Expand Up @@ -46,6 +46,10 @@ export interface Locale {
Image?: {
preview: string;
};
QRCode?: {
expired: string;
refresh: string;
};
}

export interface LocaleProviderProps {
Expand Down
4 changes: 4 additions & 0 deletions components/locale/en_US.tsx
Expand Up @@ -136,6 +136,10 @@ const localeValues: Locale = {
Image: {
preview: 'Preview',
},
QRCode: {
expired: 'QRCode is expired',
refresh: 'click refresh',
},
};

export default localeValues;
4 changes: 4 additions & 0 deletions components/locale/zh_CN.tsx
Expand Up @@ -136,6 +136,10 @@ const localeValues: Locale = {
Image: {
preview: '预览',
},
QRCode: {
expired: '二维码过期',
refresh: '点击刷新',
},
};

export default localeValues;
16 changes: 8 additions & 8 deletions components/mentions/index.en-US.md
Expand Up @@ -68,7 +68,7 @@ return <Mentions options={options} />;
| onResize | The callback function that is triggered when textarea resize | function({ width, height }) | - | |
li-jia-nan marked this conversation as resolved.
Show resolved Hide resolved
| onSearch | Trigger when prefix hit | (text: string, prefix: string) => void | - | |
| onSelect | Trigger when user select the option | (option: OptionProps, prefix: string) => void | - | |
| options | Option Configuration | [Options](#Option) | \[] | 5.1.0 |
| options | Option Configuration | [Options](#Option) | \[] | 5.1.0 |

### Mention methods

Expand All @@ -79,10 +79,10 @@ return <Mentions options={options} />;

### Option

| Property | Description | Type | Default |
| --- | --- | --- | --- |
| label | Title of the option | React.ReactNode | - |
| key | The key value of the option | string | - |
| disabled | Optional | boolean | - |
| className | className | string | - |
| style | The style of the option | React.CSSProperties | - |
| Property | Description | Type | Default |
| --------- | --------------------------- | ------------------- | ------- |
| label | Title of the option | React.ReactNode | - |
| key | The key value of the option | string | - |
| disabled | Optional | boolean | - |
| className | className | string | - |
| style | The style of the option | React.CSSProperties | - |
2 changes: 1 addition & 1 deletion components/modal/style/index.tsx
Expand Up @@ -297,7 +297,7 @@ const genModalConfirmStyle: GenerateStyle<ModalToken> = (token) => {

[`+ ${confirmComponentCls}-content`]: {
marginBlockStart: token.marginXS,
flexBasis: "100%",
flexBasis: '100%',
},
},

Expand Down