diff --git a/package.json b/package.json index fded66f..42c8c01 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ant-design-pro", - "version": "4.5.50", + "version": "4.5.51", "private": true, "description": "An out-of-box UI solution for enterprise applications", "scripts": { diff --git a/src/layouts/SecurityLayout.tsx b/src/layouts/SecurityLayout.tsx index 807de54..e208fb0 100644 --- a/src/layouts/SecurityLayout.tsx +++ b/src/layouts/SecurityLayout.tsx @@ -28,28 +28,31 @@ class SecurityLayout extends React.Component{ + dispatch({ + type: 'user/fetch', callback: (user) => { - if(user.code && location.pathname !== '/user/login') { - history.push('/user/login'); - return - } - console.log('secur') - dispatch({ type: 'global/getMenuData', payload: user.ID, callback:(menu)=>{ - if(menu){ - - this.setState({ - isReady: true, - }); + if (user.code && location.pathname !== '/user/login') { + history.push('/user/login'); + return } + console.log('secur') + dispatch({ + type: 'global/getMenuData', payload: user.ID, callback: (menu) => { + if (menu) { + + this.setState({ + isReady: true, + }); + } + } + }) + } - }) + }) - } }) - - } else { + } else { this.setState({ isReady: true, }); diff --git a/src/pages/busniess/ShopExpenseFince/index.tsx b/src/pages/busniess/ShopExpenseFince/index.tsx index 52f1100..025b88c 100644 --- a/src/pages/busniess/ShopExpenseFince/index.tsx +++ b/src/pages/busniess/ShopExpenseFince/index.tsx @@ -1524,18 +1524,11 @@ const SHOPEXPENSETablePage: React.FC<{ // ]} fieldProps={{ beforeUpload: (file, files) => { - console.log('file', file); - - console.log('filesbeforeUpload', files); - setFileList([...fileList, ...files]) return false }, onPreview: handlePreview, onChange: async (info: any) => { - console.log('info', info); - console.log('fileList', fileList); - if (info.file.status === 'removed') { // 如果在待上传列表中找到,则说明当前图片没有上传服务器,可直接删除 diff --git a/src/versionEnv.ts b/src/versionEnv.ts index b2e2610..44e0854 100644 --- a/src/versionEnv.ts +++ b/src/versionEnv.ts @@ -1,4 +1,4 @@ // 由 scripts/writeVersion.js 自动生成 -export const VERSION = "4.5.50"; -export const GIT_HASH = "169c5fa"; -export const BUILD_TIME = "2025-09-05T11:01:12.391Z"; +export const VERSION = "4.5.51"; +export const GIT_HASH = "a4729f7"; +export const BUILD_TIME = "2025-09-08T03:14:16.308Z";