From 03faa035cda5bdc060095b9a2a2b9e8fae5aed09 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 09 四月 2025 15:34:46 +0800
Subject: [PATCH] fix:收货单增加字段

---
 rsf-admin/src/App.jsx |   73 +++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/rsf-admin/src/App.jsx b/rsf-admin/src/App.jsx
index f5034a8..f3fbe6b 100644
--- a/rsf-admin/src/App.jsx
+++ b/rsf-admin/src/App.jsx
@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect, useMemo } from "react";
-import { Route } from 'react-router-dom'
+import { Route } from "react-router-dom";
 import {
   Admin,
   Resource,
@@ -9,50 +9,55 @@
   StoreContextProvider,
   resolveBrowserLocale,
 } from "react-admin";
-import polyglotI18nProvider from 'ra-i18n-polyglot';
-import englishMessages from './i18n/en';
+import polyglotI18nProvider from "ra-i18n-polyglot";
+import englishMessages from "./i18n/en";
+import zhMessages from "./i18n/zh";
 import { Layout } from "./layout";
 import AuthProvider from "./config/authProvider";
 import DataProvider from "./config/dataProvider";
 import Dashboard from "./page/dashboard";
 import Settings from "./page/settings";
 import Login from "./page/login";
-import * as Common from './utils/common'
-import { themes } from './themes/themes';
-import { SPA_NAME, SPA_VERSION, DEFAULT_THEME_NAME, DEFAULT_THEME_MODE, DATA_PROVIDER_SPRING } from "./config/setting";
+import * as Common from "./utils/common";
+import { themes } from "./themes/themes";
+import {
+  SPA_NAME,
+  SPA_VERSION,
+  DEFAULT_THEME_NAME,
+  DEFAULT_THEME_MODE,
+  DATA_PROVIDER_SPRING,
+} from "./config/setting";
 import ResourceContent from "./page/ResourceContent";
-import { getSystemInfo } from '@/api/auth';
+import { getSystemInfo, getSystemDicts, tenants } from "@/api/auth";
+import chineseMessages from 'ra-language-chinese';
 
 const i18nProvider = polyglotI18nProvider(
-  locale => {
-    if (locale === 'zh') {
-      return import('./i18n/zh').then(messages => messages.default);
+  (locale) => {
+    if (locale === "en") {
+      return import("./i18n/en").then((messages) => messages.default);
     }
-    // fallback
-    return englishMessages;
+    return { ...chineseMessages, ...zhMessages };
   },
-  // default
-  // 'en',
-  resolveBrowserLocale('en', { fullLocale: true }),
+  "zh",
   [
-    { locale: 'en', name: 'English' },
-    { locale: 'zh', name: '绠�浣撲腑鏂�' },
+    { locale: "en", name: "English" },
+    { locale: "zh", name: "绠�浣撲腑鏂�" },
   ],
   {
     // msg in console
     allowMissing: true,
-  }
+  },
 );
 
 const store = localStorageStore(SPA_VERSION, SPA_NAME);
 
 const App = () => {
-  const [themeName] = useStore('themeName', DEFAULT_THEME_NAME);
-  const lightTheme = themes.find(theme => theme.name === themeName)?.light;
-  const darkTheme = themes.find(theme => theme.name === themeName)?.dark;
+  const [themeName] = useStore("themeName", DEFAULT_THEME_NAME);
+  const lightTheme = themes.find((theme) => theme.name === themeName)?.light;
+  const darkTheme = themes.find((theme) => theme.name === themeName)?.dark;
 
   useEffect(() => {
-    getSystemInfo().then(data => {
+    getSystemInfo().then((data) => {
       localStorage.setItem("system", JSON.stringify(data));
     })
   }, []);
@@ -72,19 +77,17 @@
         loginPage={Login}
         dashboard={Dashboard}
       >
-        {permissions => (
+        {(permissions) => (
           <>
-            {
-              Common.extractNavMenus(permissions)?.map(node => {
-                return (
-                  <Resource
-                    key={node.id}
-                    name={node.component}
-                    {...ResourceContent(node)}
-                  />
-                )
-              })
-            }
+            {Common.extractNavMenus(permissions)?.map((node) => {
+              return (
+                <Resource
+                  key={node.id}
+                  name={node.component}
+                  {...ResourceContent(node)}
+                />
+              );
+            })}
           </>
         )}
         {/* CustomRoutes don't trigger checkAuth */}
@@ -94,7 +97,7 @@
         </CustomRoutes>
       </Admin>
     </>
-  )
+  );
 };
 
 const AppWrapper = () => (

--
Gitblit v1.9.1