seeder-st2110-components 1.0.6 → 1.1.0

package/dist/index.js

@@ -2271,42 +2271,39 @@ const NetworkSettingsModal = _ref2 => {
   const [submitLoading, setSubmitLoading] = react.useState(false);
   const [isInitialized, setIsInitialized] = react.useState(false);
   const hasFetchedRef = react.useRef(false);
-  const fetchData = react.useCallback(async () => {
-    if (!open || hasFetchedRef.current) return;
-    try {
-      hasFetchedRef.current = 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 || []);
+  react.useEffect(() => {
+    if (!open) return;
+    const fetchData = async () => {
+      if (hasFetchedRef.current) return;
+      try {
+        hasFetchedRef.current = true;
+        const promises = [];
+        if (sections.includes('LAN')) {
+          promises.push(getLanConfig());
         }
-      }
-      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')) {
+          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 = sections.includes('LAN') ? results[1] : results[0];
+          if (sysResult.status === 'fulfilled' && sysResult.value) {
+            setSt2110Interfaces(sysResult.value.st2110_interfaces || []);
+          }
         }
+        setIsInitialized(true);
+      } catch (error) {
+        console.error('Failed to fetch data:', error);
       }
-      setIsInitialized(true);
-    } catch (error) {
-      console.error('Failed to fetch data:', error);
-      hasFetchedRef.current = false; // 出错时重置标志
-    }
+    };
+    fetchData();
   }, [open, getLanConfig, getSysConfig, sections]);
-  react.useEffect(() => {
-    if (open) {
-      console.log(123456);
-      fetchData();
-    }
-  }, [open, fetchData]);
 
   // 当模态框关闭时重置状态
   react.useEffect(() => {
@@ -2315,7 +2312,7 @@ const NetworkSettingsModal = _ref2 => {
       setLanConfigs([]);
       setSt2110Interfaces([]);
       form.resetFields();
-      hasFetchedRef.current = false; // 重置fetch标志
+      hasFetchedRef.current = false;
     }
   }, [open, form]);
 
@@ -2342,10 +2339,10 @@ const NetworkSettingsModal = _ref2 => {
 
   // 当初始值准备好后设置表单值
   react.useEffect(() => {
-    if (isInitialized && Object.keys(initialValues).length > 0) {
+    if (isInitialized) {
       form.setFieldsValue(initialValues);
     }
-  }, [initialValues, isInitialized, form]);
+  }, [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';