0.1.7-DEV-4

This commit is contained in:
Elvanos 2021-05-08 16:05:13 +02:00
parent 3a494396c7
commit e1de700431
23 changed files with 152 additions and 25 deletions

View file

@ -200,7 +200,7 @@ export default class DocumentPreview extends BaseClass {
@Prop() readonly forceRefresh!: string @Prop() readonly forceRefresh!: string
@Watch("forceRefresh", { immediate: true }) @Watch("forceRefresh")
reactToForceRefresh () { reactToForceRefresh () {
this.reactToDocumentIDChange() this.reactToDocumentIDChange()
} }
@ -350,6 +350,7 @@ export default class DocumentPreview extends BaseClass {
.documentPreviewContent { .documentPreviewContent {
padding: 20px; padding: 20px;
width: 700px; width: 700px;
max-width: 100%;
background-color: map-get($customColors, 'gunmetal-lighter') !important; background-color: map-get($customColors, 'gunmetal-lighter') !important;
color: #fff; color: #fff;

View file

@ -68,10 +68,11 @@
@mouseleave="setDocumentPreviewClose" @mouseleave="setDocumentPreviewClose"
> >
<documentPreview <documentPreview
v-if="!prop.node.isRoot && !prop.node.isTag && !prop.node.specialLabel" v-if="!preventPreviewsTree && !prop.node.isRoot && !prop.node.isTag && !prop.node.specialLabel"
:document-id="prop.node._id" :document-id="prop.node._id"
:custom-anchor="'center right'" :custom-anchor="'center right'"
:custom-self="'center left'" :custom-self="'center left'"
:external-close-trigger="documentPreviewClose"
/> />
<div class="documentLabel" <div class="documentLabel"
@ -307,12 +308,11 @@ import { retrieveCurrentProjectName } from "src/scripts/projectManagement/projec
import { createNewWithParent } from "src/scripts/documentActions/createNewWithParent" import { createNewWithParent } from "src/scripts/documentActions/createNewWithParent"
import { copyDocumentName, copyDocumentTextColor, copyDocumentBackgroundColor } from "src/scripts/documentActions/uniqueFieldCopy" import { copyDocumentName, copyDocumentTextColor, copyDocumentBackgroundColor } from "src/scripts/documentActions/uniqueFieldCopy"
import { copyDocument } from "src/scripts/documentActions/copyDocument" import { copyDocument } from "src/scripts/documentActions/copyDocument"
import documentPreview from "src/components/DocumentPreview.vue"
@Component({ @Component({
components: { components: {
deleteDocumentCheckDialog, deleteDocumentCheckDialog,
documentPreview documentPreview: () => import("src/components/DocumentPreview.vue")
} }
}) })
export default class ObjectTree extends BaseClass { export default class ObjectTree extends BaseClass {
@ -367,6 +367,7 @@ export default class ObjectTree extends BaseClass {
hideTreeIconAddUnder = false hideTreeIconAddUnder = false
hideTreeIconEdit = false hideTreeIconEdit = false
hideTreeIconView = false hideTreeIconView = false
preventPreviewsTree = true
@Watch("SGET_options", { immediate: true, deep: true }) @Watch("SGET_options", { immediate: true, deep: true })
onSettingsChange () { onSettingsChange () {
@ -389,6 +390,7 @@ export default class ObjectTree extends BaseClass {
this.hideTreeIconAddUnder = options.hideTreeIconAddUnder this.hideTreeIconAddUnder = options.hideTreeIconAddUnder
this.hideTreeIconEdit = options.hideTreeIconEdit this.hideTreeIconEdit = options.hideTreeIconEdit
this.hideTreeIconView = options.hideTreeIconView this.hideTreeIconView = options.hideTreeIconView
this.preventPreviewsTree = options.preventPreviewsTree
this.buildCurrentObjectTree() this.buildCurrentObjectTree()
} }

View file

@ -67,6 +67,7 @@
{{retrieveFieldValue(document,'name')}} {{retrieveFieldValue(document,'name')}}
</div> </div>
<documentPreview <documentPreview
v-if="!preventPreviewsTabs"
:document-id="document._id" :document-id="document._id"
:external-close-trigger="documentPreviewClose" :external-close-trigger="documentPreviewClose"
:custom-delay="1500" :custom-delay="1500"
@ -239,6 +240,11 @@ export default class TopTabs extends BaseClass {
*/ */
hideDeadCrossThrough = false hideDeadCrossThrough = false
/**
* Determines document previews should be shown or not
*/
preventPreviewsTabs = true
/** /**
* Watch changes on options * Watch changes on options
*/ */
@ -247,6 +253,7 @@ export default class TopTabs extends BaseClass {
const options = this.SGET_options const options = this.SGET_options
this.textShadow = options.textShadow this.textShadow = options.textShadow
this.hideDeadCrossThrough = options.hideDeadCrossThrough this.hideDeadCrossThrough = options.hideDeadCrossThrough
this.preventPreviewsTabs = options.preventPreviewsTabs
} }
/****************************************************************/ /****************************************************************/

View file

@ -2,7 +2,7 @@
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card <q-card
class="aboutDialog" class="aboutDialog"

View file

@ -2,7 +2,7 @@
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card <q-card
class="advancedSearchDialog" class="advancedSearchDialog"

View file

@ -2,7 +2,7 @@
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card <q-card
class="changeLogDialog" class="changeLogDialog"

View file

@ -1,7 +1,7 @@
<template> <template>
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card dark class="documentCloseDialog"> <q-card dark class="documentCloseDialog">
<q-card-section class="row justify-center"> <q-card-section class="row justify-center">

View file

@ -1,7 +1,7 @@
<template> <template>
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card dark class="documentCloseDialog"> <q-card dark class="documentCloseDialog">
<q-card-section class="row justify-center"> <q-card-section class="row justify-center">

View file

@ -2,7 +2,7 @@
<q-dialog <q-dialog
no-route-dismiss no-route-dismiss
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card <q-card
dark dark
@ -54,9 +54,12 @@
@mouseleave="setDocumentPreviewClose" @mouseleave="setDocumentPreviewClose"
> >
<documentPreview <documentPreview
v-if="!preventPreviewsPopups"
:document-id="opt._id" :document-id="opt._id"
:external-close-trigger="documentPreviewClose" :external-close-trigger="documentPreviewClose"
:special-z-index="999999999" :special-z-index="999999999"
:custom-anchor="'top start'"
:custom-self="'center right'"
/> />
<q-item-section avatar> <q-item-section avatar>
<q-icon <q-icon
@ -282,8 +285,14 @@ export default class ExistingDocumentDialog extends DialogBase {
this.textShadow = this.SGET_options.textShadow this.textShadow = this.SGET_options.textShadow
this.hideDeadCrossThrough = this.SGET_options.hideDeadCrossThrough this.hideDeadCrossThrough = this.SGET_options.hideDeadCrossThrough
this.hideAdvSearchCheatsheetButton = this.SGET_options.hideAdvSearchCheatsheetButton this.hideAdvSearchCheatsheetButton = this.SGET_options.hideAdvSearchCheatsheetButton
this.preventPreviewsPopups = this.SGET_options.preventPreviewsPopups
} }
/**
* Determines if the document previews should be disabled or not
*/
preventPreviewsPopups = false
/** /**
* Hides the advanced search cheatsheet help button in relationship type fields. * Hides the advanced search cheatsheet help button in relationship type fields.
*/ */

View file

@ -1,7 +1,7 @@
<template> <template>
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
no-route-dismiss no-route-dismiss
> >
<q-card dark class="documentCloseDialog"> <q-card dark class="documentCloseDialog">

View file

@ -2,7 +2,7 @@
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card <q-card
class="keyBindsDialog" class="keyBindsDialog"

View file

@ -2,7 +2,7 @@
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card <q-card
class="licenseDialog" class="licenseDialog"

View file

@ -1,7 +1,7 @@
<template> <template>
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
no-route-dismiss no-route-dismiss
> >
<q-card dark class="documentCloseDialog"> <q-card dark class="documentCloseDialog">

View file

@ -2,7 +2,7 @@
<q-dialog <q-dialog
no-route-dismiss no-route-dismiss
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card <q-card
dark dark
@ -238,8 +238,10 @@ export default class NewDocumentDialog extends DialogBase {
*/ */
triggerNewInput (e: NewObjectDocument) { triggerNewInput (e: NewObjectDocument) {
this.dialogModel = false this.dialogModel = false
this.addNewObjectRoute(e) setTimeout(() => {
this.newDocumentModel = null this.addNewObjectRoute(e)
this.newDocumentModel = null
}, 1000)
} }
} }
</script> </script>

View file

@ -1,7 +1,7 @@
<template> <template>
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
no-route-dismiss no-route-dismiss
> >
<q-card dark class="newProjectCheckDialog"> <q-card dark class="newProjectCheckDialog">

View file

@ -3,7 +3,7 @@
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
persistent persistent
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card <q-card
class="programSettingsDialog" class="programSettingsDialog"
@ -25,6 +25,7 @@
<q-tab name="docSettings" label="Document view/edit" /> <q-tab name="docSettings" label="Document view/edit" />
<q-tab name="popupSettings" label="Popups & Floating Windows" /> <q-tab name="popupSettings" label="Popups & Floating Windows" />
<q-tab name="treeSettings" label="Hierarchical tree" /> <q-tab name="treeSettings" label="Hierarchical tree" />
<q-tab name="tabSettings" label="Opened documents tabs" />
<q-separator dark /> <q-separator dark />
@ -324,6 +325,21 @@
/> />
</div> </div>
<div class="col-12 col-md-6 col-lg-4 optionWrapper">
<div class="optionTitle">
Prevent document previews
<q-icon name="mdi-help-circle" size="16px" class="q-ml-md">
<q-tooltip :delay="500">
Determines if the document quick-previews on hover are on or off.
</q-tooltip>
</q-icon>
</div>
<q-toggle
v-model="options.preventPreviewsDocuments"
/>
</div>
<div class="col-12 col-md-6 col-lg-4 optionWrapper"> <div class="col-12 col-md-6 col-lg-4 optionWrapper">
<div class="optionTitle"> <div class="optionTitle">
DEVELOPMENT - Show document IDs DEVELOPMENT - Show document IDs
@ -387,7 +403,7 @@
<div class="col-12 col-md-6 col-lg-4 optionWrapper"> <div class="col-12 col-md-6 col-lg-4 optionWrapper">
<div class="optionTitle"> <div class="optionTitle">
Stop quick-search close after selection Stop closing after selection
<q-icon name="mdi-help-circle" size="16px" class="q-ml-md"> <q-icon name="mdi-help-circle" size="16px" class="q-ml-md">
<q-tooltip :delay="500"> <q-tooltip :delay="500">
Normally the quick-search closes after an item is selected from it. Normally the quick-search closes after an item is selected from it.
@ -419,6 +435,21 @@
/> />
</div> </div>
<div class="col-12 col-md-6 col-lg-4 optionWrapper">
<div class="optionTitle">
Prevent document previews
<q-icon name="mdi-help-circle" size="16px" class="q-ml-md">
<q-tooltip :delay="500">
Determines if the document quick-previews on hover are on or off.
</q-tooltip>
</q-icon>
</div>
<q-toggle
v-model="options.preventPreviewsPopups"
/>
</div>
<div class="col-12"> <div class="col-12">
<div class="text-bold q-mt-xl"> <div class="text-bold q-mt-xl">
Floating windows Floating windows
@ -483,6 +514,23 @@
/> />
</div> </div>
<div class="col-12 col-md-6 col-lg-4 optionWrapper">
<div class="optionTitle">
PERFORMANCE TAXING<br>Prevent document previews
<q-icon name="mdi-help-circle" size="16px" class="q-ml-md">
<q-tooltip :delay="500">
Determines if the document quick-previews on hover are on or off.
<br>
<b>Turning OFF this setting might have a MASSIVE impact on the performance of the app.</b>
</q-tooltip>
</q-icon>
</div>
<q-toggle
v-model="options.preventPreviewsTree"
/>
</div>
<div class="col-12"> <div class="col-12">
<div class="text-bold q-mt-xl"> <div class="text-bold q-mt-xl">
Tag settings Tag settings
@ -724,6 +772,45 @@
</q-scroll-area> </q-scroll-area>
</q-tab-panel> </q-tab-panel>
<q-tab-panel name="tabSettings" dark class="q-pt-sm">
<q-scroll-area
class="programSettingsScrollArea"
visible
dark
:thumb-style="thumbStyle"
>
<div class="row justify-start">
<div class="col-12">
<div class="text-h6">
Opened documents tabs
</div>
</div>
<div class="col-12">
<div class="text-bold q-mt-xl">
Tab behavior
</div>
</div>
<div class="col-12 col-md-6 col-lg-4 optionWrapper">
<div class="optionTitle">
Prevent document previews
<q-icon name="mdi-help-circle" size="16px" class="q-ml-md">
<q-tooltip :delay="500">
Determines if the document quick-previews on hover are on or off.
</q-tooltip>
</q-icon>
</div>
<q-toggle
v-model="options.preventPreviewsTabs"
/>
</div>
</div>
</q-scroll-area>
</q-tab-panel>
<q-tab-panel name="keybinds" dark> <q-tab-panel name="keybinds" dark>
<q-table <q-table
class="keybindsTable" class="keybindsTable"
@ -991,6 +1078,10 @@ export default class ProgramSettings extends DialogBase {
hideTreeIconAddUnder: false, hideTreeIconAddUnder: false,
hideTreeIconEdit: false, hideTreeIconEdit: false,
hideTreeIconView: false, hideTreeIconView: false,
preventPreviewsTree: true,
preventPreviewsTabs: true,
preventPreviewsPopups: false,
preventPreviewsDocuments: false,
userKeybindList: [] userKeybindList: []
} }

View file

@ -1,7 +1,7 @@
<template> <template>
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card dark> <q-card dark>

View file

@ -1,7 +1,7 @@
<template> <template>
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
no-route-dismiss no-route-dismiss
:persistent="repairOngoing || repairFinished" :persistent="repairOngoing || repairFinished"
> >

View file

@ -2,7 +2,7 @@
<q-dialog <q-dialog
v-model="dialogModel" v-model="dialogModel"
@hide="triggerDialogClose" @before-hide="triggerDialogClose"
> >
<q-card <q-card
class="tipsTricksTriviaDialog" class="tipsTricksTriviaDialog"

View file

@ -43,7 +43,7 @@
@mouseleave="setDocumentPreviewClose" @mouseleave="setDocumentPreviewClose"
> >
<documentPreview <documentPreview
v-if="!recursive" v-if="!recursive || preventPreviewsDocuments"
:document-id="single._id" :document-id="single._id"
:external-close-trigger="documentPreviewClose" :external-close-trigger="documentPreviewClose"
/> />

View file

@ -134,7 +134,7 @@
</q-menu> </q-menu>
<documentPreview <documentPreview
v-if="!recursive" v-if="!recursive || preventPreviewsDocuments"
:document-id="localInput._id" :document-id="localInput._id"
:external-close-trigger="documentPreviewClose" :external-close-trigger="documentPreviewClose"
/> />

View file

@ -46,6 +46,7 @@ export default class FieldBase extends BaseClass {
this.textShadow = this.SGET_options.textShadow this.textShadow = this.SGET_options.textShadow
this.hideDeadCrossThrough = this.SGET_options.hideDeadCrossThrough this.hideDeadCrossThrough = this.SGET_options.hideDeadCrossThrough
this.hideAdvSearchCheatsheetButton = this.SGET_options.hideAdvSearchCheatsheetButton this.hideAdvSearchCheatsheetButton = this.SGET_options.hideAdvSearchCheatsheetButton
this.preventPreviewsDocuments = this.SGET_options.preventPreviewsDocuments
} }
/** /**
@ -72,4 +73,9 @@ export default class FieldBase extends BaseClass {
* Determines if the tooltips should be disabled or not * Determines if the tooltips should be disabled or not
*/ */
disableDocumentToolTips = false disableDocumentToolTips = false
/**
* Determines if the document previews should be disabled or not
*/
preventPreviewsDocuments = false
} }

View file

@ -36,6 +36,11 @@ export interface OptionsStateInteface {
hidePlushes: boolean hidePlushes: boolean
showDocumentID: boolean showDocumentID: boolean
preventPreviewsTree: boolean
preventPreviewsTabs: boolean
preventPreviewsPopups: boolean
preventPreviewsDocuments: boolean
userKeybindList: any[] userKeybindList: any[]
treeWidth?: number treeWidth?: number
pre017check?: boolean pre017check?: boolean
@ -78,6 +83,10 @@ function state (): OptionsStateInteface {
hideTreeIconEdit: false, hideTreeIconEdit: false,
hideTreeIconView: false, hideTreeIconView: false,
showDocumentID: false, showDocumentID: false,
preventPreviewsTree: true,
preventPreviewsTabs: true,
preventPreviewsPopups: false,
preventPreviewsDocuments: false,
treeWidth: 374, treeWidth: 374,
userKeybindList: [], userKeybindList: [],
pre017check: true pre017check: true