1 files changed, 36 insertions, 22 deletions

diff --git a/src/views/SystemDescription/Network/InventoryIPv6Settings.vue b/src/views/SystemDescription/Network/InventoryIPv6Settings.vue
index 4ff0897a..3de1c414 100644
--- a/src/views/SystemDescription/Network/InventoryIPv6Settings.vue
+++ b/src/views/SystemDescription/Network/InventoryIPv6Settings.vue
@@ -11,33 +11,34 @@
       <template #cell(value)="data">
         <b-row v-if="!(typeof data.value === 'boolean')">
           <b-form-input
-            v-if="systems[data.index].isEdit && selectedCell === 'value'"
+            v-if="systems[data.index].isEdit"
             ref="input"
-            v-model="systems[data.index].value"
+            v-model="selectedCell"
             class="regular-12px"
+            :class="{ validateIP: isIpInvalid }"
             type="text"
+            @keydown.enter="clickOk(data)"
+            @keydown.escape="clickCancel(data)"
           ></b-form-input>
           <b-col v-else>{{ data.value }}</b-col>
           <b-col class="system-network-table__icon-col">
-            <b-row
-              v-if="systems[data.index].isEdit && selectedCell === 'value'"
-            >
+            <b-row v-if="systems[data.index].isEdit">
               <img
                 src="@/assets/images/edit-ok.svg"
                 class="system-network-table__icon pointer"
-                @click="clickOk"
+                @click="clickOk(data)"
               />
               <img
                 src="@/assets/images/edit-no.svg"
                 class="system-network-table__icon close_icon pointer"
-                @click="clickCancel"
+                @click="clickCancel(data)"
               />
             </b-row>
             <img
               v-else
               src="@/assets/images/icon-edit.svg"
               class="system-network-table__icon pointer"
-              @click="editCellHandler(data, 'value')"
+              @click="editCellHandler(data)"
             />
           </b-col>
         </b-row>
@@ -85,6 +86,7 @@ export default {
     return {
       isBusy: true,
       selectedCell: null,
+      isIpInvalid: false,
       isActive: false,
       fields: [
         {
@@ -124,43 +126,54 @@ export default {
         },
         {
           param: 'IP-адрес',
-          value: '192.168.1.1',
+          value: 'fe80::1ff:fe23:4567:890a',
           comment: 'Введите IP адрес',
         },
         {
           param: 'Маска',
-          value: '192.168.0.1',
+          value: 'fe80::1ff:fe23:4567:890a',
           comment: 'Введите маску сети',
         },
         {
           param: 'Сетевой шлюз',
-          value: '192.168.0.1',
+          value: 'fe80::1ff:fe23:4567:890a',
           comment: 'Введите сетевой шлюз',
         },
         {
           param: 'DNS',
-          value: '8.8.8.8',
+          value: 'fe80::1ff:fe23:4567:890a',
           comment: 'Введите DNS',
         },
       ],
     };
   },
-  mounted() {
-    this.systems = this.systems.map((item) => ({ ...item, isEdit: false }));
-  },
   methods: {
-    editCellHandler(data, value) {
+    editCellHandler(data) {
       this.systems = this.systems.map((item) => ({ ...item, isEdit: false }));
       this.systems[data.index].isEdit = true;
-      this.selectedCell = value;
+      this.selectedCell = this.systems[data.index].value;
       this.$nextTick(() => this.$refs.input.focus());
     },
     clickOk(data) {
-      this.selectedCell = null;
-      this.systems[data.index].value = this.$refs.input.value;
+      const EDIT_VALUE = this.selectedCell.trim();
+      if (this.validateIP(EDIT_VALUE)) {
+        this.systems[data.index].value = EDIT_VALUE;
+        this.isIpInvalid = false;
+        this.selectedCell = null;
+        this.systems[data.index].isEdit = false;
+      } else {
+        this.isIpInvalid = true;
+      }
     },
-    clickCancel() {
+    clickCancel(data) {
+      this.isIpInvalid = false;
       this.selectedCell = null;
+      this.systems[data.index].isEdit = false;
+    },
+    validateIP(ipCheck) {
+      return /(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))/gi.test(
+        ipCheck
+      );
     },
     DHCPoff() {
       this.systems[0].value = false;
@@ -191,14 +204,15 @@ export default {
 }
 
 .form-control {
-  border: none;
   max-height: 16px;
   width: 60%;
-  border: none;
   background-color: transparent;
   &:focus {
     box-shadow: none;
   }
+  &.validateIP {
+    color: $red-brand-primary;
+  }
 }
 
 .popup-container {