chore: 继续完善审计日志

packages/ui/certd-client/src/router/source/modules/sys.ts

@@ -413,8 +413,8 @@ export const sysResources = [
       {
         title: "certd.sysResources.auditLog",
         name: "SysAuditLog",
-        path: "/sys/audit",
-        component: "/sys/audit/index.vue",
+        path: "/sys/enterprise/audit",
+        component: "/sys/enterprise/audit/index.vue",
         meta: {
           icon: "ion:document-text-outline",
           keepAlive: true,

packages/ui/certd-client/src/views/certd/audit/crud.tsx

@@ -1,4 +1,4 @@
-import { CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, UserPageQuery, UserPageRes, dict } from "@fast-crud/fast-crud";
+import { ColumnProps, DataFormatterContext, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, UserPageQuery, UserPageRes, dict } from "@fast-crud/fast-crud";
 import { useI18n } from "/src/locales";
 import { useDicts } from "../dicts";
 
@@ -12,16 +12,6 @@ const typeDict = dict({
   },
 });
 
-const actionDict = dict({
-  url: "/pi/audit/dict",
-  getData: async () => {
-    const { createAuditApi } = await import("./api");
-    const api = createAuditApi();
-    const res = await api.GetDict();
-    return res.actions || [];
-  },
-});
-
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
   const { t } = useI18n();
   const { myProjectDict } = useDicts();
@@ -37,6 +27,22 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
   return {
     crudOptions: {
       request: { pageRequest, delRequest },
+      toolbar: {
+        buttons: {
+          export: { show: true },
+        },
+        export: {
+          dataFrom: "search",
+          columnFilter: (col: ColumnProps) => col.show === true,
+          dataFormatter: (opts: DataFormatterContext) => {
+            const { row, originalRow, col } = opts;
+            const key = col.key;
+            if (key === "createTime" && originalRow[key]) {
+              row[key] = new Date(originalRow[key]).toLocaleString();
+            }
+          },
+        },
+      },
       actionbar: {
         buttons: {
           add: { show: false },
@@ -86,6 +92,19 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           column: { width: 200, tooltip: true },
           form: { show: false },
         },
+        success: {
+          title: "结果",
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { value: true, label: "成功", color: "success" },
+              { value: false, label: "失败", color: "error" },
+            ],
+          }),
+          column: { width: 100, align: "center" },
+          form: { show: false },
+          search: { show: true },
+        },
         content: {
           title: "备注",
           type: "text",

packages/ui/certd-client/src/views/sys/audit/crud.tsx

@@ -127,6 +127,19 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           column: { width: 200, tooltip: true },
           form: { show: false },
         },
+        success: {
+          title: "结果",
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { value: true, label: "成功", color: "success" },
+              { value: false, label: "失败", color: "error" },
+            ],
+          }),
+          column: { width: 100, align: "center" },
+          form: { show: false },
+          search: { show: true },
+        },
         content: {
           title: "备注",
           type: "text",

packages/ui/certd-client/src/views/sys/enterprise/audit/api.ts

@@ -1,75 +1,35 @@
 import { request } from "/src/api/service";
 
-const apiPrefix = "/sys/project/provider";
+const apiPrefix = "/sys/audit";
 
-export async function GetList(query: any) {
-  return await request({
-    url: apiPrefix + "/page",
-    method: "post",
-    data: query,
-  });
-}
-
-export async function AddObj(obj: any) {
-  return await request({
-    url: apiPrefix + "/add",
-    method: "post",
-    data: obj,
-  });
-}
-
-export async function UpdateObj(obj: any) {
-  return await request({
-    url: apiPrefix + "/update",
-    method: "post",
-    data: obj,
-  });
-}
-
-export async function DelObj(id: any) {
-  return await request({
-    url: apiPrefix + "/delete",
-    method: "post",
-    params: { id },
-  });
-}
-
-export async function GetObj(id: any) {
-  return await request({
-    url: apiPrefix + "/info",
-    method: "post",
-    params: { id },
-  });
-}
-
-export async function GetDetail(id: any) {
-  return await request({
-    url: apiPrefix + "/detail",
-    method: "post",
-    params: { id },
-  });
-}
-
-export async function DeleteBatch(ids: any[]) {
-  return await request({
-    url: apiPrefix + "/deleteByIds",
-    method: "post",
-    data: { ids },
-  });
-}
-
-export async function SetDefault(id: any) {
-  return await request({
-    url: apiPrefix + "/setDefault",
-    method: "post",
-    data: { id },
-  });
-}
-
-export async function SetDisabled(id: any, disabled: boolean) {
-  return await request({
-    url: apiPrefix + "/setDisabled",
-    method: "post",
-    data: { id, disabled },
-  });
+export function createSysAuditApi() {
+  return {
+    async GetList(query: any) {
+      return await request({
+        url: apiPrefix + "/page",
+        method: "post",
+        data: query,
+      });
+    },
+    async DelObj(id: number) {
+      return await request({
+        url: apiPrefix + "/delete",
+        method: "post",
+        params: { id },
+      });
+    },
+    async Clean(retentionDays: number) {
+      return await request({
+        url: apiPrefix + "/clean",
+        method: "post",
+        data: { retentionDays },
+      });
+    },
+    async GetDict() {
+      return await request({
+        url: apiPrefix + "/dict",
+        method: "post",
+      });
+    },
+  };
 }

packages/ui/certd-client/src/views/sys/enterprise/audit/crud.tsx

@@ -1,252 +1,194 @@
-import * as api from "./api";
-import { useI18n } from "/src/locales";
-import { computed, Ref, ref } from "vue";
-import { useRouter } from "vue-router";
-import { AddReq, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes, utils } from "@fast-crud/fast-crud";
-import { useUserStore } from "/@/store/user";
-import { useSettingStore } from "/@/store/settings";
+import { ColumnProps, DataFormatterContext, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, UserPageQuery, UserPageRes, dict } from "@fast-crud/fast-crud";
 import { Modal } from "ant-design-vue";
+import { useI18n } from "/src/locales";
+import { useDicts } from "/@/views/certd/dicts";
+
+const typeDict = dict({
+  url: "/sys/audit/dict",
+  getData: async () => {
+    const { createSysAuditApi } = await import("./api");
+    const api = createSysAuditApi();
+    const res = await api.GetDict();
+    return res.types || [];
+  },
+});
+
+const actionDict = dict({
+  url: "/sys/audit/dict",
+  getData: async () => {
+    const { createSysAuditApi } = await import("./api");
+    const api = createSysAuditApi();
+    const res = await api.GetDict();
+    return res.actions || [];
+  },
+});
 
 export default function ({ crudExpose, context }: CreateCrudOptionsProps): CreateCrudOptionsRet {
-  const router = useRouter();
   const { t } = useI18n();
+  const { myProjectDict } = useDicts();
+  const api = context.api;
+
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
     return await api.GetList(query);
   };
-  const editRequest = async ({ form, row }: EditReq) => {
-    form.id = row.id;
-    const res = await api.UpdateObj(form);
-    return res;
-  };
-  const delRequest = async ({ row }: DelReq) => {
-    return await api.DelObj(row.id);
+  const delRequest = async (req: DelReq) => {
+    return await api.DelObj(req.row.id);
   };
 
-  const addRequest = async ({ form }: AddReq) => {
-    const res = await api.AddObj(form);
-    return res;
+  const cleanExpired = async () => {
+    Modal.confirm({
+      title: "确认清理",
+      content: "确定要清理90天前的审计日志吗？此操作不可撤销。",
+      okText: "确认清理",
+      okType: "danger",
+      cancelText: "取消",
+      async onOk() {
+        await api.Clean(90);
+        crudExpose.doRefresh();
+      },
+    });
   };
 
-  const userStore = useUserStore();
-  const settingStore = useSettingStore();
-  const selectedRowKeys: Ref<any[]> = ref([]);
-  context.selectedRowKeys = selectedRowKeys;
-
   return {
     crudOptions: {
-      settings: {
-        plugins: {
-          //这里使用行选择插件，生成行选择crudOptions配置，最终会与crudOptions合并
-          rowSelection: {
-            enabled: true,
-            order: -2,
-            before: true,
-            // handle: (pluginProps,useCrudProps)=>CrudOptions,
-            props: {
-              multiple: true,
-              crossPage: true,
-              selectedRowKeys,
-            },
+      request: { pageRequest, delRequest },
+      tabs: {
+        name: "scope",
+        show: true,
+        dict: {
+          data: [
+            { value: "system", label: "系统级", color: "red" },
+            { value: "user", label: "用户级", color: "blue" },
+          ],
+        },
+      },
+      toolbar: {
+        buttons: {
+          export: { show: true },
+        },
+        export: {
+          dataFrom: "search",
+          columnFilter: (col: ColumnProps) => col.show === true,
+          dataFormatter: (opts: DataFormatterContext) => {
+            const { row, originalRow, col } = opts;
+            const key = col.key;
+            if (key === "createTime" && originalRow[key]) {
+              row[key] = new Date(originalRow[key]).toLocaleString();
+            }
           },
         },
       },
-      request: {
-        pageRequest,
-        addRequest,
-        editRequest,
-        delRequest,
+      actionbar: {
+        buttons: {
+          add: { show: false },
+          clean: {
+            text: "清理过期日志(90天)",
+            type: "primary",
+            danger: true,
+            click: cleanExpired,
+          },
+        },
       },
       rowHandle: {
-        minWidth: 200,
+        width: 120,
         fixed: "right",
+        buttons: {
+          view: { show: false },
+          edit: { show: false },
+          remove: { show: true },
+          copy: { show: false },
+        },
+      },
+      search: {
+        initialForm: { scope: "system" },
       },
       columns: {
         id: {
           title: "ID",
-          key: "id",
           type: "number",
-          column: {
-            width: 100,
-          },
-          form: {
-            show: false,
-          },
-        },
-        domain: {
-          title: t("certd.cnameDomain"),
-          type: "text",
-          editForm: {
-            component: {
-              disabled: true,
-            },
-          },
-          search: {
-            show: true,
-          },
-          form: {
-            component: {
-              placeholder: t("certd.cnameDomainPlaceholder"),
-            },
-            helper: t("certd.cnameDomainHelper"),
-            rules: [
-              { required: true, message: t("certd.requiredField") },
-              { pattern: /^[^*]+$/, message: t("certd.cnameDomainPattern") },
-            ],
-          },
-          column: {
-            width: 200,
-          },
-        },
-        dnsProviderType: {
-          title: t("certd.dnsProvider"),
-          type: "dict-select",
-          search: {
-            show: true,
-          },
-          dict: dict({
-            url: "pi/dnsProvider/list",
-            value: "key",
-            label: "title",
-          }),
-          form: {
-            rules: [{ required: true, message: t("certd.requiredField") }],
-          },
-          column: {
-            width: 150,
-            component: {
-              color: "auto",
-            },
-          },
-        },
-        accessId: {
-          title: t("certd.dnsProviderAuthorization"),
-          type: "dict-select",
-          dict: dict({
-            url: "/pi/access/list",
-            value: "id",
-            label: "name",
-          }),
-          form: {
-            component: {
-              name: "access-selector",
-              vModel: "modelValue",
-              type: compute(({ form }) => {
-                return form.dnsProviderType;
-              }),
-            },
-            rules: [{ required: true, message: t("certd.requiredField") }],
-          },
-          column: {
-            width: 150,
-            component: {
-              color: "auto",
-            },
-          },
-        },
-        isDefault: {
-          title: t("certd.isDefault"),
-          type: "dict-switch",
-          dict: dict({
-            data: [
-              { label: t("certd.yes"), value: true, color: "success" },
-              { label: t("certd.no"), value: false, color: "default" },
-            ],
-          }),
-          form: {
-            value: false,
-            rules: [{ required: true, message: t("certd.selectIsDefault") }],
-          },
-          column: {
-            align: "center",
-            width: 100,
-          },
-        },
-        setDefault: {
-          title: t("certd.setDefault"),
-          type: "text",
-          form: {
-            show: false,
-          },
-          column: {
-            width: 100,
-            align: "center",
-            conditionalRenderDisabled: true,
-            cellRender: ({ row }) => {
-              if (row.isDefault) {
-                return;
-              }
-              const onClick = async () => {
-                Modal.confirm({
-                  title: t("certd.prompt"),
-                  content: t("certd.confirmSetDefault"),
-                  onOk: async () => {
-                    await api.SetDefault(row.id);
-                    await crudExpose.doRefresh();
-                  },
-                });
-              };
-
-              return (
-                <a-button type={"link"} size={"small"} onClick={onClick}>
-                  {t("certd.setAsDefault")}
-                </a-button>
-              );
-            },
-          },
-        },
-        disabled: {
-          title: t("certd.disabled"),
-          type: "dict-switch",
-          dict: dict({
-            data: [
-              { label: t("certd.enabled"), value: false, color: "success" },
-              { label: t("certd.disabledLabel"), value: true, color: "error" },
-            ],
-          }),
-          form: {
-            value: false,
-          },
-          column: {
-            width: 100,
-            component: {
-              title: t("certd.clickToToggle"),
-              on: {
-                async click({ value, row }) {
-                  Modal.confirm({
-                    title: t("certd.prompt"),
-                    content: t("certd.confirmToggleStatus", { action: !value ? t("certd.disable") : t("certd.enable") }),
-                    onOk: async () => {
-                      await api.SetDisabled(row.id, !value);
-                      await crudExpose.doRefresh();
-                    },
-                  });
-                },
-              },
-            },
-          },
+          column: { width: 80 },
+          form: { show: false },
         },
         createTime: {
-          title: t("certd.createTime"),
+          title: "操作时间",
           type: "datetime",
+          search: {
+            show: true,
+            component: {
+              name: "a-range-picker",
+            },
+          },
+          column: { width: 170, sorter: true },
+          form: { show: false },
+        },
+        username: {
+          title: "操作人",
+          type: "text",
+          search: { show: true },
+          column: { width: 120 },
+          form: { show: false },
+        },
+        type: {
+          title: "类型",
+          type: "dict-select",
+          dict: typeDict,
+          search: { show: true },
+          column: { width: 120 },
+          form: { show: false },
+        },
+        action: {
+          title: "操作",
+          type: "text",
+          search: { show: true },
+          column: { width: 200, tooltip: true },
+          form: { show: false },
+        },
+        success: {
+          title: "结果",
+          type: "dict-switch",
+          dict: dict({
+            data: [
+              { value: true, label: "成功", color: "success" },
+              { value: false, label: "失败", color: "error" },
+            ],
+          }),
+          column: { width: 100, align: "center" },
+          form: { show: false },
+          search: { show: true },
+        },
+        content: {
+          title: "备注",
+          type: "text",
+          search: { show: true },
+          column: { width: 500, tooltip: true },
+          form: { show: false },
+        },
+        ipAddress: {
+          title: "IP地址",
+          type: "text",
+          column: { width: 140 },
+          form: { show: false },
+        },
+        projectId: {
+          title: t("certd.fields.projectName"),
+          type: "dict-select",
+          dict: myProjectDict,
           form: {
             show: false,
           },
-          column: {
-            sorter: true,
-            width: 160,
-            align: "center",
-          },
         },
-        updateTime: {
-          title: t("certd.updateTime"),
-          type: "datetime",
-          form: {
-            show: false,
-          },
-          column: {
-            show: true,
-            width: 160,
-          },
+        scope: {
+          title: "范围",
+          type: "dict-select",
+          dict: dict({
+            data: [
+              { value: "system", label: "系统级", color: "blue" },
+              { value: "user", label: "用户级", color: "green" },
+            ],
+          }),
+          search: { show: true },
+          column: { width: 100 },
+          form: { show: false },
         },
       },
     },

packages/ui/certd-client/src/views/sys/enterprise/audit/index.vue

@@ -1,63 +1,24 @@
 <template>
-  <fs-page class="page-cert">
+  <fs-page>
     <template #header>
       <div class="title">
-        {{ t("certd.cnameTitle") }}
-        <span class="sub">
-          {{ t("certd.cnameDescription") }}
-          <a href="https://certd.docmirror.cn/guide/feature/cname/" target="_blank">
-            {{ t("certd.cnameLinkText") }}
-          </a>
-        </span>
+        操作日志
+        <span class="sub">查看所有用户的操作记录</span>
       </div>
     </template>
-    <fs-crud ref="crudRef" v-bind="crudBinding">
-      <template #pagination-left>
-        <a-tooltip :title="t('certd.batchDelete')">
-          <fs-button icon="DeleteOutlined" @click="handleBatchDelete"></fs-button>
-        </a-tooltip>
-      </template>
-    </fs-crud>
+    <fs-crud ref="crudRef" v-bind="crudBinding" />
   </fs-page>
 </template>
 
 <script lang="ts" setup>
-import { useMounted } from "/@/use/use-mounted";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
-import { message, Modal } from "ant-design-vue";
-import { DeleteBatch } from "./api";
-import { useI18n } from "/src/locales";
-import { useCrudPermission } from "/@/plugin/permission";
+import { createSysAuditApi } from "./api";
+import { useMounted } from "/@/use/use-mounted";
 
-const { t } = useI18n();
+defineOptions({ name: "SysAuditLog" });
 
-defineOptions({
-  name: "CnameProvider",
-});
-const { crudBinding, crudRef, crudExpose, context } = useFs({ createCrudOptions });
-
-const selectedRowKeys = context.selectedRowKeys;
-const handleBatchDelete = () => {
-  if (selectedRowKeys.value?.length > 0) {
-    Modal.confirm({
-      title: t("certd.confirmTitle"),
-      content: t("certd.confirmDeleteBatch", { count: selectedRowKeys.value.length }),
-      async onOk() {
-        await DeleteBatch(selectedRowKeys.value);
-        message.info(t("certd.deleteSuccess"));
-        crudExpose.doRefresh();
-        selectedRowKeys.value = [];
-      },
-    });
-  } else {
-    message.error(t("certd.selectRecordsFirst"));
-  }
-};
-
-// 页面打开后获取列表数据
-useMounted(async () => {
-  await crudExpose.doRefresh();
-});
+const api = createSysAuditApi();
+const { crudBinding, crudRef, crudExpose } = useFs({ createCrudOptions, context: { api } });
+useMounted(() => crudExpose.doRefresh());
 </script>
-<style lang="less"></style>