fix: 1. 全局axios添加formData文件上传的检测,删除Content-Type让axios自动检测。
2. 完善入口模块管理的接口的对接。 3. 完善角色权限管理的接口对接和测试。 4. 完善主页的入口模块的图标的显示和图片的显示。
This commit is contained in:
@@ -10,6 +10,7 @@ interface ButtonProps {
|
||||
size?: ButtonSize;
|
||||
to?: string;
|
||||
icon?: string;
|
||||
loading?: boolean;
|
||||
disabled?: boolean;
|
||||
className?: string;
|
||||
onClick?: (e: React.MouseEvent<HTMLButtonElement>) => void;
|
||||
@@ -21,6 +22,7 @@ export function Button({
|
||||
size = 'medium',
|
||||
to,
|
||||
icon,
|
||||
loading = false,
|
||||
disabled = false,
|
||||
className = '',
|
||||
onClick,
|
||||
@@ -44,31 +46,34 @@ export function Button({
|
||||
baseClasses,
|
||||
typeClasses[type],
|
||||
sizeClasses[size],
|
||||
disabled ? 'opacity-50 cursor-not-allowed' : '',
|
||||
(disabled || loading) ? 'opacity-50 cursor-not-allowed' : '',
|
||||
className
|
||||
].filter(Boolean).join(' ');
|
||||
|
||||
|
||||
// 显示的图标:loading 时显示加载图标,否则显示传入的图标
|
||||
const displayIcon = loading ? 'ri-loader-4-line animate-spin' : icon;
|
||||
|
||||
if (to) {
|
||||
return (
|
||||
<Link
|
||||
to={to}
|
||||
<Link
|
||||
to={to}
|
||||
className={classes}
|
||||
{...(rest as any)}
|
||||
>
|
||||
{icon && <i className={`${icon} mr-1.5`}></i>}
|
||||
{displayIcon && <i className={`${displayIcon} mr-1.5`}></i>}
|
||||
{children}
|
||||
</Link>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
return (
|
||||
<button
|
||||
className={classes}
|
||||
disabled={disabled}
|
||||
disabled={disabled || loading}
|
||||
onClick={onClick}
|
||||
{...rest}
|
||||
>
|
||||
{icon && <i className={`${icon} mr-1.5`}></i>}
|
||||
{displayIcon && <i className={`${displayIcon} mr-1.5`}></i>}
|
||||
{children}
|
||||
</button>
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user