gitee
/
django-vue-admin
mirror of https://gitee.com/liqianglog/django-vue-admin
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pre Merge pull request !77 from dvadmin/main

pull/77/MERGE
dvadmin 2022-11-03 16:14:11 +00:00 committed by Gitee
parent 359d0575bc 6e8f64bea6
commit 26d70aea93
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/dvadmin/utils/exception.py
View File

@ -10,7 +10,6 @@ import logging
import traceback import traceback
from django.db.models import ProtectedError from django.db.models import ProtectedError
from rest_framework import exceptions
from rest_framework.exceptions import APIException as DRFAPIException, AuthenticationFailed from rest_framework.exceptions import APIException as DRFAPIException, AuthenticationFailed
from rest_framework.views import set_rollback from rest_framework.views import set_rollback
@ -37,9 +36,6 @@ def CustomExceptionHandler(ex, context):
elif isinstance(ex, DRFAPIException): elif isinstance(ex, DRFAPIException):
set_rollback() set_rollback()
msg = ex.detail msg = ex.detail
elif isinstance(ex, exceptions.APIException):
set_rollback()
msg = ex.detail
elif isinstance(ex, ProtectedError): elif isinstance(ex, ProtectedError):
set_rollback() set_rollback()
msg = "删除失败:该条数据与其他数据有相关绑定" msg = "删除失败:该条数据与其他数据有相关绑定"

4
web/src/layout/header-aside/layout.vue
View File

@ -160,8 +160,8 @@ export default {
routerViewKey () { routerViewKey () {
// 默认情况下 key 类似 __transition-n-/foo // 默认情况下 key 类似 __transition-n-/foo
// 这里的字符串操作是为了最终 key 的格式和原来相同 类似 __transition-n-__stamp-time-/foo // 这里的字符串操作是为了最终 key 的格式和原来相同 类似 __transition-n-__stamp-time-/foo
const stamp = this.$route.meta[`__stamp-${this.$route.fullpath}`] || '' const stamp = this.$route.meta[`__stamp-${this.$route.fullPath}`] || ''
return `${stamp ? `__stamp-${stamp}-` : ''}${this.$route.fullpath}` return `${stamp ? `__stamp-${stamp}-` : ''}${this.$route.fullPath}`
}, },
/** /**
* @description 最外层容器的背景图片样式 * @description 最外层容器的背景图片样式