@fto-consult/expo-ui 2.29.2 → 2.29.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.29.2",
+  "version": "2.29.3",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {

package/src/components/Datagrid/Common/Common.js

@@ -2842,6 +2842,45 @@ export default class CommonDatagridComponent extends AppComponent {
             key = {props.rowKey}
         />
     }
+    renderSelectFieldCell({rowData,columnDef,columnField}){
+            let v1 = rowData[columnField],_render = v1;
+            if(isObjOrArray(columnDef.items)){
+                if(columnDef.multiple){
+                v1 = Object.toArray(v1);
+                _render = "";
+                v1.map((v)=>{
+                    for(let i in columnDef.items){
+                        let it = columnDef.items[i];
+                        if(isObj(it) && defaultVal(it.code,i) == v){
+                            _render+=(_render?arrayValueSeparator:"")+defaultStr(it.label,it.text,v);
+                        } else if(isNonNullString(it) && i == v){
+                            _render+=(_render?arrayValueSeparator:"")+it;
+                        }
+                    }
+                })
+                if(!_render){
+                    return v1.join(arrayValueSeparator);
+                }
+                return _render;
+            } else {
+                for(let i in columnDef.items){
+                    let it = columnDef.items[i];
+                    if(isObj(it) && defaultVal(it.code,i) == v1){
+                        return defaultStr(it.label,it.text,v1);
+                    } else if(isNonNullString(it) && i == v1){
+                        return it;
+                    }
+                }
+                if(_render === undefined || _render === null) return v1;
+                if(isArray(_render)){
+                   return _render.join(arrayValueSeparator)
+                } else if(isObj(_render)){
+                   return "";
+                }
+            }
+            return _render 
+        }
+    }
     /*** retourne le rendu d'une cellule de la ligne du tableau 
     @parm, rowData, object, la ligne à afficher le rendu du contenu
     @param , rowInidex, l'indice de la ligne dont on affiche le rendu en cours
@@ -2935,48 +2974,11 @@ export default class CommonDatagridComponent extends AppComponent {
                         data = {rowData}
                         columnField = {columnField}
                     >
-                        {rowData[columnField]}
+                        {this.renderSelectFieldCell({columnDef,columnField,rowData})}
                     </TableLink>             
                 }
              } else if((_type.contains('select'))){
-                 let v1 = rowData[columnField];
-                 _render = v1;
-                 if(isObjOrArray(columnDef.items)){
-                     if(columnDef.multiple){
-                         v1 = Object.toArray(v1);
-                         _render = "";
-                         v1.map((v)=>{
-                             for(let i in columnDef.items){
-                                 let it = columnDef.items[i];
-                                 if(isObj(it) && defaultVal(it.code,i) == v){
-                                     _render+=(_render?arrayValueSeparator:"")+defaultStr(it.label,it.text,v);
-                                 } else if(isNonNullString(it) && i == v){
-                                    _render+=(_render?arrayValueSeparator:"")+it;
-                                 }
-                             }
-                         })
-                         if(!_render){
-                             _render = v1.join(arrayValueSeparator);
-                         }
-                     } else {
-                         for(let i in columnDef.items){
-                            let it = columnDef.items[i];
-                            if(isObj(it) && defaultVal(it.code,i) == v1){
-                                _render =defaultStr(it.label,it.text,v1);
-                                break;
-                            } else if(isNonNullString(it) && i == v1){
-                                _render = it;
-                                break;
-                            }
-                        }
-                        if(!_render) _render = v1;
-                        if(isArray(_render)){
-                            _render = _render.join(arrayValueSeparator)
-                        } else if(isObj(_render)){
-                            _render = "";
-                        }
-                     }
-                 }
+                 _render= this.renderSelectFieldCell({columnDef,columnField,rowData,data:rowData})
              } else if(_type == 'image'){
                 if(renderText) return null;
                  columnDef = defaultObj(columnDef)
@@ -2987,7 +2989,7 @@ export default class CommonDatagridComponent extends AppComponent {
                  columnDef.src = rowData[columnField];
                  _render = <Image {...columnDef}/>
              } 
-             if(_render === undefined){
+             if(_render === undefined || _render ===null){
                  _render = rowData[columnField];
              }
              if(columnDef.type =="password" && isNonNullString(_render)){