diff --git a/web/public/js/components/ns/ns-route-ranges-box.js b/web/public/js/components/ns/ns-route-ranges-box.js index 93809415..b62aa953 100644 --- a/web/public/js/components/ns/ns-route-ranges-box.js +++ b/web/public/js/components/ns/ns-route-ranges-box.js @@ -26,7 +26,8 @@ Vue.component("ns-route-ranges-box", { // region regions: [], - regionType: "country" + regionType: "country", + regionConnector: "OR" } }, methods: { @@ -68,6 +69,7 @@ Vue.component("ns-route-ranges-box", { this.isAdding = false this.regions = [] this.regionType = "country" + this.regionConnector = "OR" this.isReverse = false }, confirmIPRange: function () { @@ -131,6 +133,7 @@ Vue.component("ns-route-ranges-box", { } this.ranges.push({ type: "region", + connector: this.regionConnector, params: { regions: this.regions, isReverse: this.isReverse @@ -362,10 +365,24 @@ Vue.component("ns-route-ranges-box", { [排除] IP范围: CIDR: - 区域: + {{range.params.ipFrom}} - {{range.params.ipTo}} {{range.params.cidr}} - {{region.name}} + + + 国家/地区 + 省份 + 城市 + ISP + :{{region.name}} + +   + + +   + + +  
@@ -488,9 +505,21 @@ Vue.component("ns-route-ranges-box", { 已添加 -
- {{region.name}} -
+ + + 国家/地区 + 省份 + 城市 + ISP + :{{region.name}} + + +   + + +   + + @@ -526,6 +555,17 @@ Vue.component("ns-route-ranges-box", { + + 区域之间关系 + + +

匹配所选任一区域即认为匹配成功。

+

匹配所有所选区域才认为匹配成功。

+ + 排除