diff --git a/static/admin/notify.js b/static/admin/notify.js
index 96ea5b2..12985ab 100644
--- a/static/admin/notify.js
+++ b/static/admin/notify.js
@@ -107,8 +107,11 @@ function openNotifyModal(id){
   const box = document.getElementById('notify-modal-box');
   if(!box) return;
   box.innerHTML =
-    '<div style="font-size:15px;font-weight:700;margin-bottom:12px">'
-      + (id ? '编辑 Webhook' : '新建 Webhook') + '</div>'
+    '<div style="display:flex;align-items:center;margin-bottom:12px">'
+      + '<div style="font-size:15px;font-weight:700;flex:1">'
+        + (id ? '编辑 Webhook' : '新建 Webhook') + '</div>'
+      + '<button class="btn btn-xs" title="关闭（不保存）" onclick="closeNotifyModal()">✕ 关闭</button>'
+    + '</div>'
     + '<div class="form-row">'
       + '<div class="form-group"><label>名称</label>'
         + '<input id="nf-name" class="form-control" value="' + esc(h.name || '') + '" placeholder="如：运维群"></div>'
@@ -136,7 +139,7 @@ function openNotifyModal(id){
       + '带 <b>★</b> 的是建议开启的。也可以直接写通配（如 <code>task.*</code>）——在下面的芯片框里加。</div>'
       + '<div id="nf-events" style="max-height:260px;overflow-y:auto;border:1px solid var(--border);border-radius:8px;padding:10px"></div>'
     + '</div>'
-    + '<div class="form-group" id="nf-pattern-wrap" style="display:none"><label>通配订阅</label>'
+    + '<div class="form-group" id="nf-pattern-wrap"><label>通配订阅（可选，任何格式都适用）</label>'
       + '<div id="nf-patterns" style="display:flex;gap:6px;flex-wrap:wrap;margin-bottom:6px"></div>'
       + '<div style="display:flex;gap:6px"><input id="nf-pattern-input" class="form-control" placeholder="task.* 或 device.* 或 *">'
       + '<button class="btn" onclick="addNotifyPattern()">添加</button></div></div>'
@@ -147,6 +150,13 @@ function openNotifyModal(id){
       + '<code>{"text":"{{markdown}}"}</code></div></div>'
     + '<div class="form-group">'
       + '<label>预览</label><div id="nf-preview" class="help">点「预览请求体」看真实会发出去的内容与字节数。</div>'
+    + '</div>'
+    // 底部操作栏（缺了它就只能靠刷新页面逃出去）
+    + '<div style="display:flex;gap:8px;align-items:center;margin-top:16px;padding-top:12px;border-top:1px solid var(--border)">'
+      + '<button class="btn btn-primary" onclick="saveNotifyHook()">' + (id ? '保存' : '创建') + '</button>'
+      + '<button class="btn" onclick="previewNotifyHook()">预览请求体</button>'
+      + '<button class="btn" onclick="closeNotifyModal()">取消</button>'
+      + '<span class="help" style="margin-left:auto">Esc 或点空白处也能关</span>'
     + '</div>';
   box.querySelector('#nf-body').value = h.body_template || '';
   renderEventTree(checked);
@@ -157,12 +167,18 @@ function openNotifyModal(id){
 
 function _notifyFormatChanged(){
   const f = (document.getElementById('nf-format') || {}).value;
+  // 只有「通用 JSON」才需要自定义请求体模板
   const bodyWrap = document.getElementById('nf-body-wrap');
   if(bodyWrap) bodyWrap.style.display = (f === 'json') ? 'block' : 'none';
-  const patWrap = document.getElementById('nf-pattern-wrap');
-  if(patWrap) patWrap.style.display = (f === 'json' || true) ? 'block' : 'none';
 }
 
+// Esc 关闭弹窗（点空白处关闭在 overlay 的 onclick 上）
+document.addEventListener('keydown', function(ev){
+  if(ev.key !== 'Escape') return;
+  const ov = document.getElementById('notify-modal-overlay');
+  if(ov && ov.style.display !== 'none') closeNotifyModal();
+});
+
 function renderEventTree(checked){
   const box = document.getElementById('nf-events');
   if(!box) return;
diff --git a/templates/admin/monitor.html b/templates/admin/monitor.html
index 0c46a84..6cfb923 100644
--- a/templates/admin/monitor.html
+++ b/templates/admin/monitor.html
@@ -1169,9 +1169,10 @@ body{background:var(--bg);font-family:var(--body);color:var(--text);font-size:14
         <input type="checkbox" id="notify-global" onchange="toggleNotifyGlobal(this)"> 启用通知
       </label>
       <span class="text-muted" style="font-size:11.5px">默认聚合
-        <input type="number" id="notify-agg" min="0" max="600" style="width:56px"
-               class="form-control" style="display:inline-block"> 秒 ·
-        限流 <input type="number" id="notify-rate" min="0" max="60" style="width:56px" class="form-control"> 条/分
+        <input type="number" id="notify-agg" min="0" max="600" class="form-control"
+               style="width:64px;display:inline-block"> 秒 ·
+        限流 <input type="number" id="notify-rate" min="0" max="60" class="form-control"
+                  style="width:64px;display:inline-block"> 条/分
         <button class="btn btn-xs" onclick="saveNotifyGlobal()">保存默认</button>
       </span>
     </div>
@@ -1193,7 +1194,8 @@ body{background:var(--bg);font-family:var(--body);color:var(--text);font-size:14
 </div>
 
 <!-- 通知：编辑弹窗（内容由 static/admin/notify.js 渲染） -->
-<div id="notify-modal-overlay" style="display:none;position:fixed;inset:0;background:rgba(0,0,0,.6);z-index:1340;align-items:flex-start;justify-content:center;overflow-y:auto;padding:30px 0">
+<div id="notify-modal-overlay" onclick="if(event.target===this)closeNotifyModal()"
+     style="display:none;position:fixed;inset:0;background:rgba(0,0,0,.6);z-index:1340;align-items:flex-start;justify-content:center;overflow-y:auto;padding:30px 0">
   <div id="notify-modal-box" style="background:#fff;border-radius:14px;padding:20px;width:760px;max-width:94vw;margin:auto"></div>
 </div>