fix: 标题自动总结判断条件修正 - 第一次对话(2条)和每5次对话(10条)

fix: 思考内容正确显示 - 判断thinking字段存在而非值
fix: 思考内容先流式展开显示，思考完成后立即折叠再显示正式回复
2026-04-26 22:10:40 +08:00 · 2026-04-26 21:33:01 +08:00 · 2026-04-26 21:27:44 +08:00 · 2026-04-26 18:17:44 +08:00
2 changed files with 20 additions and 19 deletions
--- a/www/app.js
+++ b/www/app.js
@@ -587,11 +587,6 @@ function openConversation(id) {
    thinkingBtn.addEventListener('click', () => {
      enableThinking = !enableThinking;
      thinkingBtn.classList.toggle('active', enableThinking);
-      // 如果开启深度思考，关闭联网搜索（智谱思考模型不支持联网）
-      if (enableThinking && enableSearch) {
-        enableSearch = false;
-        searchBtn.classList.remove('active');
-      }
    });
  }
  
@@ -599,11 +594,6 @@ function openConversation(id) {
    searchBtn.addEventListener('click', () => {
      enableSearch = !enableSearch;
      searchBtn.classList.toggle('active', enableSearch);
-      // 如果开启联网搜索，关闭深度思考
-      if (enableSearch && enableThinking) {
-        enableThinking = false;
-        thinkingBtn.classList.remove('active');
-      }
    });
  }
  
@@ -888,12 +878,17 @@ async function streamGenerate(userMsgIndex) {
                if (thinkingEl) {
                  thinkingEl.innerHTML = renderMarkdown(currentConversation.messages[aiMessageIndex].thinking) + '<span class="streaming-cursor">▌</span>';
                }
+                // 确保思考块展开
+                const thinkingBlock = lastMessageEl.querySelector('.thinking-block');
+                if (thinkingBlock && !thinkingBlock.classList.contains('expanded')) {
+                  thinkingBlock.classList.add('expanded');
+                }
                scrollToBottom();
              }
              
              // 处理正式回复内容
              if (delta.content) {
-                // 如果开启深度思考且开始输出正式内容，折叠思考块
+                // 如果开启深度思考且开始输出正式内容，说明思考完成，立即折叠思考块
                if (enableThinking && !thinkingOutputStarted && currentConversation.messages[aiMessageIndex].thinking) {
                  thinkingOutputStarted = true;
                  // 折叠思考内容
@@ -932,7 +927,8 @@ async function streamGenerate(userMsgIndex) {
    
    // 自动总结标题：第一次对话和每隔5次对话
    const totalMessages = currentConversation.messages.length;
-    if (totalMessages === 1 || totalMessages % 5 === 0) {
+    // 第一次对话（用户+AI=2条）或每5次对话（10条）
+    if (totalMessages === 2 || totalMessages % 10 === 0) {
      await generateConversationTitle();
    }
  }
@@ -949,7 +945,7 @@ async function performSearch(query) {
      },
      body: JSON.stringify({
        query: query,
-        max_results: 5,
+        max_results: 10,
        include_raw_content: false
      })
    });
@@ -1170,15 +1166,20 @@ function renderMessages() {
    
    // 思考内容块（仅AI消息）
    let thinkingHtml = '';
-    if (!isUser && msg.thinking) {
+    if (!isUser && 'thinking' in msg) {
+      // 判断是否是当前正在生成的消息（有thinking字段且正在加载）
+      const isGenerating = index === currentConversation.messages.length - 1 && isLoading && enableThinking;
+      // 思考进行中且没有正式内容时展开
+      const expandedClass = isGenerating && !msg.content ? 'expanded' : '';
+      
      thinkingHtml = `
-        <div class="thinking-block" onclick="toggleThinking(this)">
+        <div class="thinking-block ${expandedClass}" onclick="toggleThinking(this)">
          <div class="thinking-header">
            <svg viewBox="0 0 24 24" width="16" height="16"><path fill="currentColor" d="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm-2 15l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z"/></svg>
            <span>思考过程</span>
            <svg class="thinking-arrow" viewBox="0 0 24 24" width="14" height="14"><path fill="currentColor" d="M7 10l5 5 5-5z"/></svg>
          </div>
-          <div class="thinking-content">${renderMarkdown(msg.thinking)}</div>
+          <div class="thinking-content">${renderMarkdown(msg.thinking || '思考中...')}</div>
        </div>`;
    }
    
--- a/www/index.html
+++ b/www/index.html
@@ -8,12 +8,12 @@
  <meta http-equiv="Pragma" content="no-cache">
  <meta http-equiv="Expires" content="0">
  <title>AI助手</title>
-  <link rel="stylesheet" href="style.css?v=2.7.0">
+  <link rel="stylesheet" href="style.css?v=2.7.4">
  <link rel="manifest" href="manifest.json">
 </head>
 <body>
  <div id="app"></div>
-  <script src="marked.min.js?v=2.7.0"></script>
-  <script src="app.js?v=2.7.0"></script>
+  <script src="marked.min.js?v=2.7.4"></script>
+  <script src="app.js?v=2.7.4"></script>
 </body>
 </html>
Author	SHA1	Message	Date
hubian	8451f04302	fix: 标题自动总结判断条件修正 - 第一次对话(2条)和每5次对话(10条)	2026-04-26 22:10:40 +08:00
hubian	c6bdfb15cc	fix: 思考内容正确显示 - 判断thinking字段存在而非值	2026-04-26 21:33:01 +08:00
hubian	ac5335ac4f	fix: 思考内容先流式展开显示，思考完成后立即折叠再显示正式回复	2026-04-26 21:27:44 +08:00
hubian	99000f6f04	fix: 搜索结果改为10个，深度思考和联网搜索可独立选择	2026-04-26 18:17:44 +08:00