From 8c6d84560352fe5b3be2ccd89931d30a35a97aea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Wed, 17 Nov 2021 16:14:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=85=AC=E7=94=A8IP=E5=90=8D=E5=8D=95?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=94=B9=E6=88=90=E5=85=A8=E5=B1=80=E5=90=8D?=
 =?UTF-8?q?=E5=8D=95=EF=BC=8C=E8=87=AA=E5=8A=A8=E5=BA=94=E7=94=A8=E4=BA=8E?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/actions/default/servers/iplists/createPopup.go     | 2 ++
 internal/web/actions/default/servers/iplists/index.go      | 1 +
 internal/web/actions/default/servers/iplists/utils.go      | 1 +
 web/views/@default/servers/iplists/createPopup.html        | 7 +++++++
 web/views/@default/servers/iplists/index.html              | 5 ++++-
 web/views/@default/servers/iplists/index.js                | 1 +
 web/views/@default/servers/iplists/list.html               | 7 +++++++
 7 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/internal/web/actions/default/servers/iplists/createPopup.go b/internal/web/actions/default/servers/iplists/createPopup.go
index 2365b1c6..f03b972b 100644
--- a/internal/web/actions/default/servers/iplists/createPopup.go
+++ b/internal/web/actions/default/servers/iplists/createPopup.go
@@ -29,6 +29,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 	Name        string
 	Type        string
 	Description string
+	IsGlobal    bool
 
 	Must *actions.Must
 	CSRF *actionutils.CSRF
@@ -49,6 +50,7 @@ func (this *CreatePopupAction) RunPost(params struct {
 		TimeoutJSON: nil,
 		IsPublic:    true,
 		Description: params.Description,
+		IsGlobal:    params.IsGlobal,
 	})
 	if err != nil {
 		this.ErrorPage(err)
diff --git a/internal/web/actions/default/servers/iplists/index.go b/internal/web/actions/default/servers/iplists/index.go
index d0b72e55..e5096ca1 100644
--- a/internal/web/actions/default/servers/iplists/index.go
+++ b/internal/web/actions/default/servers/iplists/index.go
@@ -68,6 +68,7 @@ func (this *IndexAction) RunGet(params struct {
 			"description": list.Description,
 			"countItems":  countItems,
 			"type":        list.Type,
+			"isGlobal":    list.IsGlobal,
 		})
 	}
 	this.Data["lists"] = listMaps
diff --git a/internal/web/actions/default/servers/iplists/utils.go b/internal/web/actions/default/servers/iplists/utils.go
index aabffa2d..d558b1c8 100644
--- a/internal/web/actions/default/servers/iplists/utils.go
+++ b/internal/web/actions/default/servers/iplists/utils.go
@@ -47,6 +47,7 @@ func InitIPList(action *actionutils.ParentAction, listId int64) error {
 		"description": list.Description,
 		"isOn":        list.IsOn,
 		"countItems":  countItems,
+		"isGlobal":    list.IsGlobal,
 	}
 	return nil
 }
diff --git a/web/views/@default/servers/iplists/createPopup.html b/web/views/@default/servers/iplists/createPopup.html
index ca3ed2e8..0f6a652c 100644
--- a/web/views/@default/servers/iplists/createPopup.html
+++ b/web/views/@default/servers/iplists/createPopup.html
@@ -20,6 +20,13 @@
                 </select>
             </td>
         </tr>
+        <tr>
+            <td>是否全局</td>
+            <td>
+                <checkbox name="isGlobal" checked="checked"></checkbox>
+                <p class="comment">如果选择为全局有效，则所有服务都自动使用此名单，否则只有在WAF策略中绑定此名单后才会生效。</p>
+            </td>
+        </tr>
         <tr>
             <td>备注</td>
             <td>
diff --git a/web/views/@default/servers/iplists/index.html b/web/views/@default/servers/iplists/index.html
index c8d2b742..c2fa0e5b 100644
--- a/web/views/@default/servers/iplists/index.html
+++ b/web/views/@default/servers/iplists/index.html
@@ -33,7 +33,10 @@
     </thead>
     <tr v-for="list in lists">
         <td class="center">{{list.id}}</td>
-        <td><a :href="'/servers/iplists/list?listId=' + list.id"><keyword :v-word="keyword">{{list.name}}</keyword></a></td>
+        <td>
+            <a :href="'/servers/iplists/list?listId=' + list.id"><keyword :v-word="keyword">{{list.name}}</keyword></a>
+            <div v-if="list.isGlobal" style="margin-top: 0.3em"><grey-label>全局</grey-label></div>
+        </td>
         <td class="center">
             <span v-if="list.type == 'black'">黑名单</span>
             <span v-if="list.type == 'white'">白名单</span>
diff --git a/web/views/@default/servers/iplists/index.js b/web/views/@default/servers/iplists/index.js
index 59f57130..cbd6c0f0 100644
--- a/web/views/@default/servers/iplists/index.js
+++ b/web/views/@default/servers/iplists/index.js
@@ -1,6 +1,7 @@
 Tea.context(function () {
 	this.createList = function () {
 		teaweb.popup(Tea.url(".createPopup", {type: this.type}), {
+			height: "24em",
 			callback: function (resp) {
 				teaweb.success("保存成功", function () {
 					window.location = "/servers/iplists?type=" + resp.data.list.type
diff --git a/web/views/@default/servers/iplists/list.html b/web/views/@default/servers/iplists/list.html
index 12663699..302427d2 100644
--- a/web/views/@default/servers/iplists/list.html
+++ b/web/views/@default/servers/iplists/list.html
@@ -14,6 +14,13 @@
             {{list.typeName}}
         </td>
     </tr>
+    <tr>
+        <td>是否全局</td>
+        <td>
+            <span v-if="list.isGlobal" class="green">Y</span>
+            <span v-else class="disabled">N</span>
+        </td>
+    </tr>
     <tr>
         <td>备注</td>
         <td>