From 02825c4e9c0b0cecf5d1717f83e129eaeee1d961 Mon Sep 17 00:00:00 2001
From: 18alantom <2.alan.tom@gmail.com>
Date: Fri, 15 Jul 2022 14:20:25 +0530
Subject: [PATCH] incr: allow edit without close - remove bg if readonly

---
 src/components/Controls/AutoComplete.vue | 10 ++--------
 src/components/Controls/Base.vue         |  6 ++++--
 src/components/Controls/Table.vue        |  2 +-
 src/components/Controls/TableRow.vue     |  4 ----
 src/components/Controls/Text.vue         |  1 +
 src/components/TwoColumnForm.vue         |  2 +-
 src/pages/InvoiceForm.vue                | 14 ++++++++++----
 7 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/components/Controls/AutoComplete.vue b/src/components/Controls/AutoComplete.vue
index eb89513c..355dca3f 100644
--- a/src/components/Controls/AutoComplete.vue
+++ b/src/components/Controls/AutoComplete.vue
@@ -12,14 +12,8 @@
         {{ df.label }}
       </div>
       <div
-        class="
-          flex
-          items-center
-          justify-between
-          focus-within:bg-gray-200
-          pr-2
-          rounded
-        "
+        class="flex items-center justify-between pr-2 rounded"
+        :class="isReadOnly ? '' : 'focus-within:bg-gray-200'"
       >
         <input
           ref="input"
diff --git a/src/components/Controls/Base.vue b/src/components/Controls/Base.vue
index bf463c2e..2b5fcc17 100644
--- a/src/components/Controls/Base.vue
+++ b/src/components/Controls/Base.vue
@@ -62,8 +62,10 @@ export default {
           'px-3 py-2': this.size !== 'small',
           'px-2 py-1': this.size === 'small',
         },
-        'focus:outline-none focus:bg-gray-200 rounded w-full placeholder-gray-500',
-        this.isReadOnly ? 'text-gray-800' : 'text-gray-900',
+        'focus:outline-none rounded w-full placeholder-gray-500',
+        this.isReadOnly
+          ? 'text-gray-800 focus:bg-transparent'
+          : 'text-gray-900 focus:bg-gray-200',
       ];
 
       return this.getInputClassesFromProp(classes);
diff --git a/src/components/Controls/Table.vue b/src/components/Controls/Table.vue
index 1c6cfd2a..fa2e91bc 100644
--- a/src/components/Controls/Table.vue
+++ b/src/components/Controls/Table.vue
@@ -172,7 +172,7 @@ export default {
       return 2;
     },
     canEditRow() {
-      return !this.doc?.isSubmitted && this.df.edit;
+      return this.df.edit;
     },
     ratio() {
       const ratio = [0.3].concat(this.tableFields.map(() => 1));
diff --git a/src/components/Controls/TableRow.vue b/src/components/Controls/TableRow.vue
index 154e7d34..f9775f0d 100644
--- a/src/components/Controls/TableRow.vue
+++ b/src/components/Controls/TableRow.vue
@@ -46,7 +46,6 @@
       :background="false"
       @click="openRowQuickEdit"
       v-if="canEditRow"
-      :disabled="isEditing"
     >
       <feather-icon name="edit" class="w-4 h-4 text-gray-600" />
     </Button>
@@ -98,9 +97,6 @@ export default {
       doc: this.row,
     };
   },
-  inject: {
-    isEditing: { default: false },
-  },
   methods: {
     onChange(df, value) {
       if (value == null) {
diff --git a/src/components/Controls/Text.vue b/src/components/Controls/Text.vue
index 02537af6..82c54306 100644
--- a/src/components/Controls/Text.vue
+++ b/src/components/Controls/Text.vue
@@ -10,6 +10,7 @@
       :value="value"
       :placeholder="inputPlaceholder"
       style="vertical-align: top"
+      :readonly="isReadOnly"
       @blur="(e) => triggerChange(e.target.value)"
       @focus="(e) => $emit('focus', e)"
       @input="(e) => $emit('input', e)"
diff --git a/src/components/TwoColumnForm.vue b/src/components/TwoColumnForm.vue
index 923e634b..84aa4668 100644
--- a/src/components/TwoColumnForm.vue
+++ b/src/components/TwoColumnForm.vue
@@ -188,7 +188,7 @@ export default {
         return true;
       }
 
-      if (this.submitted) {
+      if (this.submitted || this.doc.parentdoc?.isSubmitted) {
         return true;
       }
 
diff --git a/src/pages/InvoiceForm.vue b/src/pages/InvoiceForm.vue
index f9390717..e6b19bde 100644
--- a/src/pages/InvoiceForm.vue
+++ b/src/pages/InvoiceForm.vue
@@ -12,7 +12,7 @@
       </Button>
       <Button
         :icon="true"
-        v-if="!doc?.isSubmitted && !quickEditDoc && doc.enableDiscounting"
+        v-if="!doc?.isSubmitted && doc.enableDiscounting"
         @click="toggleInvoiceSettings"
       >
         <feather-icon name="settings" class="w-4 h-4" />
@@ -308,6 +308,7 @@ getActionsForDocument,
 routeTo,
 showMessageDialog
 } from 'src/utils/ui';
+import { nextTick } from 'vue';
 import { handleErrorWithDialog } from '../errorHandling';
 import QuickEditForm from './QuickEditForm.vue';
 
@@ -328,7 +329,6 @@ export default {
       schemaName: this.schemaName,
       name: this.name,
       doc: computed(() => this.doc),
-      isEditing: computed(() => !!this.quickEditDoc),
     };
   },
   data() {
@@ -413,7 +413,7 @@ export default {
   methods: {
     routeTo,
     toggleInvoiceSettings() {
-      if (this.quickEditDoc || !this.schemaName) {
+      if (!this.schemaName) {
         return;
       }
 
@@ -423,7 +423,13 @@ export default {
 
       this.toggleQuickEditDoc(this.doc, fields);
     },
-    toggleQuickEditDoc(doc, fields = []) {
+    async toggleQuickEditDoc(doc, fields = []) {
+      if (this.quickEditDoc && doc) {
+        this.quickEditDoc = null;
+        this.quickEditFields = [];
+        await nextTick();
+      }
+
       this.quickEditDoc = doc;
       this.quickEditFields = fields;
     },