From ab2a3895315b7d078c8303a15b1343bdb839c6cc Mon Sep 17 00:00:00 2001
From: Dragon <canyanol@qq.com>
Date: Sat, 3 Sep 2022 17:01:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=97=A5=E5=BF=97=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=96=B0=E5=A2=9E=E6=98=AF=E5=90=A6=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=EF=BC=8C=E5=BC=82=E5=B8=B8=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=88=97=E5=9B=BA=E5=AE=9A=E5=AE=BD=E5=BA=A6=EF=BC=8C=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8=E4=BF=A1=E6=81=AF=E5=A4=9A=E7=9A=84=E6=97=B6=E5=80=99?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vben28/src/locales/lang/zh-CN/routes/admin.ts |  5 ++++
 vben28/src/views/admin/auditLog/AuditLog.ts   | 27 ++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/vben28/src/locales/lang/zh-CN/routes/admin.ts b/vben28/src/locales/lang/zh-CN/routes/admin.ts
index 291cc7c6..1577abca 100644
--- a/vben28/src/locales/lang/zh-CN/routes/admin.ts
+++ b/vben28/src/locales/lang/zh-CN/routes/admin.ts
@@ -33,6 +33,10 @@ export default {
   audit_entityInfo: '实体信息',
   audit_message: '报文',
   audit_applicationName: '应用名称',
+  audit_hasException: '是否异常',
+  audit_hasException_all: '全部',
+  audit_hasException_yes: '是',
+  audit_hasException_no: '否',
   grantedMessage: '授权成功，请重新登录.',
   close: '关闭',
 
@@ -67,6 +71,7 @@ export default {
   editPasswordMessage: '输入的2次密码不一致',
   executionTime: '执行时间',
   executionDuration: '响应时间(毫秒)',
+  executionMessage: '异常内容',
   organizationUnitName: '名称',
   parentOrganizationUnitName: '上级组织机构',
   organizationUnitManagement: '组织机构管理',
diff --git a/vben28/src/views/admin/auditLog/AuditLog.ts b/vben28/src/views/admin/auditLog/AuditLog.ts
index 56f9f315..721a9bc9 100644
--- a/vben28/src/views/admin/auditLog/AuditLog.ts
+++ b/vben28/src/views/admin/auditLog/AuditLog.ts
@@ -20,7 +20,22 @@ export const searchFormSchema: FormSchema[] = [
     colProps: {
       span: 6
     }
-  }
+  },
+  {
+    field: "hasException",
+    label: t("routes.admin.audit_hasException"),
+    component: "Select",
+    colProps: { span: 4 },
+    componentProps: ()=>{
+      return {
+        options: [
+          { label: t("routes.admin.audit_hasException_all"), value: null },
+          { label: t("routes.admin.audit_hasException_yes"), value: true },
+          { label: t("routes.admin.audit_hasException_no"), value: false },
+        ]
+      }
+    }
+  },
 ];
 
 export const tableColumns: BasicColumn[] = [
@@ -54,9 +69,15 @@ export const tableColumns: BasicColumn[] = [
     width: 150
   },
   {
-    title: "Exceptions",
+    title: t("routes.admin.executionMessage"),
     dataIndex: "exceptions",
-    
+    resizable:false,
+    width: 350,
+    customRender: ({ text }) => {
+      if (text) {
+        return text.toString();
+      }
+    }
   }
 ];