From 3aff6a9c94bf1e29cc2e46b4a875de0ab7aebaf1 Mon Sep 17 00:00:00 2001
From: Surya Paolo <paolo.arena77@gmail.com>
Date: Wed, 30 Nov 2022 11:36:48 +0100
Subject: [PATCH] fix column changed value (fieldtype)

---
 src/components/CMyFieldRec/CMyFieldRec.ts    | 3 +++
 src/components/CMyFieldRec/CMyFieldRec.vue   | 1 +
 src/components/CMyPopupEdit/CMyPopupEdit.ts  | 2 +-
 src/components/CMyPopupEdit/CMyPopupEdit.vue | 6 ++++++
 src/components/CStatusReg/CStatusReg.vue     | 1 +
 src/store/Modules/fieldsTable.ts             | 2 +-
 6 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/components/CMyFieldRec/CMyFieldRec.ts b/src/components/CMyFieldRec/CMyFieldRec.ts
index 03f52dc5..d8eb5735 100755
--- a/src/components/CMyFieldRec/CMyFieldRec.ts
+++ b/src/components/CMyFieldRec/CMyFieldRec.ts
@@ -150,6 +150,8 @@ export default defineComponent({
       // recordCol.value = fieldsTable.getrecTableList(props.table)
       let columns = fieldsTable.getArrColsByTable(props.table)
 
+      // console.log('table', props.table, 'LAB', optlab.value, 'COL', columns)
+
       if (columns) {
         col.value = columns.find((col: any) => col.name === props.field)
       } else {
@@ -160,6 +162,7 @@ export default defineComponent({
         jointable.value = col.value.jointable!
       }
 
+
       const arrk = props.field.split('.')
       if (arrk) {
         mykey.value = props.field
diff --git a/src/components/CMyFieldRec/CMyFieldRec.vue b/src/components/CMyFieldRec/CMyFieldRec.vue
index c48c3b14..d967a984 100755
--- a/src/components/CMyFieldRec/CMyFieldRec.vue
+++ b/src/components/CMyFieldRec/CMyFieldRec.vue
@@ -1,4 +1,5 @@
 <template>
+fieldtype: {{fieldtype}}
   <div v-if="visuElem()" :class="mytitle ? `row items-center justify-center q-ma-xs text-center` : ``">
     <div v-if="mytitle" class="q-ma-xs">
       <q-field rounded outlined :bg-color="($q.dark.isActive ? '' : 'blue-4')" dense style="min-width:110px;">
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.ts b/src/components/CMyPopupEdit/CMyPopupEdit.ts
index 02887fdf..6d618c63 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.ts
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.ts
@@ -254,7 +254,7 @@ export default defineComponent({
       // console.log('crea', isFieldDb(), 'props.mycol', props.mycol)
 
       if (props.mycol && props.mycol.name && props.mycol.name !== 'test') {
-        col.value = props.mycol
+        col.value = {...props.mycol}
       } else {
         if (col.value.name === 'test') {
           col.value.name = props.field
diff --git a/src/components/CMyPopupEdit/CMyPopupEdit.vue b/src/components/CMyPopupEdit/CMyPopupEdit.vue
index 337da556..1f6492c8 100755
--- a/src/components/CMyPopupEdit/CMyPopupEdit.vue
+++ b/src/components/CMyPopupEdit/CMyPopupEdit.vue
@@ -119,6 +119,12 @@
                 :label="myvalue"
               >
               </q-btn>
+              <div v-else>
+              <span
+                :class="{ disabled: disable }"
+                v-html="visuValByType(myvalue, col, row)"
+              ></span>
+              </div>
             </div>
           </div>
           <div
diff --git a/src/components/CStatusReg/CStatusReg.vue b/src/components/CStatusReg/CStatusReg.vue
index ca40e43a..e4204528 100755
--- a/src/components/CStatusReg/CStatusReg.vue
+++ b/src/components/CStatusReg/CStatusReg.vue
@@ -56,6 +56,7 @@
 
                 <q-item-section>
                   <q-item-label lines="1">
+
                     <CMyFieldRec
                       table="users"
                       :id="user._id"
diff --git a/src/store/Modules/fieldsTable.ts b/src/store/Modules/fieldsTable.ts
index f14284ca..ab67536a 100755
--- a/src/store/Modules/fieldsTable.ts
+++ b/src/store/Modules/fieldsTable.ts
@@ -2981,7 +2981,7 @@ export const fieldsTable = {
   },
   getArrColsByTable(mytable: string) {
     const tablerec: any = this.tablesList.find((rec) => rec.value === mytable)
-    if (tablerec) {
+    if (tablerec && tablerec.columns) {
       return tablerec.columns
     } else
       return null