From 4719b4a88be4f6d5afd768efc72997b1722fbf67 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 11 四月 2025 17:11:26 +0800
Subject: [PATCH] 组件中英文穿插问题修复
---
rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx | 12 +++++-------
rsf-admin/src/App.jsx | 20 +++++++++++++++++---
2 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/rsf-admin/src/App.jsx b/rsf-admin/src/App.jsx
index f3fbe6b..7ede214 100644
--- a/rsf-admin/src/App.jsx
+++ b/rsf-admin/src/App.jsx
@@ -30,6 +30,8 @@
import ResourceContent from "./page/ResourceContent";
import { getSystemInfo, getSystemDicts, tenants } from "@/api/auth";
import chineseMessages from 'ra-language-chinese';
+import { createTheme, ThemeProvider } from '@mui/material/styles';
+import { zhCN } from '@mui/material/locale';
const i18nProvider = polyglotI18nProvider(
(locale) => {
@@ -48,6 +50,15 @@
allowMissing: true,
},
);
+
+
+const theme = createTheme(
+ {
+ palette: { main: '#1976d2' },
+ },
+ zhCN
+)
+
const store = localStorageStore(SPA_VERSION, SPA_NAME);
@@ -101,9 +112,12 @@
};
const AppWrapper = () => (
- <StoreContextProvider value={store}>
- <App />
- </StoreContextProvider>
+ <ThemeProvider theme={theme}>
+ <StoreContextProvider value={store}>
+ <App />
+ </StoreContextProvider>
+ </ThemeProvider>
+
);
export default AppWrapper;
\ No newline at end of file
diff --git a/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx b/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
index 5d6655a..9f5bad2 100644
--- a/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
+++ b/rsf-admin/src/page/system/dicts/dictType/DictDataList.jsx
@@ -145,13 +145,11 @@
</WrapperField>
</StyledDatagrid>
</List>
- if (!select == null) {
- <DictDataEdit
- open={editDialog}
- record={select}
- setOpen={setEditDialog}
- />
- }
+ <DictDataEdit
+ open={editDialog}
+ record={select}
+ setOpen={setEditDialog}
+ />
<DictDataCreate
open={createDialog}
record={dicts}
--
Gitblit v1.9.1