🔨 优化异常处理逻辑.

2025-12-04 15:31:11 +08:00
parent 14dc8e0407
commit d1cb056adf
26 changed files with 18 additions and 67 deletions
--- a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-clear-modal.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-clear-modal.vue
@@ -175,7 +175,6 @@
        // 无数据
        Message.warning('当前条件未查询到数据');
      }
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -195,7 +194,6 @@
          Message.success(`已成功清理 ${data} 条数据`);
          emits('clear');
          handleClose();
-        } catch (e) {
        } finally {
          setLoading(false);
        }
--- a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-handle-modal.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-handle-modal.vue
@@ -104,8 +104,6 @@
      emits('handled', { ...formModel.value });
      handleClose();
      return true;
-    } catch (e) {
-      return false;
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table-base.vue
@@ -302,7 +302,6 @@
          props.tableData.filter(s => idList.includes(s.id)).forEach(s => {
            s.falseAlarm = FalseAlarm.TRUE;
          });
-        } catch (e) {
        } finally {
          emits('setLoading', false);
        }
@@ -324,7 +323,6 @@
          selectedKeys.value = [];
          // 重新加载
          emits('query');
-        } catch (e) {
        } finally {
          emits('setLoading', false);
        }
--- a/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-event/components/alarm-event-table.vue
@@ -164,7 +164,6 @@
      pagination.total = data.total;
      pagination.current = request.page;
      pagination.pageSize = request.limit;
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-form-modal.vue
@@ -116,7 +116,6 @@
      setLoading(true);
      const { data } = await getAlarmPolicy(id);
      formModel.value = assignOmitRecord(data);
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -151,8 +150,6 @@
      }
      // 清空
      handlerClear();
-    } catch (e) {
-      return false;
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-table.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-policy/components/alarm-policy-table.vue
@@ -188,7 +188,6 @@
      Message.success('删除成功');
      // 重新加载
      reload();
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -211,7 +210,6 @@
      pagination.total = data.total;
      pagination.current = request.page;
      pagination.pageSize = request.limit;
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-form-drawer.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-form-drawer.vue
@@ -397,8 +397,6 @@
      }
      handleClose();
      return true;
-    } catch (e) {
-      return false;
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-table.vue
+++ b/orion-visor-ui/src/views/monitor/alarm-rule/components/alarm-rule-table.vue
@@ -185,7 +185,6 @@
      Message.success('删除成功');
      // 重新加载
      reload();
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -217,7 +216,6 @@
        ruleSwitch: checked
      });
      record.ruleSwitch = checked;
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -237,28 +235,25 @@
      setLoading(true);
      const { data } = await getAlarmRuleList(policyId.value, measurement.value);
      tableRenderData.value = data;
-    } catch (e) {
    } finally {
      setLoading(false);
    }
  };

  onMounted(() => {
-    try {
-      // 解析参数
-      const route = useRoute();
-      policyId.value = Number.parseInt(route.query.id as string);
-      policyName.value = route.query.name as string;
-      // 重新加载数据
-      reload();
-    } catch (e) {
-    }
+    // 解析参数
+    const route = useRoute();
+    policyId.value = Number.parseInt(route.query.id as string);
+    policyName.value = route.query.name as string;
+    // 重新加载数据
+    reload();
  });

 </script>

 <style lang="less" scoped>
  @measurement-card-width: 120px;
+
  .container-content {
    display: flex;
  }
--- a/orion-visor-ui/src/views/monitor/metrics/components/metrics-form-modal.vue
+++ b/orion-visor-ui/src/views/monitor/metrics/components/metrics-form-modal.vue
@@ -152,8 +152,6 @@
      }
      // 清空
      handlerClear();
-    } catch (e) {
-      return false;
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/metrics/components/metrics-table.vue
+++ b/orion-visor-ui/src/views/monitor/metrics/components/metrics-table.vue
@@ -178,7 +178,6 @@
      Message.success('删除成功');
      // 重新加载
      reload();
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -201,7 +200,6 @@
      pagination.total = data.total;
      pagination.current = request.page;
      pagination.pageSize = request.limit;
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/alarm-event-tab.vue
+++ b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/alarm-event-tab.vue
@@ -156,7 +156,6 @@
      pagination.total = data.total;
      pagination.current = request.page;
      pagination.pageSize = request.limit;
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/host-overview-tab.vue
+++ b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/host-overview-tab.vue
@@ -457,7 +457,6 @@
    try {
      renderLoading.value = true;
      await reload();
-    } catch (e) {
    } finally {
      renderLoading.value = false;
    }
--- a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/metrics-chart-tab.vue
+++ b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/metrics-chart-tab.vue
@@ -160,10 +160,7 @@
    }
    // 顺序刷新
    for (const chunk of chunks) {
-      try {
-        await Promise.all(chunk.map(s => s.refresh()));
-      } catch (e) {
-      }
+      await Promise.all(chunk.map(s => s?.refresh?.()));
    }
  };

--- a/orion-visor-ui/src/views/monitor/monitor-detail/compoments/metrics-chart.vue
+++ b/orion-visor-ui/src/views/monitor/monitor-detail/compoments/metrics-chart.vue
@@ -220,6 +220,9 @@
      });
      series.value = data;
    } catch (e) {
+      console.error('load metrics error', e);
+      series.value = [];
+      return e;
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-card-list.vue
+++ b/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-card-list.vue
@@ -423,7 +423,6 @@
      pagination.total = data.total;
      pagination.current = request.page;
      pagination.pageSize = request.limit;
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-form-drawer.vue
+++ b/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-form-drawer.vue
@@ -134,8 +134,6 @@
      emits('updated');
      // 清空
      handlerClear();
-    } catch (e) {
-      return false;
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-table.vue
+++ b/orion-visor-ui/src/views/monitor/monitor-host/components/monitor-host-table.vue
@@ -487,7 +487,6 @@
          await updateMonitorHostAlarmSwitch({ idList, alarmSwitch });
          rows.forEach(s => s.alarmSwitch = alarmSwitch);
          Message.success(`已${label}`);
-        } catch (e) {
        } finally {
          setLoading(false);
        }
@@ -505,7 +504,6 @@
      pagination.current = request.page;
      pagination.pageSize = request.limit;
      selectedKeys.value = [];
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/monitor-host/components/release-upload-modal.vue
+++ b/orion-visor-ui/src/views/monitor/monitor-host/components/release-upload-modal.vue
@@ -73,8 +73,6 @@
      // 清空
      handlerClear();
      return true;
-    } catch (e) {
-      return false;
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/monitor/monitor-host/types/use-monitor-host-list.ts
+++ b/orion-visor-ui/src/views/monitor/monitor-host/types/use-monitor-host-list.ts
@@ -1,4 +1,4 @@
-import type { MonitorHostQueryResponse, } from '@/api/monitor/monitor-host';
+import type { MonitorHostQueryResponse } from '@/api/monitor/monitor-host';
 import { getMonitorHostMetrics, updateMonitorHostAlarmSwitch } from '@/api/monitor/monitor-host';
 import type { HostAgentLogResponse } from '@/api/asset/host-agent';
 import { getAgentInstallLogStatus, getHostAgentStatus, installHostAgent, updateAgentInstallStatus } from '@/api/asset/host-agent';
@@ -69,13 +69,11 @@ export default function useMonitorHostList(options: UseMonitorHostListOptions) {
            Message.success('开始安装');
            // 重新加载
            reload();
-          } catch (e) {
          } finally {
            setLoading(false);
          }
        }
      });
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -99,7 +97,6 @@ export default function useMonitorHostList(options: UseMonitorHostListOptions) {
          });
          log.status = AgentLogStatus.SUCCESS;
          Message.success('状态已修正');
-        } catch (e) {
        } finally {
          setLoading(false);
        }
@@ -126,7 +123,6 @@ export default function useMonitorHostList(options: UseMonitorHostListOptions) {
          });
          record.alarmSwitch = newSwitch;
          Message.success(`已${dict.label}`);
-        } catch (e) {
        } finally {
          setLoading(false);
        }
@@ -178,6 +174,7 @@ export default function useMonitorHostList(options: UseMonitorHostListOptions) {
          });
        });
      } catch (e) {
+        // ignored
      }
    }
  };
@@ -199,6 +196,7 @@ export default function useMonitorHostList(options: UseMonitorHostListOptions) {
          });
        });
      } catch (e) {
+        // ignored
      }
    }
  };
--- a/orion-visor-ui/src/views/system/setting/components/about-setting.vue
+++ b/orion-visor-ui/src/views/system/setting/components/about-setting.vue
@@ -74,7 +74,6 @@
    try {
      const { data } = await getSystemAppInfo();
      app.value = data;
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -86,6 +85,7 @@
      const { data } = await getAppLatestRelease();
      repo.value = data;
    } catch (e) {
+      // ignored
    }
  });

--- a/orion-visor-ui/src/views/system/setting/components/auto-clear-setting.vue
+++ b/orion-visor-ui/src/views/system/setting/components/auto-clear-setting.vue
@@ -121,7 +121,6 @@
        settings: setting.value
      });
      Message.success('修改成功');
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -137,7 +136,6 @@
        'auto-clear.exec-log.keep-days': toAnonymousNumber(data['auto-clear.exec-log.keep-days']),
        'auto-clear.terminal-log.keep-days': toAnonymousNumber(data['auto-clear.terminal-log.keep-days']),
      };
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/system/setting/components/encrypt-setting.vue
+++ b/orion-visor-ui/src/views/system/setting/components/encrypt-setting.vue
@@ -84,7 +84,6 @@
        settings: { ...setting.value }
      });
      Message.success('修改成功');
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -97,7 +96,6 @@
      const { data } = await generatorKeypair();
      setting.value['encrypt.public-key'] = data.publicKey;
      setting.value['encrypt.private-key'] = data.privateKey;
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -111,7 +109,6 @@
      setting.value = {
        ...data
      };
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/system/setting/components/log-setting.vue
+++ b/orion-visor-ui/src/views/system/setting/components/log-setting.vue
@@ -126,7 +126,6 @@
        settings: setting.value
      });
      Message.success('修改成功');
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -143,7 +142,6 @@
        'log.tracker-load-interval': toAnonymousNumber(data['log.tracker-load-interval']),
        'log.tracker-load-lines': toAnonymousNumber(data['log.tracker-load-lines']),
      };
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/system/setting/components/login-setting.vue
+++ b/orion-visor-ui/src/views/system/setting/components/login-setting.vue
@@ -181,7 +181,7 @@

 <script lang="ts">
  export default {
-    name: 'loginSetting',
+    name: 'loginSetting'
  };
 </script>

@@ -213,7 +213,6 @@
        settings: setting.value
      });
      Message.success('修改成功');
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -233,7 +232,6 @@
        'login.login-failed-lock-time': toAnonymousNumber(data['login.login-failed-lock-time']),
        'login.login-failed-send-threshold': toAnonymousNumber(data['login.login-failed-send-threshold']),
      };
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/system/setting/components/sftp-setting.vue
+++ b/orion-visor-ui/src/views/system/setting/components/sftp-setting.vue
@@ -100,7 +100,6 @@
        settings: setting.value,
      });
      Message.success('修改成功');
-    } catch (e) {
    } finally {
      setLoading(false);
    }
@@ -115,7 +114,6 @@
        ...data,
        'sftp.preview-size': toAnonymousNumber(data['sftp.preview-size']),
      };
-    } catch (e) {
    } finally {
      setLoading(false);
    }
--- a/orion-visor-ui/src/views/terminal/components/setting/theme/terminal-ssh-theme-block.vue
+++ b/orion-visor-ui/src/views/terminal/components/setting/theme/terminal-ssh-theme-block.vue
@@ -91,11 +91,8 @@

  // 加载用户主题
  onMounted(async () => {
-    try {
-      const { data } = await getPreference<Record<string, any>>('TERMINAL', [TerminalPreferenceItem.SSH_THEME]);
-      currentThemeName.value = data[TerminalPreferenceItem.SSH_THEME]?.name;
-    } catch (e) {
-    }
+    const { data } = await getPreference<Record<string, any>>('TERMINAL', [TerminalPreferenceItem.SSH_THEME]);
+    currentThemeName.value = data[TerminalPreferenceItem.SSH_THEME]?.name;
  });

  // 加载主题列表
@@ -110,7 +107,6 @@
        result.push(subArray);
      }
      themes.value = result;
-    } catch (e) {
    } finally {
      setLoading(false);
    }