seeder-st2110-components 1.0.0 → 1.0.2

package/dist/index.js

@@ -56,14 +56,15 @@ const UsageItem = /*#__PURE__*/react.memo(_ref => {
     iconClass,
     text,
     children,
-    ram
+    showRam,
+    ramValue
   } = _ref;
   const tooltipContent = react.useMemo(() => /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
     title: /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
       children: [/*#__PURE__*/jsxRuntime.jsx("div", {
         children: text
-      }), ram && /*#__PURE__*/jsxRuntime.jsxs("div", {
-        children: ["Total Memory: ", ram, "GB"]
+      }), showRam && /*#__PURE__*/jsxRuntime.jsxs("div", {
+        children: ["Total Memory: ", ramValue, "GB"]
       })]
     }),
     destroyOnHidden: false,
@@ -88,7 +89,8 @@ const UsageItem = /*#__PURE__*/react.memo(_ref => {
 const getTemperature = (supermicro, sensors) => {
   return supermicro?.cpu_temperature ?? sensors?.temperatures?.coretemp?.[0]?.current;
 };
-const useHardwareUsage = ps_status => {
+const useHardwareUsage = function (ps_status) {
+  let showRam = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   return react.useMemo(() => {
     if (!ps_status || typeof ps_status !== 'object') return null;
     const {
@@ -111,7 +113,8 @@ const useHardwareUsage = ps_status => {
       }), mem && /*#__PURE__*/jsxRuntime.jsxs(UsageItem, {
         text: "Memory Usage",
         iconClass: "icon-shiyongshuai",
-        ram: false,
+        showRam: showRam,
+        ramValue: (mem.total / (1024 * 1024 * 1024)).toFixed(1),
         children: [mem.percent, "%"]
       }), supermicro?.nic_temperature && /*#__PURE__*/jsxRuntime.jsxs(UsageItem, {
         text: "NIC Temperature",
@@ -332,68 +335,60 @@ const useUpgrade = _ref => {
   const hideLoader = () => setIsSpinning(false);
 
   // 构建菜单项 - 确保至少包含download和upload
+  // 构建菜单项 - 最终完美版本
   const finalMenuItems = react.useMemo(() => {
     const hasDownload = menuItems.some(item => item.key === 'download');
     const hasUpload = menuItems.some(item => item.key === 'upload');
-
-    // 如果都已经存在，直接返回
     if (hasDownload && hasUpload) {
       return menuItems;
     }
-    let finalItems = [...menuItems];
-
-    // 查找license项的位置
-    const licenseIndex = finalItems.findIndex(item => item.key === 'license');
-
-    // 查找最后一个分隔符的位置（在license之前）
-    let insertIndex = finalItems.length;
-    let hasPrecedingDivider = false;
-    if (licenseIndex !== -1) {
-      // 如果找到license，在其前面插入
-      insertIndex = licenseIndex;
-
-      // 检查license前面是否有分隔符
-      if (licenseIndex > 0 && finalItems[licenseIndex - 1].type === 'divider') {
-        hasPrecedingDivider = true;
-        insertIndex = licenseIndex - 1; // 在分隔符前面插入
-      }
-    } else {
-      // 如果没有license，查找最后一个分隔符
-      const lastDividerIndex = finalItems.map((item, idx) => item.type === 'divider' ? idx : -1).filter(idx => idx !== -1).pop();
-      if (lastDividerIndex !== undefined) {
-        insertIndex = lastDividerIndex + 1;
-      }
-    }
-    const itemsToInsert = [];
+    const licenseIndex = menuItems.findIndex(item => item.key === 'license');
 
-    // 添加缺少的download项
-    if (!hasDownload) {
-      itemsToInsert.push({
+    // 如果没有license，在末尾添加
+    if (licenseIndex === -1) {
+      const itemsToAdd = [];
+      if (menuItems.length > 0) itemsToAdd.push({
+        type: 'divider'
+      });
+      if (!hasDownload) itemsToAdd.push({
         key: "download",
         label: "Download Config File"
       });
-    }
-
-    // 添加缺少的upload项
-    if (!hasUpload) {
-      itemsToInsert.push({
+      if (!hasUpload) itemsToAdd.push({
         key: "upload",
         label: "Software Update"
       });
+      return [...menuItems, ...itemsToAdd];
     }
 
-    // 在前面插入分隔符（如果还没有且需要插入项）
-    if (!hasPrecedingDivider && itemsToInsert.length > 0 && insertIndex > 0) {
-      itemsToInsert.unshift({
+    // 有license，在license前面插入
+    const beforeLicense = menuItems.slice(0, licenseIndex);
+    const licenseItem = menuItems[licenseIndex];
+    const afterLicense = menuItems.slice(licenseIndex + 1);
+    const itemsToInsert = [];
+
+    // 1. 前面的分隔符（如果beforeLicense不为空且最后一项不是分隔符）
+    if (beforeLicense.length > 0 && beforeLicense[beforeLicense.length - 1].type !== 'divider') {
+      itemsToInsert.push({
         type: 'divider'
       });
     }
 
-    // 在指定位置插入项
-    if (itemsToInsert.length > 0) {
-      finalItems.splice(insertIndex, 0, ...itemsToInsert);
-    }
-    return finalItems;
+    // 2. 添加缺少的项
+    if (!hasDownload) itemsToInsert.push({
+      key: "download",
+      label: "Download Config File"
+    });
+    if (!hasUpload) itemsToInsert.push({
+      key: "upload",
+      label: "Software Update"
+    });
+
+    // 3. 后面的分隔符（与license之间）
+    itemsToInsert.push({
+      type: 'divider'
+    });
+    return [...beforeLicense, ...itemsToInsert, licenseItem, ...afterLicense];
   }, [menuItems]);
   const handleMenuClick = _ref2 => {
     let {