mirror of
				https://github.com/Fabio286/antares.git
				synced 2025-06-05 21:59:22 +02:00 
			
		
		
		
	fix: prevents F5 shortcut to run in non-selected workspaces
This commit is contained in:
		| @@ -17,7 +17,7 @@ | ||||
|                   class="btn btn-primary btn-sm" | ||||
|                   :class="{'loading':isQuering}" | ||||
|                   :disabled="!query" | ||||
|                   title="F9" | ||||
|                   title="F5" | ||||
|                   @click="runQuery(query)" | ||||
|                > | ||||
|                   <span>{{ $t('word.run') }}</span> | ||||
| @@ -89,10 +89,14 @@ export default { | ||||
|    }, | ||||
|    computed: { | ||||
|       ...mapGetters({ | ||||
|          getWorkspace: 'workspaces/getWorkspace' | ||||
|          getWorkspace: 'workspaces/getWorkspace', | ||||
|          selectedWorkspace: 'workspaces/getSelected' | ||||
|       }), | ||||
|       workspace () { | ||||
|          return this.getWorkspace(this.connection.uid); | ||||
|       }, | ||||
|       isWorkspaceSelected () { | ||||
|          return this.workspace.uid === this.selectedWorkspace; | ||||
|       } | ||||
|    }, | ||||
|    created () { | ||||
| @@ -169,9 +173,9 @@ export default { | ||||
|             this.$refs.queryEditor.editor.resize(); | ||||
|       }, | ||||
|       onKey (e) { | ||||
|          if (this.isSelected) { | ||||
|          if (this.isSelected && this.isWorkspaceSelected) { | ||||
|             e.stopPropagation(); | ||||
|             if (e.key === 'F9') | ||||
|             if (e.key === 'F5') | ||||
|                this.runQuery(this.query); | ||||
|          } | ||||
|       } | ||||
|   | ||||
| @@ -142,13 +142,14 @@ export default { | ||||
|    }, | ||||
|    computed: { | ||||
|       ...mapGetters({ | ||||
|          getWorkspace: 'workspaces/getWorkspace' | ||||
|          getWorkspace: 'workspaces/getWorkspace', | ||||
|          selectedWorkspace: 'workspaces/getSelected' | ||||
|       }), | ||||
|       workspace () { | ||||
|          return this.getWorkspace(this.connection.uid); | ||||
|       }, | ||||
|       isSelected () { | ||||
|          return this.workspace.selected_tab === 'data'; | ||||
|          return this.workspace.selected_tab === 'data' && this.workspace.uid === this.selectedWorkspace; | ||||
|       }, | ||||
|       isTable () { | ||||
|          return !!this.workspace.breadcrumbs.table; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user