fabio286/antares
1
1
Fork 0
mirror of https://github.com/Fabio286/antares.git synced 2025-06-05 21:59:22 +02:00
Code Issues Releases Wiki Activity

refactor: vue3 migration in progress

Browse Source
This commit is contained in:
Fabio Di Stasio
2022-04-21 14:39:24 +02:00
parent 9a0f982723
commit 443170bbb1
61 changed files with 607 additions and 563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/renderer/components/BaseConfirmModal.vue
View File

@ -81,7 +81,7 @@ export default {
created () {
window.addEventListener('keydown', this.onKey);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

2
src/renderer/components/BaseContextMenu.vue
View File

@ -61,7 +61,7 @@ export default {
if (this.$refs.contextContent)
this.contextSize = this.$refs.contextContent.getBoundingClientRect();
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

20
src/renderer/components/BaseUploadInput.vue
View File

@ -4,7 +4,7 @@
<i class="mdi mdi-folder-open mr-1" />{{ message }}
</span>
<span class="text-ellipsis file-uploader-value">
{{ value | lastPart }}
{{ lastPart(value) }}
</span>
<i
v-if="value.length"
@ -25,16 +25,6 @@
<script>
export default {
name: 'BaseUploadInput',
filters: {
lastPart (string) {
if (!string) return '';
string = string.split(/[/\\]+/).pop();
if (string.length >= 19)
string = `...${string.slice(-19)}`;
return string;
}
},
props: {
message: {
default: 'Browse',
@ -56,6 +46,14 @@ export default {
methods: {
clear () {
this.$emit('clear');
},
lastPart (string) {
if (!string) return '';
string = string.split(/[/\\]+/).pop();
if (string.length >= 19)
string = `...${string.slice(-19)}`;
return string;
}
}
};

2
src/renderer/components/BaseVirtualScroll.vue
View File

@ -49,7 +49,7 @@ export default {
mounted () {
this.setScrollElement();
},
beforeDestroy () {
beforeUnmount () {
this.localScrollElement.removeEventListener('scroll', this.checkScrollPosition);
},
methods: {

2
src/renderer/components/FakerSelect.vue
View File

@ -36,8 +36,8 @@
<ForeignKeySelect
v-else-if="foreignKeys.includes(field.name)"
ref="formInput"
v-model="selectedValue"
class="form-select"
:value.sync="selectedValue"
:key-usage="getKeyUsage(field.name)"
:disabled="!isChecked"
/>

12
src/renderer/components/ForeignKeySelect.vue
View File

@ -15,7 +15,7 @@
:value="row.foreign_column"
:selected="row.foreign_column === value"
>
{{ row.foreign_column }} {{ 'foreign_description' in row ? ` - ${row.foreign_description}` : '' | cutText }}
{{ row.foreign_column }} {{ cutText('foreign_description' in row ? ` - ${row.foreign_description}` : '') }}
</option>
</select>
</template>
@ -26,12 +26,6 @@ import { mapGetters, mapActions } from 'vuex';
import { TEXT, LONG_TEXT } from 'common/fieldTypes';
export default {
name: 'ForeignKeySelect',
filters: {
cutText (val) {
if (typeof val !== 'string') return val;
return val.length > 15 ? `${val.substring(0, 15)}...` : val;
}
},
props: {
value: [String, Number],
keyUsage: Object,
@ -98,6 +92,10 @@ export default {
}),
onChange () {
this.$emit('update:value', this.$refs.editField.value);
},
cutText (val) {
if (typeof val !== 'string') return val;
return val.length > 15 ? `${val.substring(0, 15)}...` : val;
}
}
};

14
src/renderer/components/ModalAskParameters.vue
View File

@ -36,7 +36,7 @@
class="input-group-addon field-type cut-text"
:class="typeClass(parameter.type)"
>
{{ parameter.type }} {{ parameter.length | wrapNumber }}
{{ parameter.type }} {{ wrapNumber(parameter.length) }}
</span>
</div>
</div>
@ -56,12 +56,6 @@ export default {
components: {
ConfirmModal
},
filters: {
wrapNumber (num) {
if (!num) return '';
return `(${num})`;
}
},
props: {
localRoutine: Object,
client: String
@ -83,7 +77,7 @@ export default {
this.$refs.firstInput[0].focus();
}, 20);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {
@ -122,6 +116,10 @@ export default {
e.stopPropagation();
if (e.key === 'Escape')
this.closeModal();
},
wrapNumber (num) {
if (!num) return '';
return `(${num})`;
}
}
};

2
src/renderer/components/ModalDiscardChanges.vue
View File

@ -29,7 +29,7 @@ export default {
created () {
window.addEventListener('keydown', this.onKey);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

2
src/renderer/components/ModalEditSchema.vue
View File

@ -124,7 +124,7 @@ export default {
this.$refs.firstInput.focus();
}, 20);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

15
src/renderer/components/ModalExportSchema.vue
View File

@ -85,8 +85,8 @@
>
<input
type="checkbox"
:indeterminate.prop="includeStructureStatus === 2"
:checked.prop="!!includeStructureStatus"
:indeterminate="includeStructureStatus === 2"
:checked="!!includeStructureStatus"
>
<i class="form-icon" />
</label>
@ -98,8 +98,8 @@
>
<input
type="checkbox"
:indeterminate.prop="includeContentStatus === 2"
:checked.prop="!!includeContentStatus"
:indeterminate="includeContentStatus === 2"
:checked="!!includeContentStatus"
>
<i class="form-icon" />
</label>
@ -111,8 +111,8 @@
>
<input
type="checkbox"
:indeterminate.prop="includeDropStatementStatus === 2"
:checked.prop="!!includeDropStatementStatus"
:indeterminate="includeDropStatementStatus === 2"
:checked="!!includeDropStatementStatus"
>
<i class="form-icon" />
</label>
@ -202,7 +202,6 @@
v-model.number="options.sqlInsertAfter"
type="number"
class="form-input"
value="250"
>
</div>
<div class="column col-6">
@ -363,7 +362,7 @@ export default {
ipcRenderer.on('export-progress', this.updateProgress);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
ipcRenderer.off('export-progress', this.updateProgress);
},

16
src/renderer/components/ModalFakerRows.vue
View File

@ -25,6 +25,7 @@
</div>
<div class="column columns col-sm-12">
<FakerSelect
v-model="localRow[field.name]"
:type="field.type"
class="column columns pr-0"
:is-checked="!fieldsToExclude.includes(field.name)"
@ -33,10 +34,9 @@
:field="field"
:field-length="fieldLength(field)"
:field-obj="localRow[field.name]"
:value.sync="localRow[field.name]"
>
<span class="input-group-addon field-type" :class="typeClass(field.type)">
{{ field.type }} {{ fieldLength(field) | wrapNumber }}
{{ field.type }} {{ wrapNumber(fieldLength(field)) }}
</span>
<label class="form-checkbox ml-3" :title="$t('word.insert')">
<input
@ -195,12 +195,6 @@ export default {
components: {
FakerSelect
},
filters: {
wrapNumber (num) {
if (!num) return '';
return `(${num})`;
}
},
props: {
tabUid: [String, Number],
fields: Array,
@ -287,7 +281,7 @@ export default {
this.localRow = { ...rowObj };
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {
@ -367,6 +361,10 @@ export default {
e.stopPropagation();
if (e.key === 'Escape')
this.closeModal();
},
wrapNumber (num) {
if (!num) return '';
return `(${num})`;
}
}
};

4
src/renderer/components/ModalHistory.vue
View File

@ -44,7 +44,7 @@
:visible-height="resultsSize"
:scroll-element="scrollElement"
>
<template slot-scope="{ items }">
<template #default="{ items }">
<div
v-for="query in items"
:key="query.uid"
@ -156,7 +156,7 @@ export default {
this.resizeResults();
window.addEventListener('resize', this.resizeResults);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey, { capture: true });
window.removeEventListener('resize', this.resizeResults);
clearInterval(this.refreshInterval);

2
src/renderer/components/ModalImportSchema.vue
View File

@ -89,7 +89,7 @@ export default {
ipcRenderer.on('import-progress', this.updateProgress);
ipcRenderer.on('query-error', this.handleQueryError);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
ipcRenderer.off('import-progress', this.updateProgress);
ipcRenderer.off('query-error', this.handleQueryError);

2
src/renderer/components/ModalNewSchema.vue
View File

@ -103,7 +103,7 @@ export default {
this.$refs.firstInput.focus();
}, 20);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

16
src/renderer/components/ModalNewTableRow.vue
View File

@ -27,8 +27,8 @@
<ForeignKeySelect
v-if="foreignKeys.includes(field.name)"
ref="formInput"
v-model="localRow[field.name]"
class="form-select"
:value.sync="localRow[field.name]"
:key-usage="getKeyUsage(field.name)"
:disabled="fieldsToExclude.includes(field.name)"
/>
@ -71,7 +71,7 @@
:tabindex="key+1"
>
<span class="input-group-addon" :class="typeCLass(field.type)">
{{ field.type }} {{ fieldLength(field) | wrapNumber }}
{{ field.type }} {{ wrapNumber(fieldLength(field)) }}
</span>
<label class="form-checkbox ml-3" :title="$t('word.insert')">
<input
@ -132,12 +132,6 @@ export default {
directives: {
mask: VueMaskDirective
},
filters: {
wrapNumber (num) {
if (!num) return '';
return `(${num})`;
}
},
props: {
tabUid: [String, Number],
fields: Array,
@ -216,7 +210,7 @@ export default {
firstSelectableInput.focus();
}, 20);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {
@ -331,6 +325,10 @@ export default {
e.stopPropagation();
if (e.key === 'Escape')
this.closeModal();
},
wrapNumber (num) {
if (!num) return '';
return `(${num})`;
}
}
};

4
src/renderer/components/ModalProcessesList.vue
View File

@ -112,7 +112,7 @@
:visible-height="resultsSize"
:scroll-element="scrollElement"
>
<template slot-scope="{ items }">
<template #default="{ items }">
<ModalProcessesListRow
v-for="row in items"
:key="row.id"
@ -203,7 +203,7 @@ export default {
this.getProcessesList();
window.addEventListener('resize', this.resizeResults);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey, { capture: true });
window.removeEventListener('resize', this.resizeResults);
clearInterval(this.refreshInterval);

12
src/renderer/components/ModalProcessesListRow.vue
View File

@ -12,7 +12,7 @@
class="cell-content"
:class="`${isNull(col)} type-${typeof col === 'number' ? 'int' : 'varchar'}`"
@dblclick="dblClick(cKey)"
>{{ col | cutText }}</span>
>{{ cutText(col) }}</span>
</div>
<ConfirmModal
v-if="isInfoModal"
@ -53,12 +53,6 @@ export default {
ConfirmModal,
TextEditor
},
filters: {
cutText (val) {
if (typeof val !== 'string') return val;
return val.length > 250 ? `${val.substring(0, 250)}[...]` : val;
}
},
props: {
row: Object
},
@ -95,6 +89,10 @@ export default {
this.editingField = null;
window.removeEventListener('keydown', this.onKey);
}
},
cutText (val) {
if (typeof val !== 'string') return val;
return val.length > 250 ? `${val.substring(0, 250)}[...]` : val;
}
}
};

2
src/renderer/components/ModalSettings.vue
View File

@ -455,7 +455,7 @@ ORDER BY
this.selectedTab = this.selectedSettingTab;
window.addEventListener('keydown', this.onKey);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

2
src/renderer/components/TheNotificationsBoard.vue
View File

@ -4,7 +4,7 @@
@mouseenter="clearTimeouts"
@mouseleave="rearmTimeouts"
>
<transition-group name="slide-fade">
<transition-group tag="div" name="slide-fade">
<BaseNotification
v-for="notification in latestNotifications"
:key="notification.uid"

2
src/renderer/components/TheScratchpad.vue
View File

@ -15,7 +15,7 @@
<div>
<div>
<TextEditor
:value.sync="localNotes"
v-model="localNotes"
editor-class="textarea-editor"
mode="markdown"
:auto-focus="true"

27
src/renderer/components/TheSettingBar.vue
View File

@ -10,22 +10,23 @@
<ul class="settingbar-elements">
<Draggable
v-model="connections"
:item-key="uid"
@start="isDragging = true"
@end="dragStop"
>
<li
v-for="connection in connections"
:key="connection.uid"
draggable="true"
class="settingbar-element btn btn-link ex-tooltip"
:class="{'selected': connection.uid === selectedWorkspace}"
@click.stop="selectWorkspace(connection.uid)"
@contextmenu.prevent="contextMenu($event, connection)"
@mouseover.self="tooltipPosition"
>
<i class="settingbar-element-icon dbi" :class="`dbi-${connection.client} ${getStatusBadge(connection.uid)}`" />
<span v-if="!isDragging" class="ex-tooltip-content">{{ getConnectionName(connection.uid) }}</span>
</li>
<template #item="{element}">
<li
:draggable="true"
class="settingbar-element btn btn-link ex-tooltip"
:class="{'selected': element.uid === selectedWorkspace}"
@click.stop="selectWorkspace(element.uid)"
@contextmenu.prevent="contextMenu($event, element)"
@mouseover.self="tooltipPosition"
>
<i class="settingbar-element-icon dbi" :class="`dbi-${element.client} ${getStatusBadge(element.uid)}`" />
<span v-if="!isDragging" class="ex-tooltip-content">{{ getConnectionName(element.uid) }}</span>
</li>
</template>
</Draggable>
<li
class="settingbar-element btn btn-link ex-tooltip"

2
src/renderer/components/TheTitleBar.vue
View File

@ -87,7 +87,7 @@ export default {
created () {
window.addEventListener('resize', this.onResize);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.onResize);
},
methods: {

502
src/renderer/components/Workspace.vue
View File

@ -1,264 +1,265 @@
<template>
<div v-show="isSelected" class="workspace column columns col-gapless">
<WorkspaceExploreBar
v-if="workspace.connectionStatus === 'connected'"
v-if="workspace?.connectionStatus === 'connected'"
:connection="connection"
:is-selected="isSelected"
/>
<div v-if="workspace.connectionStatus === 'connected'" class="workspace-tabs column columns col-gapless">
<div v-if="workspace?.connectionStatus === 'connected'" class="workspace-tabs column columns col-gapless">
<Draggable
ref="tabWrap"
v-model="draggableTabs"
tag="ul"
:item-key="uid"
group="tabs"
class="tab tab-block column col-12"
draggable=".tab-draggable"
@mouseover.native="addWheelEvent"
@mouseover="addWheelEvent"
>
<li
v-for="(tab, i) of draggableTabs"
:key="i"
class="tab-item tab-draggable"
draggable="true"
:class="{'active': selectedTab === tab.uid}"
@mousedown.left="selectTab({uid: workspace.uid, tab: tab.uid})"
@mouseup.middle="closeTab(tab)"
>
<a
v-if="tab.type === 'query'"
class="tab-link"
:class="{'badge': tab.isChanged}"
<template #item="{element}">
<li
class="tab-item tab-draggable"
:draggable="true"
:class="{'active': selectedTab === element.uid}"
@mousedown.left="selectTab({uid: workspace.uid, tab: element.uid})"
@mouseup.middle="closeTab(element)"
>
<i class="mdi mdi-18px mdi-code-tags mr-1" />
<span>
<span>{{ tab.content || 'Query' | cutText }} #{{ tab.index }}</span>
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-if="element.type === 'query'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-18px mdi-code-tags mr-1" />
<span>
<span>{{ cutText(element.content || 'Query') }} #{{ element.index }}</span>
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'temp-data'"
class="tab-link"
@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()}: ${$tc(`word.${tab.elementType}`)}`">
<span class=" text-italic">{{ tab.elementName | cutText }}</span>
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'temp-data'"
class="tab-link"
@dblclick="openAsPermanentTab(element)"
>
<i class="mdi mdi-18px mr-1" :class="element.elementType === 'view' ? 'mdi-table-eye' : 'mdi-table'" />
<span :title="`${$t('word.data').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
<span class=" text-italic">{{ cutText(element.elementName) }}</span>
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</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()}: ${$tc(`word.${tab.elementType}`)}`">
{{ tab.elementName | cutText }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a v-else-if="element.type === 'data'" class="tab-link">
<i class="mdi mdi-18px mr-1" :class="element.elementType === 'view' ? 'mdi-table-eye' : 'mdi-table'" />
<span :title="`${$t('word.data').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ cutText(element.elementName) }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'new-table'"
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
{{ $t('message.newTable') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'new-table'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ $t('message.newTable') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'table-props'"
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
<span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
{{ tab.elementName | cutText }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'table-props'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
<span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ cutText(element.elementName) }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'view-props'"
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
<span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.view`)}`">
{{ tab.elementName | cutText }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'view-props'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-tune-vertical-variant mdi-18px mr-1" />
<span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.view`)}`">
{{ cutText(element.elementName) }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'new-view'"
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
{{ $t('message.newView') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'new-view'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ $t('message.newView') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'new-trigger'"
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
{{ $t('message.newTrigger') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'new-trigger'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ $t('message.newTrigger') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'new-routine'"
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
{{ $t('message.newRoutine') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'new-routine'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ $t('message.newRoutine') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'new-function'"
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
{{ $t('message.newFunction') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'new-function'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ $t('message.newFunction') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'new-trigger-function'"
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
{{ $t('message.newTriggerFunction') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'new-trigger-function'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ $t('message.newTriggerFunction') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type === 'new-scheduler'"
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
{{ $t('message.newScheduler') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type === 'new-scheduler'"
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-shape-square-plus mdi-18px mr-1" />
<span :title="`${$t('word.new').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ $t('message.newScheduler') }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else-if="tab.type.includes('temp-')"
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()}: ${$tc(`word.${tab.elementType}`)}`">
<span class=" text-italic">{{ tab.elementName | cutText }}</span>
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
<a
v-else-if="element.type.includes('temp-')"
class="tab-link"
:class="{'badge': element.isChanged}"
@dblclick="openAsPermanentTab(element)"
>
<i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
<span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
<span class=" text-italic">{{ cutText(element.elementName) }}</span>
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
<a
v-else
class="tab-link"
:class="{'badge': tab.isChanged}"
>
<i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
<span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${tab.elementType}`)}`">
{{ tab.elementName | cutText }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(tab)"
/>
</span>
</a>
</li>
<a
v-else
class="tab-link"
:class="{'badge': element.isChanged}"
>
<i class="mdi mdi-18px mdi-tune-vertical-variant mr-1" />
<span :title="`${$t('word.settings').toUpperCase()}: ${$tc(`word.${element.elementType}`)}`">
{{ cutText(element.elementName) }}
<span
class="btn btn-clear"
:title="$t('word.close')"
@mousedown.left.stop
@click.stop="closeTab(element)"
/>
</span>
</a>
</li>
</template>
<template #header>
<li
v-if="workspace.customizations.processesList"
@ -521,15 +522,6 @@ export default {
ModalProcessesList,
ModalDiscardChanges
},
filters: {
cutText (string) {
const limit = 20;
const escapedString = string.replace(/\s{2,}/g, ' ');
if (escapedString.length > limit)
return `${escapedString.substr(0, limit)}...`;
return escapedString;
}
},
props: {
connection: Object
},
@ -589,13 +581,16 @@ export default {
}
},
watch: {
queryTabs: function (newVal, oldVal) {
if (newVal.length > oldVal.length) {
setTimeout(() => {
const scroller = this.$refs.tabWrap;
if (scroller) scroller.$el.scrollLeft = scroller.$el.scrollWidth;
}, 0);
}
queryTabs: {
handler (newVal, oldVal) {
if (newVal.length > oldVal.length) {
setTimeout(() => {
const scroller = this.$refs.tabWrap;
if (scroller) scroller.$el.scrollLeft = scroller.$el.scrollWidth;
}, 0);
}
},
deep: true
}
},
async created () {
@ -605,7 +600,7 @@ export default {
if (isInitiated)
this.connectWorkspace(this.connection);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {
@ -683,6 +678,13 @@ export default {
});
this.hasWheelEvent = true;
}
},
cutText (string) {
const limit = 20;
const escapedString = string.replace(/\s{2,}/g, ' ');
if (escapedString.length > limit)
return `${escapedString.substr(0, limit)}...`;
return escapedString;
}
}
};

6
src/renderer/components/WorkspaceTabNewFunction.vue
View File

@ -185,7 +185,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localFunction.sql"
v-model="localFunction.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -302,10 +302,10 @@ export default {
this.$refs.firstInput.focus();
}, 100);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

6
src/renderer/components/WorkspaceTabNewRoutine.vue
View File

@ -145,7 +145,7 @@
v-show="isSelected"
:key="`new-${_uid}`"
ref="queryEditor"
:value.sync="localRoutine.sql"
v-model="localRoutine.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -261,10 +261,10 @@ export default {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

6
src/renderer/components/WorkspaceTabNewScheduler.vue
View File

@ -125,7 +125,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localScheduler.sql"
v-model="localScheduler.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -237,10 +237,10 @@ export default {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

2
src/renderer/components/WorkspaceTabNewTable.vue
View File

@ -276,7 +276,7 @@ export default {
this.$refs.firstInput.focus();
}, 100);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

6
src/renderer/components/WorkspaceTabNewTrigger.vue
View File

@ -122,7 +122,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localTrigger.sql"
v-model="localTrigger.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -226,10 +226,10 @@ export default {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

6
src/renderer/components/WorkspaceTabNewTriggerFunction.vue
View File

@ -98,7 +98,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localFunction.sql"
v-model="localFunction.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -202,10 +202,10 @@ export default {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

6
src/renderer/components/WorkspaceTabNewView.vue
View File

@ -111,7 +111,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localView.sql"
v-model="localView.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -209,10 +209,10 @@ export default {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

6
src/renderer/components/WorkspaceTabPropsFunction.vue
View File

@ -197,7 +197,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localFunction.sql"
v-model="localFunction.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -339,10 +339,10 @@ export default {
mounted () {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

2
src/renderer/components/WorkspaceTabPropsFunctionParamsModal.vue
View File

@ -215,7 +215,7 @@ export default {
this.getModalInnerHeight();
window.addEventListener('resize', this.getModalInnerHeight);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.getModalInnerHeight);
},
methods: {

6
src/renderer/components/WorkspaceTabPropsRoutine.vue
View File

@ -154,7 +154,7 @@
v-show="isSelected"
:key="`${routine}-${_uid}`"
ref="queryEditor"
:value.sync="localRoutine.sql"
v-model="localRoutine.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -284,10 +284,10 @@ export default {
mounted () {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

2
src/renderer/components/WorkspaceTabPropsRoutineParamsModal.vue
View File

@ -215,7 +215,7 @@ export default {
this.getModalInnerHeight();
window.addEventListener('resize', this.getModalInnerHeight);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.getModalInnerHeight);
},
methods: {

6
src/renderer/components/WorkspaceTabPropsScheduler.vue
View File

@ -124,7 +124,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localScheduler.sql"
v-model="localScheduler.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -236,10 +236,10 @@ export default {
mounted () {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

6
src/renderer/components/WorkspaceTabPropsTable.vue
View File

@ -228,7 +228,7 @@ export default {
return this.getWorkspace(this.connection.uid);
},
tabUid () {
return this.$vnode.key;
return this.$vnode?.key;
},
defaultEngine () {
const engine = this.getDatabaseVariable(this.connection.uid, 'default_storage_engine');
@ -277,7 +277,7 @@ export default {
this.getFieldsData();
window.addEventListener('keydown', this.onKey);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {
@ -415,7 +415,7 @@ export default {
const localIDs = this.localFields.reduce((acc, curr) => [...acc, curr._antares_id], []);
// Fields Additions
const additions = this.localFields.filter((field, i) => !originalIDs.includes(field._antares_id)).map(field => {
const additions = this.localFields.filter(field => !originalIDs.includes(field._antares_id)).map(field => {
const lI = this.localFields.findIndex(localField => localField._antares_id === field._antares_id);
const after = lI > 0 ? this.localFields[lI - 1].name : false;
return { ...field, after };

25
src/renderer/components/WorkspaceTabPropsTableFields.vue
View File

@ -105,19 +105,20 @@
ref="resultTable"
:list="fields"
class="tbody"
:item-key="_antares_id"
handle=".row-draggable"
>
<TableRow
v-for="row in fields"
:key="row._antares_id"
:row="row"
:indexes="getIndexes(row.name)"
:foreigns="getForeigns(row.name)"
:data-types="dataTypes"
:customizations="customizations"
@contextmenu="contextMenu"
@rename-field="$emit('rename-field', $event)"
/>
<template #item="{element}">
<TableRow
:row="element"
:indexes="getIndexes(element.name)"
:foreigns="getForeigns(element.name)"
:data-types="dataTypes"
:customizations="customizations"
@contextmenu="contextMenu"
@rename-field="$emit('rename-field', $event)"
/>
</template>
</Draggable>
</div>
</div>
@ -195,7 +196,7 @@ export default {
mounted () {
window.addEventListener('resize', this.resizeResults);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeResults);
},
methods: {

2
src/renderer/components/WorkspaceTabPropsTableForeignModal.vue
View File

@ -259,7 +259,7 @@ export default {
this.getModalInnerHeight();
window.addEventListener('resize', this.getModalInnerHeight);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.getModalInnerHeight);
},
methods: {

2
src/renderer/components/WorkspaceTabPropsTableIndexesModal.vue
View File

@ -181,7 +181,7 @@ export default {
this.getModalInnerHeight();
window.addEventListener('resize', this.getModalInnerHeight);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.getModalInnerHeight);
},
methods: {

6
src/renderer/components/WorkspaceTabPropsTrigger.vue
View File

@ -121,7 +121,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localTrigger.sql"
v-model="localTrigger.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -227,10 +227,10 @@ export default {
mounted () {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

6
src/renderer/components/WorkspaceTabPropsTriggerFunction.vue
View File

@ -85,7 +85,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localFunction.sql"
v-model="localFunction.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -204,10 +204,10 @@ export default {
mounted () {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

6
src/renderer/components/WorkspaceTabPropsView.vue
View File

@ -110,7 +110,7 @@
<QueryEditor
v-show="isSelected"
ref="queryEditor"
:value.sync="localView.sql"
v-model="localView.sql"
:workspace="workspace"
:schema="schema"
:height="editorHeight"
@ -205,10 +205,10 @@ export default {
mounted () {
window.addEventListener('resize', this.resizeQueryEditor);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeQueryEditor);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
},
methods: {

14
src/renderer/components/WorkspaceTabQuery.vue
View File

@ -3,18 +3,18 @@
v-show="isSelected"
class="workspace-query-tab column col-12 columns col-gapless no-outline p-0"
tabindex="0"
@keydown.116="runQuery(query)"
@keydown.75="killTabQuery"
@keydown.ctrl.alt.87="clear"
@keydown.ctrl.66="beautify"
@keydown.ctrl.71="openHistoryModal"
@keydown.f5="runQuery(query)"
@keydown.k="killTabQuery"
@keydown.ctrl.alt.w="clear"
@keydown.ctrl.b="beautify"
@keydown.ctrl.g="openHistoryModal"
>
<div class="workspace-query-runner column col-12">
<QueryEditor
v-show="isSelected"
ref="queryEditor"
v-model="query"
:auto-focus="true"
:value.sync="query"
:workspace="workspace"
:schema="breadcrumbsSchema"
:is-selected="isSelected"
@ -296,7 +296,7 @@ export default {
if (this.tab.autorun)
this.runQuery(this.query);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
const params = {
uid: this.connection.uid,

8
src/renderer/components/WorkspaceTabQueryTable.vue
View File

@ -4,8 +4,8 @@
class="vscroll no-outline"
tabindex="0"
:style="{'height': resultsSize+'px'}"
@keyup.46="showDeleteConfirmModal"
@keydown.ctrl.65="selectAllRows($event)"
@keyup.delete="showDeleteConfirmModal"
@keydown.ctrl.a="selectAllRows($event)"
@keydown.esc="deselectRows"
>
<TableContext
@ -68,7 +68,7 @@
:visible-height="resultsSize"
:scroll-element="scrollElement"
>
<template slot-scope="{ items }">
<template #default="{ items }">
<WorkspaceTabQueryTableRow
v-for="row in items"
:key="row._antares_id"
@ -256,7 +256,7 @@ export default {
mounted () {
window.addEventListener('resize', this.resizeResults);
},
destroyed () {
unmounted () {
window.removeEventListener('resize', this.resizeResults);
},
methods: {

120
src/renderer/components/WorkspaceTabQueryTableRow.vue
View File

@ -18,11 +18,11 @@
class="cell-content"
:class="`${isNull(col)} ${typeClass(fields[cKey].type)}`"
@dblclick="editON($event, col, cKey)"
>{{ col | typeFormat(fields[cKey].type.toLowerCase(), fields[cKey].length) | cutText }}</span>
>{{ cutText(typeFormat(col, fields[cKey].type.toLowerCase(), fields[cKey].length)) }}</span>
<ForeignKeySelect
v-else-if="isForeignKey(cKey)"
v-model="editingContent"
class="editable-field"
:value.sync="editingContent"
:key-usage="getKeyUsage(cKey)"
size="small"
@blur="editOFF"
@ -85,7 +85,7 @@
<div class="mb-2">
<div>
<TextEditor
:value.sync="editingContent"
v-model="editingContent"
editor-class="textarea-editor"
:mode="editorMode"
/>
@ -176,7 +176,7 @@
</transition>
<div class="editor-field-info">
<div>
<b>{{ $t('word.size') }}</b>: {{ editingContent.length | formatBytes }}<br>
<b>{{ $t('word.size') }}</b>: {{ formatBytes(editingContent.length) }}<br>
<b>{{ $t('word.mimeType') }}</b>: {{ contentInfo.mime }}
</div>
<div><b>{{ $t('word.type') }}</b>: {{ editingType.toUpperCase() }}</div>
@ -236,58 +236,6 @@ export default {
directives: {
mask: VueMaskDirective
},
filters: {
formatBytes,
cutText (val) {
if (typeof val !== 'string') return val;
return val.length > 128 ? `${val.substring(0, 128)}[...]` : val;
},
typeFormat (val, type, precision) {
if (!val) return val;
type = type.toUpperCase();
if (DATE.includes(type))
return moment(val).isValid() ? moment(val).format('YYYY-MM-DD') : val;
if (DATETIME.includes(type)) {
if (typeof val === 'string')
return val;
let datePrecision = '';
for (let i = 0; i < precision; i++)
datePrecision += i === 0 ? '.S' : 'S';
return moment(val).isValid() ? moment(val).format(`YYYY-MM-DD HH:mm:ss${datePrecision}`) : val;
}
if (BLOB.includes(type)) {
const buff = Buffer.from(val);
if (!buff.length) return '';
const hex = buff.toString('hex').substring(0, 8).toUpperCase();
return `${mimeFromHex(hex).mime} (${formatBytes(buff.length)})`;
}
if (BIT.includes(type)) {
if (typeof val === 'number') val = [val];
const hex = Buffer.from(val).toString('hex');
const bitString = hexToBinary(hex);
return parseInt(bitString).toString().padStart(precision, '0');
}
if (ARRAY.includes(type)) {
if (Array.isArray(val))
return JSON.stringify(val).replaceAll('[', '{').replaceAll(']', '}');
return val;
}
if (SPATIAL.includes(type))
return val;
return typeof val === 'object' ? JSON.stringify(val) : val;
}
},
props: {
row: Object,
fields: Object,
@ -449,15 +397,15 @@ export default {
window.addEventListener('keydown', this.onKey);
const type = this.fields[field].type.toUpperCase(); ;
this.originalContent = this.$options.filters.typeFormat(content, type, this.fields[field].length);
const type = this.fields[field].type.toUpperCase();
this.originalContent = this.typeFormat(content, type, this.fields[field].length);
this.editingType = type;
this.editingField = field;
this.editingLength = this.fields[field].length;
if ([...LONG_TEXT, ...ARRAY, ...TEXT_SEARCH].includes(type)) {
this.isTextareaEditor = true;
this.editingContent = this.$options.filters.typeFormat(content, type);
this.editingContent = this.typeFormat(content, type);
return;
}
@ -465,7 +413,7 @@ export default {
if (content) {
this.isMultiSpatial = IS_MULTI_SPATIAL.includes(type);
this.isMapModal = true;
this.editingContent = this.$options.filters.typeFormat(content, type);
this.editingContent = this.typeFormat(content, type);
}
return;
}
@ -513,7 +461,7 @@ export default {
this.editingContent = this.editingContent.slice(0, -1);
}
if (this.editingContent === this.$options.filters.typeFormat(this.originalContent, this.editingType, this.editingLength)) return;// If not changed
if (this.editingContent === this.typeFormat(this.originalContent, this.editingType, this.editingLength)) return;// If not changed
content = this.editingContent;
}
@ -590,6 +538,56 @@ export default {
this.editingField = null;
window.removeEventListener('keydown', this.onKey);
}
},
formatBytes,
cutText (val) {
if (typeof val !== 'string') return val;
return val.length > 128 ? `${val.substring(0, 128)}[...]` : val;
},
typeFormat (val, type, precision) {
if (!val) return val;
type = type.toUpperCase();
if (DATE.includes(type))
return moment(val).isValid() ? moment(val).format('YYYY-MM-DD') : val;
if (DATETIME.includes(type)) {
if (typeof val === 'string')
return val;
let datePrecision = '';
for (let i = 0; i < precision; i++)
datePrecision += i === 0 ? '.S' : 'S';
return moment(val).isValid() ? moment(val).format(`YYYY-MM-DD HH:mm:ss${datePrecision}`) : val;
}
if (BLOB.includes(type)) {
const buff = Buffer.from(val);
if (!buff.length) return '';
const hex = buff.toString('hex').substring(0, 8).toUpperCase();
return `${mimeFromHex(hex).mime} (${formatBytes(buff.length)})`;
}
if (BIT.includes(type)) {
if (typeof val === 'number') val = [val];
const hex = Buffer.from(val).toString('hex');
const bitString = hexToBinary(hex);
return parseInt(bitString).toString().padStart(precision, '0');
}
if (ARRAY.includes(type)) {
if (Array.isArray(val))
return JSON.stringify(val).replaceAll('[', '{').replaceAll(']', '}');
return val;
}
if (SPATIAL.includes(type))
return val;
return typeof val === 'object' ? JSON.stringify(val) : val;
}
}
};

20
src/renderer/components/WorkspaceTabTable.vue
View File

@ -117,14 +117,14 @@
<i class="mdi mdi-timer-sand mdi-rotate-180 pr-1" /> <b>{{ results[0].duration / 1000 }}s</b>
</div>
<div v-if="results.length && results[0].rows">
{{ $t('word.results') }}: <b>{{ results[0].rows.length | localeString }}</b>
{{ $t('word.results') }}: <b>{{ localeString(results[0].rows.length) }}</b>
</div>
<div v-if="hasApproximately || (page > 1 && approximateCount)">
{{ $t('word.total') }}: <b
:title="!customizations.tableRealCount ? $t('word.approximately') : ''"
>
<span v-if="!customizations.tableRealCount">≈</span>
{{ approximateCount | localeString }}
{{ localeString(approximateCount) }}
</b>
</div>
<div class="d-flex" :title="$t('word.schema')">
@ -194,12 +194,6 @@ export default {
ModalNewTableRow,
ModalFakerRows
},
filters: {
localeString (val) {
if (val !== null)
return val.toLocaleString();
}
},
mixins: [tableTabs],
props: {
connection: Object,
@ -310,7 +304,7 @@ export default {
this.getTableData();
window.addEventListener('keydown', this.onKey);
},
beforeDestroy () {
beforeUnmount () {
window.removeEventListener('keydown', this.onKey);
clearInterval(this.refreshInterval);
},
@ -335,8 +329,8 @@ export default {
table: this.table,
limit: this.limit,
page: this.page,
sortParams: this.sortParams,
where: this.filters || []
sortParams: { ...this.sortParams },
where: [...this.filters] || []
};
try { // Table data
@ -458,6 +452,10 @@ export default {
updateFilters (clausoles) {
this.filters = clausoles;
this.getTableData();
},
localeString (val) {
if (val !== null)
return val.toLocaleString();
}
}
};