Merge remote-tracking branch 'origin/v2' into v2

Author: liqiang-fit2cloud

ui/src/components/generate-related-dialog/index.vue

@@ -70,22 +70,30 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import { reactive, ref, watch } from 'vue'
+import { reactive, ref, watch, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import documentApi from '@/api/knowledge/document'
 import paragraphApi from '@/api/knowledge/paragraph'
-import knowledgeApi from '@/api/knowledge/knowledge'
 import useStore from '@/stores'
 import { groupBy } from 'lodash'
 import { MsgSuccess } from '@/utils/message'
 import { t } from '@/locales'
 import type { FormInstance } from 'element-plus'
+import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
 
 const route = useRoute()
 const {
   params: { id, documentId }, // id为knowledgeID
 } = route as any
-
+const type = computed(() => {
+  if (route.path.includes('shared')) {
+    return 'systemShare'
+  } else if (route.path.includes('resource-management')) {
+    return 'systemManage'
+  } else {
+    return 'workspace'
+  }
+})
 const { model, prompt, user } = useStore()
 
 const emit = defineEmits(['refresh'])
@@ -171,18 +179,20 @@ const submitHandle = async (formEl: FormInstance) => {
           ...form.value,
           state_list: stateMap[state.value],
         }
-        knowledgeApi.putGenerateRelated(id ? id : knowledgeId.value, data, loading).then(() => {
-          MsgSuccess(t('views.document.generateQuestion.successMessage'))
-          dialogVisible.value = false
-        })
+        loadSharedApi({ type: 'knowledge', systemType: type.value })
+          .putGenerateRelated(id ? id : knowledgeId.value, data, loading)
+          .then(() => {
+            MsgSuccess(t('views.document.generateQuestion.successMessage'))
+            dialogVisible.value = false
+          })
       }
     }
   })
 }
 
 function getModel() {
   loading.value = true
-  knowledgeApi
+  loadSharedApi({ type: 'knowledge', systemType: type.value })
     .getKnowledgeModel()
     .then((res: any) => {
       modelOptions.value = groupBy(res?.data, 'provider')

ui/src/layout/components/breadcrumb/index.vue

@@ -115,32 +115,35 @@
 <script setup lang="ts">
 import { ref, onMounted, computed } from 'vue'
 import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router'
-import { isWorkFlow } from '@/utils/application'
 import { isAppIcon } from '@/utils/common'
+import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
 
 import useStore from '@/stores'
-const { common, knowledge, application } = useStore()
+const { common, application } = useStore()
 const route = useRoute()
-const router = useRouter()
+
 const {
   meta: { activeMenu },
   params: { id },
 } = route as any
 
+const type = computed(() => {
+  if (route.path.includes('shared')) {
+    return 'systemShare'
+  } else if (route.path.includes('resource-management')) {
+    return 'systemManage'
+  } else {
+    return 'workspace'
+  }
+})
+
 onBeforeRouteLeave((to, from) => {
   common.saveBreadcrumb(null)
 })
 
-const CreateKnowledgeDialogRef = ref()
-const CreateApplicationDialogRef = ref()
-const list = ref<any[]>([])
 const loading = ref(false)
 
-const breadcrumbData = computed(() => common.breadcrumb)
 const current = ref<any>(null)
-// const current = computed(() => {
-//   return list.value?.filter((v) => v.id === id)?.[0]
-// })
 
 const isApplication = computed(() => {
   return activeMenu.includes('application')
@@ -151,8 +154,8 @@ const isKnowledge = computed(() => {
 
 function getKnowledgeDetail() {
   loading.value = true
-  knowledge
-    .asyncGetKnowledgeDetail(id)
+  loadSharedApi({ type: 'knowledge', systemType: type.value })
+    .getKnowledgeDetail(id)
     .then((res: any) => {
       current.value = res.data
       loading.value = false
@@ -175,80 +178,12 @@ function getApplicationDetail() {
     })
 }
 
-function openCreateDialog() {
-  if (isKnowledge.value) {
-    CreateKnowledgeDialogRef.value.open()
-  } else if (isApplication.value) {
-    CreateApplicationDialogRef.value.open()
-  }
-}
-
-function changeMenu(id: string) {
-  const lastMatched = route.matched[route.matched.length - 1]
-  if (lastMatched) {
-    if (isKnowledge.value) {
-      router.push({ name: lastMatched.name, params: { id: id } })
-    } else if (isApplication.value) {
-      const type = list.value?.filter((v) => v.id === id)?.[0]?.type
-      if (
-        isWorkFlow(type) &&
-        (lastMatched.name === 'AppSetting' || lastMatched.name === 'AppHitTest')
-      ) {
-        router.push({ path: `/application/${id}/${type}/overview` })
-      } else {
-        router.push({
-          name: lastMatched.name,
-          params: { id: id, type: type },
-        })
-      }
-    }
-  }
-}
-
-function getKnowledge() {
-  loading.value = true
-  knowledge
-    .asyncGetFolderKnowledge()
-    .then((res: any) => {
-      list.value = res.data
-      common.saveBreadcrumb(list.value)
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
-    })
-}
-function getApplication() {
-  loading.value = true
-  application
-    .asyncGetAllApplication()
-    .then((res: any) => {
-      list.value = res.data
-      common.saveBreadcrumb(list.value)
-      loading.value = false
-    })
-    .catch(() => {
-      loading.value = false
-    })
-}
-function refresh() {
-  common.saveBreadcrumb(null)
-}
 onMounted(() => {
   if (isKnowledge.value) {
     getKnowledgeDetail()
   } else if (isApplication.value) {
     getApplicationDetail()
   }
-  // if (!breadcrumbData.value) {
-  //   if (isKnowledge.value) {
-  //     getKnowledge()
-  //   } else if (isApplication.value) {
-  //     getApplication()
-  //   }
-  // } else {
-  //   list.value = breadcrumbData.value
-  // }
 })
 </script>
 

ui/src/stores/modules/knowledge.ts

@@ -13,7 +13,7 @@ export interface knowledgeStateTypes {
   webInfo: any
   documentsType: string
   documentsFiles: UploadUserFile[]
-  knowledgeList: knowledgeData[]
+  knowledgeList: any[]
 }
 
 const useKnowledgeStore = defineStore('knowledge', {
@@ -56,7 +56,7 @@ const useKnowledgeStore = defineStore('knowledge', {
           ...paramsData,
         }
         loadSharedApi({ type: 'knowledge', isShared, systemType })
-          .getToolListPage(page, params, loading)
+          .getKnowledgeListPage(page, params, loading)
           .then((res: any) => {
             resolve(res)
           })
@@ -80,18 +80,6 @@ const useKnowledgeStore = defineStore('knowledge', {
           })
       })
     },
-    async asyncGetKnowledgeDetail(knowledge_id: string, loading?: Ref<boolean>) {
-      return new Promise((resolve, reject) => {
-        knowledgeApi
-          .getKnowledgeDetail(knowledge_id, loading)
-          .then((data) => {
-            resolve(data)
-          })
-          .catch((error) => {
-            reject(error)
-          })
-      })
-    },
   },
 })
 

ui/src/views/application/component/AddKnowledgeDialog.vue

@@ -94,7 +94,6 @@
 </template>
 <script setup lang="ts">
 import { computed, ref, watch } from 'vue'
-import KnowledgeApi from '@/api/knowledge/knowledge'
 import useStore from '@/stores'
 const props = defineProps({
   data: {

ui/src/views/document/component/SelectKnowledgeDialog.vue

@@ -56,17 +56,25 @@
   </el-dialog>
 </template>
 <script setup lang="ts">
-import { ref, watch } from 'vue'
+import { ref, watch, computed } from 'vue'
 import { useRoute } from 'vue-router'
 import documentApi from '@/api/knowledge/document'
+import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
 
 import useStore from '@/stores'
-const { knowledge } = useStore()
 const route = useRoute()
 const {
   params: { id }, // id为knowledgeID
 } = route as any
-
+const type = computed(() => {
+  if (route.path.includes('shared')) {
+    return 'systemShare'
+  } else if (route.path.includes('resource-management')) {
+    return 'systemManage'
+  } else {
+    return 'workspace'
+  }
+})
 const emit = defineEmits(['refresh'])
 
 const loading = ref<boolean>(false)
@@ -91,9 +99,11 @@ const loadTree = (node: any, resolve: any) => {
   console.log(node)
   if (node.isLeaf) return resolve([])
   const folder_id = node.level === 0 ? '' : node.data.id
-  knowledge.asyncGetFolderKnowledge(folder_id, loading).then((res: any) => {
-    resolve(res.data)
-  })
+  loadSharedApi({ type: 'knowledge', systemType: type.value })
+    .getKnowledgeList(folder_id, loading)
+    .then((res: any) => {
+      resolve(res.data)
+    })
 }
 
 watch(dialogVisible, (bool) => {