From 2661b5e69d70344f78d55ee3c2471b489847effa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com> Date: Mon, 8 Jan 2024 16:42:41 +0800 Subject: [PATCH] =?UTF-8?q?CN-1540=20fix:=20=E6=9B=B4=E6=96=B0=E8=8E=B7?= =?UTF-8?q?=E5=8F=96tag=E5=AD=97=E6=AE=B5=E5=90=8DpluginName=E4=B8=BAvpnSe?= =?UTF-8?q?rviceName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/tools.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/utils/tools.js b/src/utils/tools.js index fcad6ad6..968f3eb7 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -1502,11 +1502,11 @@ export const formatTags = (data, type, list) => { if (k !== 'userDefinedTags' && data[k]) { if (_.isArray(data[k])) { data[k].forEach(k3 => { - const find = entityDetailTags[type].find(t => t.name === k3.pluginName) + const find = entityDetailTags[type].find(t => t.name === k3.vpnServiceName) if (find) { - list.push({ key: 'pluginName', value: tagValueHandler(k3.pluginName), type: find.type }) + list.push({ key: 'vpnServiceName', value: tagValueHandler(k3.vpnServiceName), type: find.type }) } else { - list.push({ key: 'pluginName', value: tagValueHandler(k3.pluginName), color: k3.knowledgeBase ? (k3.knowledgeBase.color || entityDefaultColor) : entityDefaultColor }) + list.push({ key: 'vpnServiceName', value: tagValueHandler(k3.vpnServiceName), color: k3.knowledgeBase ? (k3.knowledgeBase.color || entityDefaultColor) : entityDefaultColor }) } }) } else { @@ -1538,11 +1538,11 @@ export const formatTagsOfDetails = (data, type, list) => { } else { if (_.isArray(r[k])) { r[k].forEach(k3 => { - const find = entityDetailTags[type].find(t => t.name === k3.pluginName) + const find = entityDetailTags[type].find(t => t.name === k3.vpnServiceName) if (find) { - aggregation.intelligenceContent.push({ key: 'pluginName', value: tagValueHandler(k3.pluginName), type: find.type }) + aggregation.intelligenceContent.push({ key: 'vpnServiceName', value: tagValueHandler(k3.vpnServiceName), type: find.type }) } else { - aggregation.intelligenceContent.push({ key: 'pluginName', value: tagValueHandler(k3.pluginName), color: k3.knowledgeBase ? (k3.knowledgeBase.color || entityDefaultColor) : entityDefaultColor }) + aggregation.intelligenceContent.push({ key: 'vpnServiceName', value: tagValueHandler(k3.vpnServiceName), color: k3.knowledgeBase ? (k3.knowledgeBase.color || entityDefaultColor) : entityDefaultColor }) } }) } else {