Skip to content

Commit 02114b1

Browse files
openeuler-ci-botgitee-org
authored andcommitted
!86 优化新建知识库表单数据请求和默认值逻辑,修复文件预览表格样式问题
From: @lnlnln629 Reviewed-by: @hongyu-shi Signed-off-by: @hongyu-shi
2 parents 00b0ff1 + 8641ff0 commit 02114b1

File tree

8 files changed

+42
-30
lines changed

8 files changed

+42
-30
lines changed

src/components/KnowledgeForm/index.vue

Lines changed: 30 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -286,13 +286,13 @@ const props = defineProps({
286286
type: Function,
287287
default: () => {},
288288
},
289+
isCreate: {
290+
type: Boolean,
291+
default: true,
292+
},
289293
});
290294
291-
const initFormData = () =>{
292-
ruleForm.value.kbName = '资产库名称01';
293-
}
294-
295-
onMounted(() => {
295+
onMounted(async () => {
296296
loading.visible.value = false;
297297
ruleForm.value = props.formData
298298
? JSON.parse(
@@ -308,28 +308,32 @@ onMounted(() => {
308308
)
309309
: ruleForm.value;
310310
311-
ruleForm.value.kbName = '资产库名称01';
312-
KbAppAPI.queryLanguageList().then( (res: any) => {
313-
console.log('queryLanguageList', res);
314-
languageOptions.value = res?.map((item: any) => {
315-
return { label: item, value: item };
316-
})
317-
ruleForm.value.tokenizer = res?.[0] || '';
318-
});
311+
// 并行请求
312+
const [languageRes, embeddingRes, parseMethodRes] = await Promise.all([
313+
KbAppAPI.queryLanguageList(),
314+
KbAppAPI.queryEmbeddingModelList(),
315+
KbAppAPI.queryParseMethodList(),
316+
]);
317+
languageOptions.value = (languageRes as unknown as [])?.map((item: any) => ({
318+
label: item,
319+
value: item,
320+
}));
321+
emBeddingModelOptions.value = (embeddingRes as unknown as [])?.map((item: any) => ({
322+
label: item,
323+
value: item,
324+
}));
319325
320-
KbAppAPI.queryEmbeddingModelList().then((res: any) => {
321-
emBeddingModelOptions.value = res?.map((item: any) => {
322-
return { label: item, value: item };
323-
});
324-
ruleForm.value.embeddingModel = res?.[0] || '';
325-
});
326-
327-
KbAppAPI.queryParseMethodList().then((res: any) => {
328-
parserMethodOptions.value = res?.map((item: any) => {
329-
return { label: item, value: item };
330-
});
331-
ruleForm.value.defaultParseMethod = res?.[0] || '';
332-
});
326+
parserMethodOptions.value = (parseMethodRes as unknown as [])?.map((item: any) => ({
327+
label: item,
328+
value: item,
329+
}));
330+
// 如果是创建状态,设置默认值
331+
if (props.isCreate) {
332+
ruleForm.value.kbName = '资产库名称01';
333+
ruleForm.value.tokenizer = languageOptions.value?.[0].value || '';
334+
ruleForm.value.embeddingModel = emBeddingModelOptions.value?.[0].value || '';
335+
ruleForm.value.defaultParseMethod = parserMethodOptions.value?.[0].value || '';
336+
}
333337
});
334338
335339
watch(

src/styles/knowledgeFileSection.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211
background-color: var(--o-bg-color-base) !important;
212212
}
213213
.kf-selection {
214-
border-bottom: unset;
214+
border-bottom: unset !important;
215215

216216
.cell {
217217
width: 24px !important;
@@ -224,7 +224,7 @@
224224
}
225225

226226
.kf-file-content {
227-
border-bottom: unset;
227+
border-bottom: unset !important;
228228
}
229229

230230
.kf-file-type {

src/styles/knowledgeLibrary.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434

3535
&>button{
3636
margin-right: 8px;
37+
margin-left: 0px !important;
3738
}
3839

3940
.createAsset,

src/views/dataSet/craeteEvaluate.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
v-if="props.dialogEvaluateVisible"
88
@close="handleCancelVisible"
99
align-center
10+
:close-on-click-modal="false"
1011
>
1112
<el-form class="evaluate-form" ref="ruleFormRef" :model="form" labelPosition="left" :rules="rules" >
1213
<el-form-item :label="$t('testing.datasetUsed')" :label-width="formLabelWidth" class="evaluate-dataSetName-container" prop="datasetId">

src/views/group/createGroup.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<el-dialog class="craete-group-dialog" v-model="props.createGroupVisible" align-center
33
:title="props.dialogueType === 'edit' ? $t('group.editTeam') : $t('group.createTeam')" width="544" v-if="props.createGroupVisible"
4-
@close="handleCancelVisible">
4+
:close-on-click-modal="false" @close="handleCancelVisible">
55
<el-form ref="ruleFormRef" class="evaluate-form" :model="form" labelPosition="right" :rules="rules">
66
<el-form-item :label="$t('group.teamName')" prop="teamName" :label-width="formLabelWidth">
77
<el-input maxlength="100" v-model="form.teamName" autocomplete="off" :placeholder="t('model.pleasePlace')" />

src/views/knowledgeFile/dataSetDialog.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
class="dataSet-edit-dialog"
77
align-center
88
width="550"
9+
:close-on-click-modal="false"
910
:title="$t('assetFile.generateDataset')">
1011
<CustomLoading :loading="loading" />
1112
<el-form

src/views/knowledgeFile/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -466,6 +466,7 @@
466466
class="edit-dialog"
467467
align-center
468468
width="560"
469+
:close-on-click-modal="false"
469470
:title="$t('dialogTipText.eidtFile')">
470471
<el-form
471472
ref="ruleFormRef"

src/views/knowledgeLibrary/index.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@
517517
align-center
518518
width="544"
519519
@close="handleCloseCreateKb"
520+
:close-on-click-modal="false"
520521
:title="
521522
formData?.kbName?.length > 0
522523
? $t('btnText.editAssetLibrary')
@@ -526,6 +527,7 @@
526527
:handleOpsKbForm="handleOpsKbForm"
527528
:handelResetForm="handelResetForm"
528529
:handleCloseCreateKb="handleCloseCreateKb"
530+
:isCreate="isCreate"
529531
:formData="formData" />
530532
</el-dialog>
531533
<el-dialog
@@ -616,6 +618,7 @@ const klCardBox = ref();
616618
const loading = ref(false);
617619
const importTaskList = ref([]);
618620
const userLanguage = ref();
621+
const isCreate = ref(true);
619622
620623
const resetFormData = ref({
621624
kbName: '',
@@ -1231,9 +1234,9 @@ watch(
12311234
immediate: true,
12321235
}
12331236
);
1234-
12351237
const handleCreateKnowledge = () => {
12361238
dialogCreateVisible.value = true;
1239+
isCreate.value = true;
12371240
};
12381241
12391242
const handleCancelVisible = () => {
@@ -1269,6 +1272,7 @@ const handleSelectionChange = (val:any) => {
12691272
const handleEditKl = (row: any) => {
12701273
formData.value = row;
12711274
dialogCreateVisible.value = true;
1275+
isCreate.value = false;
12721276
};
12731277
12741278
const handleDeleteKl = (row: any) => {

0 commit comments

Comments
 (0)