⚡ 优化缓存策略.

2024-12-29 23:58:44 +08:00
parent 3b89e9bf29
commit c2311f0682
47 changed files with 302 additions and 289 deletions
--- a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-log-table.vue
@@ -264,8 +264,8 @@
      await batchDeleteExecCommandLog(selectedKeys.value);
      Message.success(`成功删除 ${selectedKeys.value.length} 条数据`);
      selectedKeys.value = [];
-      // 重新加载数据
-      fetchTableData();
+      // 重新加载
+      reload();
    } catch (e) {
    } finally {
      setLoading(false);
@@ -273,16 +273,14 @@
  };

  // 删除当前行
-  const deleteRow = async ({ id }: {
-    id: number
-  }) => {
+  const deleteRow = async (record: ExecLogQueryResponse) => {
    try {
      setLoading(true);
      // 调用删除接口
-      await deleteExecCommandLog(id);
+      await deleteExecCommandLog(record.id);
      Message.success('删除成功');
-      // 重新加载数据
-      fetchTableData();
+      // 重新加载
+      reload();
    } catch (e) {
    } finally {
      setLoading(false);
@@ -381,6 +379,14 @@
    });
  };

+  // 重新加载
+  const reload = () => {
+    // 重新加载数据
+    fetchTableData();
+  };
+
+  defineExpose({ reload });
+
  // 加载数据
  const doFetchTableData = async (request: ExecLogQueryRequest) => {
    try {
@@ -403,10 +409,6 @@
    doFetchTableData({ page, limit, ...form });
  };

-  defineExpose({
-    fetchTableData
-  });
-
  onMounted(() => {
    // 当前用户
    const action = route.query.action as string;
--- a/orion-visor-ui/src/views/exec/exec-command-log/index.vue
+++ b/orion-visor-ui/src/views/exec/exec-command-log/index.vue
@@ -8,7 +8,7 @@
                            @open-clear="openClearModal" />
    <!-- 清理模态框 -->
    <exec-command-log-clear-modal ref="clearModal"
-                                  @clear="clearCallback" />
+                                  @clear="() => tableRef.reload()" />
    <!-- 执行日志模态框 -->
    <exec-log-panel-modal ref="logModal"
                          type="BATCH" />
@@ -67,20 +67,13 @@
      // 跳转新页面
      openNewRoute({
        name: 'execCommand',
-        query: {
-          id
-        }
+        query: { id },
      });
    } else {
      logModal.value.open(id);
    }
  };

-  // 清理回调
-  const clearCallback = () => {
-    tableRef.value.fetchTableData();
-  };
-
  onBeforeMount(async () => {
    const dictStore = useDictStore();
    await dictStore.loadKeys(dictKeys);
--- a/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-job-log/components/exec-job-log-table.vue
@@ -264,6 +264,21 @@
    emits('openClear', { ...formModel, id: undefined, description: undefined });
  };

+  // 删除当前行
+  const deleteRow = async (record: ExecLogQueryResponse) => {
+    try {
+      setLoading(true);
+      // 调用删除接口
+      await deleteExecJobLog(record.id);
+      Message.success('删除成功');
+      // 重新加载
+      reload();
+    } catch (e) {
+    } finally {
+      setLoading(false);
+    }
+  };
+
  // 删除选中行
  const deleteSelectedRows = async () => {
    try {
@@ -272,31 +287,22 @@
      await batchDeleteExecJobLog(selectedKeys.value);
      Message.success(`成功删除 ${selectedKeys.value.length} 条数据`);
      selectedKeys.value = [];
-      // 重新加载数据
-      fetchTableData();
+      // 重新加载
+      reload();
    } catch (e) {
    } finally {
      setLoading(false);
    }
  };

-  // 删除当前行
-  const deleteRow = async ({ id }: {
-    id: number
-  }) => {
-    try {
-      setLoading(true);
-      // 调用删除接口
-      await deleteExecJobLog(id);
-      Message.success('删除成功');
-      // 重新加载数据
-      fetchTableData();
-    } catch (e) {
-    } finally {
-      setLoading(false);
-    }
+  // 重新加载
+  const reload = () => {
+    // 重新加载数据
+    fetchTableData();
  };

+  defineExpose({ reload });
+
  // 中断执行
  const doInterruptExecJob = async (record: ExecLogQueryResponse) => {
    try {
@@ -395,10 +401,6 @@
    doFetchTableData({ page, limit, ...form });
  };

-  defineExpose({
-    fetchTableData
-  });
-
  onMounted(() => {
    // 加载数据
    fetchTableData();
--- a/orion-visor-ui/src/views/exec/exec-job-log/index.vue
+++ b/orion-visor-ui/src/views/exec/exec-job-log/index.vue
@@ -8,7 +8,7 @@
                        @open-clear="openClearModal" />
    <!-- 清理模态框 -->
    <exec-job-log-clear-modal ref="clearModal"
-                              @clear="clearCallback" />
+                              @clear="() => tableRef.reload()" />
    <!-- 执行日志模态框 -->
    <exec-log-panel-modal ref="logModal"
                          type="JOB" />
@@ -70,20 +70,13 @@
      // 跳转新页面
      openNewRoute({
        name: 'execJobLogView',
-        query: {
-          id
-        }
+        query: { id },
      });
    } else {
      logModal.value.open(id);
    }
  };

-  // 清理回调
-  const clearCallback = () => {
-    tableRef.value.fetchTableData();
-  };
-
  onBeforeMount(async () => {
    const dictStore = useDictStore();
    await dictStore.loadKeys(dictKeys);
--- a/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-job/components/exec-job-table.vue
@@ -215,7 +215,7 @@
  import columns from '../types/table.columns';
  import { ExecJobStatus, execJobStatusKey, execStatusKey } from '../types/const';
  import { useTablePagination, useRowSelection } from '@/hooks/table';
-  import { useDictStore, useUserStore } from '@/store';
+  import { useCacheStore, useDictStore, useUserStore } from '@/store';
  import { useRoute } from 'vue-router';
  import { copy } from '@/hooks/copy';
  import { dateFormat } from '@/utils';
@@ -224,6 +224,7 @@
  const emits = defineEmits(['openAdd', 'openUpdate', 'openDetail', 'updateExecUser', 'testCron']);

  const route = useRoute();
+  const cacheStore = useCacheStore();
  const pagination = useTablePagination();
  const rowSelection = useRowSelection();
  const { loading, setLoading } = useLoading();
@@ -242,16 +243,14 @@
  });

  // 删除当前行
-  const deleteRow = async ({ id }: {
-    id: number
-  }) => {
+  const deleteRow = async (record: ExecJobQueryResponse) => {
    try {
      setLoading(true);
      // 调用删除接口
-      await deleteExecJob(id);
+      await deleteExecJob(record.id);
      Message.success('删除成功');
-      // 重新加载数据
-      fetchTableData();
+      // 重新加载
+      reload();
    } catch (e) {
    } finally {
      setLoading(false);
@@ -266,8 +265,8 @@
      await batchDeleteExecJob(selectedKeys.value);
      Message.success(`成功删除 ${selectedKeys.value.length} 条数据`);
      selectedKeys.value = [];
-      // 重新加载数据
-      fetchTableData();
+      // 重新加载
+      reload();
    } catch (e) {
    } finally {
      setLoading(false);
@@ -276,7 +275,10 @@

  // 重新加载
  const reload = () => {
+    // 重新加载数据
    fetchTableData();
+    // 清空缓存
+    cacheStore.reset('execJob');
  };

  defineExpose({ reload });
--- a/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
+++ b/orion-visor-ui/src/views/exec/exec-template/components/exec-template-table.vue
@@ -153,16 +153,14 @@
  });

  // 删除当前行
-  const deleteRow = async ({ id }: {
-    id: number
-  }) => {
+  const deleteRow = async (record: ExecTemplateQueryResponse) => {
    try {
      setLoading(true);
      // 调用删除接口
-      await deleteExecTemplate(id);
+      await deleteExecTemplate(record.id);
      Message.success('删除成功');
-      // 重新加载数据
-      fetchTableData();
+      // 重新加载
+      reload();
    } catch (e) {
    } finally {
      setLoading(false);
@@ -177,8 +175,8 @@
      await batchDeleteExecTemplate(selectedKeys.value);
      Message.success(`成功删除 ${selectedKeys.value.length} 条数据`);
      selectedKeys.value = [];
-      // 重新加载数据
-      fetchTableData();
+      // 重新加载
+      reload();
    } catch (e) {
    } finally {
      setLoading(false);
@@ -187,6 +185,7 @@

  // 重新加载
  const reload = () => {
+    // 重新加载数据
    fetchTableData();
  };

--- a/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
+++ b/orion-visor-ui/src/views/exec/upload-task/components/upload-task-table.vue
@@ -238,8 +238,8 @@
      await batchDeleteUploadTask(selectedKeys.value);
      Message.success(`成功删除 ${selectedKeys.value.length} 条数据`);
      selectedKeys.value = [];
-      // 重新加载数据
-      fetchTableData();
+      // 重新加载
+      reload();
    } catch (e) {
    } finally {
      setLoading(false);
@@ -247,22 +247,26 @@
  };

  // 删除当前行
-  const deleteRow = async ({ id }: {
-    id: number
-  }) => {
+  const deleteRow = async (record: UploadTaskQueryResponse) => {
    try {
      setLoading(true);
      // 调用删除接口
-      await deleteUploadTask(id);
+      await deleteUploadTask(record.id);
      Message.success('删除成功');
-      // 重新加载数据
-      fetchTableData();
+      // 重新加载
+      reload();
    } catch (e) {
    } finally {
      setLoading(false);
    }
  };

+  // 重新加载
+  const reload = () => {
+    // 重新加载数据
+    fetchTableData();
+  };
+
  // 加载状态
  const pullTaskStatus = async () => {
    const unCompleteIdList = tableRenderData.value
@@ -303,10 +307,6 @@
    doFetchTableData({ page, limit, ...form });
  };

-  defineExpose({
-    fetchTableData
-  });
-
  onMounted(() => {
    // 加载数据
    fetchTableData();
--- a/orion-visor-ui/src/views/exec/upload-task/index.vue
+++ b/orion-visor-ui/src/views/exec/upload-task/index.vue
@@ -5,7 +5,7 @@
                       @open-clear="(e) => clear.open(e)" />
    <!-- 清理模态框 -->
    <upload-task-clear-modal ref="clear"
-                             @clear="clearCallback" />
+                             @clear="() => table.reload()" />
  </div>
 </template>

@@ -26,11 +26,6 @@
  const table = ref();
  const clear = ref();

-  // 清理回调
-  const clearCallback = () => {
-    table.value.fetchTableData();
-  };
-
  // 加载字典值
  onBeforeMount(async () => {
    const dictStore = useDictStore();