Return to the corresponding permission directory and locate the tool folder

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

@@ -111,7 +111,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, onUnmounted, ref, watch } from 'vue'
+import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
 import { onBeforeRouteLeave } from 'vue-router'
 import type { TreeInstance } from 'element-plus'
 import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue'
@@ -125,7 +125,7 @@ import useStore from '@/stores'
 import { TreeToFlatten } from '@/utils/array'
 import { MsgConfirm } from '@/utils/message'
 import permissionMap from '@/permission'
-
+import bus from '@/bus'
 defineOptions({ name: 'FolderTree' })
 const props = defineProps({
   data: {
@@ -188,7 +188,12 @@ const { folder } = useStore()
 onBeforeRouteLeave((to, from) => {
   folder.setCurrentFolder({})
 })
-
+onMounted(() => {
+  bus.on('select_node', (id: string) => {
+    treeRef.value?.setCurrentKey(id)
+      hoverNodeId.value=id
+   })
+})
 interface Tree {
   name: string
   children?: Tree[]

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

@@ -30,7 +30,8 @@ import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router'
 import { resetUrl } from '@/utils/common'
 import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
 import useStore from '@/stores'
-const { common, folder } = useStore()
+import permissionMap from '@/permission'
+const { common, folder,user } = useStore()
 const route = useRoute()
 const router = useRouter()
 
@@ -50,6 +51,20 @@ const apiType = computed(() => {
   }
 })
 
+const folderType = computed(() => {
+  if (route.path.includes('application')) {
+    return 'application'
+  }
+  if (route.path.includes('knowledge')) {
+    return 'knowledge'
+  }
+  else {return 'application'}
+})
+
+const permissionPrecise = computed(() => {
+  return permissionMap[folderType.value!]['workspace']
+})
+
 const shareDisabled = computed(() => {
   return folderId === 'share' || isShared === 'true'
 })
@@ -108,14 +123,13 @@ function getApplicationDetail() {
 function toBack() {
   if (isKnowledge.value) {
     folder.setCurrentFolder({
-      id: folderId,
+      id: permissionPrecise.value.folderRead(folderId)? folderId : user.getWorkspaceId(),
     })
   } else if (isApplication.value) {
     folder.setCurrentFolder({
-      id: current.value.folder,
+      id: permissionPrecise.value.folderRead(current.value.folder)? current.value.folder : user.getWorkspaceId(),
     })
   }
-
   router.push({ path: toBackPath.value })
 }
 

ui/src/views/tool/component/ToolListContainer.vue

@@ -6,32 +6,16 @@
     <template #search>
       <div class="flex">
         <div class="flex-between complex-search">
-          <el-select
-            class="complex-search__left"
-            v-model="search_type"
-            style="width: 120px"
-            @change="search_type_change"
-          >
+          <el-select class="complex-search__left" v-model="search_type" style="width: 120px"
+            @change="search_type_change">
             <el-option :label="$t('common.creator')" value="create_user" />
 
             <el-option :label="$t('views.tool.form.toolName.label')" value="name" />
           </el-select>
-          <el-input
-            v-if="search_type === 'name'"
-            v-model="search_form.name"
-            @change="searchHandle"
-            :placeholder="$t('common.searchBar.placeholder')"
-            style="width: 220px"
-            clearable
-          />
-          <el-select
-            v-else-if="search_type === 'create_user'"
-            v-model="search_form.create_user"
-            @change="searchHandle"
-            filterable
-            clearable
-            style="width: 220px"
-          >
+          <el-input v-if="search_type === 'name'" v-model="search_form.name" @change="searchHandle"
+            :placeholder="$t('common.searchBar.placeholder')" style="width: 220px" clearable />
+          <el-select v-else-if="search_type === 'create_user'" v-model="search_form.create_user" @change="searchHandle"
+            filterable clearable style="width: 220px">
             <el-option v-for="u in user_options" :key="u.id" :value="u.id" :label="u.nick_name" />
           </el-select>
         </div>
@@ -64,17 +48,9 @@
                   </div>
                 </div>
               </el-dropdown-item>
-              <el-upload
-                ref="elUploadRef"
-                :file-list="[]"
-                action="#"
-                multiple
-                :auto-upload="false"
-                :show-file-list="false"
-                :limit="1"
-                :on-change="(file: any, fileList: any) => importTool(file)"
-                class="import-button"
-              >
+              <el-upload ref="elUploadRef" :file-list="[]" action="#" multiple :auto-upload="false"
+                :show-file-list="false" :limit="1" :on-change="(file: any, fileList: any) => importTool(file)"
+                class="import-button">
                 <el-dropdown-item v-if="permissionPrecise.import()">
                   <div class="flex align-center w-full">
                     <el-avatar shape="square" :size="32" style="background: none">
@@ -115,35 +91,16 @@
       </div>
     </template>
 
-    <div
-      v-loading.fullscreen.lock="paginationConfig.current_page === 1 && loading"
-      style="max-height: calc(100vh - 120px)"
-    >
-      <InfiniteScroll
-        :size="tool.toolList.length"
-        :total="paginationConfig.total"
-        :page_size="paginationConfig.page_size"
-        v-model:current_page="paginationConfig.current_page"
-        @load="getList"
-        :loading="loading"
-      >
+    <div v-loading.fullscreen.lock="paginationConfig.current_page === 1 && loading"
+      style="max-height: calc(100vh - 120px)">
+      <InfiniteScroll :size="tool.toolList.length" :total="paginationConfig.total"
+        :page_size="paginationConfig.page_size" v-model:current_page="paginationConfig.current_page" @load="getList"
+        :loading="loading">
         <el-row v-if="tool.toolList.length > 0" :gutter="15" class="w-full">
           <template v-for="(item, index) in tool.toolList" :key="index">
-            <el-col
-              v-if="item.resource_type === 'folder'"
-              :xs="24"
-              :sm="12"
-              :md="12"
-              :lg="8"
-              :xl="6"
-              class="mb-16"
-            >
-              <CardBox
-                :title="item.name"
-                :description="item.desc || $t('components.noDesc')"
-                class="cursor"
-                @click="clickFolder(item)"
-              >
+            <el-col v-if="item.resource_type === 'folder'" :xs="24" :sm="12" :md="12" :lg="8" :xl="6" class="mb-16">
+              <CardBox :title="item.name" :description="item.desc || $t('components.noDesc')" class="cursor"
+                @click="clickFolder(item)">
                 <template #icon>
                   <el-avatar shape="square" :size="32" style="background: none">
                     <AppIcon iconName="app-folder" style="font-size: 32px"></AppIcon>
@@ -157,21 +114,10 @@
               </CardBox>
             </el-col>
             <el-col v-else :xs="24" :sm="12" :md="12" :lg="8" :xl="6" class="mb-16">
-              <CardBox
-                :title="item.name"
-                :description="item.desc"
-                class="cursor"
-                @click.stop="openCreateDialog(item)"
-                :disabled="permissionPrecise.edit(item.id)"
-              >
+              <CardBox :title="item.name" :description="item.desc" class="cursor" @click.stop="openCreateDialog(item)"
+                :disabled="permissionPrecise.edit(item.id)">
                 <template #icon>
-                  <el-avatar
-                    v-if="item?.icon"
-                    shape="square"
-                    :size="32"
-                    style="background: none"
-                    class="mr-8"
-                  >
+                  <el-avatar v-if="item?.icon" shape="square" :size="32" style="background: none" class="mr-8">
                     <img :src="resetUrl(item?.icon)" alt="" />
                   </el-avatar>
                   <ToolIcon v-else :size="32" :type="item?.tool_type" />
@@ -194,15 +140,12 @@
                     {{ t('views.shared.title') }}
                   </el-tag>
                   <el-tooltip effect="dark" content="更新版本">
-                    <el-button
-                      text
-                      @click.stop
-                      v-if="
-                        showUpdateStoreTool(item) && !isShared && permissionPrecise.edit(item.id)
-                      "
-                      @click="updateStoreTool(item)"
-                    >
-                      <el-icon v-if="hoverShow"><Refresh /></el-icon>
+                    <el-button text @click.stop v-if="
+                      showUpdateStoreTool(item) && !isShared && permissionPrecise.edit(item.id)
+                    " @click="updateStoreTool(item)">
+                      <el-icon v-if="hoverShow">
+                        <Refresh />
+                      </el-icon>
                       <div v-else class="dot-success"></div>
                     </el-button>
                   </el-tooltip>
@@ -226,13 +169,8 @@
                 </template>
                 <template #mouseEnter>
                   <div @click.stop v-if="!isShared && MoreFieldPermission(item.id)">
-                    <el-switch
-                      v-model="item.is_active"
-                      :before-change="() => changeState(item)"
-                      size="small"
-                      class="mr-4"
-                      v-if="permissionPrecise.switch(item.id)"
-                    />
+                    <el-switch v-model="item.is_active" :before-change="() => changeState(item)" size="small"
+                      class="mr-4" v-if="permissionPrecise.switch(item.id)" />
                     <el-divider direction="vertical" />
                     <el-dropdown trigger="click">
                       <el-button text @click.stop>
@@ -240,87 +178,58 @@
                       </el-button>
                       <template #dropdown>
                         <el-dropdown-menu>
-                          <el-dropdown-item
-                            v-if="item.tool_type === 'MCP'"
-                            @click.stop="showMcpConfig(item)"
-                          >
+                          <el-dropdown-item v-if="item.tool_type === 'MCP'" @click.stop="showMcpConfig(item)">
                             <AppIcon iconName="app-operate-log" class="color-secondary"></AppIcon>
                             {{ $t('views.tool.mcpConfig') }}
                           </el-dropdown-item>
-                          <el-dropdown-item
-                            v-if="item.template_id && permissionPrecise.edit(item.id)"
-                            @click.stop="addInternalTool(item, true)"
-                          >
+                          <el-dropdown-item v-if="item.template_id && permissionPrecise.edit(item.id)"
+                            @click.stop="addInternalTool(item, true)">
                             <AppIcon iconName="app-edit" class="color-secondary"></AppIcon>
                             {{ $t('common.edit') }}
                           </el-dropdown-item>
-                          <el-dropdown-item
-                            v-if="!item.template_id && permissionPrecise.edit(item.id)"
-                            @click.stop="openCreateDialog(item)"
-                          >
+                          <el-dropdown-item v-if="!item.template_id && permissionPrecise.edit(item.id)"
+                            @click.stop="openCreateDialog(item)">
                             <AppIcon iconName="app-edit" class="color-secondary"></AppIcon>
                             {{ $t('common.edit') }}
                           </el-dropdown-item>
-                          <el-dropdown-item
-                            v-if="
-                              !item.template_id &&
-                              permissionPrecise.copy(item.id) &&
-                              item.tool_type !== 'MCP'
-                            "
-                            @click.stop="copyTool(item)"
-                          >
+                          <el-dropdown-item v-if="
+                            !item.template_id &&
+                            permissionPrecise.copy(item.id) &&
+                            item.tool_type !== 'MCP'
+                          " @click.stop="copyTool(item)">
                             <AppIcon iconName="app-copy" class="color-secondary"></AppIcon>
                             {{ $t('common.copy') }}
                           </el-dropdown-item>
-                          <el-dropdown-item
-                            v-if="
-                              item.init_field_list?.length > 0 && permissionPrecise.edit(item.id)
-                            "
-                            @click.stop="configInitParams(item)"
-                          >
+                          <el-dropdown-item v-if="
+                            item.init_field_list?.length > 0 && permissionPrecise.edit(item.id)
+                          " @click.stop="configInitParams(item)">
                             <AppIcon iconName="app-operation" class="color-secondary"></AppIcon>
                             {{ $t('common.param.initParam') }}
                           </el-dropdown-item>
-                          <el-dropdown-item
-                            @click.stop="openAuthorization(item)"
-                            v-if="apiType === 'workspace' && permissionPrecise.auth(item.id)"
-                          >
-                            <AppIcon
-                              iconName="app-resource-authorization"
-                              class="color-secondary"
-                            ></AppIcon>
+                          <el-dropdown-item @click.stop="openAuthorization(item)"
+                            v-if="apiType === 'workspace' && permissionPrecise.auth(item.id)">
+                            <AppIcon iconName="app-resource-authorization" class="color-secondary"></AppIcon>
                             {{ $t('views.system.resourceAuthorization.title') }}
                           </el-dropdown-item>
-                          <el-dropdown-item
-                            @click.stop="openMoveToDialog(item)"
-                            v-if="permissionPrecise.copy(item.id) && apiType === 'workspace'"
-                          >
+                          <el-dropdown-item @click.stop="openMoveToDialog(item)"
+                            v-if="permissionPrecise.copy(item.id) && apiType === 'workspace'">
                             <AppIcon iconName="app-migrate" class="color-secondary"></AppIcon>
                             {{ $t('common.moveTo') }}
                           </el-dropdown-item>
-                          <el-dropdown-item
-                            v-if="isSystemShare"
-                            @click.stop="openAuthorizedWorkspaceDialog(item)"
-                          >
+                          <el-dropdown-item v-if="isSystemShare" @click.stop="openAuthorizedWorkspaceDialog(item)">
                             <AppIcon iconName="app-lock" class="color-secondary"></AppIcon>
-                            {{ $t('views.shared.authorized_workspace') }}</el-dropdown-item
-                          >
-                          <el-dropdown-item
-                            v-if="
-                              !item.template_id &&
-                              permissionPrecise.export(item.id) &&
-                              item.tool_type !== 'MCP'
-                            "
-                            @click.stop="exportTool(item)"
-                          >
+                            {{ $t('views.shared.authorized_workspace') }}
+                          </el-dropdown-item>
+                          <el-dropdown-item v-if="
+                            !item.template_id &&
+                            permissionPrecise.export(item.id) &&
+                            item.tool_type !== 'MCP'
+                          " @click.stop="exportTool(item)">
                             <AppIcon iconName="app-export" class="color-secondary"></AppIcon>
                             {{ $t('common.export') }}
                           </el-dropdown-item>
-                          <el-dropdown-item
-                            v-if="permissionPrecise.delete(item.id)"
-                            divided
-                            @click.stop="deleteTool(item)"
-                          >
+                          <el-dropdown-item v-if="permissionPrecise.delete(item.id)" divided
+                            @click.stop="deleteTool(item)">
                             <AppIcon iconName="app-delete" class="color-secondary"></AppIcon>
                             {{ $t('common.delete') }}
                           </el-dropdown-item>
@@ -344,21 +253,11 @@
   <ToolStoreDialog ref="toolStoreDialogRef" :api-type="apiType" @refresh="refresh" />
   <AddInternalToolDialog ref="AddInternalToolDialogRef" @refresh="confirmAddInternalTool" />
   <McpToolConfigDialog ref="McpToolConfigDialogRef" @refresh="refresh" />
-  <AuthorizedWorkspace
-    ref="AuthorizedWorkspaceDialogRef"
-    v-if="isSystemShare"
-  ></AuthorizedWorkspace>
-  <MoveToDialog
-    ref="MoveToDialogRef"
-    :source="SourceTypeEnum.TOOL"
-    @refresh="refreshToolList"
-    v-if="apiType === 'workspace'"
-  />
-  <ResourceAuthorizationDrawer
-    :type="SourceTypeEnum.TOOL"
-    ref="ResourceAuthorizationDrawerRef"
-    v-if="apiType === 'workspace'"
-  />
+  <AuthorizedWorkspace ref="AuthorizedWorkspaceDialogRef" v-if="isSystemShare"></AuthorizedWorkspace>
+  <MoveToDialog ref="MoveToDialogRef" :source="SourceTypeEnum.TOOL" @refresh="refreshToolList"
+    v-if="apiType === 'workspace'" />
+  <ResourceAuthorizationDrawer :type="SourceTypeEnum.TOOL" ref="ResourceAuthorizationDrawerRef"
+    v-if="apiType === 'workspace'" />
   <ToolStoreDescDrawer ref="toolStoreDescDrawerRef" />
 </template>
 
@@ -386,6 +285,7 @@ import { t } from '@/locales'
 import { i18n_name } from '@/utils/common'
 import ToolStoreApi from '@/api/tool/store.ts'
 import ToolStoreDescDrawer from "@/views/tool/component/ToolStoreDescDrawer.vue";
+import bus from "@/bus"
 const route = useRoute()
 const { folder, user, tool } = useStore()
 onBeforeRouteLeave((to, from) => {
@@ -510,6 +410,10 @@ function openCreateDialog(data?: any) {
   } else {
     ToolFormDrawerRef.value.open(data)
   }
+  if (data) {
+    bus.emit('select_node', data.folder_id)
+  }
+
 }
 
 function openCreateMcpDialog(data?: any) {
@@ -637,7 +541,7 @@ function deleteTool(row: any) {
           MsgSuccess(t('common.deleteSuccess'))
         })
     })
-    .catch(() => {})
+    .catch(() => { })
 }
 
 function configInitParams(item: any) {
@@ -718,7 +622,7 @@ function updateStoreTool(item: any) {
           getList()
         })
     })
-    .catch(() => {})
+    .catch(() => { })
 }
 
 const elUploadRef = ref()

ui/src/views/tool/index.vue

@@ -40,6 +40,7 @@ import { SourceTypeEnum } from '@/enums/common'
 import permissionMap from '@/permission'
 import { useRoute } from 'vue-router'
 import useStore from '@/stores'
+import bus from "@/bus"
 const route = useRoute()
 const { folder, tool } = useStore()