diff --git a/src/pages/account/center/components/Articles/index.less b/src/pages/account/center/components/Articles/index.less
index e78c412c..54da98ee 100644
--- a/src/pages/account/center/components/Articles/index.less
+++ b/src/pages/account/center/components/Articles/index.less
@@ -7,6 +7,6 @@
}
}
}
-a.listItemMetaTitle {
+.listItemMetaTitle {
color: @heading-color;
}
diff --git a/src/pages/account/center/components/Articles/index.style.ts b/src/pages/account/center/components/Articles/index.style.ts
index 8d8df0f9..5a9d385f 100644
--- a/src/pages/account/center/components/Articles/index.style.ts
+++ b/src/pages/account/center/components/Articles/index.style.ts
@@ -1,11 +1,11 @@
-import { createStyles } from "antd-style";
+import { createStyles } from 'antd-style';
const useStyles = createStyles(({ token }) => {
return {
articleList: {
- ".ant-list-item:first-child": { paddingTop: "0" },
+ '.ant-list-item:first-child': { paddingTop: '0' },
},
- "a.listItemMetaTitle": {
+ listItemMetaTitle: {
color: token.colorTextHeading,
},
};
diff --git a/src/pages/account/center/components/AvatarList/index.style.ts b/src/pages/account/center/components/AvatarList/index.style.ts
index 51db29d0..e9f60ed3 100644
--- a/src/pages/account/center/components/AvatarList/index.style.ts
+++ b/src/pages/account/center/components/AvatarList/index.style.ts
@@ -12,7 +12,7 @@ const useStyles = createStyles(({ token }) => {
height: token.controlHeight,
marginLeft: "-8px",
fontSize: token.fontSize,
- ".ant-avatar": { border: "1px solid @border-color-base" },
+ ".ant-avatar": { border: `1px solid ${token.colorBorder}` },
},
avatarItemLarge: {
width: token.controlHeightLG,
diff --git a/src/pages/account/settings/components/PhoneView.tsx b/src/pages/account/settings/components/PhoneView.tsx
index 2196129a..37e153ff 100644
--- a/src/pages/account/settings/components/PhoneView.tsx
+++ b/src/pages/account/settings/components/PhoneView.tsx
@@ -1,6 +1,7 @@
import React from 'react';
import { Input } from 'antd';
-import useStyles from './PhoneView.style';
+import useStyles from './index.style';
+
type PhoneViewProps = {
value?: string;
onChange?: (value: string) => void;
diff --git a/src/pages/account/settings/components/base.tsx b/src/pages/account/settings/components/base.tsx
index 738acb2b..dfe22fd8 100644
--- a/src/pages/account/settings/components/base.tsx
+++ b/src/pages/account/settings/components/base.tsx
@@ -12,7 +12,8 @@ import {
import { useRequest } from '@umijs/max';
import { queryCurrent } from '../service';
import { queryProvince, queryCity } from '../service';
-import useStyles from './BaseView.style';
+import useStyles from './index.style';
+
const validatorPhone = (rule: any, value: string[], callback: (message?: string) => void) => {
if (!value[0]) {
callback('Please input your area code!');
diff --git a/src/pages/account/settings/components/BaseView.less b/src/pages/account/settings/components/index.less
similarity index 100%
rename from src/pages/account/settings/components/BaseView.less
rename to src/pages/account/settings/components/index.less
diff --git a/src/pages/account/settings/components/BaseView.style.ts b/src/pages/account/settings/components/index.style.ts
similarity index 100%
rename from src/pages/account/settings/components/BaseView.style.ts
rename to src/pages/account/settings/components/index.style.ts
diff --git a/src/pages/account/settings/style.style.ts b/src/pages/account/settings/style.style.ts
index 063733be..d1ed5f36 100644
--- a/src/pages/account/settings/style.style.ts
+++ b/src/pages/account/settings/style.style.ts
@@ -10,7 +10,7 @@ const useStyles = createStyles(({ token }) => {
paddingBottom: "16px",
backgroundColor: token.colorBgContainer,
".ant-list-split .ant-list-item:last-child": {
- borderBottom: "1px solid @border-color-split",
+ borderBottom: `1px solid ${token.colorSplit}`,
},
".ant-list-item": { paddingTop: "14px", paddingBottom: "14px" },
[`@media screen and (max-width: ${token.screenMD}px)`]: {
@@ -19,7 +19,7 @@ const useStyles = createStyles(({ token }) => {
},
leftMenu: {
width: "224px",
- borderRight: `${token.lineWidth} ${token.borderStyle} ${token.colorSplit}`,
+ borderRight: `${token.lineWidth}px solid ${token.colorSplit}`,
".ant-menu-inline": { border: "none" },
".ant-menu-horizontal": { fontWeight: "bold" },
[`@media screen and (max-width: ${token.screenMD}px)`]: {
diff --git a/src/pages/dashboard/analysis/components/Charts/ChartCard/index.style.ts b/src/pages/dashboard/analysis/components/Charts/ChartCard/index.style.ts
index 87997495..eb023d21 100644
--- a/src/pages/dashboard/analysis/components/Charts/ChartCard/index.style.ts
+++ b/src/pages/dashboard/analysis/components/Charts/ChartCard/index.style.ts
@@ -65,7 +65,7 @@ const useStyles = createStyles(({ token }) => {
footer: {
marginTop: "8px",
paddingTop: "9px",
- borderTop: "1px solid @border-color-split",
+ borderTop: `1px solid ${token.colorSplit}`,
"& > *": { position: "relative" },
},
footerMargin: {
diff --git a/src/pages/dashboard/analysis/components/NumberInfo/index.style.ts b/src/pages/dashboard/analysis/components/NumberInfo/index.style.ts
index 024041b0..64742db7 100644
--- a/src/pages/dashboard/analysis/components/NumberInfo/index.style.ts
+++ b/src/pages/dashboard/analysis/components/NumberInfo/index.style.ts
@@ -11,7 +11,7 @@ const useStyles = createStyles(({ token }) => {
numberInfoTitle: {
marginBottom: "16px",
color: token.colorText,
- fontSize: token.fontSizeLg,
+ fontSize: token["font-size-lg"],
transition: "all 0.3s",
},
numberInfoSubTitle: {
@@ -36,7 +36,7 @@ const useStyles = createStyles(({ token }) => {
subTotal: {
marginRight: "0",
color: token.colorTextSecondary,
- fontSize: token.fontSizeLg,
+ fontSize: token["font-size-lg"],
verticalAlign: "top",
},
anticon: {
@@ -45,10 +45,10 @@ const useStyles = createStyles(({ token }) => {
transform: "scale(0.82)",
},
"anticon-caret-up": {
- color: token.red6,
+ color: token["red-6"],
},
"anticon-caret-down": {
- color: token.green6,
+ color: token["green-6"],
},
};
});
diff --git a/src/pages/dashboard/analysis/components/Trend/index.style.ts b/src/pages/dashboard/analysis/components/Trend/index.style.ts
index e3e83d4c..c8513955 100644
--- a/src/pages/dashboard/analysis/components/Trend/index.style.ts
+++ b/src/pages/dashboard/analysis/components/Trend/index.style.ts
@@ -8,20 +8,20 @@ const useStyles = createStyles(({ token }) => {
lineHeight: "22px",
},
up: {
- color: token.red6,
+ color: token["red-6"],
},
down: {
top: "-1px",
- color: token.green6,
+ color: token["green-6"],
},
"trendItemGrey .up, trendItemGrey .down": {
color: token.colorText,
},
"reverseColor .up": {
- color: token.green6,
+ color: token["green-6"],
},
"reverseColor .down": {
- color: token.red6,
+ color: token["red-6"],
},
};
});
diff --git a/src/pages/dashboard/analysis/style.style.ts b/src/pages/dashboard/analysis/style.style.ts
index e0e4a86b..630e122a 100644
--- a/src/pages/dashboard/analysis/style.style.ts
+++ b/src/pages/dashboard/analysis/style.style.ts
@@ -37,10 +37,6 @@ const useStyles = createStyles(({ token }) => {
fontSize: "14px",
lineHeight: "22px",
},
- active: {
- color: "#fff",
- backgroundColor: "#314659",
- },
},
[`@media screen and (max-width: ${token.screenLG}px)`]: {
li: {
@@ -58,7 +54,7 @@ const useStyles = createStyles(({ token }) => {
fontSize: "12px",
lineHeight: "20px",
textAlign: "center",
- backgroundColor: token.tagDefaultBg,
+ backgroundColor: "#F9F9F9",
borderRadius: "20px",
},
rankingItemTitle: {
@@ -68,6 +64,10 @@ const useStyles = createStyles(({ token }) => {
whiteSpace: "nowrap",
textOverflow: "ellipsis",
},
+ active: {
+ color: "#fff",
+ backgroundColor: "#314659",
+ },
salesExtra: {
display: "inline-block",
marginRight: "24px",
@@ -78,11 +78,13 @@ const useStyles = createStyles(({ token }) => {
color: token.colorPrimary,
},
},
- currentDate: { color: token.colorPrimary },
[`@media screen and (max-width: ${token.screenLG}px)`]: {
display: "none",
},
},
+ currentDate: {
+ color: token.colorPrimary,
+ },
salesBar: {
padding: "0 0 32px 32px",
[`@media screen and (max-width: ${token.screenMD}px)`]: {
diff --git a/src/pages/dashboard/workplace/style.style.ts b/src/pages/dashboard/workplace/style.style.ts
index 0aaeae42..732b9a0e 100644
--- a/src/pages/dashboard/workplace/style.style.ts
+++ b/src/pages/dashboard/workplace/style.style.ts
@@ -2,16 +2,6 @@ import { createStyles } from "antd-style";
const useStyles = createStyles(({ token }) => {
return {
- "clearfix()": {
- zoom: "1",
- "&::before, &::after": { display: "table", content: "' '" },
- "&::after": {
- clear: "both",
- height: "0",
- fontSize: "0",
- visibility: "hidden",
- },
- },
activitiesList: {
padding: "0 24px 8px 24px",
},
@@ -128,30 +118,10 @@ const useStyles = createStyles(({ token }) => {
margin: "12px 0",
color: token.colorText,
transition: "all 0.3s",
- position: "relative",
- maxHeight: "4.5em",
- marginRight: "-1em",
- paddingRight: "1em",
overflow: "hidden",
- lineHeight: "1.5em",
- textAlign: "justify",
- "&::before": {
- position: "absolute",
- right: "14px",
- bottom: "0",
- padding: "0 1px",
- background: token.colorBgContainer,
- content: "'...'",
- },
- "&::after": {
- position: "absolute",
- right: "14px",
- width: "1em",
- height: "1em",
- marginTop: "0.2em",
- background: "white",
- content: "''",
- },
+ whiteSpace: "nowrap",
+ textOverflow: "ellipsis",
+ wordBreak: "break-all",
"&:hover": {
color: token.colorPrimary,
},
@@ -202,57 +172,18 @@ const useStyles = createStyles(({ token }) => {
marginTop: "8px",
overflow: "hidden",
fontSize: "12px",
- lineHeight: "1.5em",
- position: "relative",
- maxHeight: "4.5em",
- marginRight: "-1em",
- paddingRight: "1em",
- textAlign: "justify",
- "&::before": {
- position: "absolute",
- right: "14px",
- bottom: "0",
- padding: "0 1px",
- background: token.colorBgContainer,
- content: "'...'",
- },
- "&::after": {
- position: "absolute",
- right: "14px",
- width: "1em",
- height: "1em",
- marginTop: "0.2em",
- background: "white",
- content: "''",
- },
+ lineHeight: "20px",
+ whiteSpace: "nowrap",
+ textOverflow: "ellipsis",
+ wordBreak: "break-all",
a: {
display: "inline-block",
flex: "1 1 0",
color: token.colorTextSecondary,
- position: "relative",
- maxHeight: "4.5em",
- marginRight: "-1em",
- paddingRight: "1em",
overflow: "hidden",
- lineHeight: "1.5em",
- textAlign: "justify",
- "&::before": {
- position: "absolute",
- right: "14px",
- bottom: "0",
- padding: "0 1px",
- background: token.colorBgContainer,
- content: "'...'",
- },
- "&::after": {
- position: "absolute",
- right: "14px",
- width: "1em",
- height: "1em",
- marginTop: "0.2em",
- background: "white",
- content: "''",
- },
+ whiteSpace: "nowrap",
+ textOverflow: "ellipsis",
+ wordBreak: "break-all",
"&:hover": {
color: token.colorPrimary,
},
diff --git a/src/pages/form/advanced-form/style.style.ts b/src/pages/form/advanced-form/style.style.ts
index 63a8fdef..68c839ab 100644
--- a/src/pages/form/advanced-form/style.style.ts
+++ b/src/pages/form/advanced-form/style.style.ts
@@ -28,7 +28,7 @@ const useStyles = createStyles(({ token }) => {
errorListItem: {
padding: "8px 16px",
listStyle: "none",
- borderBottom: "1px solid @border-color-split",
+ borderBottom: `1px solid ${token.colorSplit}`,
cursor: "pointer",
transition: "all 0.3s",
"&:hover": { background: token.colorBgTextActive },
diff --git a/src/pages/form/step-form/index.tsx b/src/pages/form/step-form/index.tsx
index e64ddca1..bbb63f1b 100644
--- a/src/pages/form/step-form/index.tsx
+++ b/src/pages/form/step-form/index.tsx
@@ -221,7 +221,7 @@ const StepForm: React.FC
> = () => {
margin: '40px 0 24px',
}}
/>
-
+
说明
转账到支付宝账户
diff --git a/src/pages/list/basic-list/index.tsx b/src/pages/list/basic-list/index.tsx
index abf2e034..f59656f7 100644
--- a/src/pages/list/basic-list/index.tsx
+++ b/src/pages/list/basic-list/index.tsx
@@ -46,7 +46,7 @@ const ListContent = ({
}) => {
const { styles } = useStyles();
return (
-
+
Owner
{owner}
@@ -128,7 +128,7 @@ export const BasicList: FC = () => {
}
};
const extraContent = (
-
+
全部
进行中
diff --git a/src/pages/list/basic-list/utils/utils.style.ts b/src/pages/list/basic-list/utils/utils.style.ts
index 20ba95d9..0ad5e64a 100644
--- a/src/pages/list/basic-list/utils/utils.style.ts
+++ b/src/pages/list/basic-list/utils/utils.style.ts
@@ -1,12 +1,6 @@
import { createStyles } from 'antd-style';
const useStyles = createStyles(() => {
- return {
- 'clearfix()': {
- zoom: '1',
- '&::before, &::after': { display: 'table', content: "' '" },
- '&::after': { clear: 'both', height: '0', fontSize: '0', visibility: 'hidden' },
- },
- };
+ return {};
});
export default useStyles;
diff --git a/src/pages/list/card-list/utils/utils.style.ts b/src/pages/list/card-list/utils/utils.style.ts
index 20ba95d9..0ad5e64a 100644
--- a/src/pages/list/card-list/utils/utils.style.ts
+++ b/src/pages/list/card-list/utils/utils.style.ts
@@ -1,12 +1,6 @@
import { createStyles } from 'antd-style';
const useStyles = createStyles(() => {
- return {
- 'clearfix()': {
- zoom: '1',
- '&::before, &::after': { display: 'table', content: "' '" },
- '&::after': { clear: 'both', height: '0', fontSize: '0', visibility: 'hidden' },
- },
- };
+ return {};
});
export default useStyles;
diff --git a/src/pages/list/search/applications/components/StandardFormRow/index.style.ts b/src/pages/list/search/applications/components/StandardFormRow/index.style.ts
index 22a1f288..10855259 100644
--- a/src/pages/list/search/applications/components/StandardFormRow/index.style.ts
+++ b/src/pages/list/search/applications/components/StandardFormRow/index.style.ts
@@ -6,7 +6,7 @@ const useStyles = createStyles(({ token }) => {
display: "flex",
marginBottom: "16px",
paddingBottom: "16px",
- borderBottom: "1px dashed @border-color-split",
+ borderBottom: `1px dashed ${token.colorSplit}`,
".ant-form-item, .ant-legacy-form-item": { marginRight: "24px" },
".ant-form-item-label, .ant-legacy-form-item-label": {
label: {
diff --git a/src/pages/list/search/applications/components/TagSelect/index.style.ts b/src/pages/list/search/applications/components/TagSelect/index.style.ts
index 07de491e..3cd7447b 100644
--- a/src/pages/list/search/applications/components/TagSelect/index.style.ts
+++ b/src/pages/list/search/applications/components/TagSelect/index.style.ts
@@ -16,16 +16,16 @@ const useStyles = createStyles(({ token }) => {
fontSize: token.fontSize,
},
},
- expanded: {
- maxHeight: "200px",
- transition: "all 0.3s",
- },
trigger: {
position: "absolute",
top: "0",
right: "0",
"span.anticon": { fontSize: "12px" },
},
+ expanded: {
+ maxHeight: "200px",
+ transition: "all 0.3s",
+ },
hasExpandTag: {
paddingRight: "50px",
},
diff --git a/src/pages/list/search/applications/index.tsx b/src/pages/list/search/applications/index.tsx
index 3d45f62d..7d4fa149 100644
--- a/src/pages/list/search/applications/index.tsx
+++ b/src/pages/list/search/applications/index.tsx
@@ -197,7 +197,7 @@ export const Applications: FC> = () => {
]}
>
} title={item.title} />
-
+
{
- return {
- 'clearfix()': {
- zoom: '1',
- '&::before, &::after': { display: 'table', content: "' '" },
- '&::after': { clear: 'both', height: '0', fontSize: '0', visibility: 'hidden' },
- },
- };
+ return {};
});
export default useStyles;
diff --git a/src/pages/list/search/articles/components/ArticleListContent/index.tsx b/src/pages/list/search/articles/components/ArticleListContent/index.tsx
index 4cabb908..5f93ac53 100644
--- a/src/pages/list/search/articles/components/ArticleListContent/index.tsx
+++ b/src/pages/list/search/articles/components/ArticleListContent/index.tsx
@@ -16,7 +16,7 @@ const ArticleListContent: React.FC = ({
}) => {
const { styles } = useStyles();
return (
-
+
{content}
diff --git a/src/pages/list/search/articles/components/StandardFormRow/index.style.ts b/src/pages/list/search/articles/components/StandardFormRow/index.style.ts
index 9bd74328..deeeb748 100644
--- a/src/pages/list/search/articles/components/StandardFormRow/index.style.ts
+++ b/src/pages/list/search/articles/components/StandardFormRow/index.style.ts
@@ -7,7 +7,7 @@ const useStyles = createStyles(({ token }) => {
width: "100%",
marginBottom: "16px",
paddingBottom: "16px",
- borderBottom: "1px dashed @border-color-split",
+ borderBottom: `1px dashed ${token.colorSplit}`,
".ant-form-item, .ant-legacy-form-item": { marginRight: "24px" },
".ant-form-item-label, .ant-legacy-form-item-label": {
label: {
diff --git a/src/pages/list/search/articles/components/TagSelect/index.style.ts b/src/pages/list/search/articles/components/TagSelect/index.style.ts
index 07de491e..3cd7447b 100644
--- a/src/pages/list/search/articles/components/TagSelect/index.style.ts
+++ b/src/pages/list/search/articles/components/TagSelect/index.style.ts
@@ -16,16 +16,16 @@ const useStyles = createStyles(({ token }) => {
fontSize: token.fontSize,
},
},
- expanded: {
- maxHeight: "200px",
- transition: "all 0.3s",
- },
trigger: {
position: "absolute",
top: "0",
right: "0",
"span.anticon": { fontSize: "12px" },
},
+ expanded: {
+ maxHeight: "200px",
+ transition: "all 0.3s",
+ },
hasExpandTag: {
paddingRight: "50px",
},
diff --git a/src/pages/list/search/articles/index.tsx b/src/pages/list/search/articles/index.tsx
index dc7630bf..e69de29b 100644
--- a/src/pages/list/search/articles/index.tsx
+++ b/src/pages/list/search/articles/index.tsx
@@ -1,270 +0,0 @@
-import { LikeOutlined, LoadingOutlined, MessageOutlined, StarOutlined } from '@ant-design/icons';
-import { Button, Card, Col, Form, List, Row, Select, Tag } from 'antd';
-import type { FC } from 'react';
-import React from 'react';
-import { useRequest } from '@umijs/max';
-import ArticleListContent from './components/ArticleListContent';
-import StandardFormRow from './components/StandardFormRow';
-import TagSelect from './components/TagSelect';
-import type { ListItemDataType } from './data.d';
-import { queryFakeList } from './service';
-import useStyles from './style.style';
-const { Option } = Select;
-const FormItem = Form.Item;
-const pageSize = 5;
-const Articles: FC = () => {
- const { styles } = useStyles();
- const [form] = Form.useForm();
- const { data, reload, loading, loadMore, loadingMore } = useRequest(
- () => {
- return queryFakeList({
- count: pageSize,
- });
- },
- {
- loadMore: true,
- },
- );
- const list = data?.list || [];
- const setOwner = () => {
- form.setFieldsValue({
- owner: ['wzj'],
- });
- };
- const owners = [
- {
- id: 'wzj',
- name: '我自己',
- },
- {
- id: 'wjh',
- name: '吴家豪',
- },
- {
- id: 'zxx',
- name: '周星星',
- },
- {
- id: 'zly',
- name: '赵丽颖',
- },
- {
- id: 'ym',
- name: '姚明',
- },
- ];
- const IconText: React.FC<{
- type: string;
- text: React.ReactNode;
- }> = ({ type, text }) => {
- switch (type) {
- case 'star-o':
- return (
-
-
- {text}
-
- );
- case 'like-o':
- return (
-
-
- {text}
-
- );
- case 'message':
- return (
-
-
- {text}
-
- );
- default:
- return null;
- }
- };
- const formItemLayout = {
- wrapperCol: {
- xs: {
- span: 24,
- },
- sm: {
- span: 24,
- },
- md: {
- span: 12,
- },
- },
- };
- const loadMoreDom = list.length > 0 && (
-
-
-
- );
- return (
- <>
-
-
-
-
-
- size="large"
- loading={loading}
- rowKey="id"
- itemLayout="vertical"
- loadMore={loadMoreDom}
- dataSource={list}
- renderItem={(item) => (
- ,
- ,
- ,
- ]}
- extra={}
- >
-
- {item.title}
-
- }
- description={
-
- Ant Design
- 设计语言
- 蚂蚁金服
-
- }
- />
-
-
- )}
- />
-
-
- );
-};
-export default Articles;
diff --git a/src/pages/list/search/articles/style.less b/src/pages/list/search/articles/style.less
index fe07d851..0289b64e 100644
--- a/src/pages/list/search/articles/style.less
+++ b/src/pages/list/search/articles/style.less
@@ -1,6 +1,6 @@
@import '~antd/es/style/themes/default.less';
-a.listItemMetaTitle {
+.listItemMetaTitle {
color: @heading-color;
}
.listItemExtra {
diff --git a/src/pages/list/search/articles/style.style.ts b/src/pages/list/search/articles/style.style.ts
index 85c2c64c..5d8db5b4 100644
--- a/src/pages/list/search/articles/style.style.ts
+++ b/src/pages/list/search/articles/style.style.ts
@@ -1,27 +1,27 @@
-import { createStyles } from "antd-style";
+import { createStyles } from 'antd-style';
const useStyles = createStyles(({ token }) => {
return {
- "a.listItemMetaTitle": {
+ listItemMetaTitle: {
color: token.colorTextHeading,
},
listItemExtra: {
- width: "272px",
- height: "1px",
+ width: '272px',
+ height: '1px',
[`@media screen and (max-width: ${token.screenLG}px)`]: {
- width: "0",
- height: "1px",
+ width: '0',
+ height: '1px',
},
},
selfTrigger: {
- marginLeft: "12px",
+ marginLeft: '12px',
[`@media screen and (max-width: ${token.screenXS}px)`]: {
- display: "block",
- marginLeft: "0",
+ display: 'block',
+ marginLeft: '0',
},
[`@media screen and (max-width: ${token.screenMD}px)`]: {
- display: "block",
- marginLeft: "0",
+ display: 'block',
+ marginLeft: '0',
},
},
};
diff --git a/src/pages/list/search/projects/components/AvatarList/index.style.ts b/src/pages/list/search/projects/components/AvatarList/index.style.ts
index 51db29d0..e9f60ed3 100644
--- a/src/pages/list/search/projects/components/AvatarList/index.style.ts
+++ b/src/pages/list/search/projects/components/AvatarList/index.style.ts
@@ -12,7 +12,7 @@ const useStyles = createStyles(({ token }) => {
height: token.controlHeight,
marginLeft: "-8px",
fontSize: token.fontSize,
- ".ant-avatar": { border: "1px solid @border-color-base" },
+ ".ant-avatar": { border: `1px solid ${token.colorBorder}` },
},
avatarItemLarge: {
width: token.controlHeightLG,
diff --git a/src/pages/list/search/projects/components/AvatarList/index.tsx b/src/pages/list/search/projects/components/AvatarList/index.tsx
index b0417348..5ba03b9e 100644
--- a/src/pages/list/search/projects/components/AvatarList/index.tsx
+++ b/src/pages/list/search/projects/components/AvatarList/index.tsx
@@ -18,14 +18,18 @@ export type AvatarListProps = {
style?: React.CSSProperties;
children: React.ReactElement
| React.ReactElement[];
};
-const avatarSizeToClassName = (size?: SizeType | 'mini') =>
+const avatarSizeToClassName = (size: SizeType | 'mini', styles: any) =>
classNames(styles.avatarItem, {
[styles.avatarItemLarge]: size === 'large',
[styles.avatarItemSmall]: size === 'small',
[styles.avatarItemMini]: size === 'mini',
});
+
const Item: React.FC = ({ src, size, tips, onClick = () => {} }) => {
- const cls = avatarSizeToClassName(size);
+ const { styles } = useStyles();
+
+ const cls = avatarSizeToClassName(size!, styles);
+
return (
{tips ? (
@@ -51,13 +55,14 @@ const AvatarList: React.FC & {
const numOfChildren = React.Children.count(children);
const numToShow = maxLength >= numOfChildren ? numOfChildren : maxLength;
const childrenArray = React.Children.toArray(children) as React.ReactElement[];
+
const childrenWithProps = childrenArray.slice(0, numToShow).map((child) =>
React.cloneElement(child, {
size,
}),
);
if (numToShow < numOfChildren) {
- const cls = avatarSizeToClassName(size);
+ const cls = avatarSizeToClassName(size!, styles);
childrenWithProps.push(
{`+${numOfChildren - maxLength}`}
diff --git a/src/pages/list/search/projects/components/StandardFormRow/index.style.ts b/src/pages/list/search/projects/components/StandardFormRow/index.style.ts
index 9bd74328..deeeb748 100644
--- a/src/pages/list/search/projects/components/StandardFormRow/index.style.ts
+++ b/src/pages/list/search/projects/components/StandardFormRow/index.style.ts
@@ -7,7 +7,7 @@ const useStyles = createStyles(({ token }) => {
width: "100%",
marginBottom: "16px",
paddingBottom: "16px",
- borderBottom: "1px dashed @border-color-split",
+ borderBottom: `1px dashed ${token.colorSplit}`,
".ant-form-item, .ant-legacy-form-item": { marginRight: "24px" },
".ant-form-item-label, .ant-legacy-form-item-label": {
label: {
diff --git a/src/pages/list/search/projects/components/TagSelect/index.style.ts b/src/pages/list/search/projects/components/TagSelect/index.style.ts
index 07de491e..3cd7447b 100644
--- a/src/pages/list/search/projects/components/TagSelect/index.style.ts
+++ b/src/pages/list/search/projects/components/TagSelect/index.style.ts
@@ -16,16 +16,16 @@ const useStyles = createStyles(({ token }) => {
fontSize: token.fontSize,
},
},
- expanded: {
- maxHeight: "200px",
- transition: "all 0.3s",
- },
trigger: {
position: "absolute",
top: "0",
right: "0",
"span.anticon": { fontSize: "12px" },
},
+ expanded: {
+ maxHeight: "200px",
+ transition: "all 0.3s",
+ },
hasExpandTag: {
paddingRight: "50px",
},
diff --git a/src/pages/list/search/projects/index.tsx b/src/pages/list/search/projects/index.tsx
index 1abf5638..9ef60783 100644
--- a/src/pages/list/search/projects/index.tsx
+++ b/src/pages/list/search/projects/index.tsx
@@ -44,7 +44,6 @@ const Projects: FC = () => {
title={{item.title}}
description={
{
- return {
- 'clearfix()': {
- zoom: '1',
- '&::before, &::after': { display: 'table', content: "' '" },
- '&::after': { clear: 'both', height: '0', fontSize: '0', visibility: 'hidden' },
- },
- };
+ return {};
});
export default useStyles;
diff --git a/src/pages/profile/advanced/index.tsx b/src/pages/profile/advanced/index.tsx
index 2bafc682..e824fcde 100644
--- a/src/pages/profile/advanced/index.tsx
+++ b/src/pages/profile/advanced/index.tsx
@@ -155,7 +155,7 @@ const Advanced: FC = () => {
);
const desc1 = (
-
+
曲丽丽
{
>
吴加号
{
/>
{
>
-
+
{contentList[tabStatus.operationKey] as React.ReactNode}
diff --git a/src/pages/user/register-result/index.tsx b/src/pages/user/register-result/index.tsx
index 2564a983..6e702274 100644
--- a/src/pages/user/register-result/index.tsx
+++ b/src/pages/user/register-result/index.tsx
@@ -2,21 +2,24 @@ import { Button, Result } from 'antd';
import { Link, useSearchParams } from '@umijs/max';
import React from 'react';
import useStyles from './style.style';
-const actions = (
-
-);
+
const RegisterResult: React.FC> = () => {
const { styles } = useStyles();
const [params] = useSearchParams();
+
+ const actions = (
+
+ );
+
const email = params?.get('account') || 'AntDesign@example.com';
return (
- 强度：强
-
- 强度：中
-
- ),
- poor: (
-
- 强度：太短
-
- ),
-};
+
const passwordProgressMap: {
ok: 'success';
pass: 'normal';
@@ -43,6 +28,25 @@ const Register: FC = () => {
const [popover, setPopover]: [boolean, any] = useState(false);
const confirmDirty = false;
let interval: number | undefined;
+
+ const passwordStatusMap = {
+ ok: (
+
+ 强度：强
+
+ ),
+ pass: (
+
+ 强度：中
+
+ ),
+ poor: (
+
+ 强度：太短
+
+ ),
+ };
+
const [form] = Form.useForm();
useEffect(
() => () => {
@@ -124,7 +128,6 @@ const Register: FC = () => {