seeder-st2110-components 1.3.2 → 1.3.3

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 import { useState, useCallback, useEffect, memo, useMemo, useRef, forwardRef, useContext, createContext } from 'react';
 import { useWebSocket, useInterval } from 'ahooks';
-import { Tooltip, Space, Flex, Divider, App, Modal, Form, Input, Alert, message, Dropdown, Spin, Popover, Button, Popconfirm, Typography, Empty, ConfigProvider, Tree, InputNumber, Badge, Switch, Select, List, Checkbox, Row, Col } from 'antd';
+import { Tooltip, Space, Divider, App, Modal, Form, Input, Alert, message, Dropdown, Spin, Popover, Flex as Flex$1, Button, Popconfirm, Typography, Empty, ConfigProvider, Tree, InputNumber, Badge, Switch, Select, List, Checkbox, Row, Col } from 'antd';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import { LoadingOutlined, ExclamationCircleFilled, FolderOpenOutlined, FolderOutlined, PlusOutlined } from '@ant-design/icons';
 import axios from 'axios';
@@ -50,20 +50,28 @@ const useHardwareWebSocket = socketUrl => {
 };
 var useHardwareWebSocket$1 = useHardwareWebSocket;
 
+const formatBytes = function (bytes) {
+  let decimals = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
+  if (bytes === 0 || !bytes) return '0 Bytes';
+  const k = 1024;
+  const dm = decimals < 0 ? 0 : decimals;
+  const sizes = ['Bytes', 'KB', 'MB', 'GB', 'TB'];
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+  return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
+};
 const UsageItem = /*#__PURE__*/memo(_ref => {
   let {
+    title,
     iconClass,
-    text,
     children,
-    showRam,
-    ramValue
+    memTotal
   } = _ref;
-  const tooltipContent = useMemo(() => /*#__PURE__*/jsx(Tooltip, {
+  return /*#__PURE__*/jsx(Tooltip, {
     title: /*#__PURE__*/jsxs(Fragment, {
       children: [/*#__PURE__*/jsx("div", {
-        children: text
-      }), showRam && /*#__PURE__*/jsxs("div", {
-        children: ["Total Memory: ", ramValue, "GB"]
+        children: title
+      }), title === 'Memory Usage' && memTotal !== undefined && /*#__PURE__*/jsxs("div", {
+        children: ["Total Memory: ", formatBytes(memTotal)]
       })]
     }),
     destroyOnHidden: false,
@@ -76,59 +84,100 @@ const UsageItem = /*#__PURE__*/memo(_ref => {
         children: children
       })]
     })
-  }), [text, iconClass, children]);
-  return /*#__PURE__*/jsxs(Flex, {
-    align: "center",
-    children: [tooltipContent, /*#__PURE__*/jsx(Divider, {
-      type: "vertical"
-    })]
   });
 });
 var UsageItem$1 = UsageItem;
 
-const getTemperature = (supermicro, sensors) => {
-  return supermicro?.cpu_temperature ?? sensors?.temperatures?.coretemp?.[0]?.current;
+const getMaxNicTemp = function (sensors) {
+  let priorityFields = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : ["i350bb", "r8169_0_8300:00"];
+  const temps = priorityFields.flatMap(field => sensors?.[field]?.map(item => item.current) || []).filter(temp => typeof temp === 'number');
+  return temps.length ? Math.max(...temps) : null;
 };
-const useHardwareUsage = function (ps_status) {
-  let showRam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+
+// 获取数组类型传感器最高温度（如内存、硬盘）
+const getMaxSensorTemp = sensorData => {
+  const temps = (sensorData || []).map(item => item.current).filter(temp => typeof temp === 'number');
+  return temps.length ? Math.max(...temps) : null;
+};
+const getDetail = function () {
+  let status = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  const {
+    cpu_percent,
+    mem,
+    sensors_temperatures,
+    gpu_stats
+  } = status;
+  return {
+    cpu_usage: cpu_percent ?? null,
+    cpu_temp: sensors_temperatures?.coretemp?.[0]?.current ?? null,
+    mem_total: mem?.total ?? null,
+    mem_usage: mem?.percent ?? null,
+    mem_temp: getMaxSensorTemp(sensors_temperatures?.spd5118),
+    nic_temp: getMaxNicTemp(sensors_temperatures) ?? null,
+    hd_temp: getMaxSensorTemp(sensors_temperatures?.nvme),
+    gpu_usage: gpu_stats?.[0]?.["utilization.gpu"] ?? null,
+    gpu_temp: gpu_stats?.[0]?.["temperature.gpu"] ?? null
+  };
+};
+
+// 提取公共逻辑
+const createMetricItem = (title, iconClass, value, unit) => {
+  const numValue = typeof value === 'string' ? parseFloat(value) : value;
+  return {
+    title,
+    iconClass,
+    valueString: `${numValue}${unit}`,
+    value: numValue
+  };
+};
+const getItems = details => {
+  const items = [];
+  if (details.cpu_usage !== null && details.cpu_usage !== undefined) {
+    items.push(createMetricItem('CPU Usage', 'icon-CPU', details.cpu_usage, '%'));
+  }
+  if (details.cpu_temp !== null && details.cpu_temp !== undefined) {
+    items.push(createMetricItem('CPU Temperature', 'icon-CPUwendu', details.cpu_temp, '℃'));
+  }
+  if (details.mem_usage !== null && details.mem_usage !== undefined) {
+    items.push({
+      ...createMetricItem('Memory Usage', 'icon-shiyongshuai', details.mem_usage, '%'),
+      memTotal: details.mem_total
+    });
+  }
+  if (details.mem_temp !== null && details.mem_temp !== undefined) {
+    items.push(createMetricItem('Memory Temperature', 'icon-wendu', details.mem_temp, '℃'));
+  }
+  if (details.nic_temp !== null && details.nic_temp !== undefined) {
+    items.push(createMetricItem('NIC Temperature', 'icon-wuliwangka', details.nic_temp, '℃'));
+  }
+  if (details.hd_temp !== null && details.hd_temp !== undefined) {
+    items.push(createMetricItem('HD Temperature', 'icon-yingpan', details.hd_temp, '℃'));
+  }
+  if (details.gpu_usage !== null && details.gpu_usage !== undefined) {
+    items.push(createMetricItem('GPU Usage', 'icon-gpufuwu', details.gpu_usage, '%'));
+  }
+  if (details.gpu_temp !== null && details.gpu_temp !== undefined) {
+    items.push(createMetricItem('GPU Temperature', 'icon-CPUwendu', details.gpu_temp, '℃'));
+  }
+  return items;
+};
+const useHardwareUsage = ps_status => {
   return useMemo(() => {
     if (!ps_status || typeof ps_status !== 'object') return null;
-    const {
-      cpu_percent,
-      sensors_temperatures,
-      mem,
-      gpu_stats,
-      supermicro
-    } = ps_status;
-    return /*#__PURE__*/jsxs("div", {
+    const statusItems = getItems(getDetail(ps_status));
+    return /*#__PURE__*/jsx("div", {
       className: "flex",
-      children: [/*#__PURE__*/jsxs(UsageItem$1, {
-        text: "CPU Usage",
-        iconClass: "icon-CPU",
-        children: [cpu_percent, "%"]
-      }), /*#__PURE__*/jsxs(UsageItem$1, {
-        text: "CPU Temperature",
-        iconClass: "icon-wendu",
-        children: [getTemperature(supermicro, sensors_temperatures), "\u2103"]
-      }), mem && /*#__PURE__*/jsxs(UsageItem$1, {
-        text: "Memory Usage",
-        iconClass: "icon-shiyongshuai",
-        showRam: showRam,
-        ramValue: (mem.total / (1024 * 1024 * 1024)).toFixed(1),
-        children: [mem.percent, "%"]
-      }), supermicro?.nic_temperature && /*#__PURE__*/jsxs(UsageItem$1, {
-        text: "NIC Temperature",
-        iconClass: "icon-wuliwangka",
-        children: [supermicro.nic_temperature, "\u2103"]
-      }), gpu_stats?.length > 0 && /*#__PURE__*/jsx(UsageItem$1, {
-        text: "GPU Usage",
-        iconClass: "icon-gpufuwu",
-        children: gpu_stats[0]["utilization.gpu"]
-      }), supermicro?.gpu_temperature && /*#__PURE__*/jsxs(UsageItem$1, {
-        text: "GPU Temperature",
-        iconClass: "icon-wendu",
-        children: [supermicro.gpu_temperature, "\u2103"]
-      })]
+      children: statusItems.map((item, index) => /*#__PURE__*/jsxs(Flex, {
+        align: "center",
+        children: [/*#__PURE__*/jsx(UsageItem$1, {
+          title: item.title,
+          iconClass: item.iconClass,
+          memTotal: item.memTotal,
+          children: item.valueString
+        }), index < statusItems.length - 1 && /*#__PURE__*/jsx(Divider, {
+          type: "vertical"
+        })]
+      }, item.title))
     });
   }, [ps_status]);
 };
@@ -703,7 +752,7 @@ const PopoverContent = /*#__PURE__*/forwardRef((_ref, ref) => {
         },
         autoFocus: true
       })
-    }), /*#__PURE__*/jsxs(Flex, {
+    }), /*#__PURE__*/jsxs(Flex$1, {
       justify: "flex-end",
       gap: "small",
       children: [/*#__PURE__*/jsx(Button, {
@@ -3347,7 +3396,7 @@ const RightDetailForm = /*#__PURE__*/memo(_ref3 => {
       };
     });
   }, [initialSelected, isEditing, hasCategoryList, fields.category_list]);
-  return /*#__PURE__*/jsxs(Flex, {
+  return /*#__PURE__*/jsxs(Flex$1, {
     vertical: true,
     className: "h-full",
     children: [/*#__PURE__*/jsxs(Form, {
@@ -3637,7 +3686,7 @@ const Preset = _ref => {
             saveButton: texts.saveButton
           },
           presetChanged: presetChanged
-        }) : /*#__PURE__*/jsx(Flex, {
+        }) : /*#__PURE__*/jsx(Flex$1, {
           vertical: true,
           justify: "center",
           align: "center",