【功能优化】全局：接入 V2 版本操作日志

src/api/system/operatelog/index.ts

@@ -1,41 +1,37 @@
-import { defHttp } from '@/utils/http/axios'
+import { defHttp } from "@/utils/http/axios";
 
 export interface OperateLogVO {
-  id: number
+  id: number;
-  userNickname: string
+  traceId: string;
-  traceId: string
+  userType: number;
-  userId: number
+  userId: number;
-  module: string
+  userName: string;
-  name: string
+  type: string;
-  type: number
+  subType: string;
-  content: string
+  bizId: number;
-  exts: Map<string, object>
+  action: string;
-  defHttpMethod: string
+  extra: string;
-  defHttpUrl: string
+  requestMethod: string;
-  userIp: string
+  requestUrl: string;
-  userAgent: string
+  userIp: string;
-  javaMethod: string
+  creator: string;
-  javaMethodArgs: string
+  creatorName: string;
-  startTime: Date
+  createTime: Date;
-  duration: number
-  resultCode: number
-  resultMsg: string
-  resultData: string
 }
 
 export interface OperateLogPageReqVO extends PageParam {
-  module?: string
+  module?: string;
-  userNickname?: string
+  userNickname?: string;
-  type?: number
+  type?: number;
-  success?: boolean
+  success?: boolean;
-  startTime?: Date[]
+  startTime?: Date[];
 }
 
 // 查询操作日志列表
 export function getOperateLogPage(params: OperateLogPageReqVO) {
-  return defHttp.get({ url: '/system/operate-log/page', params })
+  return defHttp.get({ url: "/system/operate-log/page", params });
 }
 // 导出操作日志
 export function exportOperateLog(params: OperateLogPageReqVO) {
-  return defHttp.download({ url: '/system/operate-log/export', params }, '操作日志.xls')
+  return defHttp.download({ url: "/system/operate-log/export", params }, "操作日志.xls");
 }

src/views/system/operatelog/operateLog.data.ts

@@ -1,202 +1,151 @@
-import { h } from 'vue'
+import type { BasicColumn, FormSchema } from "@/components/Table";
-import type { BasicColumn, FormSchema } from '@/components/Table'
+import { useRender } from "@/components/Table";
-import { useRender } from '@/components/Table'
+import type { DescItem } from "@/components/Description";
-import { DICT_TYPE, getDictOptions } from '@/utils/dict'
+import { getListSimpleUsers } from "@/api/system/user";
-import type { DescItem } from '@/components/Description/index'
 
 export const columns: BasicColumn[] = [
   {
-    title: '日志编号',
+    title: "日志编号",
-    dataIndex: 'id',
+    dataIndex: "id",
     width: 100,
   },
   {
-    title: '操作模块',
+    title: "操作人",
-    dataIndex: 'module',
+    dataIndex: "userName",
+    width: 120,
+  },
+  {
+    title: "操作模块",
+    dataIndex: "type",
     width: 200,
   },
   {
-    title: '操作名',
+    title: "操作名",
-    dataIndex: 'name',
+    dataIndex: "subType",
     width: 180,
   },
   {
-    title: '操作类型',
+    title: "操作内容",
-    dataIndex: 'type',
+    dataIndex: "action",
-    width: 120,
     customRender: ({ text }) => {
-      return useRender.renderDict(text, DICT_TYPE.SYSTEM_OPERATE_TYPE)
+      // 和 action 关键字冲突，所以通过 customRender 解决
+      return text;
     },
   },
   {
-    title: '操作人',
+    title: "操作时间",
-    dataIndex: 'userNickname',
+    dataIndex: "createTime",
+    width: 180,
+    customRender: ({ text }) => {
+      return useRender.renderDate(text);
+    },
+  },
+  {
+    title: "业务编号",
+    dataIndex: "bizId",
     width: 120,
   },
-  // {
-  //   title: 'userAgent',
-  //   dataIndex: 'userAgent',
-  //   width: 400
-  // },
   {
-    title: '请求路径',
+    title: "操作 IP",
-    dataIndex: 'requestUrl',
+    dataIndex: "userIp",
+    width: 120,
   },
-  {
+];
-    title: '操作结果',
-    dataIndex: 'resultCode',
-    width: 180,
-    customRender: ({ text }) => {
-      return useRender.renderTag(text === 0 ? '成功' : '失败', text === 0 ? '#87d068' : '#f50')
-    },
-  },
-  {
-    title: '执行时长',
-    dataIndex: 'duration',
-    width: 180,
-    customRender: ({ text }) => {
-      return useRender.renderText(text, 'ms')
-    },
-  },
-  {
-    title: '操作日期',
-    dataIndex: 'startTime',
-    width: 180,
-    customRender: ({ text }) => {
-      return useRender.renderDate(text)
-    },
-  },
-]
 
 export const searchFormSchema: FormSchema[] = [
   {
-    label: '系统模块',
+    label: "操作人",
-    field: 'title',
+    field: "userId",
-    component: 'Input',
+    component: "ApiSelect",
-    colProps: { span: 8 },
-  },
-  {
-    label: '操作人员',
-    field: 'operName',
-    component: 'Input',
-    colProps: { span: 8 },
-  },
-  {
-    label: '类型',
-    field: 'type',
-    component: 'Select',
     componentProps: {
-      options: getDictOptions(DICT_TYPE.SYSTEM_OPERATE_TYPE),
+      api: () => getListSimpleUsers(),
+      labelField: "nickname",
+      valueField: "id",
     },
     colProps: { span: 8 },
   },
   {
-    label: '状态',
+    label: "操作模块",
-    field: 'success',
+    field: "type",
-    component: 'Select',
+    component: "Input",
-    componentProps: {
-      options: [
-        { value: true, key: true, label: '成功' },
-        { value: false, key: false, label: '失败' },
-      ],
-    },
     colProps: { span: 8 },
   },
   {
-    label: '操作时间',
+    label: "操作名",
-    field: 'startTime',
+    field: "subType",
-    component: 'RangePicker',
+    component: "Input",
     colProps: { span: 8 },
   },
-]
+  {
-
+    label: "操作内容",
-const httpMethods = [
+    field: "action",
-  { value: 'GET', color: '#108ee9' },
+    component: "Input",
-  { value: 'POST', color: '#2db7f5' },
+    colProps: { span: 8 },
-  { value: 'PUT', color: 'warning' },
+  },
-  { value: 'DELETE', color: '#f50' },
+  {
-]
+    label: "操作时间",
+    field: "createTime",
+    component: "RangePicker",
+    colProps: { span: 8 },
+  },
+  {
+    label: "业务编号",
+    field: "bizId",
+    component: "Input",
+    colProps: { span: 8 },
+  },
+];
 
 export const infoSchema: DescItem[] = [
   {
-    field: 'module',
+    field: "id",
-    label: '操作模块',
+    label: "日志编号",
   },
   {
-    field: 'name',
+    field: "userName",
-    label: '操作名',
+    label: "操作人",
   },
   {
-    field: 'userNickname',
+    field: "type",
-    label: '操作人',
+    label: "操作模块",
-    render(_, data) {
-      const { userNickname, userId } = data
-      // return useRender.renderText(userNickname, 'uid: ' + userId)
-      return useRender.renderTags([userNickname, `uid: ${userId}`])
-    },
   },
   {
-    field: 'resultCode',
+    field: "subType",
-    label: '请求结果',
+    label: "操作名",
+  },
+  {
+    field: "action",
+    label: "操作内容",
+  },
+  {
+    field: "createTime",
+    label: "操作时间",
     render(value) {
-      return useRender.renderTag(value === 0 ? '成功' : '失败', value === 0 ? '#87d068' : '#f50')
+      return useRender.renderDate(value);
     },
   },
   {
-    field: 'resultMsg',
+    field: "bizId",
-    label: '响应信息',
+    label: "业务编号",
-    show(data) {
-      return data && data.resultMsg && data.resultMsg !== ''
-    },
-    render(value) {
-      return h('span', { style: { color: 'red', fontWeight: 'bold' } }, value)
-    },
   },
   {
-    field: 'userIp',
+    field: "userIp",
-    label: '请求ip',
+    label: "操作 IP",
   },
   {
-    field: 'startTime',
+    field: "extra",
-    label: '请求时间',
+    label: "拓展字段",
-    render(value) {
-      return useRender.renderDate(value)
-    },
   },
   {
-    field: 'requestUrl',
+    field: "requestMethod",
-    label: '请求路径',
+    label: "请求方法名",
-    render(_, data) {
-      if (!data)
-        return ''
-
-      const { requestMethod, requestUrl } = data
-      const current = httpMethods.find(item => item.value === requestMethod.toUpperCase())
-      const methodTag = current ? useRender.renderTag(requestMethod, current.color) : requestMethod
-      return h('span', {}, [methodTag, requestUrl])
-    },
   },
   {
-    field: 'javaMethod',
+    field: "requestUrl",
-    label: '操作方法',
+    label: "请求 URL",
-    labelMinWidth: 80,
   },
   {
-    field: 'javaMethodArgs',
+    field: "userAgent",
-    label: '请求参数',
+    label: "浏览器 UA",
-    render(value) {
-      return useRender.renderJsonPreview(value)
-    },
   },
-  {
+];
-    field: 'userAgent',
-    label: 'userAgent',
-  },
-  {
-    field: 'duration',
-    label: '请求耗时',
-    render(value) {
-      return useRender.renderText(value, 'ms')
-    },
-  },
-]