diff --git a/CHANGELOG.zh_CN.md b/CHANGELOG.zh_CN.md
index 6f255b6b33201334ffcb0b18335d54801fcccb19..996a4701be4cf84e4889d23982f4a8bd1c72c879 100644
--- a/CHANGELOG.zh_CN.md
+++ b/CHANGELOG.zh_CN.md
@@ -10,6 +10,7 @@
- 删除菜单背景图
- 更新`ant-design-vue`版本为`beta13`
- 更新`vite`版本为`rc.9`
+- 异常页调整
### 🐛 Bug Fixes
diff --git a/build/config/lessModifyVars.ts b/build/config/lessModifyVars.ts
index 69b04d2269caaeb322725309192207897eea7712..83cf851479d78189010f116a113eacfd79cc8dbb 100644
--- a/build/config/lessModifyVars.ts
+++ b/build/config/lessModifyVars.ts
@@ -17,8 +17,8 @@ const modifyVars = {
'background-color-base': '#F0F2F5', // background color
'font-size-base': '14px', // Main font size
'box-shadow-base': '0 2px 8px rgba(0, 0, 0, 0.15)', // Floating shadow
- 'border-color-base': '#cececd', // Border color,
- 'border-color-split': '#cececd', // Border color,
+ 'border-color-base': '#F0F0F0', // Border color,
+ 'border-color-split': '#F0F0F0', // Border color,
'border-radius-base': '2px', // Component/float fillet
};
//}
diff --git a/src/assets/images/exception/404.png b/src/assets/images/exception/404.png
deleted file mode 100644
index 8d8b4c3d1e7df9bc03d2ab9b5ad44526baa3999a..0000000000000000000000000000000000000000
Binary files a/src/assets/images/exception/404.png and /dev/null differ
diff --git a/src/assets/images/exception/500.png b/src/assets/images/exception/500.png
deleted file mode 100644
index c62ad978000cd47c2b0dc6e1c93e6b015477b9db..0000000000000000000000000000000000000000
Binary files a/src/assets/images/exception/500.png and /dev/null differ
diff --git a/src/components/Form/src/FormItem.tsx b/src/components/Form/src/FormItem.tsx
index 0a5bc77ce9d3104c0309ba120fb5c3c21768ebf8..b2dc5c8d5e6b631fe539aac0514901bdf1459a46 100644
--- a/src/components/Form/src/FormItem.tsx
+++ b/src/components/Form/src/FormItem.tsx
@@ -193,18 +193,6 @@ export default defineComponent({
const bindValue = {
[isCheck ? 'checked' : 'value']: (props.formModel as any)[field],
};
- // TODO先兼容antd的警告，后面官方修复后删除
- if (component === 'Select') {
- if (Reflect.has(propsData, 'options')) {
- propsData.options = propsData.options.map((item: any) => {
- return {
- key: item.value,
- ...item,
- };
- });
- }
- }
-
if (!renderComponentContent) {
return ;
}
diff --git a/src/enums/exceptionEnum.ts b/src/enums/exceptionEnum.ts
index c7f579bc4c29c65db60f41b37ba65c52493177e9..d28f4d0e35edc540849e480b113ac5a5b8d55839 100644
--- a/src/enums/exceptionEnum.ts
+++ b/src/enums/exceptionEnum.ts
@@ -2,6 +2,9 @@
* @description: Exception related enumeration
*/
export enum ExceptionEnum {
+ // page not access
+ PAGE_NOT_ACCESS = 403,
+
// page not found
PAGE_NOT_FOUND = 404,
@@ -11,17 +14,8 @@ export enum ExceptionEnum {
// net work error
NET_WORK_ERROR = 10000,
- // net work timeout
- NET_WORK_TIMEOUT = 10100,
-
- // not data
- NOT_DATA = 10200,
-
- // The page loads too long and timeout
- PAGE_TIMEOUT = 10300,
-
// No data on the page. In fact, it is not an exception page
- PAGE_NOT_DATA = 10400,
+ PAGE_NOT_DATA = 10100,
}
export enum ErrorTypeEnum {
diff --git a/src/layouts/Logo.vue b/src/layouts/Logo.vue
index 7c4b8709c9b286679d017e630ad5dd6aaeb112c5..a3f71e41d9d02df7fce016d73874709d3a984966 100644
--- a/src/layouts/Logo.vue
+++ b/src/layouts/Logo.vue
@@ -83,7 +83,7 @@
.logo-title {
font-size: 18px;
- font-weight: 400;
+ font-weight: 700;
opacity: 0;
transition: all 0.5s;
.respond-to(medium,{
diff --git a/src/router/menus/modules/demo/exception.ts b/src/router/menus/modules/demo/exception.ts
index 29a7be2a02135caf61bd792912416621ea810f33..9344ba1fd6962fccee673ee799ef0bd1a38d8510 100644
--- a/src/router/menus/modules/demo/exception.ts
+++ b/src/router/menus/modules/demo/exception.ts
@@ -5,6 +5,10 @@ const menu: MenuModule = {
name: '异常页',
path: '/exception',
children: [
+ {
+ path: '403',
+ name: '403',
+ },
{
path: '404',
name: '404',
diff --git a/src/router/routes/modules/demo/exception.ts b/src/router/routes/modules/demo/exception.ts
index e95f2cdfea43f17becec7b697cc840844b507743..0f33b6cc5fab465b649426a66d14732e30b64929 100644
--- a/src/router/routes/modules/demo/exception.ts
+++ b/src/router/routes/modules/demo/exception.ts
@@ -18,6 +18,18 @@ export default {
},
routes: [
+ {
+ path: '/403',
+ name: 'PageNotAccess',
+ component: ExceptionPage,
+ props: {
+ status: ExceptionEnum.PAGE_NOT_ACCESS,
+ },
+ meta: {
+ title: '403',
+ afterCloseLoading: true,
+ },
+ },
{
path: '/404',
name: 'PageNotFound',
@@ -54,18 +66,6 @@ export default {
afterCloseLoading: true,
},
},
- {
- path: '/page-time-out',
- name: 'PageTimeOut',
- component: ExceptionPage,
- props: {
- status: ExceptionEnum.PAGE_TIMEOUT,
- },
- meta: {
- title: '页面超时',
- afterCloseLoading: true,
- },
- },
{
path: '/not-data',
name: 'NotData',
diff --git a/src/settings/projectSetting.ts b/src/settings/projectSetting.ts
index e05c7b5c20523171338b9af735f2997b1117d186..c7ac82579983d43b1f34e55515bae5b79bed7f5a 100644
--- a/src/settings/projectSetting.ts
+++ b/src/settings/projectSetting.ts
@@ -4,7 +4,7 @@ import { MenuTypeEnum, MenuThemeEnum, MenuModeEnum } from '/@/enums/menuEnum';
import { ContentEnum, PermissionModeEnum, RouterTransitionEnum } from '/@/enums/appEnum';
import { primaryColor } from '../../build/config/lessModifyVars';
import { isProdMode } from '/@/utils/env';
-// ! 改动后需要清空浏览器缓存
+// ! You need to clear the browser cache after the change
const setting: ProjectConfig = {
// Whether to show the configuration button
showSettingButton: true,
diff --git a/src/views/sys/exception/Exception.tsx b/src/views/sys/exception/Exception.tsx
index dec709dda8e9c6ea7bfaec4febfa5f90cad2cc26..683b7341c23a133c84fa4c5904b565578b0f4bb6 100644
--- a/src/views/sys/exception/Exception.tsx
+++ b/src/views/sys/exception/Exception.tsx
@@ -6,8 +6,6 @@ import { defineComponent, ref, computed, unref } from 'vue';
import { ExceptionEnum } from '/@/enums/exceptionEnum';
import netWorkImg from '/@/assets/images/exception/net-work.png';
-import error404 from '/@/assets/images/exception/404.png';
-import error500 from '/@/assets/images/exception/500.png';
import notDataImg from '/@/assets/images/no-data.png';
import { useRoute } from 'vue-router';
@@ -22,6 +20,7 @@ interface MapValue {
btnText?: string;
icon?: string;
handler?: Fn;
+ status?: string;
}
export default defineComponent({
@@ -63,50 +62,52 @@ export default defineComponent({
}
);
+ unref(statusMapRef).set(ExceptionEnum.PAGE_NOT_ACCESS, {
+ title: '403',
+ status: `${ExceptionEnum.PAGE_NOT_ACCESS}`,
+ subTitle: `Sorry, you don't have access to this page.!`,
+ btnText: props.full ? 'Back Login' : 'Back Home',
+ handler: () => (props.full ? go(PageEnum.BASE_LOGIN) : go()),
+ });
+
unref(statusMapRef).set(ExceptionEnum.PAGE_NOT_FOUND, {
title: '404',
- subTitle: '抱歉，您访问的页面不存在!',
- btnText: props.full ? '返回登录' : '返回首页',
+ status: `${ExceptionEnum.PAGE_NOT_FOUND}`,
+ subTitle: `Sorry, the page you visited does not exist.`,
+ btnText: props.full ? 'Back Login' : 'Back Home',
handler: () => (props.full ? go(PageEnum.BASE_LOGIN) : go()),
- icon: error404,
});
unref(statusMapRef).set(ExceptionEnum.ERROR, {
title: '500',
- subTitle: '抱歉，服务器出现异常!',
- btnText: '返回首页',
+ status: `${ExceptionEnum.ERROR}`,
+ subTitle: `Sorry, the server is reporting an error.`,
+ btnText: 'Back Home',
handler: () => go(),
- icon: error500,
});
unref(statusMapRef).set(ExceptionEnum.PAGE_NOT_DATA, {
- title: '当前页面无数据',
+ title: 'No data on the current page',
subTitle: '',
- btnText: '刷新',
+ btnText: 'Refresh',
handler: () => redo(),
icon: notDataImg,
});
unref(statusMapRef).set(ExceptionEnum.NET_WORK_ERROR, {
- title: '网络错误',
- subTitle: '抱歉，您的网络连接已断开,请检查您的网络!',
- btnText: '刷新',
+ title: 'Network Error',
+ subTitle: 'Sorry，Your network connection has been disconnected, please check your network!',
+ btnText: 'Refresh',
handler: () => redo(),
icon: netWorkImg,
});
- unref(statusMapRef).set(ExceptionEnum.PAGE_TIMEOUT, {
- title: '页面加载失败',
- subTitle: '抱歉，您的页面加载出错或者过久未响应,请检查您的网络!',
- btnText: '刷新',
- handler: () => redo(),
- icon: netWorkImg,
- });
return () => {
- const { title, subTitle, btnText, icon, handler } = unref(getMapValue) || {};
+ const { title, subTitle, btnText, icon, handler, status } = unref(getMapValue) || {};
return (
@@ -117,7 +118,7 @@ export default defineComponent({
{() => btnText}
),
- icon: () => icon && 
,
+ icon: () => (icon ? : null),
}}
);
diff --git a/src/views/sys/exception/LoadTimeOut.vue b/src/views/sys/exception/LoadTimeOut.vue
deleted file mode 100644
index 6c932471971946bd76c64dbf219bf99a9c487ea1..0000000000000000000000000000000000000000
--- a/src/views/sys/exception/LoadTimeOut.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
diff --git a/src/views/sys/exception/index.ts b/src/views/sys/exception/index.ts
index 81e7fcb8e6e298cd5619587c89c9201f368bb8a0..f1bb9948fc13b82c0e730b07230d68607ac0067c 100644
--- a/src/views/sys/exception/index.ts
+++ b/src/views/sys/exception/index.ts
@@ -1,2 +1 @@
export { default as Exception } from './Exception';
-export { default as LoadTimeOut } from './LoadTimeOut.vue';