Commit e44927b1 authored by chenshouchao's avatar chenshouchao

ui: 数据管理中的项目数据表格页样式优化

parent 8fb30dd9
...@@ -12,9 +12,10 @@ import { ...@@ -12,9 +12,10 @@ import {
} from "@mui/material"; } from "@mui/material";
import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown"; import ArrowDropDownIcon from "@mui/icons-material/ArrowDropDown";
interface ButtonTagProps extends Omit<ExtendButtonBase<ButtonTypeMap<{}, "button">>, 'text'>{ interface ButtonTagProps
startIcon?: React.ReactNode; /** 开始Icon */ extends Omit<ExtendButtonBase<ButtonTypeMap<{}, "button">>, "text"> {
endIcon?: React.ReactNode; /** 结束Icon */ startIcon?: React.ReactNode /** 开始Icon */;
endIcon?: React.ReactNode /** 结束Icon */;
text: string; //文本内容 text: string; //文本内容
variant?: "text" | "contained" | "outlined"; //按钮样式 variant?: "text" | "contained" | "outlined"; //按钮样式
onClick?: any; //点击事件 onClick?: any; //点击事件
...@@ -22,13 +23,20 @@ interface ButtonTagProps extends Omit<ExtendButtonBase<ButtonTypeMap<{}, "butto ...@@ -22,13 +23,20 @@ interface ButtonTagProps extends Omit<ExtendButtonBase<ButtonTypeMap<{}, "butto
fontSize?: string; //按钮文字大小 fontSize?: string; //按钮文字大小
dropValue?: boolean; //选择的值 dropValue?: boolean; //选择的值
drop?: boolean; //是否开启选择 drop?: boolean; //是否开启选择
color?: "inherit" | "primary" | "secondary" | 'success' | 'error' | 'info' | 'warning'; //按钮颜色风格 color?:
| "inherit"
| "primary"
| "secondary"
| "success"
| "error"
| "info"
| "warning"; //按钮颜色风格
size?: "large" | "medium" | "small"; //按钮尺寸 size?: "large" | "medium" | "small"; //按钮尺寸
disabled?: boolean; //是否禁用 disabled?: boolean; //是否禁用
style?: any; //按钮自定义样式 style?: any; //按钮自定义样式
img?: JSX.Element; //图标按钮中的图标 img?: JSX.Element; //图标按钮中的图标
selectCallBack?: (item: any, key: number) => void; //选择按钮的回调 selectCallBack?: (item: any, key: number) => void; //选择按钮的回调
}; }
const theme = createTheme({ const theme = createTheme({
components: { components: {
...@@ -36,6 +44,9 @@ const theme = createTheme({ ...@@ -36,6 +44,9 @@ const theme = createTheme({
styleOverrides: { styleOverrides: {
root: { root: {
minWidth: "48px", minWidth: "48px",
"&.MuiButton-textError": {
color: "rgba(255, 78, 78, 1)",
},
}, },
contained: { contained: {
backgroundColor: "#1370FF", backgroundColor: "#1370FF",
...@@ -78,7 +89,6 @@ const theme = createTheme({ ...@@ -78,7 +89,6 @@ const theme = createTheme({
color: "#FF4E4E", color: "#FF4E4E",
"&:hover": { backgroundColor: "#FFEDED " }, "&:hover": { backgroundColor: "#FFEDED " },
}, },
sizeSmall: { sizeSmall: {
"& p": { fontSize: "12px" }, "& p": { fontSize: "12px" },
height: "28px", height: "28px",
...@@ -113,7 +123,16 @@ const theme = createTheme({ ...@@ -113,7 +123,16 @@ const theme = createTheme({
}); });
const ButtonComponent = (props: ButtonTagProps) => { const ButtonComponent = (props: ButtonTagProps) => {
const { size, disabled, variant, color, img, select, selectCallBack, ...other } = props; const {
size,
disabled,
variant,
color,
img,
select,
selectCallBack,
...other
} = props;
const { classes, cx } = useStyles({}); const { classes, cx } = useStyles({});
const [anchorEl, setAnchorEl] = React.useState(null); const [anchorEl, setAnchorEl] = React.useState(null);
......
...@@ -34,9 +34,13 @@ const MyInput = (props: MyInputProps) => { ...@@ -34,9 +34,13 @@ const MyInput = (props: MyInputProps) => {
styleOverrides: { styleOverrides: {
root: { root: {
height: "36px", height: "36px",
// width: "40px", fontSize: "14px",
// boxSizing: "border-box", "&.MuiInputBase-sizeSmall": {
// padding: "0", height: "32px",
"& .MuiOutlinedInput-notchedOutline": {
height: "34px",
},
},
}, },
}, },
}, },
...@@ -53,6 +57,7 @@ const MyInput = (props: MyInputProps) => { ...@@ -53,6 +57,7 @@ const MyInput = (props: MyInputProps) => {
root: { root: {
height: "36px", height: "36px",
lineHeight: "36px", lineHeight: "36px",
paddingRight: "12px",
":hover": { ":hover": {
"& .MuiOutlinedInput-notchedOutline": error "& .MuiOutlinedInput-notchedOutline": error
? {} ? {}
...@@ -62,7 +67,7 @@ const MyInput = (props: MyInputProps) => { ...@@ -62,7 +67,7 @@ const MyInput = (props: MyInputProps) => {
}, },
}, },
input: { input: {
padding: "6.5px 14px", padding: "6.5px 12px",
verticalAlign: "middle", verticalAlign: "middle",
}, },
notchedOutline: { notchedOutline: {
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment