fix: tab selected when clicking closing cross

antares-sql · Jul 29, 2021 · 07ee1ae · 07ee1ae
1 parent cbe0e29
commit 07ee1ae
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 42 deletions.
diff --git a/src/renderer/components/ModalProcessesList.vue b/src/renderer/components/ModalProcessesList.vue
@@ -20,9 +20,9 @@
                      title="F5"
                      @click="getProcessesList"
                   >
+                     <i v-if="!+autorefreshTimer" class="mdi mdi-24px mdi-refresh mr-1" />
+                     <i v-else class="mdi mdi-24px mdi-history mdi-flip-h mr-1" />
                      <span>{{ $t('word.refresh') }}</span>
-                     <i v-if="!+autorefreshTimer" class="mdi mdi-24px mdi-refresh ml-1" />
-                     <i v-else class="mdi mdi-24px mdi-history mdi-flip-h ml-1" />
                   </button>
                   <div class="btn btn-dark btn-sm dropdown-toggle pl-0 pr-0" tabindex="0">
                      <i class="mdi mdi-24px mdi-menu-down" />

diff --git a/src/renderer/components/Workspace.vue b/src/renderer/components/Workspace.vue
@@ -31,6 +31,7 @@
                      <span
                         class="btn btn-clear"
                         :title="$t('word.close')"
+                        @mousedown.left.stop
                         @click.stop="closeTab(tab)"
                      />
                   </span>
@@ -42,23 +43,25 @@
                   @dblclick="openAsPermanentTab(tab)"
                >
                   <i class="mdi mdi-18px mr-1" :class="tab.elementType === 'view' ? 'mdi-table-eye' : 'mdi-table'" />
-                  <span :title="`${$t('word.data').toUpperCase()}: ${tab.elementType}`">
+                  <span :title="`${$t('word.data').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
                      <span class=" text-italic">{{ tab.elementName }}</span>
                      <span
                         class="btn btn-clear"
                         :title="$t('word.close')"
+                        @mousedown.left.stop
                         @click.stop="closeTab(tab)"
                      />
                   </span>
                </a>
 
                <a v-else-if="tab.type === 'data'" class="tab-link">
                   <i class="mdi mdi-18px mr-1" :class="tab.elementType === 'view' ? 'mdi-table-eye' : 'mdi-table'" />
-                  <span :title="`${$t('word.data').toUpperCase()}: ${tab.elementType}`">
+                  <span :title="`${$t('word.data').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
                      {{ tab.elementName }}
                      <span
                         class="btn btn-clear"
                         :title="$t('word.close')"
+                        @mousedown.left.stop
                         @click.stop="closeTab(tab)"
                      />
                   </span>
@@ -70,11 +73,12 @@
                   :class="{'badge': tab.isChanged}"
                >
                   <i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
-                  <span :title="`${$t('word.settings').toUpperCase()}: ${tab.elementType}`">
+                  <span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
                      {{ tab.elementName }}
                      <span
                         class="btn btn-clear"
                         :title="$t('word.close')"
+                        @mousedown.left.stop
                         @click.stop="closeTab(tab)"
                      />
                   </span>
@@ -86,11 +90,12 @@
                   :class="{'badge': tab.isChanged}"
                >
                   <i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
-                  <span :title="`${$t('word.settings').toUpperCase()}: ${tab.elementType}`">
+                  <span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
                      {{ tab.elementName }}
                      <span
                         class="btn btn-clear"
                         :title="$t('word.close')"
+                        @mousedown.left.stop
                         @click.stop="closeTab(tab)"
                      />
                   </span>
@@ -103,11 +108,12 @@
                   @dblclick="openAsPermanentTab(tab)"
                >
                   <i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
-                  <span :title="`${$t('word.settings').toUpperCase()}: ${tab.elementType}`">
+                  <span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
                      <span class=" text-italic">{{ tab.elementName }}</span>
                      <span
                         class="btn btn-clear"
                         :title="$t('word.close')"
+                        @mousedown.left.stop
                         @click.stop="closeTab(tab)"
                      />
                   </span>
@@ -119,48 +125,16 @@
                   :class="{'badge': tab.isChanged}"
                >
                   <i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
-                  <span :title="`${$t('word.settings').toUpperCase()}: ${tab.elementType}`">
+                  <span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
                      {{ tab.elementName }}
                      <span
                         class="btn btn-clear"
                         :title="$t('word.close')"
+                        @mousedown.left.stop
                         @click.stop="closeTab(tab)"
                      />
                   </span>
                </a>
-
-               <!-- <a
-                  v-else-if="tab.type === 'temp-trigger-function-props'"
-                  class="tab-link"
-                  :class="{'badge': tab.isChanged}"
-                  @dblclick="openAsPermanentTab(tab)"
-               >
-                  <i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
-                  <span :title="`${$t('word.settings').toUpperCase()}: ${tab.elementType}`">
-                     <span class=" text-italic">{{ tab.elementName }}</span>
-                     <span
-                        class="btn btn-clear"
-                        :title="$t('word.close')"
-                        @click.stop="closeTab(tab)"
-                     />
-                  </span>
-               </a>
-
-               <a
-                  v-else-if="tab.type === 'trigger-function-props'"
-                  class="tab-link"
-                  :class="{'badge': tab.isChanged}"
-               >
-                  <i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
-                  <span :title="`${$t('word.settings').toUpperCase()}: ${tab.elementType}`">
-                     {{ tab.elementName }}
-                     <span
-                        class="btn btn-clear"
-                        :title="$t('word.close')"
-                        @click.stop="closeTab(tab)"
-                     />
-                  </span>
-               </a> -->
             </li>
             <li slot="header" class="tab-item dropdown tools-dropdown">
                <a

diff --git a/src/renderer/i18n/en-US.js b/src/renderer/i18n/en-US.js
@@ -115,7 +115,8 @@ module.exports = {
       cell: 'Cell | Cells',
       triggerFunction: 'Trigger function | Trigger functions',
       all: 'All',
-      duplicate: 'Duplicate'
+      duplicate: 'Duplicate',
+      routine: 'Routine'
    },
    message: {
       appWelcome: 'Welcome to Antares SQL Client!',