Merge branch 'master' of http://192.168.5.5:10010/r/web/flow_web

src/views/dmx/knowledgeLib/config.vue

@@ -68,9 +68,9 @@
 <!--              <a-option value="1">英文</a-option>-->
 <!--            </a-select>-->
 <!--          </a-form-item>-->
-          <a-form-item field="section" label="嵌入模型">
+          <a-form-item field="embd_id" label="嵌入模型">
             <a-space direction="vertical" size="large">
-              <a-select :size="'large'" v-model="form.embd_id" :style="{width:'100%'}" placeholder="请选择 ..." :disabled="kbObj.chunk_num>0 || kbObj.token_num>0" allow-clear>
+              <a-select :size="'large'" v-model="form.embd_id" :style="{width:'100%'}" placeholder="请选择 ..." :disabled="kbObj.chunk_num==0 && kbObj.token_num==0" allow-clear>
                 <a-optgroup  :label="index" v-for="(item,index) in modelList" :key=index>
                   <a-option
                     v-for="(obj) in item"
@@ -84,7 +84,7 @@
             </a-space>
           </a-form-item>
           <a-form-item field="parser_id" label="解析方法">
-            <a-select v-model="form.parser_id" placeholder="请选择" :disabled="kbObj.chunk_num>0 || kbObj.token_num>0" allow-clear>
+            <a-select v-model="form.parser_id" placeholder="请选择" :disabled="kbObj.chunk_num==0 && kbObj.token_num==0" allow-clear>
               <a-option v-for="item in parser_ids" :key="item.value" :label="item.name" :value="item.value"></a-option>
             </a-select>
           </a-form-item>
@@ -92,13 +92,13 @@
             <a-slider v-model="form.chunk_token_num" :min="0" :max="2048"  show-input />
           </a-form-item>
           <a-form-item  label="布局识别" >
-            <a-space direction="vertical" size="large">
-              <a-switch v-model="form.layout_recognize"  />
+            <a-space direction="vertical">
+              <a-switch v-model="form.layout_recognize" size="small" />
             </a-space>
           </a-form-item>
           <a-form-item field="raptor" label="使用召回增强RAPTOR策略">
-            <a-space direction="vertical" size="large">
-              <a-switch v-model="form.use_raptor" />
+            <a-space direction="vertical" >
+              <a-switch v-model="form.use_raptor" size="small" />
             </a-space>
           </a-form-item>
           <div v-if="form.use_raptor">
@@ -130,8 +130,8 @@
           <a-form-item>
             <div style="width: 100%;text-align: right">
               <a-space>
+                <a-button @click="cancelConfig">取消</a-button>
                 <a-button type="primary" html-type="submit">保存</a-button>
-                <!--               <a-button @click="$refs.formRef.resetFields()">Reset</a-button>-->
               </a-space>
             </div>
           </a-form-item>
@@ -196,7 +196,7 @@ import message from "@arco-design/web-vue/es/message";
 
 
 const props =  defineProps(['kbtenantInfo'])
-// const emit =  defineEmits(['upTabdateItem'])
+const emit =  defineEmits(['cancleConfig','saveConfig'])
 // 解析方法列表
 let parser_ids = props.kbtenantInfo.parser_ids.split(",").map((item) => {
   const [value1, value2] = item.split(":");
@@ -215,7 +215,7 @@ const form = reactive({
   threshold: 0.32,
   max_cluster: 233,
   random_seed: 1500,
-  chunk_token_num: 128,
+  chunk_token_num: 384,
   use_raptor: false,
   pages: {},
   prompt: "请总结以下段落。 小心数字，不要编造。 段落如下：\n" +
@@ -236,6 +236,24 @@ const rules = {
       message:'知识库名称不允许为空',
     },
   ],
+  embd_id: [
+    {
+      required: true,
+      message:'请选择',
+    },
+  ],
+  parser_id: [
+    {
+      required: true,
+      message:'请选择',
+    },
+  ],
+  prompt: [
+    {
+      required: true,
+      message:'提示词不允许为空',
+    },
+  ],
 }
 
 
@@ -302,6 +320,8 @@ const handleSubmit = async ({ values, errors }) => {
     if(data.code == '0'){
       Message.success("配置成功");
       // window.location.reload();
+      emit('saveConfig')
+
     }
     // emit('upTabdateItem')
 
@@ -313,6 +333,11 @@ const handleSubmit = async ({ values, errors }) => {
 
 };
 
+const cancelConfig = () => {
+    emit('cancleConfig')
+}
+
+
 function randomNumber() {
   // 生成一个介于min和max之间的随机整数（包含min和max）
   const min = 1; // 最小值
@@ -360,7 +385,6 @@ const changekbObj = (value) => {
   let configObj = {
     name: kbObj.name,
     avatar: kbObj.avatar,
-    chunk_token_num: kbObj.parser_config.chunk_token_num,
     pages:  kbObj.parser_config.pages,
     description: kbObj.description,
     language: "English",

src/views/dmx/knowledgeLib/index.vue

@@ -256,7 +256,7 @@
           </a-tab-pane>
           <a-tab-pane key="3" :title="t('dmx.list.disposition')">
             <div class="rt-container-main">
-              <config ref="configForm" :kbtenantInfo="kbtenantInfo"  :kbobj="kbobj"></config>
+              <config ref="configForm" :kbtenantInfo="kbtenantInfo"  :kbobj="kbobj"  @cancleConfig="cancleConfig" @saveConfig="saveConfig"></config>
             </div>
           </a-tab-pane>
         </a-tabs>
@@ -604,8 +604,6 @@ const getknowledge = async (id) => {
       selectedTab.value = tabs.value.findIndex(item=>item.id==id);
       getKbdetail(id) // 获取详情
       activeKey.value = '3';
-      //   详情
-      // const  kbtenantInfo  = await queryKbtenantInfo();
     }
 
 
@@ -644,6 +642,30 @@ const getknowledge = async (id) => {
     size.value = val as SizeProps;
   };
 
+  const cancleConfig = () => {
+    activeKey.value = '1';
+    let id = tabs.value[selectedTab.value].id;
+    fetchData({
+      kb_id: id,
+      page: 1,
+      page_size: 20
+    })
+  }
+
+  const saveConfig = async () => {
+    activeKey.value = '1';
+    let id = tabs.value[selectedTab.value].id;
+    const { data } = await queryKbList({ page: 1, page_size: 20 });
+    tabs.value = data;
+    fetchData({
+      kb_id: id,
+      page: 1,
+      page_size: 20
+    })
+    getKbdetail(id) // 获取详情
+  }
+
+
   const handleChange = (
     checked: boolean | (string | boolean | number)[],
     column: Column,
@@ -713,7 +735,7 @@ const   deleteItem =  async (row)=>{
     let data = await kbdocumentrm({doc_id: row.id})
     if(data.code == 0){
       Message.success('删除成功');
-      console.log(kbobj, 'kbobj');
+      // console.log(kbobj, 'kbobj');
       fetchData({
         kb_id: kbobj.id,
         page: 1,
@@ -762,7 +784,7 @@ const   handleChangeStatus =  async (row)=>{
 
 
 const   run =  async (row)=>{
-  console.log(row);
+  // console.log(row);
   row.loading = true;
   let run = '1'
   if(row.run!='2'){
@@ -781,6 +803,12 @@ const   run =  async (row)=>{
     Message.error('解析失败');
     row.run = '1';
   }
+  fetchData({
+    kb_id: tabs.value[selectedTab.value].id,
+    page: 1,
+    page_size: 20
+  })
+
   row.loading = false;
 }
 
@@ -804,7 +832,10 @@ const   changeFetchData =  async (row)=>{
     { deep: true, immediate: true }
   );
 
-  onBeforeMount(()=>{
+  onBeforeMount(async()=>{
+    // const  {data}  = await queryKbtenantInfo();
+    // Object.assign(kbtenantInfo,data);
+    // console.log(kbtenantInfo,'kbtenantInfo的数据');
 
   })
   onMounted(()=>{

src/views/dmx/knowledgeLib/test.vue

@@ -29,7 +29,7 @@
                 </a-select>
               </a-space>
             </a-form-item>
-            <a-form-item field="slider" label="Top-K" v-if="form.rerank_id === 'Jina' || form.rerank_id === 'BAAI'">
+            <a-form-item field="slider" label="Top-K" v-if="form.rerank_id">
               <a-slider v-model="form.top_k" :min="1" :max="2048" />
             </a-form-item>
             <a-form-item >