Merge branch 'main' of https://github.com/maxkb-dev/maxkb

Author: liqiang-fit2cloud

apps/application/chat_pipeline/step/chat_step/impl/base_chat_step.py

@@ -301,7 +301,7 @@ def execute_block(self, message_list: List[BaseMessage],
                 reasoning_content = reasoning_result.get('reasoning_content') + reasoning_result_end.get(
                     'reasoning_content')
             post_response_handler.handler(chat_id, chat_record_id, paragraph_list, problem_text,
-                                          chat_result.content, manage, self, padding_problem_text, client_id,
+                                          content, manage, self, padding_problem_text, client_id,
                                           reasoning_content=reasoning_content if reasoning_content_enable else '')
             add_access_num(client_id, client_type, manage.context.get('application_id'))
             return manage.get_base_to_response().to_block_response(str(chat_id), str(chat_record_id),

ui/src/components/ai-chat/component/ParagraphCard.vue

@@ -68,7 +68,7 @@ const props = defineProps({
   },
   score: {
     type: Number,
-    default: 0
+    default: null
   }
 })
 const isMetaObject = computed(() => typeof props.data.meta === 'object')

ui/src/components/codemirror-editor/index.vue

@@ -16,12 +16,7 @@
       </el-button>
     </div>
     <!-- Codemirror 弹出层 -->
-    <el-dialog
-      v-model="dialogVisible"
-      :title="$t('views.functionLib.functionForm.form.param.code')"
-      append-to-body
-      fullscreen
-    >
+    <el-dialog v-model="dialogVisible" :title="title" append-to-body fullscreen>
       <Codemirror
         v-model="cloneContent"
         :extensions="extensions"
@@ -54,6 +49,7 @@ import FunctionApi from '@/api/function-lib'
 defineOptions({ name: 'CodemirrorEditor' })
 
 const props = defineProps<{
+  title: String
   modelValue: any
 }>()
 const emit = defineEmits(['update:modelValue', 'submitDialog'])

ui/src/components/dynamics-form/items/JsonInput.vue

@@ -22,7 +22,7 @@
     <!-- Codemirror 弹出层 -->
     <el-dialog
       v-model="dialogVisible"
-      :title="$t('views.functionLib.functionForm.form.param.code')"
+      :title="$t('dynamicsForm.default.label')"
       append-to-body
       fullscreen
     >

ui/src/views/function-lib/component/FunctionFormDrawer.vue

@@ -134,7 +134,11 @@
       </h4>
 
       <div class="mb-8" v-if="showEditor">
-        <CodemirrorEditor v-model="form.code" @submitDialog="submitCodemirrorEditor" />
+        <CodemirrorEditor
+          :title="$t('views.functionLib.functionForm.form.param.code')"
+          v-model="form.code"
+          @submitDialog="submitCodemirrorEditor"
+        />
       </div>
       <h4 class="title-decoration-1 mb-16 mt-16">
         {{ $t('common.param.outputParam') }}

ui/src/views/team/index.vue

@@ -3,7 +3,7 @@
     <div class="team-manage flex main-calc-height">
       <div class="team-member p-8 border-r">
         <div class="flex-between p-16">
-          <h4>{{$t('views.team.member')}}</h4>
+          <h4>{{ $t('views.team.member') }}</h4>
           <el-button type="primary" link @click="addMember">
             <AppIcon iconName="app-add-users" class="add-user-icon" />
           </el-button>
@@ -29,7 +29,9 @@
                 <div class="flex-between">
                   <div>
                     <span class="mr-8">{{ row.username }}</span>
-                    <el-tag v-if="isManage(row.type)" class="default-tag">{{$t('views.team.manage')}}</el-tag>
+                    <el-tag v-if="isManage(row.type)" class="default-tag">{{
+                      $t('views.team.manage')
+                    }}</el-tag>
                   </div>
                   <div @click.stop style="margin-top: 5px">
                     <el-dropdown trigger="click" v-if="!isManage(row.type)">
@@ -38,9 +40,9 @@
                       </span>
                       <template #dropdown>
                         <el-dropdown-menu>
-                          <el-dropdown-item @click.prevent="deleteMember(row)"
-                            >{{$t('views.team.delete.button')}}</el-dropdown-item
-                          >
+                          <el-dropdown-item @click.prevent="deleteMember(row)">{{
+                            $t('views.team.delete.button')
+                          }}</el-dropdown-item>
                         </el-dropdown-menu>
                       </template>
                     </el-dropdown>
@@ -53,7 +55,7 @@
       </div>
       <div class="permission-setting flex" v-loading="rLoading">
         <div class="team-manage__table">
-          <h4 class="p-24 pb-0 mb-4">{{$t('views.team.permissionSetting')}}</h4>
+          <h4 class="p-24 pb-0 mb-4">{{ $t('views.team.permissionSetting') }}</h4>
           <el-tabs v-model="activeName" class="team-manage__tabs">
             <el-tab-pane
               v-for="(item, index) in settingTags"
@@ -73,7 +75,7 @@
         </div>
 
         <div class="submit-button">
-          <el-button type="primary" @click="submitPermissions">{{ $t('common.save')}}</el-button>
+          <el-button type="primary" @click="submitPermissions">{{ $t('common.save') }}</el-button>
         </div>
       </div>
     </div>
@@ -118,7 +120,9 @@ const settingTags = reactive([
 
 watch(filterText, (val) => {
   if (val) {
-    filterMember.value = memberList.value.filter((v) => v.username.includes(val))
+    filterMember.value = memberList.value.filter((v) =>
+      v.username.toLowerCase().includes(val.toLowerCase())
+    )
   } else {
     filterMember.value = memberList.value
   }

ui/src/workflow/common/NodeContainer.vue

@@ -135,6 +135,7 @@
       :close-on-press-escape="false"
       :destroy-on-close="true"
       append-to-body
+      @submit.prevent
     >
       <el-form label-position="top" ref="titleFormRef" :model="form">
         <el-form-item

ui/src/workflow/nodes/function-node/index.vue

@@ -79,6 +79,7 @@
       </h5>
       <div class="mb-8" v-if="showEditor">
         <CodemirrorEditor
+          :title="$t('views.functionLib.functionForm.form.param.code')"
           v-model="chat_data.code"
           @wheel="wheel"
           style="height: 130px !important"

ui/src/workflow/nodes/variable-assign-node/index.vue

@@ -118,6 +118,7 @@
               ]"
             >
               <CodemirrorEditor
+                title="JSON"
                 v-model="item.value"
                 :style="{
                   height: '100px'