From f8dbe17c6a3e6a9fbea0d948039d3f6efb7b3882 Mon Sep 17 00:00:00 2001
From: makotocc0107 <1424018999@qq.com>
Date: Wed, 9 Oct 2024 13:37:34 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BF=AE=E6=AD=A3]=E4=BF=AE=E6=AD=A3=E4=BA=86?=
 =?UTF-8?q?=E5=BD=93dhcp=E5=90=AF=E7=94=A8=E6=97=B6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/Filament/Pages/ManageNetwork.php      | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/management-panel/app/Filament/Pages/ManageNetwork.php b/management-panel/app/Filament/Pages/ManageNetwork.php
index dabea6e..ac8e0cd 100644
--- a/management-panel/app/Filament/Pages/ManageNetwork.php
+++ b/management-panel/app/Filament/Pages/ManageNetwork.php
@@ -157,26 +157,29 @@ class ManageNetwork extends SettingsPage
         // 获取用户输入的网络配置
         $ipAddress = $this->form->getState()['ip'] ?? '';
         $gateway = $this->form->getState()['gateway'] ?? '';
+        $dhcpEnabled = $this->form->getState()['dhcp_enabled'];
+        if ($dhcpEnabled !== 'true'){
+            if (!filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                Notification::make()
+                    ->title('无效的 IP 地址格式')
+                    ->warning()
+                    ->send();
 
+                return; // 返回，不执行保存操作
+            }
+
+            // 验证网关地址格式
+            if (!filter_var($gateway, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+                Notification::make()
+                    ->title('无效的网关地址格式')
+                    ->warning()
+                    ->send();
+
+                return; // 返回，不执行保存操作
+            }
+        }
         // 验证 IP 地址格式
-        if (!filter_var($ipAddress, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            Notification::make()
-                ->title('无效的 IP 地址格式')
-                ->warning()
-                ->send();
 
-            return; // 返回，不执行保存操作
-        }
-
-        // 验证网关地址格式
-        if (!filter_var($gateway, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
-            Notification::make()
-                ->title('无效的网关地址格式')
-                ->warning()
-                ->send();
-
-            return; // 返回，不执行保存操作
-        }
 
         // 调用父类的保存方法以持久化设置
         parent::save();
@@ -197,8 +200,6 @@ class ManageNetwork extends SettingsPage
         $ipAddress = $this->form->getState()['ip'] ?? '';
         $mask = $this->form->getState()['mask'] ?? '';
         $gateway = $this->form->getState()['gateway'] ?? '';
-//        $dns1 = $this->form->getState()['dns_server_1'] ?? '';
-//        $dns2 = $this->form->getState()['dns_server_2'] ?? '';
 
         $dnsServers = $this->form->getState()['dns_servers'] ?? [];
         $dnsString = implode(',', $dnsServers); // 合并 DNS 地址为字符串