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

Author: liqiang-fit2cloud

ui/src/components/folder-tree/index.vue

@@ -33,7 +33,9 @@
         <div class="flex-between w-full" @mouseenter.stop="handleMouseEnter(data)">
           <div class="flex align-center">
             <AppIcon iconName="app-folder" style="font-size: 16px"></AppIcon>
-            <span class="ml-8 ellipsis" style="max-width:110px" :label="node.label">{{ node.label }}</span>
+            <span class="ml-8 ellipsis" style="max-width: 110px" :label="node.label">{{
+              node.label
+            }}</span>
           </div>
 
           <div
@@ -79,12 +81,15 @@
 
 <script lang="ts" setup>
 import { ref, watch } from 'vue'
+import { onBeforeRouteLeave } from 'vue-router'
 import type { TreeInstance } from 'element-plus'
 import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue'
 import { t } from '@/locales'
 import folderApi from '@/api/folder'
 import { EditionConst } from '@/utils/permission/data'
 import { hasPermission } from '@/utils/permission/index'
+import useStore from '@/stores'
+
 defineOptions({ name: 'FolderTree' })
 const props = defineProps({
   data: {
@@ -116,6 +121,12 @@ const props = defineProps({
     default: true,
   },
 })
+
+const { folder } = useStore()
+onBeforeRouteLeave((to, from) => {
+  folder.setCurrentFolder({})
+})
+
 interface Tree {
   name: string
   children?: Tree[]

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

@@ -135,7 +135,7 @@ const systemRouter = {
             parentPath: '/system',
             parentName: 'system',
           },
-          component: () => import('@/views/shared/knowledge-shared/index.vue'),
+          component: () => import('@/views/system-shared/KnowLedgeSharedIndex.vue'),
         },
         {
           path: '/system/shared/tool',

ui/src/router/modules/system.ts

@@ -1,15 +1,18 @@
 import { defineStore } from 'pinia'
 import type { knowledgeData } from '@/api/type/knowledge'
 import type { UploadUserFile } from 'element-plus'
-import knowledgeApi from '@/api/knowledge/knowledge'
+import type { pageRequest } from '@/api/type/common'
 import { type Ref } from 'vue'
+import useUserStore from './user'
 import useFolderStore from './folder'
+import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
 
 export interface knowledgeStateTypes {
   baseInfo: knowledgeData | null
   webInfo: any
   documentsType: string
   documentsFiles: UploadUserFile[]
+  knowledgeList: knowledgeData[]
 }
 
 const useKnowledgeStore = defineStore('knowledge', {
@@ -18,6 +21,7 @@ const useKnowledgeStore = defineStore('knowledge', {
     webInfo: null,
     documentsType: '',
     documentsFiles: [],
+    knowledgeList: [],
   }),
   actions: {
     saveBaseInfo(info: knowledgeData | null) {
@@ -32,6 +36,34 @@ const useKnowledgeStore = defineStore('knowledge', {
     saveDocumentsFile(file: UploadUserFile[]) {
       this.documentsFiles = file
     },
+    setKnowledgeList(list: any[]) {
+      this.knowledgeList = list
+    },
+    async asyncGetKnowledgeListPage(
+      page: pageRequest,
+      isShared?: boolean | undefined,
+      systemType: 'systemShare' | 'workspace' | 'systemManage' = 'workspace',
+      paramsData: any,
+      loading?: Ref<boolean>,
+    ) {
+      return new Promise((resolve, reject) => {
+        const folder = useFolderStore()
+        const user = useUserStore()
+        const params = {
+          folder_id: folder.currentFolder?.id || user.getWorkspaceId(),
+          scope: systemType === 'systemShare' ? 'SHARED' : 'WORKSPACE',
+          ...paramsData,
+        }
+        loadSharedApi({ type: 'knowledge', isShared, systemType })
+          .getToolListPage(page, params, loading)
+          .then((res: any) => {
+            resolve(res)
+          })
+          .catch((error: any) => {
+            reject(error)
+          })
+      })
+    },
     async asyncGetFolderKnowledge(folder_id?: string, loading?: Ref<boolean>) {
       return new Promise((resolve, reject) => {
         const params = {
@@ -59,46 +91,6 @@ const useKnowledgeStore = defineStore('knowledge', {
           })
       })
     },
-    // async asyncGetTreeRootKnowledge(loading?: Ref<boolean>) {
-    //   const folder = useFolderStore()
-    //   return Promise.all([
-    //     folder.asyncGetFolder('KNOWLEDGE', {}, loading),
-    //     this.asyncGetFolderKnowledge(loading),
-    //   ])
-    //     .then((res: any) => {
-    //       const folderList = res[0].data
-    //       const knowledgeList = res[1].data
-    //       const arrMap: any = {}
-    //       function buildIdMap(arr: any) {
-    //         arr.forEach((item: any) => {
-    //           arrMap[item.id] = item
-    //           // 递归处理子节点
-    //           if (item.children && item.children.length > 0) {
-    //             buildIdMap(item.children)
-    //           }
-    //         })
-    //       }
-    //       buildIdMap(folderList)
-    //       knowledgeList
-    //         .filter((v: any) => v.resource_type !== 'folder')
-    //         .forEach((item: any) => {
-    //           const targetFolder = arrMap[item.folder_id]
-    //           if (targetFolder) {
-    //             // 检查是否已有相同ID的子节点（避免重复插入）
-    //             const existingChild = targetFolder.children.find(
-    //               (child: any) => child.id === item.id,
-    //             )
-    //             if (!existingChild) {
-    //               targetFolder.children.push(item)
-    //             }
-    //           }
-    //         })
-    //       return Promise.resolve(folderList)
-    //     })
-    //     .catch((error) => {
-    //       return Promise.reject(error)
-    //     })
-    // },
   },
 })
 

ui/src/stores/modules/knowledge.ts

@@ -15,8 +15,9 @@ const useToolStore = defineStore('tool', {
     },
     async asyncGetToolListPage(
       page: pageRequest,
-      isShared?: boolean | undefined,
+      isShared: boolean | undefined,
       systemType: 'systemShare' | 'workspace' | 'systemManage' = 'workspace',
+      paramsData: any,
       loading?: Ref<boolean>,
     ) {
       return new Promise((resolve, reject) => {
@@ -25,6 +26,7 @@ const useToolStore = defineStore('tool', {
         const params = {
           folder_id: folder.currentFolder?.id || user.getWorkspaceId(),
           scope: systemType === 'systemShare' ? 'SHARED' : 'WORKSPACE',
+          ...paramsData,
         }
         loadSharedApi({ type: 'tool', isShared, systemType })
           .getToolListPage(page, params, loading)