From 861cf0af1908ea1284ee4211c05bd99656dfecbd Mon Sep 17 00:00:00 2001
From: yumoqing <yumoqing@gmail.com>
Date: Thu, 6 Aug 2026 13:48:51 +0800
Subject: [PATCH] fix: all popups close before action (rename, delete, tags)

---
 .../knowledge_bases_list/confirm_delete_form.dspy   |  5 ++---
 wwwroot/knowledge_bases_list/rename_kb_form.dspy    | 13 +++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/wwwroot/knowledge_bases_list/confirm_delete_form.dspy b/wwwroot/knowledge_bases_list/confirm_delete_form.dspy
index cfc9137..7e6f689 100644
--- a/wwwroot/knowledge_bases_list/confirm_delete_form.dspy
+++ b/wwwroot/knowledge_bases_list/confirm_delete_form.dspy
@@ -23,9 +23,8 @@ result = {
                          "script": "var pw=null;var w=this;while(w){if(w instanceof bricks.PopupWindow||w instanceof bricks.Popup){pw=w;break};w=w.parent};if(pw){pw.dismiss();pw.destroy()}"}]},
              {"widgettype": "Button", "options": {"label": "\u786e\u8ba4\u5220\u9664",
                   "bgcolor": "#e74c3c", "color": "#fff", "padding": "6px 20px", "borderRadius": "6px"},
-              "binds": [{"wid": "self", "event": "click", "actiontype": "urlwidget",
-                         "target": "app.rag_main_content", "mode": "replace",
-                         "options": {"url": "/rag/knowledge_bases_list/delete_kb.dspy?kb_id=" + kb_id}}]}
+              "binds": [{"wid": "self", "event": "click", "actiontype": "script",
+                         "script": "var pw=null;var w=this;while(w){if(w instanceof bricks.PopupWindow||w instanceof bricks.Popup){pw=w;break};w=w.parent};if(pw){pw.dismiss();pw.destroy()};window.location.href='/rag/knowledge_bases_list/delete_kb.dspy?kb_id=" + kb_id + "'"}]}
          ]}
     ]
 }
diff --git a/wwwroot/knowledge_bases_list/rename_kb_form.dspy b/wwwroot/knowledge_bases_list/rename_kb_form.dspy
index 2384b6a..91ef038 100644
--- a/wwwroot/knowledge_bases_list/rename_kb_form.dspy
+++ b/wwwroot/knowledge_bases_list/rename_kb_form.dspy
@@ -42,10 +42,15 @@ result = {
     "binds": [{
         "wid": "rename_form",
         "event": "submit",
-        "actiontype": "urlwidget",
-        "target": "app.rag_main_content",
-        "mode": "replace",
-        "options": {"url": entire_url('./rename_kb.dspy')}
+        "actiontype": "script",
+        "script": (
+            "var pw=null;var w=this;while(w){if(w instanceof bricks.PopupWindow||w instanceof bricks.Popup){pw=w;break};w=w.parent};if(pw){pw.dismiss();pw.destroy()};"
+            "var nm=(params.name||'').trim();"
+            "var did=params.kb_id||'';"
+            "var dc=params.description||'';"
+            "if(!nm||!did){alert('请填写名称');return};"
+            "fetch('/rag/knowledge_bases_list/rename_kb.dspy?kb_id='+encodeURIComponent(did)+'&name='+encodeURIComponent(nm)+'&description='+encodeURIComponent(dc)).then(function(){window.location.href='/rag/knowledge_bases_list/index.ui'})"
+        )
     }]
 }
 return result