Skip to content

Commit 982b34e

Browse files
committed
Return to the corresponding permission directory and locate the tool folder
1 parent 2ecdb66 commit 982b34e

File tree

4 files changed

+95
-171
lines changed

4 files changed

+95
-171
lines changed

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
</template>
112112

113113
<script lang="ts" setup>
114-
import { computed, onUnmounted, ref, watch } from 'vue'
114+
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
115115
import { onBeforeRouteLeave } from 'vue-router'
116116
import type { TreeInstance } from 'element-plus'
117117
import CreateFolderDialog from '@/components/folder-tree/CreateFolderDialog.vue'
@@ -125,7 +125,7 @@ import useStore from '@/stores'
125125
import { TreeToFlatten } from '@/utils/array'
126126
import { MsgConfirm } from '@/utils/message'
127127
import permissionMap from '@/permission'
128-
128+
import bus from '@/bus'
129129
defineOptions({ name: 'FolderTree' })
130130
const props = defineProps({
131131
data: {
@@ -188,7 +188,12 @@ const { folder } = useStore()
188188
onBeforeRouteLeave((to, from) => {
189189
folder.setCurrentFolder({})
190190
})
191-
191+
onMounted(() => {
192+
bus.on('select_node', (id: string) => {
193+
treeRef.value?.setCurrentKey(id)
194+
hoverNodeId.value=id
195+
})
196+
})
192197
interface Tree {
193198
name: string
194199
children?: Tree[]

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

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ import { onBeforeRouteLeave, useRouter, useRoute } from 'vue-router'
3030
import { resetUrl } from '@/utils/common'
3131
import { loadSharedApi } from '@/utils/dynamics-api/shared-api'
3232
import useStore from '@/stores'
33-
const { common, folder } = useStore()
33+
import permissionMap from '@/permission'
34+
const { common, folder,user } = useStore()
3435
const route = useRoute()
3536
const router = useRouter()
3637
@@ -50,6 +51,20 @@ const apiType = computed(() => {
5051
}
5152
})
5253
54+
const folderType = computed(() => {
55+
if (route.path.includes('application')) {
56+
return 'application'
57+
}
58+
if (route.path.includes('knowledge')) {
59+
return 'knowledge'
60+
}
61+
else {return 'application'}
62+
})
63+
64+
const permissionPrecise = computed(() => {
65+
return permissionMap[folderType.value!]['workspace']
66+
})
67+
5368
const shareDisabled = computed(() => {
5469
return folderId === 'share' || isShared === 'true'
5570
})
@@ -108,14 +123,13 @@ function getApplicationDetail() {
108123
function toBack() {
109124
if (isKnowledge.value) {
110125
folder.setCurrentFolder({
111-
id: folderId,
126+
id: permissionPrecise.value.folderRead(folderId)? folderId : user.getWorkspaceId(),
112127
})
113128
} else if (isApplication.value) {
114129
folder.setCurrentFolder({
115-
id: current.value.folder,
130+
id: permissionPrecise.value.folderRead(current.value.folder)? current.value.folder : user.getWorkspaceId(),
116131
})
117132
}
118-
119133
router.push({ path: toBackPath.value })
120134
}
121135

0 commit comments

Comments
 (0)