diff --git a/react-ui/src/components/KFIcon/index.tsx b/react-ui/src/components/KFIcon/index.tsx index eef4dbe7..e3951928 100644 --- a/react-ui/src/components/KFIcon/index.tsx +++ b/react-ui/src/components/KFIcon/index.tsx @@ -17,15 +17,16 @@ interface KFIconProps extends IconFontProps { font?: number; color?: string; style?: React.CSSProperties; + className?: string; } -function KFIcon({ type, font = 15, color = '', style = {} }: KFIconProps) { +function KFIcon({ type, font = 15, color = '', style = {}, className }: KFIconProps) { const iconStyle = { ...style, fontSize: font, color, }; - return ; + return ; } export default KFIcon; diff --git a/react-ui/src/components/KFModal/index.less b/react-ui/src/components/KFModal/index.less index d24b6135..4285826e 100644 --- a/react-ui/src/components/KFModal/index.less +++ b/react-ui/src/components/KFModal/index.less @@ -2,10 +2,9 @@ .ant-modal-content { padding: 20px 67px; background-image: url(/assets/images/modal-back.png); -background-repeat:no-repeat; -background-size:100%; -background-position: top center; - // background: linear-gradient(180deg, #cfdfff 0%, #d4e2ff 9.77%, #ffffff 40%, #ffffff 100%); + background-repeat: no-repeat; + background-position: top center; + background-size: 100%; border-radius: 21px; } .ant-modal-header { diff --git a/react-ui/src/components/KFModal/index.tsx b/react-ui/src/components/KFModal/index.tsx index 3491ca6b..ba3233c6 100644 --- a/react-ui/src/components/KFModal/index.tsx +++ b/react-ui/src/components/KFModal/index.tsx @@ -5,31 +5,22 @@ */ import ModalTitle from '@/components/ModalTitle'; -import { ConfigProvider, Modal, theme, type ModalProps } from 'antd'; +import { Modal, type ModalProps } from 'antd'; import classNames from 'classnames'; -import { useAntdConfig } from 'umi'; import './index.less'; -const { useToken } = theme; - export interface KFModalProps extends ModalProps { image: string; } function KFModal({ title, image, children, className = '', ...rest }: KFModalProps) { - const { token } = useToken(); - console.log('token', token); - const antdConfig = useAntdConfig(); - console.log('antdConfig', antdConfig); return ( - - } - > - {children} - - + } + > + {children} + ); } diff --git a/react-ui/src/components/KFRadio/index.tsx b/react-ui/src/components/KFRadio/index.tsx index b60a4d11..9f18f6e8 100644 --- a/react-ui/src/components/KFRadio/index.tsx +++ b/react-ui/src/components/KFRadio/index.tsx @@ -16,12 +16,14 @@ export type KFRadioItem = { type KFRadioProps = { items: KFRadioItem[]; value?: string; + style?: React.CSSProperties; + className?: string; onChange?: (value: string) => void; }; -function KFRadio({ items, value, onChange }: KFRadioProps) { +function KFRadio({ items, value, style, className, onChange }: KFRadioProps) { return ( - + {items.map((item) => { return ( {}, []); - -// return ( -//
-// -//
-// ); -// } - -// export default KFTabs; diff --git a/react-ui/src/components/ModalTitle/index.less b/react-ui/src/components/ModalTitle/index.less index ac4d8360..20ebc539 100644 --- a/react-ui/src/components/ModalTitle/index.less +++ b/react-ui/src/components/ModalTitle/index.less @@ -1,11 +1,11 @@ -.modal_title { +.modal-title { display: flex; align-items: center; color: @primary-color; font-weight: 400; font-size: 20px; - &_image { + &__image { width: 22px; margin-right: 10px; } diff --git a/react-ui/src/components/ModalTitle/index.tsx b/react-ui/src/components/ModalTitle/index.tsx index 34bdda74..485e22a7 100644 --- a/react-ui/src/components/ModalTitle/index.tsx +++ b/react-ui/src/components/ModalTitle/index.tsx @@ -1,15 +1,18 @@ +import classNames from 'classnames'; import React from 'react'; import styles from './index.less'; type ModalTitleProps = { title: React.ReactNode; image?: string; + style?: React.CSSProperties; + className?: string; }; -function ModalTitle({ title, image }: ModalTitleProps) { +function ModalTitle({ title, image, style, className }: ModalTitleProps) { return ( -
- +
+ {title}
); diff --git a/react-ui/src/components/SubAreaTitle/index.tsx b/react-ui/src/components/SubAreaTitle/index.tsx index cfdef539..a1d5e33e 100644 --- a/react-ui/src/components/SubAreaTitle/index.tsx +++ b/react-ui/src/components/SubAreaTitle/index.tsx @@ -4,17 +4,19 @@ * @Description: 分区标题 */ +import classNames from 'classnames'; import './index.less'; type SubAreaTitleProps = { title: string; image: string; style?: React.CSSProperties; + className?: string; }; -function SubAreaTitle({ title, image, style }: SubAreaTitleProps) { +function SubAreaTitle({ title, image, style, className }: SubAreaTitleProps) { return ( -
+
{title}
diff --git a/react-ui/src/global.less b/react-ui/src/global.less index 69161adc..d3ba6430 100644 --- a/react-ui/src/global.less +++ b/react-ui/src/global.less @@ -151,7 +151,7 @@ body { height: 46px; padding: 1px 11px; } -.ant-input-textarea-affix-wrapper.ant-input-affix-wrapper{ +.ant-input-textarea-affix-wrapper.ant-input-affix-wrapper { padding: 0; } .ant-modal .ant-select-single { @@ -160,15 +160,26 @@ body { .ant-modal .ant-select-single .ant-select-selector .ant-select-selection-placeholder { line-height: 46px; } -.ant-menu-light.ant-menu-inline .ant-menu-item{ - color:#575757; +.ant-menu-light.ant-menu-inline .ant-menu-item { + color: #575757; } .ant-modal .ant-modal-close-x { width: 26px; height: 26px; - color: #272536; - border: 2px solid #272536; + color: @text-color-secondary; + border: 2px solid @text-color-secondary; border-radius: 50%; + + &:hover { + color: #272536; + border: 2px solid #272536; + } +} +.ant-modal .ant-modal-close:hover { + background-color: transparent; +} +.ant-modal .ant-modal-close:active { + background-color: transparent; } .ant-modal-content { margin-top: 50px; @@ -188,9 +199,6 @@ body { .ant-modal .ant-modal-content { border-radius: 20px; } -.ant-modal .ant-modal-close:hover { - background-color: transparent; -} .ant-modal .ant-modal-footer > .ant-btn + .ant-btn { margin-left: 20px; } @@ -211,22 +219,18 @@ body { border: 1px solid #e6e6e6; } -// ::-webkit-scrollbar-button { -// background: #97a1bd; -// } ::-webkit-scrollbar { - width: 9px; - border-radius: 2px; + width: 8px; + background: transparent; } ::-webkit-scrollbar-thumb { - // background-color: #9aa3bc!important; - width: 7px; - background: rgba(77, 87, 123, 0.5) !important; + width: 8px; + background: rgba(0, 0, 0, 0.5); + border-radius: 99px; } ::-webkit-scrollbar-track { - // background-color: #eaf1ff!important; - width: 9px; - background: rgba(22, 100, 255, 0.06) !important; + width: 8px; + background: transparent; } ul, ol {