diff --git a/ui/src/components/codemirror-editor/index.vue b/ui/src/components/codemirror-editor/index.vue index 1835fb7c8..4286c6906 100644 --- a/ui/src/components/codemirror-editor/index.vue +++ b/ui/src/components/codemirror-editor/index.vue @@ -57,7 +57,7 @@ const emit = defineEmits(['update:modelValue', 'submitDialog']) const route = useRoute() -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -88,7 +88,7 @@ function getRangeFromLineAndColumn(state: any, line: number, column: number, end const regexpLinter = linter(async (view) => { const diagnostics: Diagnostic[] = [] - await loadSharedApi({ type: 'tool', systemType: type.value }) + await loadSharedApi({ type: 'tool', systemType: apiType.value }) .postPylint(view.state.doc.toString()) .then((ok: any) => { ok.data.forEach((element: any) => { diff --git a/ui/src/components/generate-related-dialog/index.vue b/ui/src/components/generate-related-dialog/index.vue index de336a8ad..4abc794b0 100644 --- a/ui/src/components/generate-related-dialog/index.vue +++ b/ui/src/components/generate-related-dialog/index.vue @@ -46,7 +46,7 @@ /> @@ -72,8 +72,6 @@ diff --git a/ui/src/views/hit-test/index.vue b/ui/src/views/hit-test/index.vue index 7348c7a60..461fabde3 100644 --- a/ui/src/views/hit-test/index.vue +++ b/ui/src/views/hit-test/index.vue @@ -230,7 +230,7 @@ const { meta: { activeMenu }, params: { id }, } = route as any -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -324,7 +324,7 @@ function getHitTestList() { ...formInline.value, } if (isDataset.value) { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putKnowledgeHitTest(id, obj, loading) .then((res: any) => { paragraphDetail.value = res.data && arraySort(res.data, 'comprehensive_score', true) diff --git a/ui/src/views/knowledge/KnowledgeSetting.vue b/ui/src/views/knowledge/KnowledgeSetting.vue index 07b1e63cd..f777eda67 100644 --- a/ui/src/views/knowledge/KnowledgeSetting.vue +++ b/ui/src/views/knowledge/KnowledgeSetting.vue @@ -22,7 +22,7 @@ shadow="never" class="mb-8 w-full" style="line-height: 22px" - v-if="detail.type === 0" + v-if="detail?.type === 0" >
@@ -78,7 +78,7 @@ - + - + - + +

{{ $t('common.otherSetting') }}

@@ -173,7 +173,7 @@ const { params: { id }, } = route as any -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -248,20 +248,20 @@ async function submit() { }) .then(() => { if (detail.value.type === 2) { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putLarkKnowledge(id, obj, loading) .then(() => { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putReEmbeddingKnowledge(id) .then(() => { MsgSuccess(t('common.saveSuccess')) }) }) } else { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putKnowledge(id, obj, loading) .then(() => { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putReEmbeddingKnowledge(id) .then(() => { MsgSuccess(t('common.saveSuccess')) @@ -272,17 +272,17 @@ async function submit() { .catch(() => {}) } else { if (detail.value.type === 2) { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putLarkKnowledge(id, obj, loading) .then(() => { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putReEmbeddingKnowledge(id) .then(() => { MsgSuccess(t('common.saveSuccess')) }) }) } else { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putKnowledge(id, obj, loading) .then(() => { MsgSuccess(t('common.saveSuccess')) @@ -295,12 +295,12 @@ async function submit() { } function getDetail() { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .getKnowledgeDetail(id, loading) .then((res: any) => { detail.value = res.data cloneModelId.value = res.data?.embedding_model_id - if (detail.value.type === '1' || detail.value.type === '2') { + if (detail.value?.type === 1 || detail.value?.type === 2) { form.value = res.data.meta } }) diff --git a/ui/src/views/knowledge/component/KnowledgeListContainer.vue b/ui/src/views/knowledge/component/KnowledgeListContainer.vue index ebc49e583..177e6ae84 100644 --- a/ui/src/views/knowledge/component/KnowledgeListContainer.vue +++ b/ui/src/views/knowledge/component/KnowledgeListContainer.vue @@ -176,7 +176,9 @@ :description="item.desc" class="cursor" @click=" - router.push({ path: `/knowledge/${item.id}/${folder.currentFolder.id}/document` }) + router.push({ + path: `/knowledge/${item.id}/${folder.currentFolder.id || 'shared'}/document`, + }) " > @@ -250,7 +252,7 @@ icon="Setting" @click.stop=" router.push({ - path: `/knowledge/${item.id}/${folder.currentFolder.id}/setting`, + path: `/knowledge/${item.id}/${folder.currentFolder.id || 'shared'}/setting`, }) " v-if="permissionPrecise.setting(item.id)" @@ -295,7 +297,7 @@ - + { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -338,14 +340,14 @@ const type = computed(() => { } }) const permissionPrecise = computed(() => { - return permissionMap['knowledge'][type.value] + return permissionMap['knowledge'][apiType.value] }) const isShared = computed(() => { return folder.currentFolder.id === 'share' }) const isSystemShare = computed(() => { - return type.value === 'systemShare' + return apiType.value === 'systemShare' }) const loading = ref(false) @@ -365,7 +367,6 @@ const paginationConfig = reactive({ }) const knowledgeList = ref([]) -const currentFolder = ref({}) const CreateKnowledgeDialogRef = ref() const currentCreateDialog = shallowRef(null) @@ -393,7 +394,7 @@ function openCreateDialog(data: any) { } function reEmbeddingKnowledge(row: any) { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putReEmbeddingKnowledge(row.id) .then(() => { MsgSuccess(t('common.submitSuccess')) @@ -418,14 +419,14 @@ function openGenerateDialog(row: any) { } const exportKnowledge = (item: any) => { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .exportKnowledge(item.name, item.id, loading) .then(() => { MsgSuccess(t('common.exportSuccess')) }) } const exportZipKnowledge = (item: any) => { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .exportZipKnowledge(item.name, item.id, loading) .then(() => { MsgSuccess(t('common.exportSuccess')) @@ -442,7 +443,7 @@ function deleteKnowledge(row: any) { }, ) .then(() => { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .delKnowledge(row.id, loading) .then(() => { const list = cloneDeep(knowledge.knowledgeList) @@ -483,7 +484,7 @@ function getList() { [search_type.value]: search_form.value[search_type.value], } knowledge - .asyncGetKnowledgeListPage(paginationConfig, isShared.value, type.value, params, loading) + .asyncGetKnowledgeListPage(paginationConfig, isShared.value, apiType.value, params, loading) .then((res: any) => { paginationConfig.total = res.data?.total knowledge.setKnowledgeList([...knowledgeList.value, ...res.data.records]) @@ -495,7 +496,10 @@ function clickFolder(item: any) { } onMounted(() => { - if (type.value !== 'workspace') { + if (apiType.value !== 'workspace') { + folder.setCurrentFolder({ + id: '', + }) getList() } }) diff --git a/ui/src/views/knowledge/component/SyncWebDialog.vue b/ui/src/views/knowledge/component/SyncWebDialog.vue index fdd439241..bb968d135 100644 --- a/ui/src/views/knowledge/component/SyncWebDialog.vue +++ b/ui/src/views/knowledge/component/SyncWebDialog.vue @@ -42,7 +42,7 @@ import { loadSharedApi } from '@/utils/dynamics-api/shared-api' import { t } from '@/locales' const route = useRoute() -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -70,7 +70,7 @@ const open = (id: string) => { } const submit = () => { - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .putSyncWebKnowledge(knowledgeId.value, method.value, loading) .then((res: any) => { emit('refresh', res.data) diff --git a/ui/src/views/knowledge/create-component/CreateKnowledgeDialog.vue b/ui/src/views/knowledge/create-component/CreateKnowledgeDialog.vue index 9dd4ca6c3..95980de37 100644 --- a/ui/src/views/knowledge/create-component/CreateKnowledgeDialog.vue +++ b/ui/src/views/knowledge/create-component/CreateKnowledgeDialog.vue @@ -33,7 +33,7 @@ const emit = defineEmits(['refresh']) const router = useRouter() const route = useRoute() -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -65,11 +65,16 @@ const submitHandle = async () => { folder_id: currentFolder.value?.id, ...BaseFormRef.value.form, } - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .postKnowledge(obj, loading) .then((res: any) => { MsgSuccess(t('common.createSuccess')) - router.push({ path: `/knowledge/${res.data.id}/${currentFolder.value.id}/document` }) + router.push({ + path: `/knowledge/${res.data.id}/${currentFolder.value.id}/document`, + query: { + type: apiType.value, + }, + }) emit('refresh') }) } else { diff --git a/ui/src/views/knowledge/create-component/CreateLarkKnowledgeDialog.vue b/ui/src/views/knowledge/create-component/CreateLarkKnowledgeDialog.vue index fc3da4548..10de6c881 100644 --- a/ui/src/views/knowledge/create-component/CreateLarkKnowledgeDialog.vue +++ b/ui/src/views/knowledge/create-component/CreateLarkKnowledgeDialog.vue @@ -62,7 +62,7 @@ const emit = defineEmits(['refresh']) const router = useRouter() const route = useRoute() -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -157,11 +157,16 @@ const submitHandle = async () => { ...BaseFormRef.value.form, ...knowledgeForm.value, } - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .postLarkKnowledge(obj, loading) .then((res: any) => { MsgSuccess(t('common.createSuccess')) - router.push({ path: `/knowledge/${res.data.id}/${currentFolder.value.id}/document` }) + router.push({ + path: `/knowledge/${res.data.id}/${currentFolder.value.id}/document`, + query: { + type: apiType.value, + }, + }) emit('refresh') }) } else { diff --git a/ui/src/views/knowledge/create-component/CreateWebKnowledgeDialog.vue b/ui/src/views/knowledge/create-component/CreateWebKnowledgeDialog.vue index 812f39c5f..a0110e9b8 100644 --- a/ui/src/views/knowledge/create-component/CreateWebKnowledgeDialog.vue +++ b/ui/src/views/knowledge/create-component/CreateWebKnowledgeDialog.vue @@ -54,7 +54,7 @@ const emit = defineEmits(['refresh']) const router = useRouter() const route = useRoute() -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -111,11 +111,16 @@ const submitHandle = async () => { ...BaseFormRef.value.form, ...knowledgeForm.value, } - loadSharedApi({ type: 'knowledge', systemType: type.value }) + loadSharedApi({ type: 'knowledge', systemType: apiType.value }) .postWebKnowledge(obj, loading) .then((res: any) => { MsgSuccess(t('common.createSuccess')) - router.push({ path: `/knowledge/${res.data.id}/${currentFolder.value.id}/document` }) + router.push({ + path: `/knowledge/${res.data.id}/${currentFolder.value.id}/document`, + query: { + type: apiType.value, + }, + }) emit('refresh') }) } else { diff --git a/ui/src/views/knowledge/index.vue b/ui/src/views/knowledge/index.vue index ef25903ce..034ca920c 100644 --- a/ui/src/views/knowledge/index.vue +++ b/ui/src/views/knowledge/index.vue @@ -30,8 +30,7 @@ import { useRoute } from 'vue-router' import useStore from '@/stores' const route = useRoute() const { folder, knowledge } = useStore() - -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -41,7 +40,7 @@ const type = computed(() => { } }) const permissionPrecise = computed(() => { - return permissionMap['knowledge'][type.value] + return permissionMap['knowledge'][apiType.value] }) const loading = ref(false) diff --git a/ui/src/views/model/component/CreateModelDialog.vue b/ui/src/views/model/component/CreateModelDialog.vue index 8a0269a28..2dda19b16 100644 --- a/ui/src/views/model/component/CreateModelDialog.vue +++ b/ui/src/views/model/component/CreateModelDialog.vue @@ -252,7 +252,7 @@ import { loadSharedApi } from '@/utils/dynamics-api/shared-api' const route = useRoute() -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -390,7 +390,7 @@ const submit = () => { ?.validate() .then(() => { if (providerValue.value) { - loadSharedApi({ type: 'model', systemType: type.value }) + loadSharedApi({ type: 'model', systemType: apiType.value }) .createModel( { ...base_form_data.value, diff --git a/ui/src/views/model/component/EditModel.vue b/ui/src/views/model/component/EditModel.vue index 6b93640fc..7caa6abe1 100644 --- a/ui/src/views/model/component/EditModel.vue +++ b/ui/src/views/model/component/EditModel.vue @@ -134,7 +134,7 @@ import { loadSharedApi } from '@/utils/dynamics-api/shared-api' const route = useRoute() -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -222,7 +222,7 @@ const list_base_model = (model_type: any, change?: boolean) => { } const open = (provider: Provider, model: Model) => { modelValue.value = model - loadSharedApi({ type: 'model', systemType: type.value }) + loadSharedApi({ type: 'model', systemType: apiType.value }) .getModelById(model.id, formLoading) .then((ok: any) => { modelValue.value = ok.data @@ -255,7 +255,7 @@ const close = () => { const submit = () => { dynamicsFormRef.value?.validate().then(() => { if (modelValue.value) { - loadSharedApi({ type: 'model', systemType: type.value }) + loadSharedApi({ type: 'model', systemType: apiType.value }) .updateModel( modelValue.value.id, { diff --git a/ui/src/views/model/component/ModelCard.vue b/ui/src/views/model/component/ModelCard.vue index faecc7b93..6509fe359 100644 --- a/ui/src/views/model/component/ModelCard.vue +++ b/ui/src/views/model/component/ModelCard.vue @@ -204,7 +204,7 @@ const deleteModel = () => { } const cancelDownload = () => { - loadSharedApi({ type: 'model', systemType: type.value }) + loadSharedApi({ type: 'model', systemType: apiType.value }) .pauseDownload(props.model.id) .then(() => { downModel.value = undefined @@ -227,7 +227,7 @@ const icon = computed(() => { const initInterval = () => { interval = setInterval(() => { if (currentModel.value.status === 'DOWNLOAD') { - loadSharedApi({ type: 'model', systemType: type.value }) + loadSharedApi({ type: 'model', systemType: apiType.value }) .getModelMetaById(props.model.id) .then((ok: any) => { downModel.value = ok.data diff --git a/ui/src/views/model/component/ParamSettingDialog.vue b/ui/src/views/model/component/ParamSettingDialog.vue index d26289622..a78906a38 100644 --- a/ui/src/views/model/component/ParamSettingDialog.vue +++ b/ui/src/views/model/component/ParamSettingDialog.vue @@ -95,7 +95,7 @@ const props = defineProps<{ const route = useRoute() -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -112,7 +112,7 @@ const AddParamRef = ref() const open = () => { dialogVisible.value = true loading.value = true - loadSharedApi({ type: 'model', systemType: type.value }) + loadSharedApi({ type: 'model', systemType: apiType.value }) .getModelParamsForm(props.model.id, loading) .then((ok: any) => { loading.value = false @@ -164,7 +164,7 @@ function refresh(data: any, index: any) { } function submit() { - loadSharedApi({ type: 'model', systemType: type.value }) + loadSharedApi({ type: 'model', systemType: apiType.value }) .updateModelParamsForm(props.model.id, modelParamsForm.value, loading) .then((ok: any) => { MsgSuccess(t('views.model.tip.saveSuccessMessage')) diff --git a/ui/src/views/model/index.vue b/ui/src/views/model/index.vue index 0f7211605..ce9e68301 100644 --- a/ui/src/views/model/index.vue +++ b/ui/src/views/model/index.vue @@ -131,7 +131,7 @@ import permissionMap from '@/permission' const route = useRoute() -const type = computed(() => { +const apiType = computed(() => { if (route.path.includes('shared')) { return 'systemShare' } else if (route.path.includes('resource-management')) { @@ -141,10 +141,10 @@ const type = computed(() => { } }) const permissionPrecise = computed(() => { - return permissionMap['model'][type.value] + return permissionMap['model'][apiType.value] }) const isSystemShare = computed(() => { - return type.value === 'systemShare' + return apiType.value === 'systemShare' }) const commonList1 = ref() const commonList2 = ref() @@ -202,7 +202,7 @@ const openCreateModel = (provider?: Provider, model_type?: string) => { const list_model = () => { const params = active_provider.value?.provider ? { provider: active_provider.value.provider } : {} - loadSharedApi({ type: 'model', isShared: isShared.value, systemType: type.value }) + loadSharedApi({ type: 'model', isShared: isShared.value, systemType: apiType.value }) .getModel({ ...model_search_form.value, ...params }, list_model_loading) .then((ok: any) => { model_list.value = ok.data diff --git a/ui/src/views/paragraph/component/ParagraphCard.vue b/ui/src/views/paragraph/component/ParagraphCard.vue index 3e45be8c0..14f40b797 100644 --- a/ui/src/views/paragraph/component/ParagraphCard.vue +++ b/ui/src/views/paragraph/component/ParagraphCard.vue @@ -68,11 +68,11 @@ - +