From 0410fea3a1952b34dca4303ce411240c3b6c21ed Mon Sep 17 00:00:00 2001
From: ylj20011123 <YLJ>
Date: Thu, 18 Sep 2025 15:01:52 +0800
Subject: [PATCH] update

---
 package.json                                 |  4 ++--
 src/components/PageLoading/index.tsx         | 13 +++++++++++--
 src/layouts/BasicLayout.tsx                  | 11 +++++++++--
 src/layouts/UserLayout.tsx                   |  6 +++---
 src/pages/ahjgPage/shopProcurement/index.tsx |  2 +-
 src/versionEnv.ts                            |  6 +++---
 6 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 47bc806..df7570f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ant-design-pro",
-  "version": "4.5.54",
+  "version": "4.5.57",
   "private": true,
   "description": "An out-of-box UI solution for enterprise applications",
   "scripts": {
@@ -142,4 +142,4 @@
     "config/**/*.js*",
     "scripts/**/*.js"
   ]
-}
+}
\ No newline at end of file
diff --git a/src/components/PageLoading/index.tsx b/src/components/PageLoading/index.tsx
index dbd4884..74f4aad 100644
--- a/src/components/PageLoading/index.tsx
+++ b/src/components/PageLoading/index.tsx
@@ -5,9 +5,18 @@
 // export default PageLoading;
 import React from 'react';
 import SkeletonLoading from '../SkeletonLoading';
+import { SimplePageTransition } from '../PageTransition';
 
-const PageLoading: React.FC = () => {
-    return <SkeletonLoading type="page" />;
+interface PageLoadingProps {
+    enableAnimation?: boolean;
+}
+
+const PageLoading: React.FC<PageLoadingProps> = ({ enableAnimation = false }) => {
+    return (
+        <SimplePageTransition enableAnimation={enableAnimation}>
+            <SkeletonLoading type="page" />
+        </SimplePageTransition>
+    );
 };
 
 export default PageLoading;
\ No newline at end of file
diff --git a/src/layouts/BasicLayout.tsx b/src/layouts/BasicLayout.tsx
index 3489719..2dcedf3 100644
--- a/src/layouts/BasicLayout.tsx
+++ b/src/layouts/BasicLayout.tsx
@@ -23,6 +23,8 @@ import type { ConnectState } from '@/models/connect';
 import { getMatchMenu } from '@umijs/route-utils';
 import logo from '../assets/logo.png';
 import './BasicLayout.less'
+import PageLoading from '@/components/PageLoading';
+import { SimplePageTransition } from '@/components/PageTransition';
 import { DoubleRightOutlined } from '@ant-design/icons';
 import * as Icon from '@ant-design/icons'
 import IconFont from '@/components/IconFont';
@@ -92,6 +94,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
 
 
 	const [activeKey, setActiveKey] = useState<string>(location?.pathname || '/')
+	const [isFromMenu, setIsFromMenu] = useState<boolean>(true) // 默认为true，首次加载显示动画
 	const menuDataRef = useRef<MenuDataItem[]>([]);
 	const { formatMessage } = useIntl();
 
@@ -915,6 +918,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
 					return defaultDom;
 				}
 				return <Link to={menuItemProps.path || '/'} onClick={() => {
+					setIsFromMenu(true) // 左侧菜单点击，启用动画
 				}}>
 					{defaultDom}
 					{/* {menuItemProps.name} */}
@@ -980,6 +984,7 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
 				hideAdd
 				type="editable-card"
 				onChange={(value) => {
+					setIsFromMenu(false) // tab切换，禁用动画
 					history.push(value)
 					setActiveKey(value)
 				}}
@@ -1039,9 +1044,11 @@ const BasicLayout: React.FC<BasicLayoutProps> = (props) => {
 					<TabPane
 						tab={item.title} key={item?.path}
 						style={{ padding: 24, paddingTop: 0 }}>
-						<Suspense fallback={<div>Loading...</div>}>
+						<Suspense fallback={<PageLoading enableAnimation={isFromMenu} />}>
 							<Authorized authority={authorized!.authority} noMatch={noMatch}>
-								{item.children}
+								<SimplePageTransition enableAnimation={isFromMenu}>
+									{item.children}
+								</SimplePageTransition>
 							</Authorized>
 						</Suspense>
 					</TabPane>)
diff --git a/src/layouts/UserLayout.tsx b/src/layouts/UserLayout.tsx
index 4aa5975..0c0b323 100644
--- a/src/layouts/UserLayout.tsx
+++ b/src/layouts/UserLayout.tsx
@@ -56,18 +56,18 @@ const UserLayout: React.FC<UserLayoutProps> = (props) => {
         <div className={styles.lang}>
           <Link to="/">
             <img alt="logo" className={styles.logo} src={logo} />
-            <span className={styles.headtitle}>云南交投</span>
+            <span className={styles.headtitle}>驿商云</span>
           </Link>
         </div>
         <div className={styles.content}>
 
           {children}
         </div>
-        {/* <DefaultFooter
+        <DefaultFooter
           copyright={`Copyright © 2013-${new Date().getFullYear()} Eshang Cloud. All Rights Reserved. 驿商云 版权所有  V${VERSION || ''}`}
           // copyright={`Copyright © 2013-${new Date().getFullYear()} Eshang Cloud. All Rights Reserved. 驿商云 版权所有  V6.6.6`}
           links={[]}
-        /> */}
+        />
       </div>
     </HelmetProvider>
   );
diff --git a/src/pages/ahjgPage/shopProcurement/index.tsx b/src/pages/ahjgPage/shopProcurement/index.tsx
index ab8eb2e..1a2a59a 100644
--- a/src/pages/ahjgPage/shopProcurement/index.tsx
+++ b/src/pages/ahjgPage/shopProcurement/index.tsx
@@ -233,7 +233,7 @@ const shopProcurement: React.FC<{ currentUser: CurrentUser }> = (props) => {
             hideInSearch: true,
         },
         {
-            title: <div style={{ textAlign: 'center' }}>入库金额</div>,
+            title: <div style={{ textAlign: 'center' }}>入库金额</div>, 
             dataIndex: "RECEIVE_TOTALPRICE",
             align: 'right',
             valueType: 'digit',
diff --git a/src/versionEnv.ts b/src/versionEnv.ts
index 4054db1..6f349a1 100644
--- a/src/versionEnv.ts
+++ b/src/versionEnv.ts
@@ -1,4 +1,4 @@
 // 由 scripts/writeVersion.js 自动生成
-export const VERSION = "4.5.54";
-export const GIT_HASH = "26ef480";
-export const BUILD_TIME = "2025-09-10T08:05:17.397Z";
+export const VERSION = "4.5.57";
+export const GIT_HASH = "8f8b347";
+export const BUILD_TIME = "2025-09-18T01:29:44.333Z";