perf: 优化站点ip检查

packages/ui/certd-client/src/views/certd/monitor/site/api.ts

@@ -55,4 +55,15 @@ export const siteInfoApi = {
       method: "post",
     });
   },
+
+  async IpCheckChange(id: number, ipCheck: boolean) {
+    return await request({
+      url: apiPrefix + "/ipCheckChange",
+      method: "post",
+      data: {
+        id,
+        ipCheck,
+      },
+    });
+  },
 };

packages/ui/certd-client/src/views/certd/monitor/site/crud.tsx

@@ -1,9 +1,9 @@
 // @ts-ignore
 import { useI18n } from "vue-i18n";
-import { AddReq, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
+import { AddReq, ColumnCompositionProps, compute, CreateCrudOptionsProps, CreateCrudOptionsRet, DelReq, dict, EditReq, UserPageQuery, UserPageRes } from "@fast-crud/fast-crud";
 import { siteInfoApi } from "./api";
 import dayjs from "dayjs";
-import { notification } from "ant-design-vue";
+import { Modal, notification } from "ant-design-vue";
 import { useSettingStore } from "/@/store/settings";
 import { mySuiteApi } from "/@/views/certd/suite/mine/api";
 import { mitter } from "/@/utils/util.mitt";
@@ -119,10 +119,13 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               });
             },
           },
-          ipMonitor: {
-            order: 0,
+          ipCheck: {
+            order: 10,
             type: "link",
             text: null,
+            show: compute(({ row }) => {
+              return row.ipCheck === true;
+            }),
             tooltip: {
               title: "IP管理",
             },
@@ -327,26 +330,46 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
         },
         ipCheck: {
-          title: "检查IP",
-          search: {
-            show: false,
-          },
+          title: "开启IP检查",
           type: "dict-switch",
           dict: dict({
             data: [
               { label: "启用", value: false, color: "green" },
-              { label: "禁用", value: true, color: "red" },
+              { label: "禁用", value: true, color: "gray" },
             ],
           }),
           form: {
             value: false,
+            rules: [{ required: true, message: "请选择" }],
           },
           column: {
-            width: 100,
-            sorter: true,
             align: "center",
+            width: 100,
+            conditionalRender: false,
+            component: {
+              name: "a-switch",
+              vModel: "checked",
+              on: {
+                change({ row, $event }) {
+                  Modal.confirm({
+                    title: "提示",
+                    content: `确定${$event ? "开启" : "关闭"}IP检查？`,
+                    onOk: async () => {
+                      await api.IpCheckChange(row.id, $event);
+                      await crudExpose.doRefresh();
+                      if ($event) {
+                        openSiteIpMonitorDialog({ siteId: row.id });
+                      }
+                    },
+                    onCancel: async () => {
+                      await crudExpose.doRefresh();
+                    },
+                  });
+                },
+              },
+            },
           },
-        },
+        } as ColumnCompositionProps,
         ipCount: {
           title: "IP数量",
           search: {

packages/ui/certd-client/src/views/certd/monitor/site/ip/crud.tsx

@@ -12,12 +12,15 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
 
   const { crudBinding } = crudExpose;
   const pageRequest = async (query: UserPageQuery): Promise<UserPageRes> => {
+    if (!query.query) {
+      query.query = {};
+    }
+    query.query.siteId = context.props.siteId;
     return await api.GetList(query);
   };
   const editRequest = async (req: EditReq) => {
     const { form, row } = req;
     form.id = row.id;
-    form.siteId = context.props.siteId;
     const res = await api.UpdateObj(form);
     return res;
   };
@@ -73,6 +76,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           load: {
             text: "同步IP",
+            type: "primary",
             async click() {
               Modal.confirm({
                 title: "同步IP",
@@ -87,6 +91,23 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               });
             },
           },
+          checkAll: {
+            text: "检查全部",
+            type: "primary",
+            click: () => {
+              Modal.confirm({
+                title: "确认",
+                content: "确认触发检查全部IP站点的证书吗?",
+                onOk: async () => {
+                  await siteIpApi.CheckAll(context.props.siteId);
+                  notification.success({
+                    message: "检查任务已提交",
+                    description: "请稍后刷新页面查看结果",
+                  });
+                },
+              });
+            },
+          },
         },
       },
       rowHandle: {
@@ -105,7 +126,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
               await api.DoCheck(row.id);
               await crudExpose.doRefresh();
               notification.success({
-                message: "检查完成",
+                message: "检查任务已提交",
               });
             },
           },
@@ -152,7 +173,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           column: {
             width: 200,
             sorter: true,
-            show: true,
+            show: false,
             cellRender({ value }) {
               return (
                 <a-tooltip title={value} placement="left">
@@ -173,6 +194,7 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
           },
           column: {
             width: 200,
+            show: false,
             sorter: true,
             cellRender({ value }) {
               return <a-tooltip title={value}>{value}</a-tooltip>;
@@ -224,6 +246,29 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             },
           },
         },
+        checkStatus: {
+          title: "检查状态",
+          search: {
+            show: false,
+          },
+          type: "dict-select",
+          dict: checkStatusDict,
+          form: {
+            show: false,
+          },
+          column: {
+            width: 100,
+            align: "center",
+            sorter: true,
+            cellRender({ value, row, key }) {
+              return (
+                <a-tooltip title={row.error}>
+                  <fs-values-format v-model={value} dict={checkStatusDict}></fs-values-format>
+                </a-tooltip>
+              );
+            },
+          },
+        },
         lastCheckTime: {
           title: "上次检查时间",
           search: {
@@ -280,29 +325,6 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
             align: "center",
           },
         },
-        checkStatus: {
-          title: "检查状态",
-          search: {
-            show: false,
-          },
-          type: "dict-select",
-          dict: checkStatusDict,
-          form: {
-            show: false,
-          },
-          column: {
-            width: 100,
-            align: "center",
-            sorter: true,
-            cellRender({ value, row, key }) {
-              return (
-                <a-tooltip title={row.error}>
-                  <fs-values-format v-model={value} dict={checkStatusDict}></fs-values-format>
-                </a-tooltip>
-              );
-            },
-          },
-        },
         remark: {
           title: "备注",
           search: {

packages/ui/certd-client/src/views/certd/monitor/site/ip/index.vue

@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts" setup>
-import { onActivated, onMounted } from "vue";
+import { onActivated, onMounted, ref, Ref } from "vue";
 import { useFs } from "@fast-crud/fast-crud";
 import createCrudOptions from "./crud";
 import { siteIpApi } from "./api";
@@ -22,19 +22,11 @@ const { crudBinding, crudRef, crudExpose } = useFs({
     props,
   },
 });
-function checkAll() {
-  Modal.confirm({
-    title: "确认",
-    content: "确认触发检查全部站点证书吗?",
-    onOk: async () => {
-      await siteIpApi.CheckAll();
-      notification.success({
-        message: "检查任务已提交",
-        description: "请稍后刷新页面查看结果",
-      });
-    },
-  });
-}
+
+const siteInfoRef: Ref<any> = ref({});
+onMounted(async () => {
+  siteInfoRef.value = await siteIpApi.GetObj(props.siteId);
+});
 
 // 页面打开后获取列表数据
 onMounted(() => {

packages/ui/certd-client/src/views/certd/notification/common.tsx

@@ -15,13 +15,13 @@ export function notificationProvide(api: any) {
 
 export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
   const notificationTypeDictRef = dict({
-    url: "/pi/notification/getTypeDict"
+    url: "/pi/notification/getTypeDict",
   });
   const defaultPluginConfig = {
     component: {
       name: "a-input",
-      vModel: "value"
-    }
+      vModel: "value",
+    },
   };
 
   function buildDefineFields(define: any, form: any, mode: string) {
@@ -38,7 +38,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
       const key = "body." + mapKey;
       const field = {
         ...value,
-        key
+        key,
       };
       const column = merge({ title: key }, defaultPluginConfig, field);
       //eval
@@ -69,29 +69,29 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
       key: "id",
       type: "number",
       column: {
-        width: 100
+        width: 100,
       },
       form: {
-        show: false
-      }
+        show: false,
+      },
     },
     type: {
       title: "通知类型",
       type: "dict-select",
       dict: notificationTypeDictRef,
       search: {
-        show: false
+        show: false,
       },
       column: {
         width: 200,
         component: {
-          color: "auto"
-        }
+          color: "auto",
+        },
       },
       editForm: {
         component: {
-          disabled: false
-        }
+          disabled: false,
+        },
       },
       form: {
         component: {
@@ -108,7 +108,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
                 {item.needPlus && <fs-icon icon={"mingcute:vip-1-line"} className={"color-plus"}></fs-icon>}
               </span>
             );
-          }
+          },
         },
         rules: [{ required: true, message: "请选择通知类型" }],
         valueChange: {
@@ -133,7 +133,7 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
               form.name = define.title;
             }
             buildDefineFields(define, form, mode);
-          }
+          },
         },
         helper: computed(() => {
           const define = currentDefine.value;
@@ -141,22 +141,22 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
             return "";
           }
           return define.desc;
-        })
-      }
+        }),
+      },
     } as ColumnCompositionProps,
     name: {
       title: "通知名称",
       search: {
-        show: true
+        show: true,
       },
       type: ["text"],
       form: {
         rules: [{ required: true, message: "请填写名称" }],
-        helper: "随便填，当多个相同类型的通知时，便于区分"
+        helper: "随便填，当多个相同类型的通知时，便于区分",
       },
       column: {
-        width: 200
-      }
+        width: 200,
+      },
     },
     isDefault: {
       title: "是否默认",
@@ -164,13 +164,13 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
       dict: dict({
         data: [
           { label: "是", value: true, color: "success" },
-          { label: "否", value: false, color: "default" }
-        ]
+          { label: "否", value: false, color: "default" },
+        ],
       }),
       form: {
         value: false,
         rules: [{ required: true, message: "请选择是否默认" }],
-        order: 999
+        order: 999,
       },
       column: {
         align: "center",
@@ -192,12 +192,12 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
                 },
                 onCancel: async () => {
                   await crudExpose.doRefresh();
-                }
+                },
               });
-            }
-          }
-        }
-      }
+            },
+          },
+        },
+      },
     } as ColumnCompositionProps,
     test: {
       title: "测试",
@@ -207,16 +207,16 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
         }),
         component: {
           name: "api-test",
-          action: "TestRequest"
+          action: "TestRequest",
         },
         order: 990,
         col: {
-          span: 24
-        }
+          span: 24,
+        },
       },
       column: {
-        show: false
-      }
+        show: false,
+      },
     },
     setting: {
       column: { show: false },
@@ -235,8 +235,8 @@ export function getCommonColumnDefine(crudExpose: any, typeRef: any, api: any) {
         valueResolve({ form }) {
           const setting = form.body;
           form.setting = JSON.stringify(setting);
-        }
-      }
-    } as ColumnCompositionProps
+        },
+      },
+    } as ColumnCompositionProps,
   };
 }

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

@@ -32,23 +32,23 @@ export default function ({ crudExpose, context }: CreateCrudOptionsProps): Creat
         pageRequest,
         addRequest,
         editRequest,
-        delRequest
+        delRequest,
       },
       form: {
         labelCol: {
           //固定label宽度
           span: null,
           style: {
-            width: "145px"
-          }
-        }
+            width: "145px",
+          },
+        },
       },
       rowHandle: {
-        width: 200
+        width: 200,
       },
       columns: {
-        ...commonColumnsDefine
-      }
-    }
+        ...commonColumnsDefine,
+      },
+    },
   };
 }