Merge pull request #38 from AGIUI/dev0.3.4-shadow

Dev0.3.4 shadow
AGIUI · Jun 11, 2023 · bf37190 · bf37190
2 parents 81b81fd + c4fa827
commit bf37190
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/components/ChatbotMain.tsx b/src/components/ChatbotMain.tsx
@@ -264,6 +264,7 @@ const sendMessageToBackground = {
     'api-run': (data: any) => sendMessageCanRetry('api-run', data, console.log),
     'open-options-page': (data: any) => sendMessageCanRetry('open-options-page', data, console.log),
     'hi': (data: any) => sendMessageCanRetry('hi', data, console.log),
+
 }
 
 
@@ -589,7 +590,8 @@ class Main extends React.Component<{
                 })
             } else if (cmd == 'chat-bot-init-result') {
                 this.initChatBot(false);
-            }
+            } 
+
 
             sendResponse('我是content，已收到消息')
             return true;
@@ -1376,14 +1378,15 @@ class Main extends React.Component<{
                     promptJson = { ...promptJson, ...await promptBindUserClipboard(promptJson.userInput) }
                 } else if (prompt.input == 'nodeInput') {
                     // 从上一节点获取文本，prompt的输入从上一个节点输入
-                    console.log('从上一节点获取文本', prompt, prompt.nodeInputId, nTalks)
+                    console.log('从上一节点获取文本', prompt.nodeInputId, nTalks)
                     if (!prompt.nodeInputId) {
                         let lastTalk: any = Talks.getLastTalk([...nTalks]);
                         promptJson = { ...promptJson, ...promptUseLastTalk(promptJson.userInput, lastTalk) }
                     } else {
                         let talk: any = Talks.getTalkByPromptId(prompt.nodeInputId, [...nTalks]);
                         promptJson = { ...promptJson, ...promptUseLastTalk(promptJson.userInput, talk) }
                     }
+                    console.log('从上一节点获取文本', prompt.nodeInputId, promptJson.context)
                 }
 
                 // translate的处理

diff --git a/src/components/background/Common.js b/src/components/background/Common.js
@@ -15,6 +15,8 @@
 
  */
 
+import { fetchImage } from '../Utils'
+
 
 class Common {
     constructor(json, chatBot, Agent, Credit) {
@@ -275,7 +277,7 @@ class Common {
                     Credit.getPoints(token, apiName).then(res => {
                         chrome.storage.sync.set({ myPoints: res })
                     })
-                }
+                };
                 sendResponse('我是后台，已收到消息：' + JSON.stringify(request))
                 return true
             }