🚀 Bump version to 0.8.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nazhua",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "type": "module",
   "scripts": {
     "dev": "vite",

src/data/code-maps.js

@@ -77,6 +77,12 @@ const codeMaps = {
     name: '吉隆坡',
     country: '马来西亚',
   },
+  BKK: {
+    name: '曼谷',
+    country: '泰国',
+    x: 985,
+    y: 296,
+  },
   HAN: {
     x: 998,
     y: 274,
@@ -89,6 +95,24 @@ const codeMaps = {
     name: '胡志明市',
     country: '越南',
   },
+  BOM: {
+    name: '孟买',
+    country: '印度',
+    x: 874,
+    y: 284,
+  },
+  DEL: {
+    name: '新德里',
+    country: '印度',
+    x: 886,
+    y: 246,
+  },
+  DXB: {
+    name: '迪拜',
+    country: '阿联酋',
+    x: 794.5,
+    y: 252,
+  },
   LAX: {
     x: 95,
     y: 207,
@@ -137,6 +161,12 @@ const codeMaps = {
     name: '纽约',
     country: '美国',
   },
+  IAD: {
+    name: '阿什本',
+    country: 'US',
+    x: 265,
+    y: 186,
+  },
   DFW: {
     x: 172,
     y: 211,
@@ -251,6 +281,30 @@ const codeMaps = {
     name: '布加勒斯特',
     country: '罗马尼亚',
   },
+  SOF: {
+    name: '索菲亚',
+    country: '保加利亚',
+    x: 662.5,
+    y: 167,
+  },
+  VNO: {
+    name: '维尔纽斯',
+    country: '立陶宛',
+    x: 657.5,
+    y: 110.5,
+  },
+  OSL: {
+    name: '奥斯陆',
+    country: '挪威',
+    x: 615.5,
+    y: 93,
+  },
+  RBA: {
+    name: '拉巴特',
+    country: '摩洛哥',
+    x: 545,
+    y: 212,
+  },
   IST: {
     x: 676,
     y: 176,
@@ -275,6 +329,7 @@ export const aliasMapping = {
   HK: 'HKG',
   MO: 'MFM',
   TW: 'TPE',
+  ASH: 'IAD',
 };
 
 export const countryCodeMapping = {
@@ -284,6 +339,9 @@ export const countryCodeMapping = {
   KR: 'SEL',
   MY: 'KUL',
   VN: 'HAN',
+  IN: 'DEL',
+  TH: 'BKK',
+  AE: 'DXB',
   TR: 'IST',
   RO: 'OTP',
   LU: 'LUX',
@@ -302,6 +360,10 @@ export const countryCodeMapping = {
   IT: 'MXP',
   ES: 'MAD',
   PL: 'WAW',
+  BG: 'SOF',
+  LT: 'VNO',
+  NO: 'OSL',
+  MA: 'RBA',
 };
 
 export default codeMaps;

src/layout/components/footer.vue

@@ -54,6 +54,7 @@ const store = useStore();
 const footerSlogan = computed(() => decodeURIComponent(config.nazhua?.footerSlogan || ''));
 
 const dynamicContentRef = ref();
+const executedScripts = ref(new Set()); // 记录已执行的脚本，避免重复执行
 
 const dynamicContent = computed(() => {
   if (store.state.setting?.config?.custom_code) {
@@ -69,24 +70,69 @@ const dynamicContent = computed(() => {
 const executeScripts = () => {
   nextTick(() => {
     if (!dynamicContentRef.value) return;
+
     const scripts = dynamicContentRef.value.querySelectorAll('script');
+
     scripts.forEach((script) => {
-      const newScript = document.createElement('script');
+      try {
-      newScript.type = 'text/javascript';
+        // 生成脚本唯一标识，避免重复执行
-      if (script.src) {
+        const scriptIdentifier = script.src || script.textContent || '';
-        newScript.src = script.src; // 拷贝外部脚本的 src
+        if (!scriptIdentifier || executedScripts.value.has(scriptIdentifier)) {
-      } else {
+          return;
-        newScript.textContent = script.textContent; // 拷贝内联脚本
+        }
+
+        const newScript = document.createElement('script');
+        newScript.type = script.type || 'text/javascript';
+
+        // 复制所有相关属性
+        if (script.async !== undefined) newScript.async = script.async;
+        if (script.defer !== undefined) newScript.defer = script.defer;
+        if (script.crossOrigin) newScript.crossOrigin = script.crossOrigin;
+        if (script.integrity) newScript.integrity = script.integrity;
+        if (script.noModule !== undefined) newScript.noModule = script.noModule;
+        if (script.referrerPolicy) newScript.referrerPolicy = script.referrerPolicy;
+
+        if (script.src) {
+          // 外部脚本：监听加载完成事件
+          newScript.src = script.src;
+          newScript.onload = () => {
+            executedScripts.value.add(scriptIdentifier);
+          };
+          newScript.onerror = (error) => {
+            console.error('Failed to load external script:', script.src, error);
+          };
+          document.body.appendChild(newScript);
+        } else {
+          // 内联脚本：直接执行
+          newScript.textContent = script.textContent;
+          document.body.appendChild(newScript);
+          executedScripts.value.add(scriptIdentifier);
+          // 内联脚本执行后可以安全移除
+          document.body.removeChild(newScript);
+        }
+      } catch (error) {
+        console.error('Error executing dynamic script:', error);
       }
-      document.body.appendChild(newScript);
-      document.body.removeChild(newScript); // 可选：移除以保持整洁
     });
   });
 };
 
-watch(dynamicContent, () => {
+// 清理已执行脚本的记录（当内容变化时）
-  if (dynamicContent.value) {
+const cleanupScripts = () => {
-    executeScripts();
+  executedScripts.value.clear();
+};
+
+watch(dynamicContent, (newVal, oldVal) => {
+  // 内容变化时，清理旧的执行记录
+  if (newVal !== oldVal) {
+    cleanupScripts();
+  }
+
+  if (newVal) {
+    // 确保 DOM 已更新
+    nextTick(() => {
+      executeScripts();
+    });
   }
 });
 

src/views/components/server-detail/server-monitor.vue

@@ -280,13 +280,6 @@ const monitorChartData = computed(() => {
    * - valueList {Array}: 包含以下内容的对象列表：
    *   - name {String}: 监控名称。
    *   - data {Array}: [时间戳, 平均延迟] 对的数组。
-   *
-   * 该函数执行以下步骤：
-   * 1. 遍历监控数据以分类和过滤平均延迟。
-   * 2. 如果启用了削峰，则应用削峰以过滤异常值。
-   * 3. 构建监控名称到其各自时间戳和平均延迟的映射。
-   * 4. 将映射转换为监控名称、时间戳和平均延迟数据的列表。
-   * 5. 删除重复的时间戳并对其进行排序。
    */
   const cateMap = {};
   monitorData.value.forEach((i) => {
@@ -319,27 +312,30 @@ const monitorChartData = computed(() => {
       }
     }
     const {
-      threshold,
+      median,
-      mean,
+      tolerancePercent,
-      max,
+    } = peakShaving.value ? getThreshold(showAvgDelay) : {};
-      min,
-    } = peakShaving.value ? getThreshold(showAvgDelay, 2) : {};
     showCreateTime.forEach((o, index) => {
       if (Object.prototype.hasOwnProperty.call(dateMap, o)) {
         return;
       }
       const avgDelay = showAvgDelay[index];
+      // 没有数据或延迟为0，算作监控失败，计入成功率
+      if (avgDelay === null || avgDelay === 0) {
+        dateMap[o] = undefined;
+        return;
+      }
+      // 只对有效的延迟值进行削峰判断
       if (peakShaving.value) {
-        if (avgDelay === 0) {
+        // 削峰过滤：根据中位数和动态容差百分比判断异常值
-          dateMap[o] = null;
+        const threshold = median * tolerancePercent;
-          return;
+        // 当偏离中位数超过阈值时，视为异常值
-        }
+        if (Math.abs(avgDelay - median) > threshold) {
-        if (Math.abs(avgDelay - mean) > threshold && max / min > 2) {
+          dateMap[o] = undefined;
-          dateMap[o] = null;
           return;
         }
       }
-      dateMap[o] = avgDelay ? (avgDelay).toFixed(2) * 1 : null;
+      dateMap[o] = (avgDelay).toFixed(2) * 1;
     });
   });
   let dateList = [];
@@ -362,9 +358,11 @@ const monitorChartData = computed(() => {
         showCates.value[id] = true;
       }
       // 计算平均延迟和成功率
-      const validAvgs = avgs.filter((a) => a[1] !== 0 && a[1] !== null);
+      // 排除被削峰过滤的点(undefined)，只统计真实的监控数据
+      const realAvgs = avgs.filter((a) => a[1] !== undefined);
+      const validAvgs = realAvgs.filter((a) => a[1] !== 0 && a[1] !== null);
       const avg = validAvgs.reduce((a, b) => a + b[1], 0) / validAvgs.length;
-      const over = avgs.filter((a) => a[1] !== 0 && a[1] !== null).length / avgs.length;
+      const over = validAvgs.length / realAvgs.length;
       const cateItem = {
         id,
         name: i,
@@ -568,6 +566,12 @@ onUnmounted(() => {
   justify-content: space-between;
   gap: 10px;
 
+  @media screen and (min-width: 768px) {
+    position: sticky;
+    top: var(--layout-header-height);
+    z-index: 1000;
+  }
+
   .module-title {
     width: max-content;
     height: 30px;

src/views/components/server/server-real-time.vue

@@ -134,11 +134,13 @@ const {
       .item-content-sub-label {
         height: var(--real-time-label-line-height);
         line-height: var(--real-time-label-line-height);
+        white-space: nowrap;
       }
 
       .item-content-sub-content {
         display: flex;
         align-items: center;
+        white-space: nowrap;
       }
 
       .item-value,

src/views/composable/server-monitor.js

@@ -1,33 +1,75 @@
 import uniqolor from 'uniqolor';
 
 /**
- * 计算数据的阈值和平均值
+ * 计算数据的统计信息，使用截尾中位数作为基准值
+ * 根据平均延迟的不同范围，使用不同的容差百分比进行削峰
  *
  * @param {number[]} data - 要计算的数据数组
- * @param {number} [tolerance=2] - 容差倍数，默认值为2
+ * @returns {{median: number, tolerancePercent: number, min: number, max: number}}
- * @returns {{threshold: number, mean: number}} 返回包含阈值和平均值的对象
+ *          返回包含统计信息的对象
- * @property {number} threshold - 计算得到的阈值
+ * @property {number} median - 截尾中位数(去掉极端值后的中位数)
- * @property {number} mean - 数据的平均值
+ * @property {number} tolerancePercent - 根据中位数计算的容差百分比
+ * @property {number} min - 最小值
+ * @property {number} max - 最大值
  */
-export function getThreshold(data, tolerance = 2) {
+export function getThreshold(data) {
-  // 计算数据的平均值
+  // 过滤掉null和0的数据，只对有效延迟值计算统计量
-  const mean = data.reduce((sum, value) => sum + (value || 0), 0) / data.length;
-  // 计算数据的方差
-  const variance = data.reduce((sum, value) => sum + ((value || 0) - mean) ** 2, 0) / data.length;
-  // 计算标准差
-  const stdDev = Math.sqrt(variance);
-  // 计算阈值
-  const threshold = tolerance * stdDev;
-  // 过滤掉值为0的数据
   const filteredData = data.filter((value) => value !== 0 && value !== null);
-  // 计算过滤后数据的最小值
+
-  const min = Math.min(...filteredData);
+  if (filteredData.length === 0) {
-  // 计算过滤后数据的最大值
+    return {
-  const max = Math.max(...filteredData);
+      median: 0,
-  // 返回包含阈值、平均值、最小值和最大值的对象
+      tolerancePercent: 0.2,
+      min: 0,
+      max: 0,
+    };
+  }
+
+  // 排序数据
+  const sortedData = [...filteredData].sort((a, b) => Math.ceil(a) - Math.ceil(b));
+  const len = sortedData.length;
+
+  // 计算需要裁剪的数量（10%）
+  const trimCount = Math.floor(len * 0.1);
+
+  // 用于计算中位数的数据：如果10%的数量>=1，则去掉最大和最小的10%
+  let dataForMedian;
+  if (trimCount >= 1) {
+    // 截尾：去掉最小的10%和最大的10%
+    dataForMedian = sortedData.slice(trimCount, len - trimCount);
+  } else {
+    // 数据量太少，不裁剪
+    dataForMedian = sortedData;
+  }
+
+  // 计算截尾中位数
+  const medianLen = dataForMedian.length;
+  const median = medianLen % 2 === 0
+    ? (dataForMedian[medianLen / 2 - 1] + dataForMedian[medianLen / 2]) / 2
+    : dataForMedian[Math.floor(medianLen / 2)];
+
+  // 根据中位数确定容差百分比，延迟越小容差越大
+  let tolerancePercent;
+  if (median <= 10) {
+    tolerancePercent = 0.50; // 50%
+  } else if (median <= 30) {
+    tolerancePercent = 0.35; // 35%
+  } else if (median <= 50) {
+    tolerancePercent = 0.25; // 25%
+  } else if (median <= 100) {
+    tolerancePercent = 0.20; // 20%
+  } else {
+    tolerancePercent = 0.15; // 15%
+  }
+
+  const min = sortedData[0];
+  const max = sortedData[len - 1];
+
+  // console.log(min, max, median, sortedData);
+
   return {
-    threshold,
+    median,
-    mean,
+    tolerancePercent,
     min,
     max,
   };