Merge remote-tracking branch 'origin/master'

src/fvcomponents/fvTableColumn/index.vue

@@ -49,7 +49,7 @@ import { isVNode } from 'vue'
     if(column && column?.formatter) {
       return column.formatter(row, column, value, $index) || '--'
     }
-    return value ? value.toString() : '--'
+    return value !== null && value !== undefined ? value.toString() : '--'
   }
 </script>
 

src/utils/request.js

@@ -1,6 +1,6 @@
 import axios from "axios";
 import { AxiosCanceler } from "./axiosCanceler";
-import { ElMessage, ElMessageBox } from "element-plus";
+import { ElMessageBox, ElNotification } from "element-plus";
 import { getToken, removeToken } from "./auth";
 
 axios.defaults.headers['Content-Type']='application/json'
@@ -49,16 +49,32 @@ serveice.interceptors.response.use(response=>{
       break;
     case 403:
       console.log(response)
-      ElMessage.warning(response.data.msg)
+      ElNotification({
+        title: '系统提示',
+        message: response.data.msg,
+        type: 'warning'
+      })
       break;
     case 404:
-      ElMessage.warning('不存在的地址')
+      ElNotification({
+        title: '系统提示',
+        message: '不存在的地址',
+        type: 'error'
+      })
       break;
     case 405:
-      ElMessage.warning('传输格式错误,请检查')
+      ElNotification({
+        title: '系统提示',
+        message: '传输格式错误,请检查',
+        type: 'error'
+      })
       break;
     case 511:
-      ElMessage.warning('禁止访问')
+      ElNotification({
+        title: '系统提示',
+        message: '禁止访问',
+        type: 'error'
+      })
       removeToken()
       window.location = '/forbidden'
       break;
@@ -66,7 +82,11 @@ serveice.interceptors.response.use(response=>{
       if (response.data){
         return response.data
       }else {
-        ElMessage.error('系统未知错误')
+        ElNotification({
+          title: '系统提示',
+          message: '系统未知错误',
+          type: 'error'
+        })
         break;
       }
   }

src/views/system/user/index.vue

@@ -120,7 +120,12 @@ const tableConfig = reactive({
         return (
           <div>
             <el-button type="primary" link onClick={()=>handleEdit(row)}>编辑</el-button>
-            <el-button type="danger" link onClick={()=>handleDel(row)}>删除</el-button>
+            {
+              row.userType != 0 ?
+              <el-button type="danger" link onClick={()=>handleDel(row)}>删除</el-button> :
+              null
+            }
+            
           </div>
         )
       }

vite.config.js

@@ -59,7 +59,7 @@ export default defineConfig({
     terserOptions: {
       compress: {
         drop_console: false, // 生产环境移除log
-        drop_debugger: false // 生产环境禁用debugger
+        drop_debugger: true // 生产环境禁用debugger
       }
     }
   },