Skip to content

Commit 1a17c7c

Browse files
committed
feat: add workspaceId prop for enhanced document management and retrieval
--bug=1059992 --user=刘瑞斌 【资源管理】应用-对话日志修改内容报错,无法获取知识库 https://www.tapd.cn/62980211/s/1749196 --bug=1059994 --user=刘瑞斌 【资源管理】知识库文档分段迁移报错,无法获取知识库 https://www.tapd.cn/62980211/s/1749198
1 parent f43fa25 commit 1a17c7c

File tree

6 files changed

+68
-7
lines changed

6 files changed

+68
-7
lines changed

ui/src/components/select-knowledge-document/index.vue

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ const props = defineProps<{
6565
default: () => {}
6666
}
6767
apiType: 'systemShare' | 'workspace' | 'systemManage'
68-
isApplication?: boolean
68+
isApplication?: boolean,
69+
workspaceId?: string,
6970
}>()
7071
7172
const { user } = useStore()
@@ -99,8 +100,17 @@ const defaultProps = {
99100
const loadTree = async (node: any, resolve: any) => {
100101
if (node.isLeaf) return resolve([])
101102
const folder_id = node.level === 0 ? user.getWorkspaceId() : node.data.id
103+
const obj =
104+
props.apiType === 'systemManage'
105+
? {
106+
workspace_id: props.workspaceId,
107+
folder_id: node.level === 0 ? props.workspaceId : node.data.id,
108+
}
109+
: {
110+
folder_id: folder_id,
111+
}
102112
await loadSharedApi({ type: 'knowledge', systemType: props.apiType })
103-
.getKnowledgeList({ folder_id: folder_id }, optionLoading)
113+
.getKnowledgeList(obj, optionLoading)
104114
.then((res: any) => {
105115
resolve(res.data)
106116
})

ui/src/views/chat-log/component/EditContentDialog.vue

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
@changeKnowledge="changeKnowledge"
5656
@changeDocument="changeDocument"
5757
:isApplication="true"
58+
:workspace-id="detail.workspace_id"
5859
/>
5960
<template #footer>
6061
<span class="dialog-footer">
@@ -67,7 +68,7 @@
6768
</el-dialog>
6869
</template>
6970
<script setup lang="ts">
70-
import { ref, watch, reactive, computed } from 'vue'
71+
import {ref, watch, reactive, computed, onMounted} from 'vue'
7172
import { useRoute } from 'vue-router'
7273
import SelectKnowledgeDocument from '@/components/select-knowledge-document/index.vue'
7374
import type { FormInstance, FormRules } from 'element-plus'
@@ -125,6 +126,7 @@ const footers = ['markdownTotal', 0, '=', 1, 'scrollSwitch']
125126
const SelectKnowledgeDocumentRef = ref()
126127
const dialogVisible = ref<boolean>(false)
127128
const loading = ref(false)
129+
const detail = ref<any>({})
128130
129131
const form = ref<any>({
130132
chat_id: '',
@@ -219,6 +221,18 @@ const submitForm = async (formEl: FormInstance | undefined) => {
219221
})
220222
}
221223
224+
function getDetail(isLoading = false) {
225+
loadSharedApi({ type: 'application', systemType: apiType.value })
226+
.getApplicationDetail(id as string, isLoading ? loading : undefined)
227+
.then((res: any) => {
228+
detail.value = res.data
229+
})
230+
}
231+
232+
onMounted(()=>{
233+
getDetail()
234+
})
235+
222236
defineExpose({ open })
223237
</script>
224238
<style lang="scss" scoped></style>

ui/src/views/chat-log/index.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@
209209
:close-on-click-modal="false"
210210
:close-on-press-escape="false"
211211
>
212-
<SelectKnowledgeDocument ref="SelectKnowledgeDocumentRef" :apiType="apiType" />
212+
<SelectKnowledgeDocument ref="SelectKnowledgeDocumentRef" :apiType="apiType" :workspace-id="detail.workspace_id"/>
213213
<template #footer>
214214
<span class="dialog-footer">
215215
<el-button @click.prevent="documentDialogVisible = false">

ui/src/views/paragraph/component/ParagraphCard.vue

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,13 @@
122122
ref="SelectDocumentDialogRef"
123123
@refresh="refreshMigrateParagraph"
124124
:apiType="apiType"
125+
:workspace-id="knowledgeDetail.workspace_id"
125126
/>
126127
<GenerateRelatedDialog ref="GenerateRelatedDialogRef" @refresh="refresh" :apiType="apiType" />
127128
</el-card>
128129
</template>
129130
<script setup lang="ts">
130-
import { ref, computed, watch } from 'vue'
131+
import {ref, computed, watch, onMounted} from 'vue'
131132
import { useRoute } from 'vue-router'
132133
import GenerateRelatedDialog from '@/components/generate-related-dialog/index.vue'
133134
import ParagraphDialog from '@/views/paragraph/component/ParagraphDialog.vue'
@@ -172,6 +173,7 @@ const emit = defineEmits([
172173
])
173174
const loading = ref(false)
174175
const changeStateloading = ref(false)
176+
const knowledgeDetail = ref<any>({})
175177
const show = ref(false)
176178
// card上面存在dropdown菜单
177179
const subHovered = ref(false)
@@ -198,6 +200,14 @@ async function changeState(row: any) {
198200
return false
199201
})
200202
}
203+
function getDetail() {
204+
loadSharedApi({ type: 'knowledge', systemType: apiType.value })
205+
.getKnowledgeDetail(id, loading)
206+
.then((res: any) => {
207+
knowledgeDetail.value = res.data
208+
})
209+
}
210+
201211
202212
const GenerateRelatedDialogRef = ref<InstanceType<typeof GenerateRelatedDialog>>()
203213
function openGenerateDialog(row: any) {
@@ -271,6 +281,11 @@ const dialogVisible = computed(
271281
SelectDocumentDialogRef.value?.dialogVisible ||
272282
GenerateRelatedDialogRef.value?.dialogVisible,
273283
)
284+
285+
onMounted(() => {
286+
getDetail()
287+
})
288+
274289
watch(dialogVisible, (val: boolean) => {
275290
emit('dialogVisibleChange', val)
276291
})

ui/src/views/paragraph/component/SelectDocumentDialog.vue

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
@changeKnowledge="changeKnowledge"
1414
@changeDocument="changeDocument"
1515
:isApplication="true"
16+
:workspace-id="knowledgeDetail.workspace_id"
1617
/>
1718
<template #footer>
1819
<span class="dialog-footer">
@@ -25,7 +26,7 @@
2526
</el-dialog>
2627
</template>
2728
<script setup lang="ts">
28-
import { ref, watch, reactive, computed } from 'vue'
29+
import {ref, watch, reactive, computed, onMounted} from 'vue'
2930
import { useRoute } from 'vue-router'
3031
import SelectKnowledgeDocument from '@/components/select-knowledge-document/index.vue'
3132
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
@@ -40,7 +41,7 @@ const {
4041
4142
const emit = defineEmits(['refresh'])
4243
const SelectKnowledgeDocumentRef = ref()
43-
44+
const knowledgeDetail = ref<any>({})
4445
const dialogVisible = ref<boolean>(false)
4546
const loading = ref(false)
4647
@@ -78,6 +79,19 @@ const submitForm = async () => {
7879
}
7980
}
8081
82+
function getDetail() {
83+
loadSharedApi({ type: 'knowledge', systemType: props.apiType })
84+
.getKnowledgeDetail(id, loading)
85+
.then((res: any) => {
86+
knowledgeDetail.value = res.data
87+
})
88+
}
89+
90+
onMounted(() => {
91+
getDetail()
92+
})
93+
94+
8195
function changeKnowledge(dataset_id: string) {
8296
localStorage.setItem(id + 'chat_dataset_id', dataset_id)
8397
}

ui/src/views/paragraph/index.vue

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@
182182
ref="SelectDocumentDialogRef"
183183
@refresh="refreshMigrateParagraph"
184184
:apiType="apiType"
185+
:workspaceId="knowledgeDetail.workspace_id"
185186
/>
186187
<GenerateRelatedDialog ref="GenerateRelatedDialogRef" @refresh="refresh" :apiType="apiType" />
187188
</div>
@@ -220,6 +221,7 @@ const ParagraphDialogRef = ref()
220221
const loading = ref(false)
221222
const changeStateloading = ref(false)
222223
const documentDetail = ref<any>({})
224+
const knowledgeDetail = ref<any>({})
223225
const paragraphDetail = ref<any[]>([])
224226
const title = ref('')
225227
const search = ref('')
@@ -332,6 +334,12 @@ function getDetail() {
332334
.then((res: any) => {
333335
documentDetail.value = res.data
334336
})
337+
338+
loadSharedApi({ type: 'knowledge', isShared: isShared.value, systemType: apiType.value })
339+
.getKnowledgeDetail(id, loading)
340+
.then((res: any) => {
341+
knowledgeDetail.value = res.data
342+
})
335343
}
336344
337345
function getParagraphList() {

0 commit comments

Comments
 (0)