@fto-consult/expo-ui 2.31.4 → 2.31.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fto-consult/expo-ui",
-  "version": "2.31.4",
+  "version": "2.31.5",
   "description": "Bibliothèque de composants UI Expo,react-native",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "@emotion/native": "^11.10.0",
     "@expo/html-elements": "^0.2.0",
     "@expo/vector-icons": "^13.0.0",
-    "@fto-consult/common": "^1.25.17",
+    "@fto-consult/common": "^1.25.24",
     "@gorhom/portal": "^1.0.14",
     "@react-native-async-storage/async-storage": "~1.17.3",
     "@react-native-community/datetimepicker": "6.5.2",

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

@@ -40,7 +40,7 @@ import {styles as tableStyles} from "$ecomponents/Table";
 import {DialogProvider} from "$ecomponents/Form/FormData";
 import Chart,{getMaxSupportedSeriesSize} from "$ecomponents/Chart";
 import notify from "$cnotify";
-import Divider from "$ecomponents/Divider";
+import FileSystem from "$file-system";
 
 export const donutChart = {
     isChart : true,
@@ -244,6 +244,7 @@ export default class CommonDatagridComponent extends AppComponent {
             displayTypes : {value : hasFoundDisplayTypes ? disTypes : Object.clone(displayTypes)},
             dateFields : {value : {}},
             sectionListColumnsSize : {value : {current:0}}, //la taille du nombre d'éléments de section dans les colonnes
+            chartRef : {value : {current:null}},
         }) 
         const sessionAggregator = defaultStr(this.getSessionData("aggregatorFunction")).trim();
         const aggregatorProps = defaultStr(this.props.aggregatorFunction).trim();
@@ -1485,6 +1486,28 @@ export default class CommonDatagridComponent extends AppComponent {
    isDashboard(){
      return false;
    }
+   /*** télécharge le chart actif */
+   downloadChart(){
+        if(!this.chartRef.current || !this.chartRef.current.dataURI) return Promise.reject({message:'Référence du graphique non valide'});
+        return this.chartRef.current.dataURI().then(({ imgURI, blob })=>{
+            FileSystem.write({content:imgURI,fileName:"graphe.png",contentType:"image/png"})
+        });
+    }
+   ///reoturne les options de menus à appliquer sur le char
+   getChartMenus(){
+        return  [
+            {
+                text : "Options du graphe",
+                textBold : true,
+                divider:true,
+            },
+            {
+                text :"Télécharger",
+                icon : "download",
+                onPress : this.downloadChart.bind(this),
+            }
+        ]
+   }
    renderDisplayTypes(){
         const m = [];
         let activeType = null,hasFoundChart = false,hasFoundTable = false;
@@ -1539,6 +1562,11 @@ export default class CommonDatagridComponent extends AppComponent {
         if(!isMobileOrTabletMedia()){
             m.unshift({text:"Type d'affichage des données",divider:true,textBold:true});
         }
+        if(hasFoundChart){
+            Object.map(this.getChartMenus(),(c,i)=>{
+                m.push(c);
+            })
+        }
         return <Menu
             title = "Type d'affichage"
             items = {m}
@@ -1782,9 +1810,11 @@ export default class CommonDatagridComponent extends AppComponent {
                 },
             },chartProps.title),
             series,
-            chart : extendObj(true,{},{height :this.isDashboard()?80:350},chartProps.chart,{
-                type : chartType.type,
-            })
+            chart : extendObj(true,{},
+                {toolbar : {show : false}},
+                {height :this.isDashboard()?80:350},chartProps.chart,
+                {type : chartType.type}
+            )
         }
         const labelColor = theme.Colors.isValid(config.labelColor)? config.labelColor : theme.colors.text; 
         if(!isDonut){
@@ -1827,6 +1857,7 @@ export default class CommonDatagridComponent extends AppComponent {
         }
         return <Chart
             options = {chartOptions}
+            ref = {this.chartRef}
             key = {chartOptions.chart.id+"-"+this.state.displayType}
         />
    }
@@ -2101,7 +2132,7 @@ export default class CommonDatagridComponent extends AppComponent {
                     mItem.right = (p)=>{
                         return <Icon name="material-settings" {...p} onPress={(e)=>{
                             //React.stopEventPropagation(e);
-                            this.configureSectionListColumn(mItem);
+                            this.configureSectionListColumn({...mItem,...defaultObj(sectionListColumns[field])});
                             //return false;
                         }}/>
                     }

package/src/media/file-system/utils/write.js

@@ -1,7 +1,7 @@
 // Copyright 2022 @fto-consult/Boris Fouomene. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
-import {defaultStr,base64toBlob,isNonNullString,getFileName,getFileExtension,defaultNumber,defaultBool,dataURLToBase64,isBlob,isBase64,isDataURL} from "$utils";
+import {defaultStr,base64toBlob,dataURLToBlob,getTypeFromDataURL,isNonNullString,getFileName,getFileExtension,defaultNumber,defaultBool,dataURLToBase64,isBlob,isBase64,isDataURL} from "$utils";
 const FileSaver = require('file-saver');
 const mime = require('mime-types')
 const XLSX = require("xlsx");
@@ -29,6 +29,13 @@ import Preloader from "$preloader";
             reject({status:false,msg:'Nom de fichier invalide'});
             return;
         }
+        if(isDataURL(content)){
+            const type = getTypeFromDataURL(content);
+            content = dataURLToBlob(content);
+            if(isNonNullString(type)){
+                contentType = type;
+            }
+        }
         content = isBlob(content)? content : new Blob([content], { type: content?.type||contentType})
         try {
             FileSaver.saveAs(content, fileName);
@@ -55,10 +62,6 @@ function s2ab(s) {
  * .xls	 : application/vnd.ms-excel
  */
 export const writeExcel = ({workbook,content,contentType,fileName,...rest})=>{
-    if(!isNonNullString(contentType) || !contentType.contains("application/vnd.")){
-        //contentType = "application/vnd.ms-excel";
-        contentType : "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"
-    }
     let ext = defaultStr(getFileExtension(fileName,true),"xlsx");
     fileName = sanitizeFileName(getFileName(fileName,true))+"."+ext;
     if(!isNonNullString(fileName)){
@@ -70,11 +73,31 @@ export const writeExcel = ({workbook,content,contentType,fileName,...rest})=>{
     if(isBlob(content)){
         return write({...rest,content,fileName,contentType})
     }
-    Preloader.open("génération du fichier excel "+fileName);
-    XLSX.writeFile(workbook, fileName);
-    setTimeout(()=>{
-        Preloader.close();
-    },1000);
+    return new Promise((resolve,reject)=>{
+        Preloader.open("génération du fichier excel "+fileName);
+        try {
+            XLSX.writeFile(workbook, fileName);
+            setTimeout(()=>{
+                Preloader.close();
+                resolve({fileName});
+            },1000);
+        } catch(e){
+            reject(e);
+        }
+    })
+}
+
+/***
+ * @see https://ourtechroom.com/tech/mime-type-for-excel/ for excel mimesTypes
+ * .xls	 : application/vnd.ms-excel
+ */
+export const writeImage = ({content,fileName,...rest})=>{
+    let ext = defaultStr(getFileExtension(fileName,true),"png");
+    fileName = sanitizeFileName(getFileName(fileName,true))+"."+ext;
+    if(!isNonNullString(fileName)){
+        return Promise.reject({status:false,message:'Nom de fichier invalide pour le contenu excel à créer'});
+    }
+    
 }