This commit is contained in:
2020-04-20 19:21:18 +00:00
parent 397abc4220
commit a50a465db0
6 changed files with 29 additions and 29 deletions

View File

@@ -65,11 +65,7 @@ CURRENT TODOs
@@@@@@@@@@@ ROADMAP STAGE 2: @@@@@@@@@@@ ROADMAP STAGE 2:
todo: Not sure I like not being able to logout from a widget edit form
- put back?
- Put in nav menu to left (seems logical that way) and remove from any other menu
- as bottom option
todo: Test widget form as bizamdinlimited read only mode because I think several things are not right in read only mode todo: Test widget form as bizamdinlimited read only mode because I think several things are not right in read only mode
- remove clear button and option if read only - remove clear button and option if read only
- make sure can't use any of the controls the make changes - make sure can't use any of the controls the make changes

View File

@@ -19,7 +19,7 @@
<div v-if="item.type === 1"> <div v-if="item.type === 1">
<gz-date-time-picker <gz-date-time-picker
v-model="_self[item.dataKey]" v-model="_self[item.dataKey]"
:readonly="readOnly" :readonly="readonly"
:label="$ay.t(item.fld)" :label="$ay.t(item.fld)"
:ref="item.fld" :ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false" :data-cy="!!$ay.dev ? item.fld : false"
@@ -39,7 +39,7 @@
<div v-else-if="item.type === 2"> <div v-else-if="item.type === 2">
<gz-date-picker <gz-date-picker
v-model="_self[item.dataKey]" v-model="_self[item.dataKey]"
:readonly="readOnly" :readonly="readonly"
:label="$ay.t(item.fld)" :label="$ay.t(item.fld)"
:ref="item.fld" :ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false" :data-cy="!!$ay.dev ? item.fld : false"
@@ -58,7 +58,7 @@
<div v-else-if="item.type === 3"> <div v-else-if="item.type === 3">
<gz-time-picker <gz-time-picker
v-model="_self[item.dataKey]" v-model="_self[item.dataKey]"
:readonly="readOnly" :readonly="readonly"
:label="$ay.t(item.fld)" :label="$ay.t(item.fld)"
:ref="item.fld" :ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false" :data-cy="!!$ay.dev ? item.fld : false"
@@ -77,7 +77,7 @@
<div v-else-if="item.type === 4"> <div v-else-if="item.type === 4">
<v-textarea <v-textarea
v-model="_self[item.dataKey]" v-model="_self[item.dataKey]"
:readonly="readOnly" :readonly="readonly"
:label="$ay.t(item.fld)" :label="$ay.t(item.fld)"
:ref="item.fld" :ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false" :data-cy="!!$ay.dev ? item.fld : false"
@@ -91,14 +91,14 @@
) )
]" ]"
auto-grow auto-grow
clearable :clearable="!readonly"
></v-textarea> ></v-textarea>
</div> </div>
<!-- INTEGER --> <!-- INTEGER -->
<div v-else-if="item.type === 5"> <div v-else-if="item.type === 5">
<v-text-field <v-text-field
v-model="_self[item.dataKey]" v-model="_self[item.dataKey]"
:readonly="readOnly" :readonly="readonly"
:label="$ay.t(item.fld)" :label="$ay.t(item.fld)"
:ref="item.fld" :ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false" :data-cy="!!$ay.dev ? item.fld : false"
@@ -111,7 +111,7 @@
$ay.t(item.fld) $ay.t(item.fld)
) )
]" ]"
clearable :clearable="!readonly"
:counter="10" :counter="10"
type="number" type="number"
step="none" step="none"
@@ -121,7 +121,7 @@
<div v-else-if="item.type === 6"> <div v-else-if="item.type === 6">
<v-checkbox <v-checkbox
v-model="_self[item.dataKey]" v-model="_self[item.dataKey]"
:readonly="readOnly" :readonly="readonly"
:label="$ay.t(item.fld)" :label="$ay.t(item.fld)"
:ref="item.fld" :ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false" :data-cy="!!$ay.dev ? item.fld : false"
@@ -140,7 +140,7 @@
<div v-else-if="item.type === 7"> <div v-else-if="item.type === 7">
<gz-decimal <gz-decimal
v-model="_self[item.dataKey]" v-model="_self[item.dataKey]"
:readonly="readOnly" :readonly="readonly"
:label="$ay.t(item.fld)" :label="$ay.t(item.fld)"
:ref="item.fld" :ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false" :data-cy="!!$ay.dev ? item.fld : false"
@@ -159,7 +159,7 @@
<div v-else-if="item.type === 8"> <div v-else-if="item.type === 8">
<gz-currency <gz-currency
v-model="_self[item.dataKey]" v-model="_self[item.dataKey]"
:readonly="readOnly" :readonly="readonly"
:label="$ay.t(item.fld)" :label="$ay.t(item.fld)"
:ref="item.fld" :ref="item.fld"
:data-cy="!!$ay.dev ? item.fld : false" :data-cy="!!$ay.dev ? item.fld : false"
@@ -201,7 +201,7 @@ export default {
type: String type: String
}, },
formKey: String, //used to grab template from store formKey: String, //used to grab template from store
readOnly: Boolean, readonly: Boolean,
parentVM: Object parentVM: Object
}, },
@@ -213,7 +213,7 @@ export default {
fieldValueChanged(ref) { fieldValueChanged(ref) {
if ( if (
!this.parentVM.formState.loading && !this.parentVM.formState.loading &&
!this.parentVM.formState.readOnly !this.parentVM.formState.readonly
) { ) {
window.$gz.form.fieldValueChanged(this.parentVM, ref); window.$gz.form.fieldValueChanged(this.parentVM, ref);
} }

View File

@@ -3,6 +3,7 @@
<v-autocomplete <v-autocomplete
v-bind:value="value" v-bind:value="value"
v-on:input="selectionMade($event)" v-on:input="selectionMade($event)"
:readonly="readonly"
return-object return-object
:items="searchResults" :items="searchResults"
:label="label" :label="label"
@@ -15,7 +16,7 @@
:search-input.sync="searchEntry" :search-input.sync="searchEntry"
:filter="customFilter" :filter="customFilter"
hide-no-data hide-no-data
clearable :clearable="!readonly"
:no-filter="isTagFilter" :no-filter="isTagFilter"
:append-icon="errorIcon" :append-icon="errorIcon"
@click:append="handleErrorClick" @click:append="handleErrorClick"
@@ -60,6 +61,7 @@ export default {
type: Number, type: Number,
default: null default: null
}, },
readonly: { type: Boolean, default: false },
ayaType: { ayaType: {
type: Number, type: Number,
default: 0 default: 0

View File

@@ -6,6 +6,7 @@
<v-autocomplete <v-autocomplete
v-bind:value="value" v-bind:value="value"
v-on:input="$emit('input', $event)" v-on:input="$emit('input', $event)"
:readonly="readonly"
:items="sourcetags" :items="sourcetags"
:loading="tagSearchUnderway" :loading="tagSearchUnderway"
:placeholder="$ay.t('TypeToSearchOrAdd')" :placeholder="$ay.t('TypeToSearchOrAdd')"
@@ -67,7 +68,8 @@ export default {
}; };
}, },
props: { props: {
value: Array value: Array,
readonly: { type: Boolean, default: false }
}, },
watch: { watch: {
tagSearchEntry(val) { tagSearchEntry(val) {

View File

@@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<template v-if="readOnly"> <template v-if="readonly">
<div> <div>
<v-btn depressed tile @click="switchView()"> <v-btn depressed tile @click="switchView()">
Wiki<v-icon right>{{ switchViewIcon() }}</v-icon></v-btn Wiki<v-icon right>{{ switchViewIcon() }}</v-icon></v-btn
@@ -387,7 +387,7 @@ export default {
}, },
props: { props: {
value: String, value: String,
readOnly: Boolean, readonly: Boolean,
attachments: Array attachments: Array
}, },
watch: { watch: {
@@ -528,7 +528,7 @@ export default {
//return the icon that indicates what it will change to if you click it //return the icon that indicates what it will change to if you click it
//mirror of switchview below //mirror of switchview below
if (this.readOnly) { if (this.readonly) {
if (this.currentView == this.view.HIDDEN_VIEW) { if (this.currentView == this.view.HIDDEN_VIEW) {
return "fa-eye"; return "fa-eye";
} else { } else {
@@ -562,7 +562,7 @@ export default {
}, },
switchView() { switchView() {
//if user can't edit then cycle between hidden and wiki view //if user can't edit then cycle between hidden and wiki view
if (this.readOnly) { if (this.readonly) {
if (this.currentView == this.view.HIDDEN_VIEW) { if (this.currentView == this.view.HIDDEN_VIEW) {
this.currentView = this.view.WIKI_VIEW; this.currentView = this.view.WIKI_VIEW;
} else { } else {

View File

@@ -10,7 +10,7 @@
<v-text-field <v-text-field
v-model="obj.name" v-model="obj.name"
:readonly="formState.readOnly" :readonly="formState.readOnly"
clearable :clearable="!formState.readOnly"
@click:clear="fieldValueChanged('name')" @click:clear="fieldValueChanged('name')"
:counter="255" :counter="255"
:label="$ay.t('WidgetName')" :label="$ay.t('WidgetName')"
@@ -48,7 +48,7 @@
<v-text-field <v-text-field
v-model="obj.count" v-model="obj.count"
:readonly="formState.readOnly" :readonly="formState.readOnly"
clearable :clearable="!formState.readOnly"
@click:clear="fieldValueChanged('count')" @click:clear="fieldValueChanged('count')"
:counter="10" :counter="10"
:label="$ay.t('WidgetCount')" :label="$ay.t('WidgetCount')"
@@ -169,7 +169,7 @@
<v-col v-if="form().showMe(this, 'Notes')" cols="12"> <v-col v-if="form().showMe(this, 'Notes')" cols="12">
<v-textarea <v-textarea
v-model="obj.notes" v-model="obj.notes"
:readonly="formState.readOnly" :readonly="formState.readOnly"
:label="$ay.t('WidgetNotes')" :label="$ay.t('WidgetNotes')"
:error-messages="form().serverErrors(this, 'notes')" :error-messages="form().serverErrors(this, 'notes')"
@@ -177,7 +177,7 @@
:data-cy="!!$ay.dev ? 'notes' : false" :data-cy="!!$ay.dev ? 'notes' : false"
@input="fieldValueChanged('notes')" @input="fieldValueChanged('notes')"
auto-grow auto-grow
clearable :clearable="!formState.readOnly"
></v-textarea> ></v-textarea>
</v-col> </v-col>
@@ -196,7 +196,7 @@
<gz-custom-fields <gz-custom-fields
v-model="obj.customFields" v-model="obj.customFields"
:formKey="formCustomTemplateKey" :formKey="formCustomTemplateKey"
:readOnly="formState.readOnly" :readonly="formState.readOnly"
:parentVM="this" :parentVM="this"
ref="customFields" ref="customFields"
:data-cy="!!$ay.dev ? 'customFields' : false" :data-cy="!!$ay.dev ? 'customFields' : false"
@@ -209,7 +209,7 @@
<gz-wiki <gz-wiki
ref="wiki" ref="wiki"
v-model="obj.wiki" v-model="obj.wiki"
:readOnly="formState.readOnly" :readonly="formState.readOnly"
:parentVM="this" :parentVM="this"
@input="fieldValueChanged('wiki')" @input="fieldValueChanged('wiki')"
></gz-wiki ></gz-wiki