From f3ee61f30e906a5b9861e26da73434a8645292fa Mon Sep 17 00:00:00 2001
From: v_xugzhou <941071842@qq.com>
Date: Mon, 11 Dec 2023 10:02:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8DIP=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=99=A8=E4=BD=93=E9=AA=8C=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/RenderForm/IpSelector/StaticIp.vue |  4 +--
 .../IpSelector/StaticIpAddingPanel.vue        | 35 +++++++++++--------
 frontend/desktop/src/config/i18n/cn.js        |  5 ++-
 frontend/desktop/src/config/i18n/en.js        |  5 ++-
 4 files changed, 30 insertions(+), 19 deletions(-)

diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue
index 4601d5ebf3..d1991ccc4f 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIp.vue
@@ -43,7 +43,7 @@
                         @search="onStaticIpSearch">
                     </ip-search-input>
                 </template>
-                <span v-if="isUnfold" @click="isUnfold = false" class="return-text">{{ i18n.return }}</span>
+                <span v-if="isUnfold" @click="isUnfold = false" class="return-text">{{ $t('返回') }}</span>
             </div>
             <div class="selected-ip-table-wrap">
                 <IpSelectorTable
@@ -95,8 +95,6 @@
     </div>
 </template>
 <script>
-    import '@/utils/i18n.js' // ip选择器兼容标准运维国际化
-
     import StaticIpAddingPanel from './StaticIpAddingPanel.vue'
     import IpSearchInput from './IpSearchInput.vue'
     import IpSelectorTable from './IpSelectorTable.vue'
diff --git a/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIpAddingPanel.vue b/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIpAddingPanel.vue
index a3756d2630..0e06860f79 100644
--- a/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIpAddingPanel.vue
+++ b/frontend/desktop/src/components/common/RenderForm/IpSelector/StaticIpAddingPanel.vue
@@ -12,21 +12,21 @@
 <template>
     <div class="static-ip-adding-panel">
         <ip-search-input
-            v-if="type === 'select'"
+            v-if="selectIpMode"
             :class="['ip-search-wrap', { 'static-ip-unfold': allowUnfoldInput }]"
             @search="onIpSearch">
         </ip-search-input>
         <div class="ip-list-wrap">
-            <template v-if="type === 'select' || isManualParse">
+            <template v-if="selectIpMode">
                 <IpSelectorTable
                     :selection="true"
                     :editable="true"
                     :operate="false"
                     :is-search-mode="isSearchMode"
                     :default-selected="selectedIp"
-                    :static-ip-list="isManualParse ? searchResult : staticIpList"
+                    :static-ip-list="isManualParse ? parseIpList : staticIpList"
                     :search-result="searchResult"
-                    :list-in-page="isManualParse ? searchResult : listInPage"
+                    :list-in-page="listInPage"
                     :static-ip-table-config="staticIpTableConfig"
                     @onIpSort="onIpSort"
                     @onHostNameSort="onHostNameSort"
@@ -63,11 +63,11 @@
         </div>
         <div class="adding-footer">
             <div class="ip-list-btns">
-                <bk-button theme="primary" size="small" @click.stop="onAddIpConfirm">{{type === 'select' || isManualParse ? $t('添加') : $t('解析')}}</bk-button>
+                <bk-button theme="primary" size="small" @click.stop="onAddIpConfirm">{{selectIpMode ? $t('添加') : $t('解析')}}</bk-button>
                 <bk-button theme="default" size="small" @click.stop="onAddIpCancel">{{$t('取消')}}</bk-button>
             </div>
             <div class="message-wrap">
-                <span v-if="type === 'select'">{{$t('已选择')}} {{selectedIp.length}} {{$t('个')}}</span>
+                <span v-if="selectIpMode">{{$t('已选择')}} {{selectedIp.length}} {{$t('个')}}</span>
                 <span v-if="type === 'manual' && errorIpList.length > 0">
                     <span style="color: red;">{{ errorIpList.length }}</span>{{ errorStr }}
                     <span class="view-error-ip-btn" v-bk-tooltips="tooltipConfig">{{ $t('查看详情') }}</span>
@@ -124,7 +124,13 @@
                     placement: 'top'
                 },
                 isSearchInputFocus: false,
-                isManualParse: false
+                isManualParse: false,
+                parseIpList: []
+            }
+        },
+        computed: {
+            selectIpMode () {
+                return this.type === 'select' || this.isManualParse
             }
         },
         watch: {
@@ -143,7 +149,7 @@
         },
         methods: {
             setDisplayList () {
-                let list = this.isSearchMode ? this.searchResult : this.staticIpList
+                let list = this.isSearchMode ? this.searchResult : this.isManualParse ? this.parseIpList : this.staticIpList
                 if (this.ipSortActive) {
                     list = this.getSortIpList(list, this.ipSortActive)
                 }
@@ -161,12 +167,13 @@
                 this.currentPage = 1
             },
             onIpSearch (keyword) {
+                const staticIpList = this.isManualParse ? this.parseIpList : this.staticIpList
                 if (keyword) {
                     const keyArr = keyword.split(',').map(item => item.trim()).filter(item => {
                         return item.trim() !== ''
                     })
                     const ipv6Regexp = tools.getIpv6Regexp()
-                    const list = this.staticIpList.filter(item => {
+                    const list = staticIpList.filter(item => {
                         const { bk_host_innerip: ipv4, bk_host_innerip_v6: ipv6 } = item
                         return keyArr.some(str => {
                             let text = str
@@ -181,7 +188,7 @@
                     this.setPanigation(list)
                     this.isSearchMode = true
                 } else {
-                    this.setPanigation(this.staticIpList)
+                    this.setPanigation(staticIpList)
                     this.isSearchMode = false
                 }
             },
@@ -228,7 +235,7 @@
                 this.hostNameSortActive = way
             },
             onPageChange (page) {
-                const list = this.isSearchMode ? this.searchResult : this.list
+                const list = this.isSearchMode ? this.searchResult : this.isManualParse ? this.parseIpList : this.list
                 this.currentPage = page
                 this.listInPage = list.slice((page - 1) * this.listCountPerPage, page * this.listCountPerPage)
             },
@@ -250,7 +257,7 @@
                         }
                         if (str) {
                             if (!ipPattern.test(str) && !ipv6Regexp.test(str)) { // 字符串不是合法 ip 地址
-                                ipInvalidList.push(str)
+                                ipInvalidList.push(item)
                             } else {
                                 let text = str
                                 if (ipv6Regexp.test(str)) { // 判断是否为ipv6地址
@@ -261,7 +268,7 @@
                                     return cloudMatch && [i.bk_host_innerip, i.bk_host_innerip_v6].includes(text)
                                 })
                                 if (!ipInList.length) { // ip 地址/ipv6地址不在可选列表里
-                                    ipNotExistList.push(str)
+                                    ipNotExistList.push(item)
                                 } else {
                                     ipInList.forEach(item => {
                                         const ipInSelected = this.selectedIp.find(i => {
@@ -288,7 +295,7 @@
                     }
                     this.errorIpList = []
                     this.selectedIp = selectedIp
-                    this.searchResult = selectedIp
+                    this.parseIpList = selectedIp
                     this.setPanigation(selectedIp)
                     this.isManualParse = true
                     return
diff --git a/frontend/desktop/src/config/i18n/cn.js b/frontend/desktop/src/config/i18n/cn.js
index b69269f734..40aba63765 100644
--- a/frontend/desktop/src/config/i18n/cn.js
+++ b/frontend/desktop/src/config/i18n/cn.js
@@ -1791,7 +1791,10 @@ const cn = {
     '节点输出型变量仅支持从节点"取消接收输出"来删除': '节点输出型变量仅支持从节点"取消接收输出"来删除',
     '刷新': '刷新',
     'exFailedText': '节点执行失败，请前往{0}查看错误原因',
-    'exFailedText_调用日志': '调用日志'
+    'exFailedText_调用日志': '调用日志',
+    '解析': '解析',
+    'IP地址不合法，': 'IP地址不合法，',
+    'IP地址不存在，': 'IP地址不存在，'
 }
 
 export default cn
diff --git a/frontend/desktop/src/config/i18n/en.js b/frontend/desktop/src/config/i18n/en.js
index ad57c28e8d..ff6f14870f 100644
--- a/frontend/desktop/src/config/i18n/en.js
+++ b/frontend/desktop/src/config/i18n/en.js
@@ -1825,7 +1825,10 @@ const en = {
     '节点输出型变量仅支持从节点"取消接收输出"来删除': 'Node output variables can only be deleted by the node "Cancel Receiving Output"',
     '刷新': 'Refresh',
     'exFailedText': 'Node execution failed. Please go to the {0} to check the error reason.',
-    'exFailedText_调用日志': 'call log'
+    'exFailedText_调用日志': 'call log',
+    '解析': 'Parse',
+    'IP地址不合法，': 'IP address is illegal,',
+    'IP地址不存在，': 'IP address does not exist,'
 }
 
 export default en