Merge branch 'main' of https://github.com/GaiZhenbiao/ChuanhuChatGPT

web_assets/javascript/ChuanhuChat.js

@@ -57,7 +57,7 @@ function addInit() {
         }
     }
 
-    chatbotObserver.observe(chatbotIndicator, { attributes: true });
+    chatbotObserver.observe(chatbotIndicator, { attributes: true, childList: true, subtree: true });
     chatListObserver.observe(chatListIndicator, { attributes: true });
     setUploader();
     
@@ -340,19 +340,32 @@ function clearChatbot() {
     // clearMessageRows();
 }
 
-function chatbotContentChanged(attempt = 1) {
+function chatbotContentChanged(attempt = 1, force = false) {
     for (var i = 0; i < attempt; i++) {
         setTimeout(() => {
             // clearMessageRows();
             saveHistoryHtml();
             disableSendBtn();
-            // gradioApp().querySelectorAll('#chuanhu-chatbot .message-wrap .message.user').forEach((userElement) => {addAvatars(userElement, 'user')});
-            // gradioApp().querySelectorAll('#chuanhu-chatbot > .wrapper > .wrap > .message-wrap .message-row.bot-row').forEach(addChuanhuButton);
+
             gradioApp().querySelectorAll('#chuanhu-chatbot .message-wrap .message.bot').forEach(addChuanhuButton);
-            if (chatbotIndicator.classList.contains('hide')) {
+
+            if (chatbotIndicator.classList.contains('hide')) { // generation finished
                 setLatestMessage();
                 setChatList();
             }
+
+            if (!chatbotIndicator.classList.contains('translucent')) { // message deleted
+                var checkLatestAdded = setInterval(() => {
+                    var latestMessageNow = gradioApp().querySelector('#chuanhu-chatbot > .wrapper > .wrap > .message-wrap .message.bot.latest');
+                    if (latestMessageNow && latestMessageNow.querySelector('.message-btn-row')) {
+                        clearInterval(checkLatestAdded);
+                    } else {
+                        setLatestMessage();
+                    }
+                }, 200);
+            }
+        
+            
         }, i === 0 ? 0 : 200);
     }
     // 理论上是不需要多次尝试执行的，可惜gradio的bug导致message可能没有渲染完毕，所以尝试500ms后再次执行
@@ -364,6 +377,10 @@ var chatbotObserver = new MutationObserver(() => {
         // setLatestMessage();
         chatbotContentChanged(2);
     }
+    if (!chatbotIndicator.classList.contains('translucent')) {
+        chatbotContentChanged(2);
+    }
+
 });
 
 var chatListObserver = new MutationObserver(() => {

web_assets/javascript/chat-list.js

@@ -59,14 +59,19 @@ function saveChatHistory(a, b, c, d) {
     var fileName = b;
 
     while (true) {
-        fileName = prompt(renameChat_i18n, fileName);
-
-        if (isValidFileName(fileName)) {
-            return [a, fileName, c, d];
+        var result = prompt(renameChat_i18n, fileName);
+
+        if (result === null) {
+            throw new Error("rename operation cancelled");
+            // 不返回原文件名，而是使用 throw new Error() 打断程序，避免 gradio 进行保存操作
+            // break;
+        } else if (isValidFileName(result)) {
+            return [a, result, c, d];
         } else {
             alert(validFileName_i18n + "!@#$%^&*()<>?/\\|}{~:");
         }
     }
+    return [a, b, c, d]; // 兜底保障
 }
 
 function isValidFileName(fileName) {

web_assets/javascript/message-button.js

@@ -144,7 +144,6 @@ function addLatestMessageButtons(botElement) {
     var gradioDelLastBtn = gradioApp().querySelector('#gr-dellast-btn');
     deleteButton.addEventListener('click', () => {
         gradioDelLastBtn.click();
-        chatbotContentChanged(2);
     });
 
     messageBtnRowLeading.appendChild(regenerateButton);

web_assets/stylesheet/ChuanhuChat.css

@@ -398,6 +398,7 @@ body.popup-open {
     /* padding: 8px 6px; */
     min-height: 82px;
     /* max-height: 166px; */
+    z-index: 2;
     background: var(--chatbot-blur-background-color);
     -webkit-backdrop-filter: blur(24px);
     backdrop-filter: blur(24px);