From bcf57611ef0efb8c7936c2e592a170f7143533c3 Mon Sep 17 00:00:00 2001 From: hyx Date: Mon, 5 Feb 2024 19:16:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=8F=92=E4=BB=B6id=E5=8F=8A=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E5=8F=98=E5=8A=A8(=E6=9C=89=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=90=8C=E5=90=8D=EF=BC=8C=E4=BD=86type(ip=E3=80=81domain)?= =?UTF-8?q?=E4=B8=8D=E5=90=8C=E7=9A=84=EF=BC=8C=E5=90=88=E5=B9=B6=E6=88=90?= =?UTF-8?q?=E4=B8=80=E6=9D=A1=EF=BC=9B=E5=90=88=E5=B9=B6=E5=90=8E=E7=9A=84?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=EF=BC=8Ctype=E5=88=97=E6=97=A2=E6=9C=89ip?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E5=8F=88=E6=9C=89domain=E6=A0=87=E7=AD=BE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/views/system/Plugin.scss | 1 + src/components/table/system/PluginTable.vue | 40 +---- src/utils/constants.js | 140 +++++++----------- src/views/system/Plugin.vue | 2 +- 4 files changed, 61 insertions(+), 122 deletions(-) diff --git a/src/assets/css/components/views/system/Plugin.scss b/src/assets/css/components/views/system/Plugin.scss index cada0aaf..0de85e8d 100644 --- a/src/assets/css/components/views/system/Plugin.scss +++ b/src/assets/css/components/views/system/Plugin.scss @@ -24,6 +24,7 @@ color: #046ECA; box-shadow: 0 2px 4px 0 rgba(51,51,51,0.02); border-radius: 12px; + margin-right:10px; } .plugin-name { display: flex; diff --git a/src/components/table/system/PluginTable.vue b/src/components/table/system/PluginTable.vue index 3408cf61..ad6d7fc7 100644 --- a/src/components/table/system/PluginTable.vue +++ b/src/components/table/system/PluginTable.vue @@ -37,19 +37,19 @@ {{scope.row[item.prop] || '-'}} @@ -110,36 +110,6 @@ export default { } }, computed: { - typeText () { - return function (id) { - const t = pluginBasicInfo.find(t => t.id === id) - return t ? t.type : 'Unknown Tag' - } - }, - scheduleText () { - return function (id) { - const basicInfo = pluginBasicInfo.find(bi => bi.id === id) - return basicInfo ? this.$t(basicInfo.schedule) : '' - } - }, - getIconUrl () { - return function (id) { - const basicInfo = pluginBasicInfo.find(bi => bi.id === id) - return basicInfo ? basicInfo.iconUrl : '' - } - }, - getDescription () { - return function (id) { - const basicInfo = pluginBasicInfo.find(bi => bi.id === id) - return basicInfo ? this.$t(basicInfo.desc) : '-' - } - }, - getName () { - return function (id) { - const basicInfo = pluginBasicInfo.find(bi => bi.id === id) - return basicInfo ? this.$t(basicInfo.name) : '-' - } - } }, methods: { statusChange (plugin) { diff --git a/src/utils/constants.js b/src/utils/constants.js index dfedea39..811e29e7 100644 --- a/src/utils/constants.js +++ b/src/utils/constants.js @@ -1883,117 +1883,85 @@ export const performanceMetricMapping = { export const pluginBasicInfo = [ { - id: 110, + id: 109, + name: 'Psiphon3 VPN', + type: ['IP'], + schedule: 'plugin.always', + desc: 'knowledgeBase.desc.psiphon3', + iconUrl: 'images/knowledge-base-logo/psiphon3-vpn.png' + }, + { + id: 111, name: 'HotSpot VPN', - type: 'IP', + type: ['IP'], schedule: 'plugin.daily', desc: 'knowledgeBase.desc.hotSpot', iconUrl: 'images/knowledge-base-logo/hotspot-vpn.png' }, { - id: 111, + id: 112, name: 'IpVanish VPN', - type: 'Domain', + type: ['IP','Domain'], schedule: 'plugin.hourly', desc: 'knowledgeBase.desc.ipVanishDomain', iconUrl: 'images/knowledge-base-logo/ip-vanish.png' }, - { - id: 112, - name: 'IpVanish VPN', - type: 'IP', - schedule: 'plugin.hourly', - desc: 'knowledgeBase.desc.ipVanishIp', - iconUrl: 'images/knowledge-base-logo/ip-vanish.png' - }, { id: 113, - name: 'CyberGhost VPN', - type: 'Domain', - schedule: 'plugin.hourly', - desc: 'knowledgeBase.desc.cyberGhostDomain', - iconUrl: 'images/knowledge-base-logo/cyber-ghost.png' - }, - { - id: 114, - name: 'CyberGhost VPN', - type: 'IP', - schedule: 'plugin.hourly', - desc: 'knowledgeBase.desc.cyberGhostIp', - iconUrl: 'images/knowledge-base-logo/cyber-ghost.png' - }, - { - id: 115, - name: 'Gecko VPN', - type: 'IP', - schedule: 'plugin.hourly', - desc: 'knowledgeBase.desc.geckoIp', - iconUrl: 'images/knowledge-base-logo/gecko.png' - }, - { - id: 116, name: 'Ivacy VPN', - type: 'Domain', + type: ['IP','Domain'], schedule: 'plugin.hourly', desc: 'knowledgeBase.desc.ivacyDomain', iconUrl: 'images/knowledge-base-logo/ivacy.png' }, { - id: 117, - name: 'Ivacy VPN', - type: 'IP', - schedule: 'plugin.hourly', - desc: 'knowledgeBase.desc.ivacyIp', - iconUrl: 'images/knowledge-base-logo/ivacy.png' - }, - { - id: 118, - name: 'Turbo VPN', - type: 'IP', - schedule: 'plugin.hourly', - desc: 'knowledgeBase.desc.turboIp', - iconUrl: 'images/knowledge-base-logo/turbo.png' - }, - { - id: 119, - name: 'Vpnunlimited', - type: 'IP', - schedule: 'plugin.hourly', - desc: 'knowledgeBase.desc.vpnunlimited', - iconUrl: 'images/knowledge-base-logo/vpnunlimited.png' - }, - { - id: 120, - name: 'Windscribe VPN', - type: 'Domain', - schedule: 'plugin.hourly', - desc: 'knowledgeBase.desc.windscribeDomain', - iconUrl: 'images/knowledge-base-logo/windscribe.png' - }, - { - id: 121, - name: 'Windscribe VPN', - type: 'IP', - schedule: 'plugin.hourly', - desc: 'knowledgeBase.desc.windscribeIp', - iconUrl: 'images/knowledge-base-logo/windscribe.png' - }, - { - id: 122, + id: 114, name: 'Proton VPN', - type: 'IP', + type: ['IP'], schedule: 'plugin.hourly', desc: 'knowledgeBase.desc.protonvpn', iconUrl: 'images/knowledge-base-logo/protonvpn.png' }, { - id: 109, - name: 'Psiphon3 VPN', - type: 'IP', - schedule: 'plugin.always', - desc: 'knowledgeBase.desc.psiphon3', - iconUrl: 'images/knowledge-base-logo/psiphon3-vpn.png' - } + id: 115, + name: 'CyberGhost VPN', + type: ['IP','Domain'], + schedule: 'plugin.hourly', + desc: 'knowledgeBase.desc.cyberGhostDomain', + iconUrl: 'images/knowledge-base-logo/cyber-ghost.png' + }, + { + id: 116, + name: 'Windscribe VPN', + type: ['IP','Domain'], + schedule: 'plugin.hourly', + desc: 'knowledgeBase.desc.windscribeDomain', + iconUrl: 'images/knowledge-base-logo/windscribe.png' + }, + { + id: 117, + name: 'Turbo VPN', + type: ['IP'], + schedule: 'plugin.hourly', + desc: 'knowledgeBase.desc.turboIp', + iconUrl: 'images/knowledge-base-logo/turbo.png' + }, + { + id: 118, + name: 'Gecko VPN', + type: ['IP'], + schedule: 'plugin.hourly', + desc: 'knowledgeBase.desc.geckoIp', + iconUrl: 'images/knowledge-base-logo/gecko.png' + }, + { + id: 119, + name: 'Vpnunlimited', + type: ['IP'], + schedule: 'plugin.hourly', + desc: 'knowledgeBase.desc.vpnunlimited', + iconUrl: 'images/knowledge-base-logo/vpnunlimited.png' + }, ] export const builtInKnowledgeBaseBasicInfo = [ diff --git a/src/views/system/Plugin.vue b/src/views/system/Plugin.vue index 2c74b0cf..b878c8cd 100644 --- a/src/views/system/Plugin.vue +++ b/src/views/system/Plugin.vue @@ -87,7 +87,7 @@ export default { response.data.data.list[i].triggerStatus = response.data.data.list[i].triggerStatus + '' const basicInfo = pluginBasicInfo.find(plugin => plugin.id === response.data.data.list[i].id) if (basicInfo) { - filterDataList.push(response.data.data.list[i]) + filterDataList.push(Object.assign({},basicInfo,response.data.data.list[i])) } } this.tableData = filterDataList