Merge remote-tracking branch 'origin/v2.x' into v2.x

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 = "删除失败:该条数据与其他数据有相关绑定"

web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "django-vue-admin",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "scripts": {
     "serve": "vue-cli-service serve --open",
     "start": "npm run serve",

web/src/api/service.js

@@ -224,7 +224,7 @@ export const downloadFile = function ({ url, params, method, filename }) {
     responseType: 'blob'
     // headers: {Accept: 'application/vnd.openxmlformats-officedocument'}
   }).then(res => {
-    const fileName = window.decodeURI(filename + '.xls' || res.headers['content-disposition'].split('=')[1]) ||  '文件导出.xls'
+    const fileName = window.decodeURI(filename + '.xls' || res.headers['content-disposition'].split('=')[1]) || '文件导出.xls'
     if (res) {
       const blob = new Blob([res.data], { type: 'charset=utf-8' })
       const elink = document.createElement('a')

web/src/api/websocket.js

@@ -56,13 +56,7 @@ function closeWebsocket () {
   // close()
   this.socket.close()
 }
-function close () {
+
-  // this.socket.close() // 关闭 websocket
-  // this.socket.onclose = function (e) {
-  //   console.log(e)// 监听关闭事件
-  //   console.log('关闭')
-  // }
-}
 function webSocketSend (message) {
   this.socket.send(JSON.stringify(message))
 }

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}`] || ''
+      const stamp = this.$route.meta[`__stamp-${this.$route.fullPath}`] || ''
-      return `${stamp ? `__stamp-${stamp}-` : ''}${this.$route.fullpath}`
+      return `${stamp ? `__stamp-${stamp}-` : ''}${this.$route.fullPath}`
     },
     /**
      * @description 最外层容器的背景图片样式

web/src/views/system/user/crud.js

@@ -1,9 +1,8 @@
 import { request } from '@/api/service'
-import { urlPrefix as deptPrefix } from '../dept/api'
 import util from '@/libs/util'
 
 export const crudOptions = (vm) => {
-  util.filterParams(vm, ['dept_name', 'role_info{name}','dept_name_all'])
+  util.filterParams(vm, ['dept_name', 'role_info{name}', 'dept_name_all'])
   return {
     pageOptions: {
       compact: true