From 05a5ac117a0376d265564e590c5d117b5af6f812 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 09 九月 2024 14:05:59 +0800
Subject: [PATCH] #
---
zy-acs-flow/package.json | 1 +
zy-acs-flow/package-lock.json | 1 +
zy-acs-flow/src/page/user/UserListAside.jsx | 24 +++++++++++++++++-------
zy-acs-flow/src/page/user/UserList.jsx | 2 +-
zy-acs-flow/src/layout/Logo.jsx | 13 ++++++-------
zy-acs-flow/src/themes/rcsTheme.js | 9 ++++++++-
6 files changed, 34 insertions(+), 16 deletions(-)
diff --git a/zy-acs-flow/package-lock.json b/zy-acs-flow/package-lock.json
index 8fb36f4..1b7cb5d 100644
--- a/zy-acs-flow/package-lock.json
+++ b/zy-acs-flow/package-lock.json
@@ -11,6 +11,7 @@
"@mui/material": "^5.16.7",
"@mui/x-tree-view": "^7.16.0",
"axios": "^1.7.4",
+ "date-fns": "^3.6.0",
"pixi.js": "^7.4.0",
"react": "^18.3.0",
"react-admin": "^5.1.0",
diff --git a/zy-acs-flow/package.json b/zy-acs-flow/package.json
index c209903..67a49cf 100644
--- a/zy-acs-flow/package.json
+++ b/zy-acs-flow/package.json
@@ -15,6 +15,7 @@
"@mui/material": "^5.16.7",
"@mui/x-tree-view": "^7.16.0",
"axios": "^1.7.4",
+ "date-fns": "^3.6.0",
"pixi.js": "^7.4.0",
"react": "^18.3.0",
"react-admin": "^5.1.0",
diff --git a/zy-acs-flow/src/layout/Logo.jsx b/zy-acs-flow/src/layout/Logo.jsx
index ac8a41f..f3efa10 100644
--- a/zy-acs-flow/src/layout/Logo.jsx
+++ b/zy-acs-flow/src/layout/Logo.jsx
@@ -48,17 +48,17 @@
case DEFAULT_THEME_NAME:
return darkLogo();
case 'soft':
- return theme.palette.mode === 'dark' ? darkLogo() : lightLogo({ opacity: .7 });
+ return mode === 'dark' ? darkLogo() : lightLogo({ opacity: .7 });
case 'default':
- return theme.palette.mode === 'dark' ? darkLogo() : darkLogo();
+ return mode === 'dark' ? darkLogo() : darkLogo();
case 'nano':
- return theme.palette.mode === 'dark' ? darkLogo() : lightLogo();
+ return mode === 'dark' ? darkLogo() : lightLogo();
case 'radiant':
- return theme.palette.mode === 'dark' ? darkLogo() : lightLogo();
+ return mode === 'dark' ? darkLogo() : lightLogo();
case 'house':
- return theme.palette.mode === 'dark' ? lightLogo() : darkLogo();
+ return mode === 'dark' ? lightLogo() : darkLogo();
case 'chiptune':
- return theme.palette.mode === 'dark' ? darkLogo() : lightLogo();
+ return mode === 'dark' ? darkLogo() : lightLogo();
default:
return lightLogo();
}
@@ -66,7 +66,6 @@
return (
<div style={{
- // backgroundColor: 'red',
display: 'flex',
justifyContent: 'center',
alignItems: 'center',
diff --git a/zy-acs-flow/src/page/user/UserList.jsx b/zy-acs-flow/src/page/user/UserList.jsx
index 6536a15..90a92d3 100644
--- a/zy-acs-flow/src/page/user/UserList.jsx
+++ b/zy-acs-flow/src/page/user/UserList.jsx
@@ -121,7 +121,7 @@
}}
title={"menu.user"}
empty={<EmptyData onClick={() => { setCreateDialog(true) }} />}
- filters={filters}
+ filters={[]}
sort={{ field: "create_time", order: "desc" }}
actions={(
<TopToolbar>
diff --git a/zy-acs-flow/src/page/user/UserListAside.jsx b/zy-acs-flow/src/page/user/UserListAside.jsx
index a4e369a..1f6dd0c 100644
--- a/zy-acs-flow/src/page/user/UserListAside.jsx
+++ b/zy-acs-flow/src/page/user/UserListAside.jsx
@@ -4,16 +4,28 @@
FilterLiveSearch,
FilterList,
FilterListItem,
+ useTheme,
+ useStore,
} from 'react-admin';
import { Box, Typography, Card, CardContent } from '@mui/material';
import { styled } from '@mui/material/styles';
-import { PAGE_DRAWER_WIDTH, OPERATE_MODE } from '@/config/setting';
+import { DEFAULT_THEME_NAME } from '@/config/setting';
import * as Common from '@/utils/common';
import MailIcon from '@mui/icons-material/MailOutline'
import BookmarkIcon from '@mui/icons-material/BookmarkBorder';
import CategoryIcon from '@mui/icons-material/LocalOffer';
+import {
+ endOfYesterday,
+ startOfWeek,
+ subWeeks,
+ startOfMonth,
+ subMonths,
+} from 'date-fns';
const UserListAside = (props) => {
+ const theme = useTheme();
+ const [themeName] = useStore('themeName', DEFAULT_THEME_NAME);
+ console.log()
const isSelected = (value, filters) => {
const categories = filters.categories || [];
@@ -37,15 +49,13 @@
<>
<Card
sx={{
- display: {
- xs: 'none',
- md: 'block',
- },
+ display: { xs: 'none', md: 'block', },
order: -1,
- // flex: '0 0 15em',
mr: 2,
- mt: 6,
+ mt: 8,
alignSelf: 'flex-start',
+ border: theme[0] === 'light' && '1px solid #e0e0e3',
+ // borderRadius: 0,
// width: 200
}}
>
diff --git a/zy-acs-flow/src/themes/rcsTheme.js b/zy-acs-flow/src/themes/rcsTheme.js
index b5cbb9c..ab78f84 100644
--- a/zy-acs-flow/src/themes/rcsTheme.js
+++ b/zy-acs-flow/src/themes/rcsTheme.js
@@ -41,6 +41,13 @@
elevation: 1,
},
},
+ MuiTable: {
+ styleOverrides: {
+ root: {
+ border: '1px solid #333',
+ },
+ },
+ },
},
}
@@ -61,7 +68,7 @@
mode: 'light',
},
shape: {
- borderRadius: 10,
+ // borderRadius: 10,
},
sidebar: {
width: 200,
--
Gitblit v1.9.1