feat: 登录日志

apps/web-antd/src/api/monitor/logininfo/index.ts

@@ -37,7 +37,7 @@ export function loginInfoExport(data: any) {
  * @returns void
  */
 export function loginInfoRemove(infoIds: IDS) {
-  return requestClient.deleteWithMsg<void>(`${Api.root}/${infoIds.join(',')}`);
+  return requestClient.deleteWithMsg<void>(`${Api.root}/${infoIds}`);
 }
 
 /**

apps/web-antd/src/views/monitor/logininfor/data.tsx

@@ -1,11 +1,9 @@
-import type { ColumnsType } from 'ant-design-vue/es/table';
+import type { FormSchemaGetter, VxeGridProps } from '#/adapter';
-
-import type { FormSchemaGetter } from '#/adapter';
 import type { DescItem } from '#/components/description';
 
-import { DictEnum } from '@vben/constants';
+import type { VNode } from 'vue';
 
-import { Tooltip } from 'ant-design-vue';
+import { DictEnum } from '@vben/constants';
 
 import { getDictOptions } from '#/utils/dict';
 import { renderBrowserIcon, renderDict, renderOsIcon } from '#/utils/render';
@@ -36,82 +34,74 @@ export const querySchema: FormSchemaGetter = () => [
   },
 ];
 
-export const columns: ColumnsType = [
+export const columns: VxeGridProps['columns'] = [
+  { type: 'checkbox', width: 60 },
   {
-    align: 'center',
-    dataIndex: 'userName',
     title: '用户账号',
+    field: 'userName',
   },
   {
-    align: 'center',
-    dataIndex: 'clientKey',
     title: '登录平台',
+    field: 'clientKey',
   },
   {
-    align: 'center',
-    dataIndex: 'ipaddr',
     title: 'IP地址',
+    field: 'ipaddr',
   },
   {
-    align: 'center',
-    dataIndex: 'loginLocation',
     title: 'IP地点',
+    field: 'loginLocation',
     width: 200,
   },
   {
-    align: 'center',
-    customRender({ value }) {
-      return renderBrowserIcon(value, true);
-    },
-    dataIndex: 'browser',
     title: '浏览器',
+    field: 'browser',
+    slots: {
+      default: ({ row }) => {
+        return renderBrowserIcon(row.browser, true) as VNode;
+      },
+    },
   },
   {
-    align: 'center',
+    title: '系统',
-    customRender({ value }) {
+    field: 'os',
+    slots: {
+      default: ({ row }) => {
         // Windows 10 or Windows Server 2016 太长了 分割一下 详情依旧能看到详细的
-      // 为什么不直接保存userAgent让前端解析 很奇怪
+        let value = row.os;
         if (value) {
           const split = value.split(' or ');
           if (split.length === 2) {
             value = split[0];
           }
         }
-      return renderOsIcon(value, true);
+        return renderOsIcon(value, true) as VNode;
+      },
     },
-    dataIndex: 'os',
-    title: '系统',
   },
   {
-    align: 'center',
-    customRender({ value }) {
-      return renderDict(value, DictEnum.SYS_COMMON_STATUS);
-    },
-    dataIndex: 'status',
     title: '登录结果',
+    field: 'status',
+    slots: {
+      default: ({ row }) => {
+        return renderDict(row.status, DictEnum.SYS_COMMON_STATUS);
+      },
+    },
   },
   {
-    align: 'center',
-    customRender({ value }) {
-      return (
-        <Tooltip placement={'top'} title={value}>
-          {value}
-        </Tooltip>
-      );
-    },
-    dataIndex: 'msg',
-    ellipsis: true,
     title: '信息',
+    field: 'msg',
   },
   {
-    align: 'center',
-    dataIndex: 'loginTime',
     title: '日期',
+    field: 'loginTime',
   },
   {
-    align: 'center',
+    field: 'action',
-    dataIndex: 'action',
+    fixed: 'right',
+    slots: { default: 'action' },
     title: '操作',
+    width: 120,
   },
 ];
 

apps/web-antd/src/views/monitor/logininfor/index.vue

@@ -1,33 +1,67 @@
 <script setup lang="ts">
 import type { Recordable } from '@vben/types';
 
-import type { LoginLog } from '#/api/monitor/logininfo/model';
+import { Page, useVbenModal, type VbenFormProps } from '@vben/common-ui';
 
-import { onMounted, ref } from 'vue';
+import { Modal, Popconfirm, Space } from 'ant-design-vue';
 
-import { Page, useVbenModal } from '@vben/common-ui';
+import { useVbenVxeGrid, type VxeGridProps } from '#/adapter';
-
+import {
-import { Card, Space, Table } from 'ant-design-vue';
+  loginInfoClean,
-
+  loginInfoExport,
-import { useVbenForm } from '#/adapter';
+  loginInfoList,
-import { loginInfoClean, loginInfoList } from '#/api/monitor/logininfo';
+  loginInfoRemove,
+} from '#/api/monitor/logininfo';
+import { downloadExcel } from '#/utils/file/download';
 import { confirmDeleteModal } from '#/utils/modal';
 
 import { columns, querySchema } from './data';
 import loginInfoModal from './login-info-modal.vue';
 
+const formOptions: VbenFormProps = {
+  schema: querySchema(),
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+};
+
+const gridOptions: VxeGridProps = {
+  checkboxConfig: {
+    // 高亮
+    highlight: true,
+    // 翻页时保留选中状态
+    reserve: true,
+    // 点击行选中
+    trigger: 'row',
+  },
+  columns,
+  height: 'auto',
+  keepSource: true,
+  pagerConfig: {},
+  proxyConfig: {
+    ajax: {
+      query: async ({ page }, formValues) => {
+        return await loginInfoList({
+          pageNum: page.currentPage,
+          pageSize: page.pageSize,
+          ...formValues,
+        });
+      },
+    },
+  },
+  rowConfig: {
+    isHover: true,
+    keyField: 'infoId',
+  },
+  round: true,
+  align: 'center',
+  showOverflow: true,
+};
+
+const [BasicTable, tableApi] = useVbenVxeGrid({ formOptions, gridOptions });
+
 const [LoginInfoModal, modalApi] = useVbenModal({
   connectedComponent: loginInfoModal,
 });
 
-const loginDataList = ref<LoginLog[]>([]);
-async function reload() {
-  const resp = await loginInfoList({ pageNum: 1, pageSize: 20 });
-  loginDataList.value = resp.rows;
-}
-
-onMounted(reload);
-
 function handlePreview(record: Recordable<any>) {
   modalApi.setData(record);
   modalApi.open();
@@ -41,49 +75,71 @@ function handleClear() {
   });
 }
 
-const [QueryForm] = useVbenForm({
+async function handleDelete(row: Recordable<any>) {
-  // 默认展开
+  await loginInfoRemove(row.infoId);
-  collapsed: false,
+  await tableApi.reload();
-  // 所有表单项共用，可单独在表单内覆盖
+}
-  commonConfig: {
+
-    // 所有表单项
+function handleMultiDelete() {
-    componentProps: {
+  const rows = tableApi.grid.getCheckboxRecords();
-      class: 'w-full',
+  const ids = rows.map((row: any) => row.infoId);
+  Modal.confirm({
+    title: '提示',
+    okType: 'danger',
+    content: `确认删除选中的${ids.length}条记录吗？`,
+    onOk: async () => {
+      await loginInfoRemove(ids);
+      await tableApi.reload();
     },
-  },
+  });
-  schema: querySchema(),
+}
-  // 是否可展开
-  showCollapseButton: true,
-  submitButtonOptions: {
-    text: '查询',
-  },
-  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
-});
 </script>
 
 <template>
-  <Page content-class="flex flex-col gap-[6px]">
+  <Page auto-content-height>
-    <Card>
+    <BasicTable>
-      <QueryForm />
+      <template #toolbar-actions>
-    </Card>
+        <span class="pl-[7px] text-[16px]">登录日志列表</span>
-    <div class="flex justify-end">
+      </template>
-      <a-button @click="handleClear">{{ $t('pages.common.clear') }}</a-button>
+      <template #toolbar-tools>
-    </div>
-    <Table :columns="columns" :data-source="loginDataList" size="middle">
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.dataIndex === 'action'">
         <Space>
-            <a-button
+          <a-button @click="handleClear">
-              size="small"
+            {{ $t('pages.common.clear') }}
-              type="primary"
-              @click="handlePreview(record)"
-            >
-              {{ $t('pages.common.info') }}
           </a-button>
+          <a-button
+            v-access:code="['monitor:logininfor:export']"
+            @click="downloadExcel(loginInfoExport, '登录日志', {})"
+          >
+            {{ $t('pages.common.export') }}
+          </a-button>
+          <a-button
+            danger
+            type="primary"
+            v-access:code="['monitor:logininfor:delete']"
+            @click="handleMultiDelete"
+          >
+            {{ $t('pages.common.delete') }}
+          </a-button>
+          <a-button type="primary">解锁(没做)</a-button>
         </Space>
       </template>
+      <template #action="{ row }">
+        <Space>
+          <a-button size="small" type="link" @click.stop="handlePreview(row)">
+            {{ $t('pages.common.info') }}
+          </a-button>
+          <Popconfirm
+            placement="left"
+            title="确认删除?"
+            @confirm="() => handleDelete(row)"
+          >
+            <a-button danger size="small" type="link" @click.stop="">
+              删除
+            </a-button>
+          </Popconfirm>
+        </Space>
       </template>
-    </Table>
+    </BasicTable>
     <LoginInfoModal />
   </Page>
 </template>

apps/web-antd/src/views/system/user/index.vue

@@ -126,7 +126,7 @@ async function handleDelete(row: Recordable<any>) {
 
 function handleMultiDelete() {
   const rows = tableApi.grid.getCheckboxRecords();
-  const ids = rows.map((row: any) => row.operId);
+  const ids = rows.map((row: any) => row.userId);
   Modal.confirm({
     title: '提示',
     okType: 'danger',