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

fix: 修复样式错误 #92

Merged
merged 3 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,9 @@
"@emotion/jest": "^11.11.0",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^14.5.0",
"@testing-library/user-event": "^14.5.1",
"@types/color": "^3.0.4",
"@types/json-schema": "^7.0.12",
"@types/json-schema": "^7.0.13",
"@types/react": "^18.2.21",
"@types/react-dom": "^18.2.7",
"@umijs/lint": "^4.0.81",
Expand All @@ -148,7 +148,7 @@
"react": "^18.2.0",
"react-dom": "^18.2.0",
"rxjs-spy": "^8.0.2",
"semantic-release": "^21.1.1",
"semantic-release": "^21.1.2",
"semantic-release-config-gitmoji": "^1.5.3",
"stylelint": "^15.10.3",
"typescript": "~5.1.6",
Expand Down
12 changes: 0 additions & 12 deletions src/FieldTitle/demos/description.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,6 @@ const Demo = () => {
<ProCard layout="center" bordered colSpan={24} title="描述" subTitle="描述在标题右边">
<FieldTitle type={APIFieldType.bool} title="success" description="成功标识" />
</ProCard>
<ProCard layout="center" bordered colSpan={24} title="额外" subTitle="额外内容在字段下面">
<FieldTitle type={APIFieldType.bool} title="success" extra="额外内容" />
</ProCard>
<ProCard
layout="center"
bordered
colSpan={24}
title="可选"
subTitle="可选为false 则额外内容左侧有 padding"
>
<FieldTitle type={APIFieldType.bool} title="success" extra="额外内容" checkable={false} />
</ProCard>
</ProCard>
);
};
Expand Down
14 changes: 6 additions & 8 deletions src/FieldTitle/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,9 @@ group: 基础组件

## API

| 参数 | 说明 | 类型 | 默认值 |
| :------------ | :----------------------------- | :-------------------------------- | :----- |
| type | 字段类型 | 参考 `FieldIcon` 字段类型类型枚举 | - |
| isParentArray | 父级是否是数组 | boolean | - |
| title | 字段标题 | `React.ReactNode` | - |
| description | 标题右侧描述 | `React.ReactNode` | - |
| extra | 额外内容 | `React.ReactNode` | - |
| checkable | 是否可选,可选会添加 `padding` | `boolean` | true |
| 参数 | 说明 | 类型 | 默认值 |
| :------------ | :------------- | :-------------------------------- | :----- |
| type | 字段类型 | 参考 `FieldIcon` 字段类型类型枚举 | - |
| isParentArray | 父级是否是数组 | boolean | - |
| title | 字段标题 | `React.ReactNode` | - |
| description | 标题右侧描述 | `React.ReactNode` | - |
25 changes: 6 additions & 19 deletions src/FieldTitle/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,6 @@ export interface FieldTitleProps {
* 标题右侧描述
*/
description?: React.ReactNode;
/**
* 额外内容
*/
extra?: React.ReactNode;
/**
* 是否可选
*/
checkable?: boolean;
}

const FieldTitle: React.FC<FieldTitleProps> = (props) => {
Expand All @@ -52,12 +44,10 @@ const FieldTitle: React.FC<FieldTitleProps> = (props) => {
isParentArray,
title,
description = null,
extra = null,
checkable = true,
} = props;

const prefixCls = getPrefixCls('field-title', customizePrefixCls);
const { styles } = useStyle({ prefixCls, checkable });
const { styles } = useStyle({ prefixCls });

let finalType = type;
if (finalType === 'boolean') {
Expand All @@ -67,14 +57,11 @@ const FieldTitle: React.FC<FieldTitleProps> = (props) => {
finalType += 'Array';
}
return (
<div className={classNames(prefixCls, className)} style={style}>
<div className={styles.content}>
{finalType ? <FieldIcon type={finalType} /> : null}
{title ? <span className={styles.title}>{title}</span> : null}
{description ? <span className={styles.description}>{description}</span> : null}
</div>
{extra ? <div className={styles.extra}>{extra}</div> : null}
</div>
<span className={classNames(prefixCls, className, styles.container)} style={style}>
{finalType ? <FieldIcon type={finalType} /> : null}
{title ? <span className={styles.title}>{title}</span> : null}
{description ? <span className={styles.description}>{description}</span> : null}
</span>
);
};

Expand Down
14 changes: 4 additions & 10 deletions src/FieldTitle/style.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { createStyles } from '../theme';

export const useStyle = createStyles(({ token, css, cx }, { prefixCls, checkable }) => {
export const useStyle = createStyles(({ token, css, cx }, { prefixCls }) => {
return {
content: cx(
`${prefixCls}-content`,
container: cx(
`${prefixCls}-container`,
css({
display: 'flex',
display: 'inline-flex',
alignItems: 'center',
fontSize: token.fontSize,
}),
Expand All @@ -22,11 +22,5 @@ export const useStyle = createStyles(({ token, css, cx }, { prefixCls, checkable
marginLeft: token.marginXXS,
}),
),
extra: cx(
`${prefixCls}-extra`,
css({
paddingLeft: checkable ? token.paddingLG : undefined,
}),
),
};
});
Loading