From 6d47871f02ced626dfe607d56194bb2eb295dc32 Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 6 Sep 2025 19:55:38 +0800
Subject: [PATCH] =?UTF-8?q?reactor=EF=BC=9A=E3=80=90system=20=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E3=80=91operate=20=E8=BF=9B?=
 =?UTF-8?q?=E4=B8=80=E6=AD=A5=E7=BB=9F=E4=B8=80=E4=BB=A3=E7=A0=81=E9=A3=8E?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/system/operatelog/data.ts       | 16 +++--
 .../src/views/system/operatelog/index.vue     |  5 +-
 .../src/views/system/operatelog/data.ts       | 33 ++-------
 .../src/views/system/operatelog/index.vue     | 68 +++++++++----------
 .../system/operatelog/modules/detail.vue      |  6 +-
 5 files changed, 56 insertions(+), 72 deletions(-)

diff --git a/apps/web-antd/src/views/system/operatelog/data.ts b/apps/web-antd/src/views/system/operatelog/data.ts
index 14cb8a7d7..0584c33e0 100644
--- a/apps/web-antd/src/views/system/operatelog/data.ts
+++ b/apps/web-antd/src/views/system/operatelog/data.ts
@@ -78,35 +78,43 @@ export function useGridColumns(): VxeTableGridOptions['columns'] {
     {
       field: 'id',
       title: '日志编号',
+      minWidth: 100,
     },
     {
       field: 'userName',
       title: '操作人',
+      minWidth: 120,
     },
     {
       field: 'type',
       title: '操作模块',
+      minWidth: 120,
     },
     {
       field: 'subType',
       title: '操作名',
+      minWidth: 160,
     },
     {
       field: 'action',
       title: '操作内容',
+      minWidth: 200,
     },
     {
       field: 'createTime',
       title: '操作时间',
+      minWidth: 180,
       formatter: 'formatDateTime',
     },
     {
       field: 'bizId',
       title: '业务编号',
+      minWidth: 120,
     },
     {
       field: 'userIp',
-      title: '操作IP',
+      title: '操作 IP',
+      minWidth: 120,
     },
     {
       title: '操作',
@@ -139,11 +147,11 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     },
     {
       field: 'userIp',
-      label: '操作人IP',
+      label: '操作人 IP',
     },
     {
       field: 'userAgent',
-      label: '操作人UA',
+      label: '操作人 UA',
     },
     {
       field: 'type',
@@ -163,7 +171,7 @@ export function useDetailSchema(): DescriptionItemSchema[] {
     },
     {
       field: 'requestUrl',
-      label: '请求URL',
+      label: '请求 URL',
       content: (data) => {
         const method = data?.requestMethod || '';
         const url = data?.requestUrl || '';
diff --git a/apps/web-antd/src/views/system/operatelog/index.vue b/apps/web-antd/src/views/system/operatelog/index.vue
index b40c149c5..fe5dcc220 100644
--- a/apps/web-antd/src/views/system/operatelog/index.vue
+++ b/apps/web-antd/src/views/system/operatelog/index.vue
@@ -18,7 +18,7 @@ const [DetailModal, detailModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
@@ -54,6 +54,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -69,7 +70,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="系统日志" url="https://doc.iocoder.cn/system-log/" />
     </template>
 
-    <DetailModal @success="onRefresh" />
+    <DetailModal @success="handleRefresh" />
     <Grid table-title="操作日志列表">
       <template #toolbar-tools>
         <TableAction
diff --git a/apps/web-ele/src/views/system/operatelog/data.ts b/apps/web-ele/src/views/system/operatelog/data.ts
index 0085280f5..e4a5bc5be 100644
--- a/apps/web-ele/src/views/system/operatelog/data.ts
+++ b/apps/web-ele/src/views/system/operatelog/data.ts
@@ -1,14 +1,9 @@
 import type { VbenFormSchema } from '#/adapter/form';
-import type { OnActionClickFn, VxeTableGridOptions } from '#/adapter/vxe-table';
-import type { SystemOperateLogApi } from '#/api/system/operate-log';
-
-import { useAccess } from '@vben/access';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 
 import { getSimpleUserList } from '#/api/system/user';
 import { getRangePickerDefaultProps } from '#/utils';
 
-const { hasAccessByCodes } = useAccess();
-
 /** 列表的搜索表单 */
 export function useGridFormSchema(): VbenFormSchema[] {
   return [
@@ -75,9 +70,7 @@ export function useGridFormSchema(): VbenFormSchema[] {
 }
 
 /** 列表的字段 */
-export function useGridColumns<T = SystemOperateLogApi.OperateLog>(
-  onActionClick: OnActionClickFn<T>,
-): VxeTableGridOptions['columns'] {
+export function useGridColumns(): VxeTableGridOptions['columns'] {
   return [
     {
       field: 'id',
@@ -117,30 +110,14 @@ export function useGridColumns<T = SystemOperateLogApi.OperateLog>(
     },
     {
       field: 'userIp',
-      title: '操作IP',
+      title: '操作 IP',
       minWidth: 120,
     },
     {
-      field: 'operation',
       title: '操作',
-      minWidth: 120,
-      align: 'center',
+      width: 80,
       fixed: 'right',
-      cellRender: {
-        attrs: {
-          nameField: 'action',
-          nameTitle: '操作日志',
-          onClick: onActionClick,
-        },
-        name: 'CellOperation',
-        options: [
-          {
-            code: 'detail',
-            text: '详情',
-            show: hasAccessByCodes(['system:operate-log:query']),
-          },
-        ],
-      },
+      slots: { default: 'actions' },
     },
   ];
 }
diff --git a/apps/web-ele/src/views/system/operatelog/index.vue b/apps/web-ele/src/views/system/operatelog/index.vue
index bced20cc4..a67735d32 100644
--- a/apps/web-ele/src/views/system/operatelog/index.vue
+++ b/apps/web-ele/src/views/system/operatelog/index.vue
@@ -1,17 +1,11 @@
 <script lang="ts" setup>
-import type {
-  OnActionClickParams,
-  VxeTableGridOptions,
-} from '#/adapter/vxe-table';
+import type { VxeTableGridOptions } from '#/adapter/vxe-table';
 import type { SystemOperateLogApi } from '#/api/system/operate-log';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
-import { Download } from '@vben/icons';
 import { downloadFileFromBlobPart } from '@vben/utils';
 
-import { ElButton } from 'element-plus';
-
-import { useVbenVxeGrid } from '#/adapter/vxe-table';
+import { ACTION_ICON, TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { exportOperateLog, getOperateLogPage } from '#/api/system/operate-log';
 import { $t } from '#/locales';
 
@@ -24,40 +18,27 @@ const [DetailModal, detailModalApi] = useVbenModal({
 });
 
 /** 刷新表格 */
-function onRefresh() {
+function handleRefresh() {
   gridApi.query();
 }
 
 /** 导出表格 */
-async function onExport() {
+async function handleExport() {
   const data = await exportOperateLog(await gridApi.formApi.getValues());
   downloadFileFromBlobPart({ fileName: '操作日志.xls', source: data });
 }
 
 /** 查看操作日志详情 */
-function onDetail(row: SystemOperateLogApi.OperateLog) {
+function handleDetail(row: SystemOperateLogApi.OperateLog) {
   detailModalApi.setData(row).open();
 }
 
-/** 表格操作按钮的回调函数 */
-function onActionClick({
-  code,
-  row,
-}: OnActionClickParams<SystemOperateLogApi.OperateLog>) {
-  switch (code) {
-    case 'detail': {
-      onDetail(row);
-      break;
-    }
-  }
-}
-
 const [Grid, gridApi] = useVbenVxeGrid({
   formOptions: {
     schema: useGridFormSchema(),
   },
   gridOptions: {
-    columns: useGridColumns(onActionClick),
+    columns: useGridColumns(),
     height: 'auto',
     keepSource: true,
     proxyConfig: {
@@ -73,6 +54,7 @@ const [Grid, gridApi] = useVbenVxeGrid({
     },
     rowConfig: {
       keyField: 'id',
+      isHover: true,
     },
     toolbarConfig: {
       refresh: true,
@@ -88,18 +70,34 @@ const [Grid, gridApi] = useVbenVxeGrid({
       <DocAlert title="系统日志" url="https://doc.iocoder.cn/system-log/" />
     </template>
 
-    <DetailModal @success="onRefresh" />
+    <DetailModal @success="handleRefresh" />
     <Grid table-title="操作日志列表">
       <template #toolbar-tools>
-        <ElButton
-          type="primary"
-          class="ml-2"
-          @click="onExport"
-          v-access:code="['system:operate-log:export']"
-        >
-          <Download class="mr-2 size-5" />
-          {{ $t('ui.actionTitle.export') }}
-        </ElButton>
+        <TableAction
+          :actions="[
+            {
+              label: $t('ui.actionTitle.export'),
+              type: 'primary',
+              icon: ACTION_ICON.DOWNLOAD,
+              auth: ['system:operate-log:export'],
+              onClick: handleExport,
+            },
+          ]"
+        />
+      </template>
+      <template #actions="{ row }">
+        <TableAction
+          :actions="[
+            {
+              label: $t('common.detail'),
+              type: 'primary',
+              link: true,
+              icon: ACTION_ICON.VIEW,
+              auth: ['system:operate-log:query'],
+              onClick: handleDetail.bind(null, row),
+            },
+          ]"
+        />
       </template>
     </Grid>
   </Page>
diff --git a/apps/web-ele/src/views/system/operatelog/modules/detail.vue b/apps/web-ele/src/views/system/operatelog/modules/detail.vue
index 389def3b6..0df6a4ae7 100644
--- a/apps/web-ele/src/views/system/operatelog/modules/detail.vue
+++ b/apps/web-ele/src/views/system/operatelog/modules/detail.vue
@@ -57,10 +57,10 @@ const [Modal, modalApi] = useVbenModal({
       <ElDescriptionsItem label="操作人名字">
         {{ formData?.userName }}
       </ElDescriptionsItem>
-      <ElDescriptionsItem label="操作人IP">
+      <ElDescriptionsItem label="操作人 IP">
         {{ formData?.userIp }}
       </ElDescriptionsItem>
-      <ElDescriptionsItem label="操作人UA">
+      <ElDescriptionsItem label="操作人 UA">
         {{ formData?.userAgent }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="操作模块">
@@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
       <ElDescriptionsItem v-if="formData?.extra" label="操作拓展参数">
         {{ formData?.extra }}
       </ElDescriptionsItem>
-      <ElDescriptionsItem label="请求URL">
+      <ElDescriptionsItem label="请求 URL">
         {{ formData?.requestMethod }} {{ formData?.requestUrl }}
       </ElDescriptionsItem>
       <ElDescriptionsItem label="操作时间">