reformat

Author: doombeaker

src/components/assistant/Sidebar.vue

@@ -373,7 +373,7 @@
     chatMessages.value.push(userMessage)
 
     // 清空输入并滚动到底部
-    userInput.value = '' 
+    userInput.value = ''
 
     setTimeout(() => {
       scrollToBottom()
@@ -409,7 +409,9 @@
           // 图片加载成功后，添加带图片的消息
           const assistantMessage = {
             role: 'assistant' as const,
-            content: serverMode.value ? '已为您编辑图片' : '已为您编辑图片，点击LoadImage节点可以直接应用。',
+            content: serverMode.value
+              ? '已为您编辑图片'
+              : '已为您编辑图片，点击LoadImage节点可以直接应用。',
             time: getCurrentTime(),
             hasImage: true,
             image: imageUrl
@@ -429,7 +431,7 @@
         } catch (error: any) {
           isLoading.value = false
           isGenerating.value = false
-          processingStatus.value = ''         
+          processingStatus.value = ''
           return
         }
       }

src/components/assistant/util.ts

@@ -461,8 +461,14 @@ export async function generateImage(options: {
  * @returns Promise<string> 返回生成的图片URL
  */
 export async function handleImageWithKontextPro(
+<<<<<<< HEAD
   prompt: string, 
   imageBase64: string, 
+=======
+  prompt: string,
+  imageBase64: string,
+  signal?: AbortSignal,
+>>>>>>> a9fb7ca663cf4b7f956d7067273cc04852317d9f
   options: Record<string, any> = {}
 ) {
   console.log('进入handleImageWithKontextPro函数')