From 67001cbd71a2f6cde26937a73db5af34db442a64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 09 九月 2024 11:40:52 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/config/setting.js | 2 +-
zy-acs-flow/src/themes/ThemeSwapper.jsx | 3 ++-
zy-acs-flow/src/layout/Logo.jsx | 11 +++++------
zy-acs-flow/src/themes/themes.jsx | 3 ++-
zy-acs-flow/src/themes/rcsTheme.js | 32 ++++++++++++++++++++------------
5 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/zy-acs-flow/src/config/setting.js b/zy-acs-flow/src/config/setting.js
index bc607f7..9dcf6c0 100644
--- a/zy-acs-flow/src/config/setting.js
+++ b/zy-acs-flow/src/config/setting.js
@@ -13,7 +13,7 @@
export const SPA_VERSION = '1';
-export const DEFAULT_THEME_NAME = 'soft';
+export const DEFAULT_THEME_NAME = 'rcs';
export const DEFAULT_THEME_MODE = 'light';
diff --git a/zy-acs-flow/src/layout/Logo.jsx b/zy-acs-flow/src/layout/Logo.jsx
index a7940df..ac8a41f 100644
--- a/zy-acs-flow/src/layout/Logo.jsx
+++ b/zy-acs-flow/src/layout/Logo.jsx
@@ -1,10 +1,11 @@
import * as React from 'react';
import { useStore } from 'react-admin'
import { useTheme } from '@mui/material/styles';
+import { DEFAULT_THEME_NAME } from '@/config/setting';
const Logo = (props) => {
const theme = useTheme();
- const [themeName] = useStore('themeName', 'soft');
+ const [themeName] = useStore('themeName', DEFAULT_THEME_NAME);
const lightLogo = (param) => {
return (
@@ -43,13 +44,11 @@
}
const getLogo = (themeName, mode) => {
- console.log(mode);
-
switch (themeName) {
- case 'rcs':
- return mode === 'dark' ? darkLogo() : darkLogo({opacity: 1});
+ case DEFAULT_THEME_NAME:
+ return darkLogo();
case 'soft':
- return theme.palette.mode === 'dark' ? darkLogo() : lightLogo({opacity: .7});
+ return theme.palette.mode === 'dark' ? darkLogo() : lightLogo({ opacity: .7 });
case 'default':
return theme.palette.mode === 'dark' ? darkLogo() : darkLogo();
case 'nano':
diff --git a/zy-acs-flow/src/themes/ThemeSwapper.jsx b/zy-acs-flow/src/themes/ThemeSwapper.jsx
index 22c0ea2..c726222 100644
--- a/zy-acs-flow/src/themes/ThemeSwapper.jsx
+++ b/zy-acs-flow/src/themes/ThemeSwapper.jsx
@@ -2,6 +2,7 @@
import { useStore, useTranslate, ToggleThemeButton } from 'react-admin';
import { IconButton, Menu, MenuItem, Tooltip } from '@mui/material';
import ColorLensIcon from '@mui/icons-material/ColorLens';
+import { DEFAULT_THEME_NAME } from '@/config/setting';
import { themes } from './themes';
@@ -15,7 +16,7 @@
setAnchorEl(null);
};
- const [themeName, setThemeName] = useStore('themeName', 'soft');
+ const [themeName, setThemeName] = useStore('themeName', DEFAULT_THEME_NAME);
const handleChange = (_, index) => {
const newTheme = themes[index];
setThemeName(newTheme.name);
diff --git a/zy-acs-flow/src/themes/rcsTheme.js b/zy-acs-flow/src/themes/rcsTheme.js
index 8498661..106dba0 100644
--- a/zy-acs-flow/src/themes/rcsTheme.js
+++ b/zy-acs-flow/src/themes/rcsTheme.js
@@ -1,18 +1,20 @@
import { defaultTheme } from 'react-admin';
+const MAIN_COLOR = 'rgb(47, 104, 172)';
+
export const rcsLightTheme = {
palette: {
primary: {
- main: 'rgb(47, 104, 172)',
+ main: '#2F68AC',
},
- secondary: {
- light: '#5f5fc4',
- main: 'rgb(47, 104, 172)',
- dark: '#001064',
- contrastText: '#fff',
- },
+ // secondary: {
+ // light: '#5f5fc4',
+ // main: '#283593',
+ // dark: '#001064',
+ // contrastText: '#fff',
+ // },
background: {
- default: '#fcfcfe',
+ default: '#fafafb',
},
mode: 'light',
},
@@ -29,7 +31,7 @@
root: {
borderLeft: '3px solid #fff',
'&.RaMenuItemLink-active': {
- borderLeft: '3px solid #4f3cc9',
+ borderLeft: `3px solid ${MAIN_COLOR}`,
},
},
},
@@ -40,7 +42,6 @@
boxShadow: 'none',
},
root: {
- border: '1px solid #e0e0e3',
backgroundClip: 'padding-box',
},
},
@@ -48,8 +49,8 @@
MuiAppBar: {
styleOverrides: {
colorSecondary: {
- color: 'rgb(255, 255, 255)',
- backgroundColor: 'rgb(47, 104, 172)',
+ color: '#ffffff',
+ backgroundColor: `${MAIN_COLOR}`,
},
},
defaultProps: {
@@ -66,6 +67,13 @@
},
},
},
+ MuiTable: {
+ styleOverrides: {
+ root: {
+ border: '1px solid #e0e0e3',
+ },
+ },
+ },
MuiTableRow: {
styleOverrides: {
root: {
diff --git a/zy-acs-flow/src/themes/themes.jsx b/zy-acs-flow/src/themes/themes.jsx
index a084a0d..b4542a9 100644
--- a/zy-acs-flow/src/themes/themes.jsx
+++ b/zy-acs-flow/src/themes/themes.jsx
@@ -8,10 +8,11 @@
houseDarkTheme,
houseLightTheme,
} from 'react-admin';
+import { DEFAULT_THEME_NAME } from '@/config/setting';
import { softDarkTheme, softLightTheme } from './softTheme';
import { chiptuneTheme } from './chiptuneTheme';
-import { rcsDarkTheme, rcsLightTheme } from './rcsTheme';
+import { rcsLightTheme } from './rcsTheme';
export const themes = [
{ name: 'rcs', light: rcsLightTheme },
--
Gitblit v1.9.1