mxd 3 жил өмнө
parent
commit
69b47dee5e

+ 5 - 5
src/components/panel/footer/magic-toolbar.vue

@@ -59,9 +59,9 @@ const opened = ref({})
 const info = ref({})
 provide('opened', opened)
 provide('info', info)
-const setOpenedToolbars = (type) => {
+const setOpenedToolbars = (type, force) => {
     toolbars.forEach(it => it.show = it.type === undefined || (Array.isArray(it.type) ? it.type.find(x => x.type === type) : it.type === type))
-    if(navbar.value){
+    if(navbar.value && force){
         navbar.value.select(toolbars.findIndex(it => it.show))
     }
 }
@@ -80,14 +80,14 @@ bus.$on(Message.ADD_FOOTER_TOOLBAR, (toolbar) => {
   navbar.value.select(toolbars.push(toolbar) - 1)
 })
 bus.$on(Message.OPEN_EMPTY, () => setOpenedToolbars(''))
-bus.$on(Message.OPEN, event => {
+bus.$on(Message.OPEN, (event, force) => {
     event.responseBlobValue = null
     opened.value = event
     info.value = event.item
-    setOpenedToolbars(event.type)
+    setOpenedToolbars(event.type, force)
 })
 bus.$on(Message.OPEN_GROUP, (item) => {
-    setOpenedToolbars('group-' + item.type)
+    setOpenedToolbars('group-' + item.type, true)
     info.value = item
 })
 bus.$on(Message.SWITCH_TOOLBAR, id => {

+ 5 - 5
src/components/panel/main/magic-resource.vue

@@ -156,7 +156,7 @@ const getFullPath = (item, onlyPath) => {
 }
 const filterText = (item) => getFullPath(item)
 const cachedItems = []
-const onItemClick = item => {
+const onItemClick = (item, force) => {
 	if(item) {
 		if(item.folder){
 			bus.$emit(Message.OPEN_GROUP, item)
@@ -186,7 +186,7 @@ const onItemClick = item => {
 				})
 				cachedItems.push(opened)
 			}
-			bus.$emit(Message.OPEN, opened)
+			bus.$emit(Message.OPEN, opened, force)
 		}
 	}
 }
@@ -275,7 +275,7 @@ const updateNode = (node, data) => {
 bus.$on(Message.OPEN_ITEM, item => {
 	const array = toRaw(tree.value)
 	if(array){
-		onItemClick(deepFind(toRaw(item), array, [], []))
+		onItemClick(deepFind(toRaw(item), array, [], []), true)
 	}
 })
 const onContextMenu = (item, event) => {
@@ -293,7 +293,7 @@ const onContextMenu = (item, event) => {
 						path: config.requirePath ? '' : undefined
 					}
 					updateNode(info)
-					onItemClick(info)
+					onItemClick(info, true)
 				}
 			},{
 				label: $i('resource.createGroup'),
@@ -383,7 +383,7 @@ const onContextMenu = (item, event) => {
 					request.send(`/resource/file/${item.id}`).success(res => {
 						res.id = `copy${new Date().getTime()}d${parseInt(Math.random() * 100000)}`
 						updateNode(res)
-						onItemClick(res)
+						onItemClick(res, true)
 						res.name = res.name + `(${$i('message.copy')})`
 						if(config.requirePath){
 							res.path = res.path + '_copy'