diff --git a/backend/dvadmin/utils/exception.py b/backend/dvadmin/utils/exception.py index 122e156..b9d2d51 100644 --- a/backend/dvadmin/utils/exception.py +++ b/backend/dvadmin/utils/exception.py @@ -10,7 +10,6 @@ import logging import traceback from django.db.models import ProtectedError -from rest_framework import exceptions from rest_framework.exceptions import APIException as DRFAPIException, AuthenticationFailed from rest_framework.views import set_rollback @@ -37,9 +36,6 @@ def CustomExceptionHandler(ex, context): elif isinstance(ex, DRFAPIException): set_rollback() msg = ex.detail - elif isinstance(ex, exceptions.APIException): - set_rollback() - msg = ex.detail elif isinstance(ex, ProtectedError): set_rollback() msg = "删除失败:该条数据与其他数据有相关绑定" diff --git a/web/src/layout/header-aside/layout.vue b/web/src/layout/header-aside/layout.vue index 42a6e96..601d890 100644 --- a/web/src/layout/header-aside/layout.vue +++ b/web/src/layout/header-aside/layout.vue @@ -160,8 +160,8 @@ export default { routerViewKey () { // 默认情况下 key 类似 __transition-n-/foo // 这里的字符串操作是为了最终 key 的格式和原来相同 类似 __transition-n-__stamp-time-/foo - const stamp = this.$route.meta[`__stamp-${this.$route.fullpath}`] || '' - return `${stamp ? `__stamp-${stamp}-` : ''}${this.$route.fullpath}` + const stamp = this.$route.meta[`__stamp-${this.$route.fullPath}`] || '' + return `${stamp ? `__stamp-${stamp}-` : ''}${this.$route.fullPath}` }, /** * @description 最外层容器的背景图片样式