From 11a62f48bfe6a6a70ba91bd28ed6cb09c25f54a3 Mon Sep 17 00:00:00 2001
From: "@changcode" <changyongqiang@geedgenetworks.com>
Date: Mon, 7 Mar 2022 14:16:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DIPAMBox=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=20type=E5=88=87=E6=8D=A2=E6=97=B6mask=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E5=92=8CIPV4/6=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E9=AA=8C=E8=AF=81=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=EF=BC=8C=E4=B8=8B=E6=8B=89=E9=80=89=E6=8B=A9=E5=99=A8=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4=E6=B8=85=E7=A9=BA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/rightBox/ipamBox.vue         | 10 ++++------
 .../common/rightBox/setting/globalizationBox.vue       |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/nezha-fronted/src/components/common/rightBox/ipamBox.vue b/nezha-fronted/src/components/common/rightBox/ipamBox.vue
index 206c77a7a..36342eda5 100644
--- a/nezha-fronted/src/components/common/rightBox/ipamBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/ipamBox.vue
@@ -18,8 +18,6 @@
             <el-select id="account-input-language"
                        class="right-box__select"
                        v-model="editipam.type"
-                       clearable
-                       collapse-tags
                        placeholder=""
                        @change="validValueType"
                        :disabled="!!editipam.id"
@@ -39,8 +37,6 @@
               <el-select id="account-input-language"
                          class="right-box__select"
                          v-model="editipam.mask"
-                         clearable
-                         collapse-tags
                          placeholder="mask"
                          popper-class="right-box-select-top right-box__select-width prevent-clickoutside"
                          size="small">
@@ -103,13 +99,13 @@ export default {
           if (Ipv4.test(value)) {
             callback()
           } else {
-            callback(new Error(vm.$t('validate.domain')))
+            callback(new Error(vm.$t('validate.address')))
           }
         } else if (this.editipam.type === 6) {
           if (Ipv6.test(value)) {
             callback()
           } else {
-            callback(new Error(vm.$t('validate.domain')))
+            callback(new Error(vm.$t('validate.address')))
           }
         }
       }, 100)
@@ -198,12 +194,14 @@ export default {
         }
         maskArray = Array.from(new Set(mask))
         maskArray.sort(function (a, b) { return b - a })
+        this.editipam.mask = 24
       } else if (e === 6) {
         for (let i = 1; i <= 128; i++) {
           mask.push(i)
         }
         maskArray = Array.from(new Set(mask))
         maskArray.sort(function (a, b) { return b - a })
+        this.editipam.mask = 24
       }
       this.maskList = maskArray
     }
diff --git a/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue b/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
index 69758b4d6..a933a0285 100644
--- a/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
+++ b/nezha-fronted/src/components/common/rightBox/setting/globalizationBox.vue
@@ -21,8 +21,6 @@
             <el-select id="account-input-language"
                        class="right-box__select"
                        v-model="editGlobalization.lang"
-                       clearable
-                       collapse-tags
                        placeholder=""
                        popper-class="right-box-select-top right-public-box-dropdown-top prevent-clickoutside"
                        size="small">