From f4b2e6cd15ab38d7f3992a9a1aabd1091f278a07 Mon Sep 17 00:00:00 2001
From: fangxiang <fangxiang@cloudview.work>
Date: Fri, 10 Feb 2023 16:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E7=9A=84IP=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/RegisterDialog.vue | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/components/RegisterDialog.vue b/src/components/RegisterDialog.vue
index 3392ce9..a2d1377 100644
--- a/src/components/RegisterDialog.vue
+++ b/src/components/RegisterDialog.vue
@@ -314,7 +314,7 @@
                   />
                   <q-checkbox
                     v-model="function_fusion"
-                  @update:model-value="changeFusion()"
+                    @update:model-value="changeFusion()"
                     :label="$t('fusion')"
                     color="cyan"
                     class="offset-md-1 col"
@@ -407,6 +407,7 @@ import GlobalData from "src/common/GlobalData";
 import QrcodeVue from "qrcode.vue";
 import { Protocol } from "src/entities/WSProtocol";
 import { EDeviceAttribute } from "src/entities/EDeviceAttribute";
+import ValidationUtil from "src/common/ValidationUtil";
 
 export default defineComponent({
   name: "ComponentRegisterDialog",
@@ -650,11 +651,10 @@ export default defineComponent({
             }
             if (function_magic_wall.value) {
               attribute |= EDeviceAttribute.ProductMagicWall;
-
             }
             if (function_fusion.value) {
-                attribute |= EDeviceAttribute.ProductFusion;
-              }
+              attribute |= EDeviceAttribute.ProductFusion;
+            }
 
             GlobalData.getInstance()
               .getCurrentClient()
@@ -692,23 +692,18 @@ export default defineComponent({
         }
       },
       isIpAddress(str: string) {
-        return (
-          str == "localhost" ||
-          /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/.test(
-            str
-          )
-        );
+        return ValidationUtil.isIpAddress(str);
       },
-      changeMagic(){
-        if(function_magic_wall.value){
-          function_fusion.value=false;
+      changeMagic() {
+        if (function_magic_wall.value) {
+          function_fusion.value = false;
         }
       },
-      changeFusion(){
-        if(function_fusion.value){
-          function_magic_wall.value=false;
+      changeFusion() {
+        if (function_fusion.value) {
+          function_magic_wall.value = false;
         }
-      }
+      },
     };
   },
 });