seeder-st2110-components 1.1.3 → 1.1.4

package/dist/index.js

@@ -619,7 +619,8 @@ const useSystemOperations = function () {
     onRestart,
     confirmTitle = "Confirm",
     cancelText = "No",
-    okText = "Yes"
+    okText = "Yes",
+    run
   } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   const {
     modal: AntdModal
@@ -637,6 +638,11 @@ const useSystemOperations = function () {
           } else if (action === 'restart' && onRestart) {
             onRestart();
           }
+
+          // Call the run callback after successful operation
+          if (typeof run === 'function') {
+            run();
+          }
         }
       });
     } catch (error) {
@@ -1909,7 +1915,8 @@ const SystemOperations = _ref => {
     iconClassName = "iconfont icon-guanji1 text-2xl text-neutral-400",
     confirmTitle = "Confirm",
     cancelText = "No",
-    okText = "Yes"
+    okText = "Yes",
+    run
   } = _ref;
   const {
     modal: AntdModal
@@ -1939,6 +1946,11 @@ const SystemOperations = _ref => {
           } else if (action === 'restart' && onRestart) {
             onRestart();
           }
+
+          // Call the run callback after successful operation
+          if (typeof run === 'function') {
+            run();
+          }
         }
       });
     } catch (error) {
@@ -1973,7 +1985,8 @@ SystemOperations.propTypes = {
   iconClassName: PropTypes.string,
   confirmTitle: PropTypes.string,
   cancelText: PropTypes.string,
-  okText: PropTypes.string
+  okText: PropTypes.string,
+  run: PropTypes.func
 };
 
 const defaultFieldConfigs = {
@@ -2232,6 +2245,7 @@ const NetworkFieldGroup = _ref => {
     interfaces,
     fieldConfig = {}
   } = _ref;
+  // 默认字段配置
   const defaultFieldConfig = {
     name: {
       label: "Name",
@@ -2243,7 +2257,7 @@ const NetworkFieldGroup = _ref => {
     },
     netmask: {
       label: "Netmask",
-      enabled: prefix === "LAN"
+      enabled: true
     }
   };
   const mergedFieldConfig = {
@@ -2288,14 +2302,23 @@ const NetworkSettingsModal = _ref2 => {
     open,
     onClose,
     getLanConfig,
+    // 可选 - 单独获取LAN配置的函数
     getSysConfig,
+    // 可选 - 单独获取QSFP配置的函数
+    getConfig,
+    // 可选 - 统一获取配置的函数
     updateLanConfig,
     updateSysConfig,
     restart,
+    refreshSettings,
     modalProps = {},
     formProps = {},
     fieldConfig = {},
-    sections = ['LAN', 'QSFP']
+    sections = ['LAN', 'QSFP'],
+    showNetmask = {
+      LAN: true,
+      QSFP: false
+    } // 控制各部分的netmask显示
   } = _ref2;
   const {
     message,
@@ -2310,30 +2333,63 @@ const NetworkSettingsModal = _ref2 => {
     hasFetched: false,
     hasInitialized: false
   });
+  const preparedFieldConfig = react.useMemo(() => {
+    const config = {
+      ...fieldConfig
+    };
+
+    // 确保LAN和QSFP的配置存在
+    config.LAN = config.LAN || {};
+    config.QSFP = config.QSFP || {};
+    if (sections.includes('LAN')) {
+      config.LAN.netmask = {
+        ...(config.LAN.netmask || {}),
+        enabled: showNetmask.LAN
+      };
+    }
+    if (sections.includes('QSFP')) {
+      config.QSFP.netmask = {
+        ...(config.QSFP.netmask || {}),
+        enabled: showNetmask.QSFP
+      };
+    }
+    return config;
+  }, [fieldConfig, showNetmask, sections]);
   react.useEffect(() => {
     if (!open) return;
     const fetchData = async () => {
       if (initializationStatus.current.hasFetched) return;
       try {
         initializationStatus.current.hasFetched = true;
-        const promises = [];
-        if (sections.includes('LAN')) {
-          promises.push(getLanConfig());
-        }
-        if (sections.includes('QSFP')) {
-          promises.push(getSysConfig());
-        }
-        const results = await Promise.allSettled(promises);
-        if (sections.includes('LAN')) {
-          const lanResult = results[0];
-          if (lanResult.status === 'fulfilled') {
-            setLanConfigs(lanResult.value || []);
+        if (getConfig) {
+          // 使用统一接口获取数据
+          const config = await getConfig();
+          if (sections.includes('LAN') && config.lan_interfaces) {
+            setLanConfigs(config.lan_interfaces);
           }
-        }
-        if (sections.includes('QSFP')) {
-          const sysResult = sections.includes('LAN') ? results[1] : results[0];
-          if (sysResult.status === 'fulfilled' && sysResult.value) {
-            setSt2110Interfaces(sysResult.value.st2110_interfaces || []);
+          if (sections.includes('QSFP') && config.interfaces) {
+            setSt2110Interfaces(config.interfaces);
+          }
+        } else {
+          const promises = [];
+          if (sections.includes('LAN')) {
+            promises.push(getLanConfig());
+          }
+          if (sections.includes('QSFP')) {
+            promises.push(getSysConfig());
+          }
+          const results = await Promise.allSettled(promises);
+          if (sections.includes('LAN') && getLanConfig) {
+            const lanResult = results[0];
+            if (lanResult.status === 'fulfilled') {
+              setLanConfigs(lanResult.value || []);
+            }
+          }
+          if (sections.includes('QSFP') && getSysConfig) {
+            const sysResult = sections.includes('LAN') ? results[1] : results[0];
+            if (sysResult.status === 'fulfilled' && sysResult.value) {
+              setSt2110Interfaces(sysResult.value.st2110_interfaces || []);
+            }
           }
         }
         setIsInitialized(true);
@@ -2367,18 +2423,27 @@ const NetworkSettingsModal = _ref2 => {
         connection_id: config.connection_id,
         display_name: config.display_name,
         ip_address: config.ip_address,
-        netmask: config.netmask
+        ...(showNetmask.LAN ? {
+          netmask: config.netmask
+        } : {})
       }));
     }
     if (sections.includes('QSFP') && st2110Interfaces.length > 0) {
       values.QSFP = st2110Interfaces.map(iface => ({
-        id: iface.id,
+        // 只有当iface中存在id字段时才包含id
+        ...(iface.id !== undefined && {
+          id: iface.id
+        }),
         display_name: iface.display_name,
-        ip_address: iface.ip_address
+        ip_address: iface.ip_address || iface.ip,
+        // 优先取ip_address，没有则取ip
+        ...(showNetmask.QSFP ? {
+          netmask: iface.netmask
+        } : {})
       }));
     }
     return values;
-  }, [lanConfigs, st2110Interfaces, sections]);
+  }, [lanConfigs, st2110Interfaces, sections, showNetmask]);
 
   // 当初始值准备好后设置表单值
   react.useEffect(() => {
@@ -2388,10 +2453,16 @@ const NetworkSettingsModal = _ref2 => {
     }
   }, [isInitialized, form, initialValues]);
   const handleSuccess = react.useCallback(async function () {
-    let isPopup = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-    let messageText = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'Success';
+    let {
+      messageText = 'Success',
+      isPopup = !!restart,
+      refresh = !!refreshSettings
+    } = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     message.success(messageText);
-    if (isPopup) {
+    if (refresh && refreshSettings) {
+      await refreshSettings();
+    }
+    if (isPopup && restart) {
       try {
         const updatedConfig = await getSysConfig();
         if (updatedConfig && updatedConfig.is_restart_required) {
@@ -2408,7 +2479,7 @@ const NetworkSettingsModal = _ref2 => {
       }
     }
     onClose();
-  }, [message, modal, getSysConfig, restart, onClose]);
+  }, [message, modal, getSysConfig, restart, refreshSettings, onClose]);
   const handleSubmit = react.useCallback(async () => {
     setSubmitLoading(true);
     try {
@@ -2422,7 +2493,9 @@ const NetworkSettingsModal = _ref2 => {
         const lanData = values.LAN.map((item, index) => ({
           connection_id: lanConfigs[index]?.connection_id,
           ip_address: item.ip_address,
-          netmask: item.netmask
+          ...(showNetmask.LAN ? {
+            netmask: item.netmask
+          } : {})
         }));
         updatePromises.push(updateLanConfig(lanData));
       }
@@ -2431,8 +2504,14 @@ const NetworkSettingsModal = _ref2 => {
       if (sections.includes('QSFP') && values.QSFP) {
         const st2110Data = {
           st2110_interfaces: values.QSFP.map((item, index) => ({
-            id: st2110Interfaces?.[index]?.id,
-            ip_address: item.ip_address
+            // 只有当原始数据中存在id时才包含id
+            ...(st2110Interfaces?.[index]?.id !== undefined && {
+              id: st2110Interfaces?.[index]?.id
+            }),
+            ip_address: item.ip_address,
+            ...(showNetmask.QSFP ? {
+              netmask: item.netmask
+            } : {})
           }))
         };
         updatePromises.push(updateSysConfig(st2110Data));
@@ -2493,12 +2572,12 @@ const NetworkSettingsModal = _ref2 => {
         children: [/*#__PURE__*/jsxRuntime.jsx(NetworkFieldGroup, {
           prefix: "LAN",
           interfaces: lanConfigs,
-          fieldConfig: fieldConfig.LAN
+          fieldConfig: preparedFieldConfig.LAN
         }), sections.includes('QSFP') && st2110Interfaces.length > 0 && /*#__PURE__*/jsxRuntime.jsx(antd.Divider, {})]
       }), sections.includes('QSFP') && st2110Interfaces.length > 0 && /*#__PURE__*/jsxRuntime.jsx(NetworkFieldGroup, {
         prefix: "QSFP",
         interfaces: st2110Interfaces,
-        fieldConfig: fieldConfig.QSFP
+        fieldConfig: preparedFieldConfig.QSFP
       })]
     })
   });