diff --git a/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go b/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go index 4fa3a200..6f991028 100644 --- a/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go +++ b/internal/web/actions/default/servers/components/waf/ipadmin/provinces.go @@ -7,13 +7,12 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/regionconfigs" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/maps" ) -const ChinaCountryId = 1 - type ProvincesAction struct { actionutils.ParentAction } @@ -43,7 +42,7 @@ func (this *ProvincesAction) RunGet(params struct { } provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{ - RegionCountryId: int64(ChinaCountryId), + RegionCountryId: regionconfigs.RegionChinaId, }) if err != nil { this.ErrorPage(err) diff --git a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/provinces.go b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/provinces.go index 4d894063..26ff3ba5 100644 --- a/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/provinces.go +++ b/internal/web/actions/default/servers/groups/group/settings/waf/ipadmin/provinces.go @@ -12,8 +12,6 @@ import ( "github.com/iwind/TeaGo/maps" ) -const ChinaCountryId = 1 - type ProvincesAction struct { actionutils.ParentAction } diff --git a/internal/web/actions/default/servers/server/settings/waf/init.go b/internal/web/actions/default/servers/server/settings/waf/init.go index e86a4c5e..8a26e942 100644 --- a/internal/web/actions/default/servers/server/settings/waf/init.go +++ b/internal/web/actions/default/servers/server/settings/waf/init.go @@ -18,6 +18,8 @@ func init() { Get("/ipadmin/allowList", new(ipadmin.AllowListAction)). Get("/ipadmin/denyList", new(ipadmin.DenyListAction)). GetPost("/ipadmin/countries", new(ipadmin.CountriesAction)). + Get("/ipadmin/selectCountriesPopup", new(ipadmin.SelectCountriesPopupAction)). + Get("/ipadmin/selectProvincesPopup", new(ipadmin.SelectProvincesPopupAction)). GetPost("/ipadmin/provinces", new(ipadmin.ProvincesAction)). GetPost("/ipadmin/updateIPPopup", new(ipadmin.UpdateIPPopupAction)). Post("/ipadmin/deleteIP", new(ipadmin.DeleteIPAction)). diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go index e2f0a09e..8d587063 100644 --- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go +++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/countries.go @@ -42,9 +42,11 @@ func (this *CountriesAction) RunGet(params struct { this.NotFound("firewallPolicy", params.FirewallPolicyId) return } - var selectedCountryIds = []int64{} + var deniedCountryIds = []int64{} + var allowedCountryIds = []int64{} if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil { - selectedCountryIds = policyConfig.Inbound.Region.DenyCountryIds + deniedCountryIds = policyConfig.Inbound.Region.DenyCountryIds + allowedCountryIds = policyConfig.Inbound.Region.AllowCountryIds } countriesResp, err := this.RPC().RegionCountryRPC().FindAllRegionCountries(this.AdminContext(), &pb.FindAllRegionCountriesRequest{}) @@ -52,16 +54,23 @@ func (this *CountriesAction) RunGet(params struct { this.ErrorPage(err) return } - var countryMaps = []maps.Map{} + var deniesCountryMaps = []maps.Map{} + var allowedCountryMaps = []maps.Map{} for _, country := range countriesResp.RegionCountries { - countryMaps = append(countryMaps, maps.Map{ - "id": country.Id, - "name": country.DisplayName, - "letter": strings.ToUpper(string(country.Pinyin[0][0])), - "isChecked": lists.ContainsInt64(selectedCountryIds, country.Id), - }) + var countryMap = maps.Map{ + "id": country.Id, + "name": country.DisplayName, + "letter": strings.ToUpper(string(country.Pinyin[0][0])), + } + if lists.ContainsInt64(deniedCountryIds, country.Id) { + deniesCountryMaps = append(deniesCountryMaps, countryMap) + } + if lists.ContainsInt64(allowedCountryIds, country.Id) { + allowedCountryMaps = append(allowedCountryMaps, countryMap) + } } - this.Data["countries"] = countryMaps + this.Data["deniedCountries"] = deniesCountryMaps + this.Data["allowedCountries"] = allowedCountryMaps // except & only URL Patterns this.Data["exceptURLPatterns"] = []*shared.URLPattern{} @@ -88,7 +97,8 @@ func (this *CountriesAction) RunGet(params struct { func (this *CountriesAction) RunPost(params struct { FirewallPolicyId int64 - CountryIds []int64 + DenyCountryIds []int64 + AllowCountryIds []int64 ExceptURLPatternsJSON []byte OnlyURLPatternsJSON []byte @@ -98,6 +108,8 @@ func (this *CountriesAction) RunPost(params struct { // 日志 defer this.CreateLogInfo(codes.WAF_LogUpdateForbiddenCountries, params.FirewallPolicyId) + // TODO validate denied and allowed countries + policyConfig, err := dao.SharedHTTPFirewallPolicyDAO.FindEnabledHTTPFirewallPolicyConfig(this.AdminContext(), params.FirewallPolicyId) if err != nil { this.ErrorPage(err) @@ -116,7 +128,8 @@ func (this *CountriesAction) RunPost(params struct { IsOn: true, } } - policyConfig.Inbound.Region.DenyCountryIds = params.CountryIds + policyConfig.Inbound.Region.DenyCountryIds = params.DenyCountryIds + policyConfig.Inbound.Region.AllowCountryIds = params.AllowCountryIds // 例外URL var exceptURLPatterns = []*shared.URLPattern{} diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go index cb2070a5..d2f2f2a3 100644 --- a/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go +++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/provinces.go @@ -7,14 +7,13 @@ import ( "github.com/TeaOSLab/EdgeCommon/pkg/rpc/dao" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/firewallconfigs" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/regionconfigs" "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/shared" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/maps" ) -const ChinaCountryId = 1 - type ProvincesAction struct { actionutils.ParentAction } @@ -42,27 +41,36 @@ func (this *ProvincesAction) RunGet(params struct { this.NotFound("firewallPolicy", params.FirewallPolicyId) return } - var selectedProvinceIds = []int64{} + var deniedProvinceIds = []int64{} + var allowedProvinceIds = []int64{} if policyConfig.Inbound != nil && policyConfig.Inbound.Region != nil { - selectedProvinceIds = policyConfig.Inbound.Region.DenyProvinceIds + deniedProvinceIds = policyConfig.Inbound.Region.DenyProvinceIds + allowedProvinceIds = policyConfig.Inbound.Region.AllowProvinceIds } provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{ - RegionCountryId: int64(ChinaCountryId), + RegionCountryId: regionconfigs.RegionChinaId, }) if err != nil { this.ErrorPage(err) return } - var provinceMaps = []maps.Map{} + var deniedProvinceMaps = []maps.Map{} + var allowedProvinceMaps = []maps.Map{} for _, province := range provincesResp.RegionProvinces { - provinceMaps = append(provinceMaps, maps.Map{ - "id": province.Id, - "name": province.DisplayName, - "isChecked": lists.ContainsInt64(selectedProvinceIds, province.Id), - }) + var provinceMap = maps.Map{ + "id": province.Id, + "name": province.DisplayName, + } + if lists.ContainsInt64(deniedProvinceIds, province.Id) { + deniedProvinceMaps = append(deniedProvinceMaps, provinceMap) + } + if lists.ContainsInt64(allowedProvinceIds, province.Id) { + allowedProvinceMaps = append(allowedProvinceMaps, provinceMap) + } } - this.Data["provinces"] = provinceMaps + this.Data["deniedProvinces"] = deniedProvinceMaps + this.Data["allowedProvinces"] = allowedProvinceMaps // except & only URL Patterns this.Data["exceptURLPatterns"] = []*shared.URLPattern{} @@ -89,7 +97,8 @@ func (this *ProvincesAction) RunGet(params struct { func (this *ProvincesAction) RunPost(params struct { FirewallPolicyId int64 - ProvinceIds []int64 + DenyProvinceIds []int64 + AllowProvinceIds []int64 ExceptURLPatternsJSON []byte OnlyURLPatternsJSON []byte @@ -117,7 +126,8 @@ func (this *ProvincesAction) RunPost(params struct { IsOn: true, } } - policyConfig.Inbound.Region.DenyProvinceIds = params.ProvinceIds + policyConfig.Inbound.Region.DenyProvinceIds = params.DenyProvinceIds + policyConfig.Inbound.Region.AllowProvinceIds = params.AllowProvinceIds // 例外URL var exceptURLPatterns = []*shared.URLPattern{} diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/selectCountriesPopup.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/selectCountriesPopup.go new file mode 100644 index 00000000..a1357ac6 --- /dev/null +++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/selectCountriesPopup.go @@ -0,0 +1,53 @@ +// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn . + +package ipadmin + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/utils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/iwind/TeaGo/lists" + "github.com/iwind/TeaGo/maps" + "strings" +) + +type SelectCountriesPopupAction struct { + actionutils.ParentAction +} + +func (this *SelectCountriesPopupAction) Init() { + this.Nav("", "", "") +} + +func (this *SelectCountriesPopupAction) RunGet(params struct { + Type string + SelectedCountryIds string +}) { + this.Data["type"] = params.Type + + var selectedCountryIds = utils.SplitNumbers(params.SelectedCountryIds) + + countriesResp, err := this.RPC().RegionCountryRPC().FindAllRegionCountries(this.AdminContext(), &pb.FindAllRegionCountriesRequest{}) + if err != nil { + this.ErrorPage(err) + return + } + + // special regions + + var countryMaps = []maps.Map{} + for _, country := range countriesResp.RegionCountries { + countryMaps = append(countryMaps, maps.Map{ + "id": country.Id, + "name": country.DisplayName, + "letter": strings.ToUpper(string(country.Pinyin[0][0])), + "pinyin": country.Pinyin, + "codes": country.Codes, + "isCommon": country.IsCommon, + "isChecked": lists.ContainsInt64(selectedCountryIds, country.Id), + }) + } + this.Data["countries"] = countryMaps + + this.Show() +} diff --git a/internal/web/actions/default/servers/server/settings/waf/ipadmin/selectProvincesPopup.go b/internal/web/actions/default/servers/server/settings/waf/ipadmin/selectProvincesPopup.go new file mode 100644 index 00000000..28db774c --- /dev/null +++ b/internal/web/actions/default/servers/server/settings/waf/ipadmin/selectProvincesPopup.go @@ -0,0 +1,48 @@ +// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn . + +package ipadmin + +import ( + "github.com/TeaOSLab/EdgeAdmin/internal/utils" + "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" + "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/regionconfigs" + "github.com/iwind/TeaGo/lists" + "github.com/iwind/TeaGo/maps" +) + +type SelectProvincesPopupAction struct { + actionutils.ParentAction +} + +func (this *SelectProvincesPopupAction) Init() { + this.Nav("", "", "") +} + +func (this *SelectProvincesPopupAction) RunGet(params struct { + Type string + SelectedProvinceIds string +}) { + this.Data["type"] = params.Type + + var selectedProvinceIds = utils.SplitNumbers(params.SelectedProvinceIds) + + provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{ + RegionCountryId: regionconfigs.RegionChinaId, + }) + if err != nil { + this.ErrorPage(err) + return + } + var provinceMaps = []maps.Map{} + for _, province := range provincesResp.RegionProvinces { + provinceMaps = append(provinceMaps, maps.Map{ + "id": province.Id, + "name": province.DisplayName, + "isChecked": lists.ContainsInt64(selectedProvinceIds, province.Id), + }) + } + this.Data["provinces"] = provinceMaps + + this.Show() +} diff --git a/internal/web/actions/default/ui/provinceOptions.go b/internal/web/actions/default/ui/provinceOptions.go index 4c967d0b..50aae388 100644 --- a/internal/web/actions/default/ui/provinceOptions.go +++ b/internal/web/actions/default/ui/provinceOptions.go @@ -5,6 +5,7 @@ package ui import ( "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/regionconfigs" "github.com/iwind/TeaGo/maps" ) @@ -13,7 +14,7 @@ type ProvinceOptionsAction struct { } func (this *ProvinceOptionsAction) RunPost(params struct{}) { - provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{RegionCountryId: ChinaCountryId}) + provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{RegionCountryId: regionconfigs.RegionChinaId}) if err != nil { this.ErrorPage(err) return diff --git a/internal/web/actions/default/ui/selectProvincesPopup.go b/internal/web/actions/default/ui/selectProvincesPopup.go index d90be1d8..f6ea5775 100644 --- a/internal/web/actions/default/ui/selectProvincesPopup.go +++ b/internal/web/actions/default/ui/selectProvincesPopup.go @@ -4,13 +4,12 @@ import ( "github.com/TeaOSLab/EdgeAdmin/internal/utils" "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils" "github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb" + "github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/regionconfigs" "github.com/iwind/TeaGo/actions" "github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/maps" ) -const ChinaCountryId = 1 - type SelectProvincesPopupAction struct { actionutils.ParentAction } @@ -24,7 +23,7 @@ func (this *SelectProvincesPopupAction) RunGet(params struct { }) { var selectedProvinceIds = utils.SplitNumbers(params.ProvinceIds) - provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{RegionCountryId: ChinaCountryId}) + provincesResp, err := this.RPC().RegionProvinceRPC().FindAllRegionProvincesWithRegionCountryId(this.AdminContext(), &pb.FindAllRegionProvincesWithRegionCountryIdRequest{RegionCountryId: regionconfigs.RegionChinaId}) if err != nil { this.ErrorPage(err) return diff --git a/web/public/js/components/common/search-box.js b/web/public/js/components/common/search-box.js new file mode 100644 index 00000000..e597b072 --- /dev/null +++ b/web/public/js/components/common/search-box.js @@ -0,0 +1,33 @@ +Vue.component("search-box", { + props: ["placeholder", "width"], + data: function () { + let width = this.width + if (width == null) { + width = "10em" + } + return { + realWidth: width, + realValue: "" + } + }, + methods: { + onInput: function () { + this.$emit("input", { value: this.realValue}) + this.$emit("change", { value: this.realValue}) + }, + clearValue: function () { + this.realValue = "" + this.focus() + this.onInput() + }, + focus: function () { + this.$refs.valueRef.focus() + } + }, + template: `
+
+ + +
+
` +}) \ No newline at end of file diff --git a/web/public/js/components/server/http-firewall-province-selector.js b/web/public/js/components/server/http-firewall-province-selector.js new file mode 100644 index 00000000..9eaf8a99 --- /dev/null +++ b/web/public/js/components/server/http-firewall-province-selector.js @@ -0,0 +1,55 @@ +Vue.component("http-firewall-province-selector", { + props: ["v-type", "v-provinces"], + data: function () { + let provinces = this.vProvinces + if (provinces == null) { + provinces = [] + } + + return { + listType: this.vType, + provinces: provinces + } + }, + methods: { + addProvince: function () { + let selectedProvinceIds = this.provinces.map(function (province) { + return province.id + }) + let that = this + teaweb.popup("/servers/server/settings/waf/ipadmin/selectProvincesPopup?type=" + this.listType + "&selectedProvinceIds=" + selectedProvinceIds.join(","), { + width: "50em", + height: "26em", + callback: function (resp) { + that.provinces = resp.data.selectedProvinces + that.$forceUpdate() + that.notifyChange() + } + }) + }, + removeProvince: function (index) { + this.provinces.$remove(index) + this.notifyChange() + }, + resetProvinces: function () { + this.provinces = [] + this.notifyChange() + }, + notifyChange: function () { + this.$emit("change", { + "provinces": this.provinces + }) + } + }, + template: `
+ 暂时没有选择允许封禁的省份。 +
+
+ + {{province.name}} +
+
+
+   +
` +}) \ No newline at end of file diff --git a/web/public/js/components/server/http-firewall-region-selector.js b/web/public/js/components/server/http-firewall-region-selector.js new file mode 100644 index 00000000..53a77923 --- /dev/null +++ b/web/public/js/components/server/http-firewall-region-selector.js @@ -0,0 +1,55 @@ +Vue.component("http-firewall-region-selector", { + props: ["v-type", "v-countries"], + data: function () { + let countries = this.vCountries + if (countries == null) { + countries = [] + } + + return { + listType: this.vType, + countries: countries + } + }, + methods: { + addCountry: function () { + let selectedCountryIds = this.countries.map(function (country) { + return country.id + }) + let that = this + teaweb.popup("/servers/server/settings/waf/ipadmin/selectCountriesPopup?type=" + this.listType + "&selectedCountryIds=" + selectedCountryIds.join(","), { + width: "52em", + height: "30em", + callback: function (resp) { + that.countries = resp.data.selectedCountries + that.$forceUpdate() + that.notifyChange() + } + }) + }, + removeCountry: function (index) { + this.countries.$remove(index) + this.notifyChange() + }, + resetCountries: function () { + this.countries = [] + this.notifyChange() + }, + notifyChange: function () { + this.$emit("change", { + "countries": this.countries + }) + } + }, + template: `
+ 暂时没有选择允许封禁的区域。 +
+
+ + ({{country.letter}}){{country.name}} +
+
+
+   +
` +}) \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/countries.css b/web/views/@default/servers/server/settings/waf/ipadmin/countries.css deleted file mode 100644 index aa3b2c53..00000000 --- a/web/views/@default/servers/server/settings/waf/ipadmin/countries.css +++ /dev/null @@ -1,17 +0,0 @@ -.region-letter-group .item { - padding-left: 1em !important; - padding-right: 1em !important; -} -.country-group { - padding-bottom: 1em; -} -.country-group .country-list .item { - float: left; - width: 12em; - margin-bottom: 0.5em; -} -.country-group .country-list .item .checkbox label { - font-size: 12px !important; - cursor: pointer !important; -} -/*# sourceMappingURL=countries.css.map */ \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/countries.css.map b/web/views/@default/servers/server/settings/waf/ipadmin/countries.css.map deleted file mode 100644 index 15d53e6c..00000000 --- a/web/views/@default/servers/server/settings/waf/ipadmin/countries.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["countries.less"],"names":[],"mappings":"AAAA,oBACC;EACC,4BAAA;EACA,6BAAA;;AAIF;EAcC,mBAAA;;AAdD,cACC,cACC;EACC,WAAA;EACA,WAAA;EACA,oBAAA;;AALH,cACC,cACC,MAKC,UAAU;EACT,0BAAA;EACA,0BAAA","file":"countries.css"} \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/countries.html b/web/views/@default/servers/server/settings/waf/ipadmin/countries.html index 0b530e97..71ca74ba 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/countries.html +++ b/web/views/@default/servers/server/settings/waf/ipadmin/countries.html @@ -15,54 +15,32 @@ - - - - - - - - - - + + - - + + + + + + + + + + + + + + +
已封禁 - 暂时没有选择封禁区域。 -
- - ({{country.letter}}){{country.name}} -
-
选择封禁区域 * - 选择区域完成选择 - -
- {{group}} -
-
- - -
-
-
-
-
-

{{letter}}

-
-
-
- - -
-
-
-
-
-
-
例外URL  仅允许的区域 + +
限制URL  仅封禁的区域 +

由于你已设置"仅允许的区域"，所以不需要再设置封禁区域。

+ +
例外URL  
限制URL  
diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/countries.js b/web/views/@default/servers/server/settings/waf/ipadmin/countries.js index b0ed60d1..8f1ffa7b 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/countries.js +++ b/web/views/@default/servers/server/settings/waf/ipadmin/countries.js @@ -1,54 +1,11 @@ Tea.context(function () { - this.letterGroups = [ - "ABC", "DEF", "GHI", "JKL", "MNO", "PQR", "STU", "VWX", "YZ" - ]; - this.selectedGroup = "ABC" - this.letterCountries = {} - let that = this - this.countSelectedCountries = this.countries.$count(function (k, country) { - return country.isChecked - }) - this.countries.forEach(function (country) { - if (typeof (that.letterCountries[country.letter]) == "undefined") { - that.letterCountries[country.letter] = [] - } - that.letterCountries[country.letter].push(country) - }) - this.isCheckingAll = false - - this.selectGroup = function (group) { - this.selectedGroup = group - } - - this.selectCountry = function (country) { - country.isChecked = !country.isChecked - this.change() - } - - this.deselectCountry = function (country) { - country.isChecked = false - this.change() - } - - this.checkAll = function () { - this.isCheckingAll = !this.isCheckingAll - - this.countries.forEach(function (country) { - country.isChecked = that.isCheckingAll - }) - - this.change() - } - this.success = function () { teaweb.success("保存成功", function () { teaweb.reload() }) } - this.change = function () { - this.countSelectedCountries = this.countries.$count(function (k, country) { - return country.isChecked - }) + this.changeAllowedCountries = function (event) { + this.allowedCountries = event.countries } }) \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/countries.less b/web/views/@default/servers/server/settings/waf/ipadmin/countries.less deleted file mode 100644 index 6888538f..00000000 --- a/web/views/@default/servers/server/settings/waf/ipadmin/countries.less +++ /dev/null @@ -1,23 +0,0 @@ -.region-letter-group { - .item { - padding-left: 1em !important; - padding-right: 1em !important; - } -} - -.country-group { - .country-list { - .item { - float: left; - width: 12em; - margin-bottom: 0.5em; - - .checkbox label { - font-size: 12px !important; - cursor: pointer !important; - } - } - } - - padding-bottom: 1em; -} \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.css.map b/web/views/@default/servers/server/settings/waf/ipadmin/provinces.css.map deleted file mode 100644 index 70006c08..00000000 --- a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["provinces.less"],"names":[],"mappings":"AAAA,cACC;EACC,WAAA;EACA,WAAA;EACA,oBAAA;;AAJF,cACC,MAKC,UAAU;EACT,0BAAA;EACA,0BAAA","file":"provinces.css"} \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html b/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html index 8ac806c0..74c952fb 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html +++ b/web/views/@default/servers/server/settings/waf/ipadmin/provinces.html @@ -15,49 +15,32 @@ - - - - - - - - - - + + - - + + + + + + + + + + + + + + +
已封禁 - 暂时没有选择封禁省份。 -
- - {{province.name}} -
-
选择封禁区域 - - - 选择省份/自治区完成选择 -
-
- - -
-
- - -
-
-
- - -
-
-
-
-
例外URL  仅允许的省份 + +
限制URL  仅封禁的省份 +

由于你已设置"仅允许的省份"，所以不需要再设置封禁省份。

+ +
例外URL  
限制URL  
diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.js b/web/views/@default/servers/server/settings/waf/ipadmin/provinces.js index f2e83994..cce07f92 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.js +++ b/web/views/@default/servers/server/settings/waf/ipadmin/provinces.js @@ -1,40 +1,11 @@ Tea.context(function () { - this.isCheckingAll = false - - this.countSelectedProvinces = this.provinces.$count(function (k, province) { - return province.isChecked - }) - - this.selectProvince = function (province) { - province.isChecked = !province.isChecked - this.change() - } - - this.deselectProvince = function (province) { - province.isChecked = false - this.change() - } - - this.checkAll = function () { - this.isCheckingAll = !this.isCheckingAll - let that = this - this.provinces.forEach(function (province) { - province.isChecked = that.isCheckingAll - }) - - this.change() - } - this.success = function () { teaweb.success("保存成功", function () { teaweb.reload() }) } - - this.change = function () { - this.countSelectedProvinces = this.provinces.$count(function (k, province) { - return province.isChecked - }) + this.changeAllowedProvinces = function (event) { + this.allowedProvinces = event.provinces } }) \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.css b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.css new file mode 100644 index 00000000..28aed6c3 --- /dev/null +++ b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.css @@ -0,0 +1,28 @@ +.region-letter-group .item { + padding-left: 0.8em !important; + padding-right: 0.8em !important; +} +.region-letter-group .item .count { + font-size: 0.8em; + color: grey; +} +.country-groups { + max-height: 23em; + overflow-y: auto; +} +.country-groups .country-group { + padding-bottom: 1em; +} +.country-groups .country-group .country-list .item { + float: left; + width: 9em; + margin-bottom: 0.5em; +} +.country-groups .country-group .country-list .item .checkbox label { + font-size: 12px !important; + cursor: pointer !important; +} +.country-groups::-webkit-scrollbar { + width: 4px; +} +/*# sourceMappingURL=selectCountriesPopup.css.map */ \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.css.map b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.css.map new file mode 100644 index 00000000..fa673929 --- /dev/null +++ b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["selectCountriesPopup.less"],"names":[],"mappings":"AAAA,oBACC;EACC,mBAAA;EACA,oBAAA;;AAHF,oBACC,MAIC;EACC,gBAAA;EACA,WAAA;;AAKH;EACC,gBAAA;EACA,gBAAA;;AAFD,eAIC;EACC,mBAAA;;AALF,eAIC,eAGC,cACC;EACC,WAAA;EACA,UAAA;EACA,oBAAA;;AAXJ,eAIC,eAGC,cACC,MAKC,UAAU;EACT,0BAAA;EACA,0BAAA;;AAOL,eAAe;EACd,UAAA","file":"selectCountriesPopup.css"} \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.html b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.html new file mode 100644 index 00000000..7f296f5e --- /dev/null +++ b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.html @@ -0,0 +1,59 @@ +{$layout "layout_popup"} + +

选择允许的区域

+

选择封禁的区域

+
+
+ {{group.code}} ({{group.count}}) +
+
+ + +
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+
+
+

{{letter}}

+
+
+
+ + +
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.js b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.js new file mode 100644 index 00000000..725386c2 --- /dev/null +++ b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.js @@ -0,0 +1,197 @@ +Tea.context(function () { + var commonGroupName = "常用" + this.letterGroups = [ + { + "code": commonGroupName, + "count": 0, + "countMatched": 0 + }, + { + "code": "ABC", + "count": 0, + "countMatched": 0 + }, + { + "code": "DEF", + "count": 0, + "countMatched": 0 + }, + { + "code": "GHI", + "count": 0, + "countMatched": 0 + }, + { + "code": "JKL", + "count": 0, + "countMatched": 0 + }, + { + "code": "MNO", + "count": 0, + "countMatched": 0 + }, + { + "code": "PQR", + "count": 0, + "countMatched": 0 + }, + { + "code": "STU", + "count": 0, + "countMatched": 0 + }, + { + "code": "VWX", + "count": 0, + "countMatched": 0 + }, + { + "code": "YZ", + "count": 0, + "countMatched": 0 + } + ] + this.commonGroupName = commonGroupName + this.selectedGroup = commonGroupName + this.letterCountries = {} + let that = this + this.countSelectedCountries = this.countries.$count(function (k, country) { + return country.isChecked + }) + this.countries.forEach(function (country) { + // letter + if (typeof (that.letterCountries[country.letter]) == "undefined") { + that.letterCountries[country.letter] = [] + } + that.letterCountries[country.letter].push(country) + + // common + if (country.isCommon) { + if (typeof that.letterCountries[commonGroupName] == "undefined") { + that.letterCountries[commonGroupName] = [] + } + that.letterCountries[commonGroupName].push(country) + } + }) + this.isCheckingAll = false + + this.$delay(function () { + this.change() + }) + + this.checkAll = function () { + this.isCheckingAll = !this.isCheckingAll + + this.countries.forEach(function (country) { + country.isChecked = that.isCheckingAll + }) + + this.change() + } + + this.selectGroup = function (group) { + this.selectedGroup = group.code + } + + this.selectCountry = function (country) { + country.isChecked = !country.isChecked + this.change() + } + + this.deselectCountry = function (country) { + country.isChecked = false + this.change() + } + + this.change = function () { + let that = this + this.letterGroups.forEach(function (group) { + group.count = 0 + group.countMatched = 0 + }) + this.countries.forEach(function (country) { + that.letterGroups.forEach(function (group) { + if (group.code.indexOf(country.letter) >= 0 || (group.code == commonGroupName && country.isCommon)) { + if (country.isChecked) { + group.count++ + } + if (that.matchCountry(country)) { + country.isMatched = (that.keyword.length > 0) + group.countMatched++ + } else { + country.isMatched = false + } + } + }) + }) + } + + this.submit = function () { + let selectedCountries = [] + this.countries.forEach(function (country) { + if (country.isChecked) { + selectedCountries.push(country) + } + }) + NotifyPopup({ + code: 200, + data: { + selectedCountries: selectedCountries + } + }) + } + + /** + * searching + */ + this.searchBoxVisible = false + this.keyword = "" + + this.showSearchBox = function () { + this.searchBoxVisible = true + this.$delay(function () { + this.$refs.searchBox.focus() + }) + } + + this.changeKeyword = function (event) { + this.keyword = event.value.trim() + this.change() + } + + this.matchCountry = function (country) { + if (this.keyword.length == 0) { + return true + } + + if (teaweb.match(country.name, this.keyword)) { + return true + } + if (country.pinyin != null && country.pinyin.length > 0) { + let matched = false + let that = this + country.pinyin.forEach(function (code) { + if (teaweb.match(code, that.keyword)) { + matched = true + } + }) + if (matched) { + return true + } + } + if (country.codes != null && country.codes.length > 0) { + let matched = false + let that = this + country.codes.forEach(function (code) { + if (teaweb.match(code, that.keyword)) { + matched = true + } + }) + if (matched) { + return true + } + } + return false + } +}) \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.less b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.less new file mode 100644 index 00000000..3eda9ece --- /dev/null +++ b/web/views/@default/servers/server/settings/waf/ipadmin/selectCountriesPopup.less @@ -0,0 +1,37 @@ +.region-letter-group { + .item { + padding-left: 0.8em !important; + padding-right: 0.8em !important; + + .count { + font-size: 0.8em; + color: grey; + } + } +} + +.country-groups { + max-height: 23em; + overflow-y: auto; + + .country-group { + padding-bottom: 1em; + + .country-list { + .item { + float: left; + width: 9em; + margin-bottom: 0.5em; + + .checkbox label { + font-size: 12px !important; + cursor: pointer !important; + } + } + } + } +} + +.country-groups::-webkit-scrollbar { + width: 4px; +} \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.css b/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.css similarity index 77% rename from web/views/@default/servers/server/settings/waf/ipadmin/provinces.css rename to web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.css index 9b90dcdc..85ced845 100644 --- a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.css +++ b/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.css @@ -7,4 +7,4 @@ font-size: 12px !important; cursor: pointer !important; } -/*# sourceMappingURL=provinces.css.map */ \ No newline at end of file +/*# sourceMappingURL=selectProvincesPopup.css.map */ \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.css.map b/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.css.map new file mode 100644 index 00000000..8d18eb7d --- /dev/null +++ b/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.css.map @@ -0,0 +1 @@ +{"version":3,"sources":["selectProvincesPopup.less"],"names":[],"mappings":"AAAA,cACC;EACC,WAAA;EACA,WAAA;EACA,oBAAA;;AAJF,cACC,MAKC,UAAU;EACT,0BAAA;EACA,0BAAA","file":"selectProvincesPopup.css"} \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.html b/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.html new file mode 100644 index 00000000..579c50f7 --- /dev/null +++ b/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.html @@ -0,0 +1,32 @@ +{$layout "layout_popup"} + +

选择允许的省份

+

选择封禁的省份

+ +
+ + + + +
+ +
+
+ + +
+
+ + +
+
+
+ + +
+
+
+
+
+ +
\ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.js b/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.js new file mode 100644 index 00000000..22b11f7f --- /dev/null +++ b/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.js @@ -0,0 +1,46 @@ +Tea.context(function () { + this.isCheckingAll = false + + this.countSelectedProvinces = this.provinces.$count(function (k, province) { + return province.isChecked + }) + + this.selectProvince = function (province) { + province.isChecked = !province.isChecked + this.change() + } + + this.deselectProvince = function (province) { + province.isChecked = false + this.change() + } + + this.checkAll = function () { + this.isCheckingAll = !this.isCheckingAll + let that = this + this.provinces.forEach(function (province) { + province.isChecked = that.isCheckingAll + }) + + this.change() + } + + this.change = function () { + + } + + this.submit = function () { + let selectedProvinces = [] + this.provinces.forEach(function (province) { + if (province.isChecked) { + selectedProvinces.push(province) + } + }) + NotifyPopup({ + code: 200, + data: { + selectedProvinces: selectedProvinces + } + }) + } +}) \ No newline at end of file diff --git a/web/views/@default/servers/server/settings/waf/ipadmin/provinces.less b/web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.less similarity index 100% rename from web/views/@default/servers/server/settings/waf/ipadmin/provinces.less rename to web/views/@default/servers/server/settings/waf/ipadmin/selectProvincesPopup.less