@fto-consult/expo-ui 2.31.2 → 2.31.4

package/package.json

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

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

@@ -1136,14 +1136,12 @@ export default class CommonDatagridComponent extends AppComponent {
         if(!isNonNullString(field)) return;
         let columns = {...this.state.columns};
         columns[field].visible = !columns[field].visible;
-        let footers = this.getFootersFields();
+        const footers = this.getFootersFields();
         if(isObj(footers[field])){
             footers[field].visible = columns[field].visible;
         }
         this.prepareColumns({columns});
-        this.setState({columns},()=>{
-            if(removeFocus) document.body.click();
-        });
+        this.setState({columns});
    }
    /****le nombre maximum de courbes supportées */
    getMaxSeriesSize(){
@@ -1788,7 +1786,6 @@ export default class CommonDatagridComponent extends AppComponent {
                 type : chartType.type,
             })
         }
-        //console.log(chartOptions," is chart options");
         const labelColor = theme.Colors.isValid(config.labelColor)? config.labelColor : theme.colors.text; 
         if(!isDonut){
             chartOptions.xaxis = extendObj(true,{},{type: 'category'},chartProps.xaxis,{xaxis});
@@ -2352,11 +2349,13 @@ export default class CommonDatagridComponent extends AppComponent {
                 cells = [];
                 const footers = this.sectionListHeaderFooters[key];
                 Object.map(visibleColumnsNames,(v,column)=>{
-                    if(typeof widths[column] !== 'number') return null;
-                    const width = widths[column];
+                    if(!v || typeof widths[column] !== 'number') {
+                        return null;
+                    }
                     if(!column) return null;
+                    const width = widths[column];
                     const key2 = key+column;
-                    if(!column || !this.state.columns[column] || !footers[column]) {
+                    if(!this.state.columns[column] || !footers[column]) {
                         if(this.isAccordion()) return null;
                         cells.push(<View key={key2} testID={testID+"_FooterCellContainer_"+key2} style={[tableStyles.headerItemOrCell,{width}]}></View>)
                     } else {
@@ -2930,43 +2929,43 @@ export default class CommonDatagridComponent extends AppComponent {
         />
     }
     renderSelectFieldCell({rowData,columnDef,columnField}){
-            let v1 = rowData[columnField],_render = v1;
-            if(isObjOrArray(columnDef.items)){
+        let v1 = rowData[columnField],_render = v1;
+        if(isObjOrArray(columnDef.items)){
                 if(columnDef.multiple){
-                v1 = Object.toArray(v1);
-                _render = "";
-                v1.map((v)=>{
+                    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) == v){
-                            _render+=(_render?arrayValueSeparator:"")+defaultStr(it.label,it.text,v);
-                        } else if(isNonNullString(it) && i == v){
-                            _render+=(_render?arrayValueSeparator:"")+it;
+                        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){
-                    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 "";
                     }
-                }
-                if(_render === undefined || _render === null) return v1;
-                if(isArray(_render)){
-                   return _render.join(arrayValueSeparator)
-                } else if(isObj(_render)){
-                   return "";
-                }
             }
-            return _render 
         }
+        return _render 
     }
     /*** retourne le rendu d'une cellule de la ligne du tableau 
     @parm, rowData, object, la ligne à afficher le rendu du contenu