seeder-st2110-components 1.0.3 → 1.0.5

package/dist/index.esm.js

@@ -2268,10 +2268,12 @@ const NetworkFieldGroup = _ref => {
       }), mergedFieldConfig.ip.enabled && /*#__PURE__*/jsx(Form.Item, {
         label: mergedFieldConfig.ip.label,
         name: [prefix, index, "ip_address"],
+        initialValue: iface.ip_address,
         children: /*#__PURE__*/jsx(Input, {})
       }), mergedFieldConfig.netmask.enabled && /*#__PURE__*/jsx(Form.Item, {
         label: mergedFieldConfig.netmask.label,
         name: [prefix, index, "netmask"],
+        initialValue: iface.netmask,
         children: /*#__PURE__*/jsx(Input, {})
       }), index < interfaces.length - 1 && /*#__PURE__*/jsx(Divider, {
         style: {
@@ -2303,59 +2305,79 @@ const NetworkSettingsModal = _ref2 => {
   const [st2110Interfaces, setSt2110Interfaces] = useState([]);
   const [lanConfigs, setLanConfigs] = useState([]);
   const [submitLoading, setSubmitLoading] = useState(false);
-  useEffect(() => {
-    const fetchInitialData = async () => {
-      try {
-        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[sections.indexOf('LAN')];
-          if (lanResult.status === 'fulfilled') {
-            setLanConfigs(lanResult.value);
-          }
+  const [isInitialized, setIsInitialized] = useState(false);
+  const fetchData = useCallback(async () => {
+    if (!open) return;
+    try {
+      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 (sections.includes('QSFP')) {
-          const sysResult = results[sections.indexOf('QSFP')];
-          if (sysResult.status === 'fulfilled' && sysResult.value) {
-            setSt2110Interfaces(sysResult.value.st2110_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 || []);
         }
-      } catch (error) {
-        console.error('Failed to fetch data:', error);
       }
-    };
-    if (open) {
-      fetchInitialData();
+      setIsInitialized(true);
+    } catch (error) {
+      console.error('Failed to fetch data:', error);
     }
   }, [open, getLanConfig, getSysConfig, sections]);
+  useEffect(() => {
+    if (open) {
+      fetchData();
+    }
+  }, [open, fetchData]);
+
+  // 当模态框关闭时重置状态
+  useEffect(() => {
+    if (!open) {
+      setIsInitialized(false);
+      setLanConfigs([]);
+      setSt2110Interfaces([]);
+      form.resetFields();
+    }
+  }, [open, form]);
 
   // 动态初始值配置
   const initialValues = useMemo(() => {
     const values = {};
-    if (sections.includes('LAN')) {
+    if (sections.includes('LAN') && lanConfigs.length > 0) {
       values.LAN = lanConfigs.map(config => ({
         connection_id: config.connection_id,
         display_name: config.display_name,
         ip_address: config.ip_address,
         netmask: config.netmask
-      })) ?? [];
+      }));
     }
-    if (sections.includes('QSFP')) {
-      values.QSFP = st2110Interfaces?.map(iface => ({
+    if (sections.includes('QSFP') && st2110Interfaces.length > 0) {
+      values.QSFP = st2110Interfaces.map(iface => ({
         id: iface.id,
         display_name: iface.display_name,
         ip_address: iface.ip_address
-      })) ?? [];
+      }));
     }
     return values;
   }, [lanConfigs, st2110Interfaces, sections]);
-  const handleSuccess = async function () {
+
+  // 当初始值准备好后设置表单值
+  useEffect(() => {
+    if (isInitialized && Object.keys(initialValues).length > 0) {
+      form.setFieldsValue(initialValues);
+    }
+  }, [initialValues, isInitialized, form]);
+  const handleSuccess = 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';
     message.success(messageText);
@@ -2376,8 +2398,8 @@ const NetworkSettingsModal = _ref2 => {
       }
     }
     onClose();
-  };
-  const handleSubmit = async () => {
+  }, [message, modal, getSysConfig, restart, onClose]);
+  const handleSubmit = useCallback(async () => {
     setSubmitLoading(true);
     try {
       const values = await form.validateFields();
@@ -2419,7 +2441,7 @@ const NetworkSettingsModal = _ref2 => {
     } finally {
       setSubmitLoading(false);
     }
-  };
+  }, [form, sections, lanConfigs, st2110Interfaces, updateLanConfig, updateSysConfig, handleSuccess, message]);
 
   // 合并默认模态框属性和传入的属性
   const mergedModalProps = {
@@ -2443,7 +2465,6 @@ const NetworkSettingsModal = _ref2 => {
   // 合并默认表单属性和传入的属性
   const mergedFormProps = {
     form: form,
-    initialValues: initialValues,
     labelCol: {
       span: 6
     },
@@ -2457,15 +2478,15 @@ const NetworkSettingsModal = _ref2 => {
     ...mergedModalProps,
     children: /*#__PURE__*/jsxs(Form, {
       ...mergedFormProps,
-      children: [sections.includes('LAN') && initialValues.LAN && initialValues.LAN.length > 0 && /*#__PURE__*/jsxs(Fragment, {
+      children: [sections.includes('LAN') && lanConfigs.length > 0 && /*#__PURE__*/jsxs(Fragment, {
         children: [/*#__PURE__*/jsx(NetworkFieldGroup, {
           prefix: "LAN",
-          interfaces: initialValues.LAN,
+          interfaces: lanConfigs,
           fieldConfig: fieldConfig.LAN
-        }), sections.includes('QSFP') && /*#__PURE__*/jsx(Divider, {})]
-      }), sections.includes('QSFP') && initialValues.QSFP && initialValues.QSFP.length > 0 && /*#__PURE__*/jsx(NetworkFieldGroup, {
+        }), sections.includes('QSFP') && st2110Interfaces.length > 0 && /*#__PURE__*/jsx(Divider, {})]
+      }), sections.includes('QSFP') && st2110Interfaces.length > 0 && /*#__PURE__*/jsx(NetworkFieldGroup, {
         prefix: "QSFP",
-        interfaces: initialValues.QSFP,
+        interfaces: st2110Interfaces,
         fieldConfig: fieldConfig.QSFP
       })]
     })