diff --git a/internal/web/actions/default/servers/server/settings/locations/waf/index.go b/internal/web/actions/default/servers/server/settings/locations/waf/index.go index 08c273a8..896013d3 100644 --- a/internal/web/actions/default/servers/server/settings/locations/waf/index.go +++ b/internal/web/actions/default/servers/server/settings/locations/waf/index.go @@ -36,9 +36,10 @@ func (this *IndexAction) RunGet(params struct { policyMaps := []maps.Map{} for _, p := range policiesResp.FirewallPolicies { policyMaps = append(policyMaps, maps.Map{ - "id": p.Id, - "name": p.Name, - "isOn": p.IsOn, + "id": p.Id, + "name": p.Name, + "isOn": p.IsOn, + "description": p.Description, }) } this.Data["firewallPolicies"] = policyMaps diff --git a/internal/web/actions/default/servers/server/settings/waf/index.go b/internal/web/actions/default/servers/server/settings/waf/index.go index c2f51c70..34457036 100644 --- a/internal/web/actions/default/servers/server/settings/waf/index.go +++ b/internal/web/actions/default/servers/server/settings/waf/index.go @@ -38,9 +38,10 @@ func (this *IndexAction) RunGet(params struct { policyMaps := []maps.Map{} for _, p := range policiesResp.FirewallPolicies { policyMaps = append(policyMaps, maps.Map{ - "id": p.Id, - "name": p.Name, - "isOn": p.IsOn, + "id": p.Id, + "name": p.Name, + "isOn": p.IsOn, + "description": p.Description, }) } this.Data["firewallPolicies"] = policyMaps diff --git a/web/public/js/components/server/http-firewall-config-box.js b/web/public/js/components/server/http-firewall-config-box.js index 104e9dbc..189194b0 100644 --- a/web/public/js/components/server/http-firewall-config-box.js +++ b/web/public/js/components/server/http-firewall-config-box.js @@ -11,12 +11,22 @@ Vue.component("http-firewall-config-box", { } return { - firewall: firewall + firewall: firewall, + selectedPolicy: this.lookupPolicy(firewall.firewallPolicyId) } }, methods: { changePolicyId: function () { this.firewall.firewallPolicyId = parseInt(this.firewall.firewallPolicyId) + this.selectedPolicy = this.lookupPolicy(this.firewall.firewallPolicyId) + }, + lookupPolicy: function (policyId) { + if (policyId <= 0) { + return null + } + return this.vFirewallPolicies.$find(function (k, v) { + return v.id == policyId + }) } }, template: `
[正在停用的策略]{{selectedPolicy.description}}