Merge branch 'dev'

Caojiahao-Coder · Feb 17, 2024 · 543aaca · 543aaca
2 parents 68c1388 + 356b880
commit 543aaca
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 18 deletions.
diff --git a/src/components/BodyHeader.vue b/src/components/BodyHeader.vue
@@ -57,22 +57,25 @@ function exportConversation() {
 </script>
 
 <template>
-  <div id="body-header" class="h-79px flex flex-row text-6 color-base border-base overflow-hidden gap-2" b="0 b-1 solid"
-    p="x-24px">
+  <div
+    id="body-header" class="h-79px flex flex-row text-6 color-base border-base overflow-hidden gap-2" b="0 b-1 solid"
+    p="x-24px"
+  >
     <div v-if="expandLeftSideBar === false" class="flex flex-col m-r-4">
       <div class="flex-1" />
       <div data-cursor="block" class="icon-button i-carbon-menu" @click="onOpenLeftSideBar" />
       <div class="flex-1" />
     </div>
     <div class="flex-1 flex flex-col overflow-hidden">
       <div class="flex-1" />
-      <div class="truncate">
+      <div class="truncate text-5 font-bold">
         {{ conversationStore.conversationInfo?.title }}
         <div class="flex-1" />
       </div>
       <div
         v-if="conversationStore.conversationInfo?.description && conversationStore.conversationInfo?.description!.trim().length > 0"
-        class="text-3 color-fade m-t1 overflow-hidden truncate">
+        class="text-3 color-fade m-t1 overflow-hidden truncate"
+      >
         {{ conversationStore.conversationInfo?.description! }}
       </div>
       <div class="flex-1" />
@@ -81,14 +84,20 @@ function exportConversation() {
       <div class="flex-1" />
       <div v-if="((conversationStore.conversationInfo?.type ?? 'chat') !== 'dataworker')" class="flex flex-row gap-2">
         <EditSessionSettingsDialog v-if="conversationStore.conversationInfo">
-          <div data-cursor="block" class="icon-button i-carbon-audio-console w-22px h-22px"
-            :title="t('conversation_edit')" />
+          <div
+            data-cursor="block" class="icon-button i-carbon-audio-console w-22px h-22px"
+            :title="t('conversation_edit')"
+          />
         </EditSessionSettingsDialog>
-        <div v-if="conversationStore.conversationInfo && (conversationStore.conversationInfo?.type ?? 'chat') === 'chat'"
+        <div
+          v-if="conversationStore.conversationInfo && (conversationStore.conversationInfo?.type ?? 'chat') === 'chat'"
           data-cursor="block" class="w-22px h-22px icon-button i-carbon-save-series" :title="t('export')"
-          @click="exportConversation()" />
-        <div v-if="conversationStore.conversationInfo" data-cursor="block"
-          class="w-22px h-22px icon-button i-carbon-clean" :title="t('conversation_clear')" @click="openDialog" />
+          @click="exportConversation()"
+        />
+        <div
+          v-if="conversationStore.conversationInfo" data-cursor="block"
+          class="w-22px h-22px icon-button i-carbon-clean" :title="t('conversation_clear')" @click="openDialog"
+        />
       </div>
       <div class="flex-1" />
     </div>
@@ -103,13 +112,17 @@ function exportConversation() {
       </div>
       <div class="flex flex-1 m-t-2">
         <div class="flex-1" />
-        <button data-cursor="block" class="outline-none border-base color-red bg-body hover-bg-base" b="1 solid rd-1"
-          p="x-4 y-2" @click="clearMessageRecords">
+        <button
+          data-cursor="block" class="outline-none border-base color-red bg-body hover-bg-base" b="1 solid rd-1"
+          p="x-4 y-2" @click="clearMessageRecords"
+        >
           {{ t('clear') }}
         </button>
 
-        <button data-cursor="block" class="outline-none border-base bg-body hover-bg-base color-base m-l-2"
-          b="1 solid rd-1" p="x-4 y-2" @click="closeDialog">
+        <button
+          data-cursor="block" class="outline-none border-base bg-body hover-bg-base color-base m-l-2"
+          b="1 solid rd-1" p="x-4 y-2" @click="closeDialog"
+        >
           {{ t('cancel') }}
         </button>
       </div>

diff --git a/src/components/ConversationBody.vue b/src/components/ConversationBody.vue
@@ -27,7 +27,9 @@ onMounted(() => {
 async function loadMessageList() {
   const messageList = await chatCompletionStore.chatCompletionHandler?.getMessageListAsync()
   myMessageList.value = messageList ?? []
-  updateScroll()
+  setTimeout(() => {
+    updateScroll()
+  }, 200)
 }
 
 function updateScroll() {

diff --git a/src/components/FunctionCallingSetting.vue b/src/components/FunctionCallingSetting.vue
@@ -2,14 +2,14 @@
 import { onMounted, ref } from 'vue'
 import { useI18n } from 'vue-i18n'
 import FunctionCallingDetailView from '@/components/FunctionCallingDetailView.vue'
-import type { ToolInfo } from '@/openai/tool-call'
 import chatFunctionCallingController from '@/chat.function.calling/ChatFunctionCallingController'
+import type { FunctionInfo } from '@/openai/type/chat.completion.function.calling'
 
 const { t } = useI18n()
 
-const toolsList = ref<ToolInfo[]>([])
+const toolsList = ref<FunctionInfo[]>([])
 
-const currentFunctionCallingInfo = ref<ToolInfo>()
+const currentFunctionCallingInfo = ref<FunctionInfo>()
 
 const openFunctionCallingListDialog = ref<boolean>(false)
 const fullScreen = ref<boolean>(false)